0030913: Values shown on EDIT tab (price, discount, total) are not correct

# HG changeset patch
# User Adrián Romero <adrianromero@openbravo.com>
# Date 1444128575 -7200
#      Tue Oct 06 12:49:35 2015 +0200
# Node ID ec5dba6d3e7eb8087badfec3173841b3f3932439
# Parent  68ae25b51eefb61f9430fbbe873dbe069241a818
Fixes issue 0030913: Values shown on EDIT tab (price, discount, total) are not correct
* Price is now line price, discount is the sum of promotion discounts and total is total line minus promotion discounts.
* Added new detail Price std with the product prices before any price change

diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -6471,6 +6471,18 @@
 <!--FA2AAFADD29C4AE2AF457CCB55CB9128-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--FA2AAFADD29C4AE2AF457CCB55CB9128--></AD_MESSAGE>
 
+<!--FA3A4F31F2BB40C39F511DD67C098431--><AD_MESSAGE>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <AD_MESSAGE_ID><![CDATA[FA3A4F31F2BB40C39F511DD67C098431]]></AD_MESSAGE_ID>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <VALUE><![CDATA[OBPOS_LinePriceStd]]></VALUE>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <MSGTEXT><![CDATA[Price std.]]></MSGTEXT>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--FA3A4F31F2BB40C39F511DD67C098431-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--FA3A4F31F2BB40C39F511DD67C098431--></AD_MESSAGE>
+
 <!--FBD2B54DD1EE459581395426546E2612--><AD_MESSAGE>
 <!--FBD2B54DD1EE459581395426546E2612-->  <AD_MESSAGE_ID><![CDATA[FBD2B54DD1EE459581395426546E2612]]></AD_MESSAGE_ID>
 <!--FBD2B54DD1EE459581395426546E2612-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
@@ -101,7 +101,19 @@
     I18NLabel: 'OBPOS_LinePrice',
     render: function (line) {
       if (line) {
-        this.$.propertyValue.setContent(OB.I18N.formatCurrency(line.get('priceList')));
+        this.$.propertyValue.setContent(line.printPrice());
+      } else {
+        this.$.propertyValue.setContent('');
+      }
+    }
+  }, {
+    kind: 'OB.OBPOSPointOfSale.UI.LineProperty',
+    position: 35,
+    name: 'priceStdLine',
+    I18NLabel: 'OBPOS_LinePriceStd',
+    render: function (line) {
+      if (line) {
+        this.$.propertyValue.setContent(OB.I18N.formatCurrency(line.get('product').get('standardPrice')));
       } else {
         this.$.propertyValue.setContent('');
       }
@@ -113,7 +125,12 @@
     I18NLabel: 'OBPOS_LineDiscount',
     render: function (line) {
       if (line) {
-        this.$.propertyValue.setContent(line.printDiscount());
+        var discount = line.getTotalAmountOfPromotions();
+        if (discount === 0) {
+          this.$.propertyValue.setContent('');
+        } else {
+          this.$.propertyValue.setContent(OB.I18N.formatCurrency(discount));
+        }
       } else {
         this.$.propertyValue.setContent('');
       }
@@ -126,9 +143,9 @@
     render: function (line) {
       if (line) {
         if (line.get('priceIncludesTax')) {
-          this.$.propertyValue.setContent(line.printTotalLine());
+          this.$.propertyValue.setContent(OB.I18N.formatCurrency(OB.DEC.sub(line.get('gross'), line.getTotalAmountOfPromotions())));
         } else {
-          this.$.propertyValue.setContent(line.printNet());
+          this.$.propertyValue.setContent(OB.I18N.formatCurrency(OB.DEC.sub(line.get('net'), line.getTotalAmountOfPromotions())));
         }
       } else {
         this.$.propertyValue.setContent('');