diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod index 2a4a101c97044df295f234220003729435a5439c..4bcf65351c33b6fdf2475b7d12f731588c1b6e38 100644 --- a/entity/Productprice_entity/Productprice_entity.aod +++ b/entity/Productprice_entity/Productprice_entity.aod @@ -91,7 +91,6 @@ <documentation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/documentation.adoc</documentation> <title>Price list</title> <consumer>KeywordPricelists</consumer> - <mandatoryProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js</mandatoryProcess> <state>AUTO</state> <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess> <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess> diff --git a/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js b/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js deleted file mode 100644 index a58e5c2bf7ea484c0a9038f0846ecec2f42be31b..0000000000000000000000000000000000000000 --- a/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js +++ /dev/null @@ -1,10 +0,0 @@ -import("system.neon"); -import("system.vars"); -import("system.result"); - -if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.CONTACT_ID") != "") - result.string("false"); -else - result.string("true"); - - \ No newline at end of file diff --git a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod index b225f31a95b5abf6de65302cf84b5d1e777e836a..19a4436db74b4df7216d312685839c1b7bda5ec4 100644 --- a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod +++ b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod @@ -11,7 +11,6 @@ <children> <tableViewTemplate> <name>Prices</name> - <autoNewRow v="true" /> <entityField>#ENTITY</entityField> <columns> <neonTableColumn> diff --git a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod index 3f9f33250c400cb0f9b755e87e229f788ff579c8..9d9bef97dfc888c3202b6d6c207c3d3cbf4bf53c 100644 --- a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod +++ b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod @@ -10,45 +10,48 @@ <children> <tableViewTemplate> <name>PriceRelations</name> - <autoNewRow v="true" /> <entityField>#ENTITY</entityField> <columns> <neonTableColumn> - <name>bc7ca35e-c454-4cc0-9b2e-0656e03f1f65</name> + <name>44311686-a24a-4cf0-87a0-6e354b3f457a</name> <entityField>IMAGE</entityField> </neonTableColumn> <neonTableColumn> - <name>9b809450-cbe5-40f3-8d64-b4a5bac5eb5b</name> + <name>695ce7be-d738-48a9-833d-e8815c6eff74</name> <entityField>PRODUCT_ID</entityField> </neonTableColumn> <neonTableColumn> - <name>fd5ab54d-439c-4836-a761-3af16e437a0e</name> + <name>472a96ca-10ff-49c7-b2ae-6550e04c4e6f</name> <entityField>VALID_FROM</entityField> </neonTableColumn> <neonTableColumn> - <name>da4728b2-d5fe-4df1-84e5-a77a653dc558</name> + <name>56b22986-0b94-4e7f-a0e8-c2a0a7281088</name> <entityField>VALID_TO</entityField> </neonTableColumn> <neonTableColumn> - <name>4fd6845e-cb3a-4fe3-8900-3b58a86cb374</name> - <entityField>FROMQUANTITY</entityField> + <name>56902ebb-b48b-42f9-b867-fb2b07527461</name> + <entityField>PRICE</entityField> </neonTableColumn> <neonTableColumn> - <name>1cf65759-0c48-4d3d-8bd1-ddf0645ded43</name> - <entityField>PRICELIST</entityField> + <name>8879e46d-fa53-4769-8bcf-15b65fdf9967</name> + <entityField>CURRENCY</entityField> </neonTableColumn> <neonTableColumn> - <name>3ed800e0-a630-42b4-9dda-288ab5eefc69</name> - <entityField>PRICE</entityField> + <name>15a669d9-b089-4134-89a0-129de6e1e68c</name> + <entityField>BUYSELL</entityField> </neonTableColumn> <neonTableColumn> - <name>20efd64c-297d-4774-b020-437d3610e798</name> - <entityField>CURRENCY</entityField> + <name>e27ad433-ca4f-4a54-8722-75c9055a202b</name> + <entityField>FROMQUANTITY</entityField> </neonTableColumn> <neonTableColumn> - <name>787d2cce-ddb0-4d7e-8df4-5675e0d96d76</name> + <name>981f29b1-b4c5-4591-8064-21a72f339179</name> <entityField>VAT</entityField> </neonTableColumn> + <neonTableColumn> + <name>51a923d8-3893-409b-869e-a4ad9704aa03</name> + <entityField>PRICELIST</entityField> + </neonTableColumn> </columns> </tableViewTemplate> </children>