0031768: [RR15Q4] When a receipt is returned, the taxes amounts are incorrect

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1451963827 -19800
# Node ID 335a3a68accdad1cc31992d49354812a01e8b7df
# Parent  03c4b420d20dec9681dff59763b1592312b99f11
Related to issue 31768 : Adding Sync in model order calculateGross() fn

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -490,6 +490,15 @@
         OB.error("setting the isCalculateGrossLocked state is mandatory before executing it the first time");
       }
 
+      // verify that there is no other calculatingGross running
+      if (this.calculatingGross) {
+        this.pendingCalculateGross = true;
+        return;
+      }
+
+      this.calculatingGross = true;
+      var me = this;
+
       var synchId = OB.UTIL.SynchronizationHelper.busyUntilFinishes('calculateGross');
 
       // reset some vital receipt values because, at this point, they are obsolete. do not fire the change event
@@ -529,8 +538,17 @@
 
           me.adjustPayment();
           me.save(function () {
+            OB.UTIL.SynchronizationHelper.finished(synchId, 'calculateGross');
+            // Reset the flag that protects reentrant invocations to calculateGross().
+            // And if there is pending any execution of calculateGross(), do it and do not continue.
+            me.calculatingGross = false;
+            if (me.pendingCalculateGross) {
+              me.pendingCalculateGross = false;
+              me.calculateGross();
+              return;
+            }
+            me.trigger('calculategross');
             me.trigger('saveCurrent');
-            OB.UTIL.SynchronizationHelper.finished(synchId, 'calculateGross');
           });
           };
 

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1452250576 -19800
# Node ID 6d9cb7566d0f95c41170159da84fa44ea36ffd53
# Parent  03c4b420d20dec9681dff59763b1592312b99f11
Fixes issue 31768 : Adding Sync in Order model calculateGross() function

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -490,6 +490,15 @@
         OB.error("setting the isCalculateGrossLocked state is mandatory before executing it the first time");
       }
 
+      // verify that there is no other calculatingGross running
+      if (this.calculatingGross) {
+        this.pendingCalculateGross = true;
+        return;
+      }
+
+      this.calculatingGross = true;
+      var me = this;
+
       var synchId = OB.UTIL.SynchronizationHelper.busyUntilFinishes('calculateGross');
 
       // reset some vital receipt values because, at this point, they are obsolete. do not fire the change event
@@ -529,8 +538,17 @@
 
           me.adjustPayment();
           me.save(function () {
+            OB.UTIL.SynchronizationHelper.finished(synchId, 'calculateGross');
+            // Reset the flag that protects reentrant invocations to calculateGross().
+            // And if there is pending any execution of calculateGross(), do it and do not continue.
+            me.calculatingGross = false;
+            if (me.pendingCalculateGross) {
+              me.pendingCalculateGross = false;
+              me.calculateGross();
+              return;
+            }
+            me.trigger('calculategross');
             me.trigger('saveCurrent');
-            OB.UTIL.SynchronizationHelper.finished(synchId, 'calculateGross');
           });
           };
 

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1452594141 -19800
# Node ID f2c450fcd4a1d9f07b9c9156d4994c33464bfb15
# Parent  747114ac5f6f21cb1967f9db7a1c679b25b4d7e2
Verifies issue 31768: Added automated test 'I31768_VerifyTaxWhileReturnReceipt'

diff --git a/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java b/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
--- a/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
+++ b/src-test/org/openbravo/test/mobile/common/selenium/javascript/TestId.java
@@ -394,6 +394,7 @@
   BUTTON_CATEGORY_LIGHTINGANDELECTRONICS("Lighting & Electronics", EnyoKind.CATEGORY), //
   BUTTON_PRODUCT_LIGHTINGANDELECTRONICS_GPSHANDHELD("GPS handheld", EnyoKind.PRODUCT), //
   LABEL_PRODUCT_LIGHTINGANDELECTRONICS_GPSHANDHELD_PRICE("GPS handheld", "price", EnyoKind.PRODUCT), //
+  BUTTON_PRODUCT_LIGHTINGANDELECTRONICS_HEADLAMP("Headlamp ultralight", EnyoKind.PRODUCT), //
   BUTTON_PRODUCT_LIGHTINGANDELECTRONICS_BASECAMPLANTERN("Basecamp lantern", EnyoKind.PRODUCT), //
   BUTTON_PRODUCT_LIGHTINGANDELECTRONICS_TORCHMINI("Torch mini", EnyoKind.PRODUCT), //
   BUTTON_PRODUCT_LIGHTINGANDELECTRONICS_MINILINTERN("Minilintern solar dynamo", EnyoKind.PRODUCT), //
@@ -620,6 +621,7 @@
   BUTTON_CASHMANAGEMENT_CARDWITHDRAWAL("payment.card_Withdrawal_button", EnyoKind.BUTTON), //
   LABEL_SELECTDEPOSIT_BACOFFICEVBS("cashMgmtDepositEvents_row1_line"), //
   BUTTON_SELECTDEPOSIT_BACOFFICEVBS("cashMgmtDepositEvents_row1_listEventLine", EnyoKind.BUTTON), //
+  BUTTON_SELECTDEPOSIT_BACOFFICEVBS1("eventList_row1_listEventLine", EnyoKind.BUTTON), //
   LABEL_SELECTDEPOSIT_CASHIERSHIFT("cashMgmtDropEvents_row1_line"), //
   BUTTON_SELECTDEPOSIT_CASHIERSHIFT("cashMgmtDropEvents_row1_listEventLine", EnyoKind.BUTTON), //
   LABEL_CASHMANAGEMENT_ROW1_DESCRIPTION("depositDropsList_row1_description"), //
diff --git a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31768_VerifyTaxWhileReturnReceipt.java b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31768_VerifyTaxWhileReturnReceipt.java
new file mode 100644
--- /dev/null
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31768_VerifyTaxWhileReturnReceipt.java
@@ -0,0 +1,117 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo S.L.U.
+ * All portions are Copyright (C) 2015 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author RAN
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.system;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.common.selenium.SeleniumHelper;
+import org.openbravo.test.mobile.common.selenium.database.DatabaseHelperSelect;
+import org.openbravo.test.mobile.common.selenium.javascript.BackboneHelper;
+import org.openbravo.test.mobile.common.selenium.javascript.TestId;
+import org.openbravo.test.mobile.common.selenium.terminals.WebPOSTerminalHelper;
+import org.openbravo.test.mobile.common.selenium.utils.OBNumber;
+
+/**
+ * 
+ * Verify Tax while returning the receipt
+ */
+public class I31768_VerifyTaxWhileReturnReceipt extends WebPOSTerminalHelper {
+
+  @Test
+  public void test() {
+    // Deposit Cash 200
+    depositCash();
+
+    // Add Product
+    tap(TestId.BUTTON_BROWSE);
+    tap(TestId.BUTTON_CATEGORY_MOUNTAINEERING);
+    tap(TestId.BUTTON_PRODUCT_MOUNTAINEERING_AVALANCHETRANSCEIVER);
+    tap(TestId.BUTTON_CATEGORY_LIGHTINGANDELECTRONICS);
+    tap(TestId.BUTTON_PRODUCT_LIGHTINGANDELECTRONICS_HEADLAMP);
+    verify(TestId.LABEL_TOTALTOPAY, "169.40");
+
+    final OBNumber taxBaseAmount = new OBNumber("140.00");
+    final OBNumber taxAmount = new OBNumber("29.40");
+    final OBNumber negatedTaxBaseAmount = taxBaseAmount.negativeSign();
+    final OBNumber negatedTaxAmount = taxAmount.negativeSign();
+
+    // Verify Tax
+    verify(TestId.LABEL_RECEIPT_TAX_ROW1_NET, taxBaseAmount.toString());
+    verify(TestId.LABEL_RECEIPT_TAX_ROW1_TOTALTAX, taxAmount.toString());
+
+    // Return Receipt
+    tap(TestId.BUTTON_MENU);
+    tap(TestId.BUTTON_MENU_RETURNTHISRECEIPT);
+    verify(TestId.LABEL_TOTALTOPAY, "-169.40");
+
+    // Verify Tax
+    verify(TestId.LABEL_RECEIPT_TAX_ROW1_NET, negatedTaxBaseAmount.toString());
+    verify(TestId.LABEL_RECEIPT_TAX_ROW1_TOTALTAX, negatedTaxAmount.toString());
+
+    final String receiptNo = BackboneHelper.getDocumentNo();
+
+    // Complete the ticket
+    tap(TestId.BUTTON_PAY);
+    tap(TestId.BUTTON_PAY_EXACT);
+    tap(TestId.BUTTON_PAY_DONE);
+
+    // Verify Order tax
+    final String sql = String.format(
+        "select taxbaseamt, taxamt from c_ordertax where c_order_id = "
+            + "(select c_order_id from c_order where documentno = '%s')", receiptNo);
+    new DatabaseHelperSelect() {
+      @Override
+      protected void yieldResultSet(final ResultSet rs) throws SQLException {
+        assertThat("WEBPOS and Backoffice tax base amount are not equal ",
+            negatedTaxBaseAmount.toString(),
+            equalTo(new OBNumber(rs.getString("taxbaseamt")).toString()));
+        assertThat("WEBPOS and Backoffice tax amount are not equal ", negatedTaxAmount.toString(),
+            equalTo(new OBNumber(rs.getString("taxamt")).toString()));
+      }
+    }.execute(sql, 1);
+  }
+
+  private void depositCash() {
+    tap(TestId.BUTTON_MENU);
+    tap(TestId.BUTTON_MENU_CASHMANAGEMENT);
+
+    tap(TestId.BUTTON_CASHMANAGEMENT_CASHDEPOSIT);
+    write(TestId.INPUT_KEYPAD_CASHMGMT_EDITBOX, "200");
+    tap(TestId.BUTTON_KEYPAD_ENTER);
+    final Long coreYear = (Long) SeleniumHelper
+        .executeScriptWithReturn("OB.UTIL.VersionManagement.current.mobileCore.year");
+    if (coreYear <= 15) {
+      tap(TestId.BUTTON_SELECTDEPOSIT_BACOFFICEVBS1);
+    } else {
+      tap(TestId.BUTTON_SELECTDEPOSIT_BACOFFICEVBS);
+    }
+    tap(TestId.BUTTON_CASHMANAGEMENT_DONE);
+    tap(TestId.BUTTON_POPUP_OK);
+    verify(TestId.LABEL_TOTALTOPAY, "0.00");
+  }
+}
\ No newline at end of file