Attached Files | 45267_20Q1_posterminal.diff [^] (8,593 bytes) 2020-10-23 10:06 [Show Content] [Hide Content]diff -r bf699c78e3c2 src-db/database/model/modifiedTables/C_ORDERLINE.xml
--- a/src-db/database/model/modifiedTables/C_ORDERLINE.xml Tue Mar 17 07:05:18 2020 +0000
+++ b/src-db/database/model/modifiedTables/C_ORDERLINE.xml Fri Oct 23 13:35:56 2020 +0530
@@ -49,6 +49,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="EM_OBPOS_PREVIOUSGROSSPRICESTD" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="OBPOS_PRICEREASON" name="EM_OBPOS_ORDERLINE_PR">
<reference local="EM_OBPOS_PRICEREASON_ID" foreign="OBPOS_PRICEREASON_ID"/>
</foreign-key>
diff -r bf699c78e3c2 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Mar 17 07:05:18 2020 +0000
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Oct 23 13:35:56 2020 +0530
@@ -17357,6 +17357,43 @@
<!--AFF5C3E0A2334A2F9D2A08ACCF06D60A--> <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[Y]]></IS_CHILD_PROPERTY_IN_PARENT>
<!--AFF5C3E0A2334A2F9D2A08ACCF06D60A--></AD_COLUMN>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--><AD_COLUMN>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_COLUMN_ID><![CDATA[B032AC0EE6914C1EAB4287FCE3D23D87]]></AD_COLUMN_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <NAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></NAME>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <COLUMNNAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></COLUMNNAME>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <SEQNO><![CDATA[484]]></SEQNO>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_ELEMENT_ID><![CDATA[3A4CE4F539E7494581696772E23788BF]]></AD_ELEMENT_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <POSITION><![CDATA[87]]></POSITION>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[N]]></IS_CHILD_PROPERTY_IN_PARENT>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--></AD_COLUMN>
+
<!--B08FCDC9A07743B7BCB62761694C43D5--><AD_COLUMN>
<!--B08FCDC9A07743B7BCB62761694C43D5--> <AD_COLUMN_ID><![CDATA[B08FCDC9A07743B7BCB62761694C43D5]]></AD_COLUMN_ID>
<!--B08FCDC9A07743B7BCB62761694C43D5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r bf699c78e3c2 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Mar 17 07:05:18 2020 +0000
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Fri Oct 23 13:35:56 2020 +0530
@@ -732,6 +732,18 @@
<!--392798F4C70B43099188B352F44B9682--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--392798F4C70B43099188B352F44B9682--></AD_ELEMENT>
+<!--3A4CE4F539E7494581696772E23788BF--><AD_ELEMENT>
+<!--3A4CE4F539E7494581696772E23788BF--> <AD_ELEMENT_ID><![CDATA[3A4CE4F539E7494581696772E23788BF]]></AD_ELEMENT_ID>
+<!--3A4CE4F539E7494581696772E23788BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3A4CE4F539E7494581696772E23788BF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3A4CE4F539E7494581696772E23788BF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3A4CE4F539E7494581696772E23788BF--> <COLUMNNAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></COLUMNNAME>
+<!--3A4CE4F539E7494581696772E23788BF--> <NAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></NAME>
+<!--3A4CE4F539E7494581696772E23788BF--> <PRINTNAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></PRINTNAME>
+<!--3A4CE4F539E7494581696772E23788BF--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--3A4CE4F539E7494581696772E23788BF--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--3A4CE4F539E7494581696772E23788BF--></AD_ELEMENT>
+
<!--3B104EF51A1B4EF69F867A8B988A01AB--><AD_ELEMENT>
<!--3B104EF51A1B4EF69F867A8B988A01AB--> <AD_ELEMENT_ID><![CDATA[3B104EF51A1B4EF69F867A8B988A01AB]]></AD_ELEMENT_ID>
<!--3B104EF51A1B4EF69F867A8B988A01AB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r bf699c78e3c2 src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java Tue Mar 17 07:05:18 2020 +0000
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java Fri Oct 23 13:35:56 2020 +0530
@@ -829,6 +829,12 @@
? (BigDecimal.valueOf(jsonOrderLine.getDouble("obposQtytodeliver")).stripTrailingZeros())
: orderline.getOrderedQuantity());
+ if (jsonOrderLine.has("taxChangedPrice")) {
+ BigDecimal previousGrossPriceStd = BigDecimal
+ .valueOf(jsonOrderLine.optDouble("taxChangedPrice", 0))
+ .setScale(pricePrecision, RoundingMode.HALF_UP);
+ orderline.setObposPreviousgrosspricestd(previousGrossPriceStd);
+ }
lineReferences.add(orderline);
orderline.setLineNo((long) ((i + 1) * 10));
order.getOrderLineList().add(orderline);
diff -r bf699c78e3c2 src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
--- a/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java Tue Mar 17 07:05:18 2020 +0000
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java Fri Oct 23 13:35:56 2020 +0530
@@ -46,6 +46,7 @@
add(new HQLProperty("ordLine.id", "lineId"));
add(new HQLProperty("ordLine.standardPrice", "baseNetUnitPrice"));
add(new HQLProperty("ordLine.salesOrder.currency.pricePrecision", "pricePrecision"));
+ add(new HQLProperty("ordLine.obposPreviousgrosspricestd", "originalGrossListPrice"));
add(new HQLProperty("ordLine.warehouse.id", "warehouse"));
add(new HQLProperty("ordLine.warehouse.name", "warehousename"));
add(new HQLProperty("ordLine.description", "description"));
diff -r bf699c78e3c2 web/org.openbravo.retail.posterminal/js/data/dataordertaxes.js
--- a/web/org.openbravo.retail.posterminal/js/data/dataordertaxes.js Tue Mar 17 07:05:18 2020 +0000
+++ b/web/org.openbravo.retail.posterminal/js/data/dataordertaxes.js Fri Oct 23 13:35:56 2020 +0530
@@ -1744,7 +1744,8 @@
OB.DEC.div(line.get('price'), line.get('lineratePrev')),
line.get('linerate')
),
- taxChangedPrice: line.get('price')
+ taxChangedPrice:
+ line.get('originalGrossListPrice') || line.get('price')
},
{
silent: true
45267_20Q1_posterminal_v2.diff [^] (9,256 bytes) 2020-11-19 09:21 [Show Content] [Hide Content]diff --git a/src-db/database/model/modifiedTables/C_ORDERLINE.xml b/src-db/database/model/modifiedTables/C_ORDERLINE.xml
index 361446f22..007731040 100644
--- a/src-db/database/model/modifiedTables/C_ORDERLINE.xml
+++ b/src-db/database/model/modifiedTables/C_ORDERLINE.xml
@@ -49,6 +49,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="EM_OBPOS_PREVIOUSGROSSPRICESTD" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="OBPOS_PRICEREASON" name="EM_OBPOS_ORDERLINE_PR">
<reference local="EM_OBPOS_PRICEREASON_ID" foreign="OBPOS_PRICEREASON_ID"/>
</foreign-key>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
index 7ab533ed2..4f55bbfb0 100644
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -17357,6 +17357,43 @@ In case this value is not set, it will be defaulted to the one defined in Openbr
<!--AFF5C3E0A2334A2F9D2A08ACCF06D60A--> <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[Y]]></IS_CHILD_PROPERTY_IN_PARENT>
<!--AFF5C3E0A2334A2F9D2A08ACCF06D60A--></AD_COLUMN>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--><AD_COLUMN>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_COLUMN_ID><![CDATA[B032AC0EE6914C1EAB4287FCE3D23D87]]></AD_COLUMN_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <NAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></NAME>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <COLUMNNAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></COLUMNNAME>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <SEQNO><![CDATA[484]]></SEQNO>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_ELEMENT_ID><![CDATA[3A4CE4F539E7494581696772E23788BF]]></AD_ELEMENT_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <POSITION><![CDATA[87]]></POSITION>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--> <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[N]]></IS_CHILD_PROPERTY_IN_PARENT>
+<!--B032AC0EE6914C1EAB4287FCE3D23D87--></AD_COLUMN>
+
<!--B08FCDC9A07743B7BCB62761694C43D5--><AD_COLUMN>
<!--B08FCDC9A07743B7BCB62761694C43D5--> <AD_COLUMN_ID><![CDATA[B08FCDC9A07743B7BCB62761694C43D5]]></AD_COLUMN_ID>
<!--B08FCDC9A07743B7BCB62761694C43D5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
index 6fb824a2f..e6e3f8ab9 100644
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -732,6 +732,18 @@ If the field is unchecked, however, the payment method is completely ignored fro
<!--392798F4C70B43099188B352F44B9682--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--392798F4C70B43099188B352F44B9682--></AD_ELEMENT>
+<!--3A4CE4F539E7494581696772E23788BF--><AD_ELEMENT>
+<!--3A4CE4F539E7494581696772E23788BF--> <AD_ELEMENT_ID><![CDATA[3A4CE4F539E7494581696772E23788BF]]></AD_ELEMENT_ID>
+<!--3A4CE4F539E7494581696772E23788BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3A4CE4F539E7494581696772E23788BF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3A4CE4F539E7494581696772E23788BF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3A4CE4F539E7494581696772E23788BF--> <COLUMNNAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></COLUMNNAME>
+<!--3A4CE4F539E7494581696772E23788BF--> <NAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></NAME>
+<!--3A4CE4F539E7494581696772E23788BF--> <PRINTNAME><![CDATA[EM_Obpos_Previousgrosspricestd]]></PRINTNAME>
+<!--3A4CE4F539E7494581696772E23788BF--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--3A4CE4F539E7494581696772E23788BF--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--3A4CE4F539E7494581696772E23788BF--></AD_ELEMENT>
+
<!--3B104EF51A1B4EF69F867A8B988A01AB--><AD_ELEMENT>
<!--3B104EF51A1B4EF69F867A8B988A01AB--> <AD_ELEMENT_ID><![CDATA[3B104EF51A1B4EF69F867A8B988A01AB]]></AD_ELEMENT_ID>
<!--3B104EF51A1B4EF69F867A8B988A01AB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java
index 95bb42ea2..e6b280bf4 100644
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java
@@ -829,6 +829,12 @@ public class OrderLoader extends POSDataSynchronizationProcess
? (BigDecimal.valueOf(jsonOrderLine.getDouble("obposQtytodeliver")).stripTrailingZeros())
: orderline.getOrderedQuantity());
+ if (jsonOrderLine.has("taxChangedPrice")) {
+ BigDecimal previousGrossPriceStd = BigDecimal
+ .valueOf(jsonOrderLine.optDouble("taxChangedPrice", 0))
+ .setScale(pricePrecision, RoundingMode.HALF_UP);
+ orderline.setObposPreviousgrosspricestd(previousGrossPriceStd);
+ }
lineReferences.add(orderline);
orderline.setLineNo((long) ((i + 1) * 10));
order.getOrderLineList().add(orderline);
diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java b/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
index 8028e3708..2a0a514d9 100644
--- a/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptLinesProperties.java
@@ -46,6 +46,7 @@ public class PaidReceiptLinesProperties extends ModelExtension {
add(new HQLProperty("ordLine.id", "lineId"));
add(new HQLProperty("ordLine.standardPrice", "baseNetUnitPrice"));
add(new HQLProperty("ordLine.salesOrder.currency.pricePrecision", "pricePrecision"));
+ add(new HQLProperty("ordLine.obposPreviousgrosspricestd", "originalGrossListPrice"));
add(new HQLProperty("ordLine.warehouse.id", "warehouse"));
add(new HQLProperty("ordLine.warehouse.name", "warehousename"));
add(new HQLProperty("ordLine.description", "description"));
diff --git a/web/org.openbravo.retail.posterminal/js/data/dataordertaxes.js b/web/org.openbravo.retail.posterminal/js/data/dataordertaxes.js
index c2608ab4b..6b80977ac 100644
--- a/web/org.openbravo.retail.posterminal/js/data/dataordertaxes.js
+++ b/web/org.openbravo.retail.posterminal/js/data/dataordertaxes.js
@@ -946,6 +946,11 @@
}
);
+ if (line.get('originalGrossListPrice')) {
+ line.set('taxChangedPrice', line.get('originalGrossListPrice'));
+ line.unset('originalGrossListPrice');
+ }
+
// Calculate product, orggross, and discountedGross.
var product = line.get('product');
var orggross = line.get('gross');
@@ -1490,6 +1495,11 @@
}
);
+ if (line.get('originalGrossListPrice')) {
+ line.set('taxChangedPrice', line.get('originalGrossListPrice'));
+ line.unset('originalGrossListPrice');
+ }
+
var resultpromise;
var product = line.get('product');
if (
|