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 @@
+
+
+
+
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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
+
+
+
+
+
+
+
+
+
+
+
+
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 (