Skip to content
Snippets Groups Projects
Commit ca3bcbe2 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Salesproject, Offer, Order fixes

parent 2f8259ac
No related branches found
No related tags found
No related merge requests found
......@@ -78,6 +78,8 @@
<entityField>
<name>VAT</name>
<title>Total VAT</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
</entityField>
<entityField>
......@@ -140,12 +142,16 @@
<entityField>
<name>NET</name>
<title>Total net</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
</entityField>
<entityField>
<name>TotalGross</name>
<documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
<title>Total gross</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
</entityField>
......
......@@ -16,6 +16,8 @@
<entityField>
<name>DISCOUNT</name>
<title>Discount %</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0</outputFormat>
</entityField>
<entityField>
<name>GROUPCODEID</name>
......@@ -57,6 +59,8 @@
<entityField>
<name>PRICE</name>
<title>Unit price</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
......@@ -74,6 +78,8 @@
<name>QUANTITY</name>
<documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
<title>Quantity</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0</outputFormat>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
<onValueChangeTypes>
......@@ -90,6 +96,8 @@
<entityField>
<name>VAT</name>
<title>VAT</title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
</entityField>
<entityParameter>
......
......@@ -16,9 +16,10 @@
<entityField>
<name>MINUTES</name>
<title>Time</title>
<contentType>NUMBER</contentType>
<contentType>TEXT</contentType>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
</entityField>
<entityField>
<name>OBJECT_ID</name>
......
import("system.translate");
import("system.result");
import("system.vars");
import("PostalAddress_lib");
import("Entity_lib");
// TODO: displayValue + contentType number crashes so we use TEXT and validate ourselve
var minutes = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MINUTES"));
var message = "";
if (!/^\d+$/.test(minutes))
message = translate.text("Only numbers are allowed.");
result.string(message);
\ No newline at end of file
......@@ -2517,6 +2517,21 @@
<entry>
<key>Discount %</key>
</entry>
<entry>
<key>Memo</key>
</entry>
<entry>
<key>Function</key>
</entry>
<entry>
<key>Relational</key>
</entry>
<entry>
<key>test</key>
</entry>
<entry>
<key>Only numbers are allowed.</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
......@@ -2945,6 +2945,22 @@
<key>supporter - supported</key>
<value>Unterstützt - Wird unterstützt von</value>
</entry>
<entry>
<key>Memo</key>
</entry>
<entry>
<key>Function</key>
</entry>
<entry>
<key>Relational</key>
</entry>
<entry>
<key>test</key>
</entry>
<entry>
<key>Only numbers are allowed.</key>
<value>Es sind nur Zahlen erlaubt.</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
......@@ -2541,6 +2541,21 @@
<entry>
<key>Discount %</key>
</entry>
<entry>
<key>Memo</key>
</entry>
<entry>
<key>Function</key>
</entry>
<entry>
<key>Relational</key>
</entry>
<entry>
<key>test</key>
</entry>
<entry>
<key>Only numbers are allowed.</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment