# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1491210998 -19800
#      Mon Apr 03 14:46:38 2017 +0530
# Node ID be85b56f567d9e0fbe26866e4458e1dfbeab3f29
# Parent  661d21a689e279c183d6b8f02af633d150ec4b7a
Related to issue 35631 : Enabled Negative Symbol in Cashup Keyboard

* In Cashup Step 2, Negative Amount should not be allowed for Cash payment methods

diff -r 661d21a689e2 -r be85b56f567d src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Mar 31 11:46:41 2017 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Apr 03 14:46:38 2017 +0530
@@ -4528,6 +4528,18 @@
 <!--81F370EBC2754D57A8FE76FB694D98F9-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--81F370EBC2754D57A8FE76FB694D98F9--></AD_MESSAGE>
 
+<!--82636353D391403393C50A4928117917--><AD_MESSAGE>
+<!--82636353D391403393C50A4928117917-->  <AD_MESSAGE_ID><![CDATA[82636353D391403393C50A4928117917]]></AD_MESSAGE_ID>
+<!--82636353D391403393C50A4928117917-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--82636353D391403393C50A4928117917-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--82636353D391403393C50A4928117917-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--82636353D391403393C50A4928117917-->  <VALUE><![CDATA[OBPOS_CashUpNegativeAmtForCashPayment]]></VALUE>
+<!--82636353D391403393C50A4928117917-->  <MSGTEXT><![CDATA[Negative Amount '%0' cannot be added for cash payment methods]]></MSGTEXT>
+<!--82636353D391403393C50A4928117917-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--82636353D391403393C50A4928117917-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--82636353D391403393C50A4928117917-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--82636353D391403393C50A4928117917--></AD_MESSAGE>
+
 <!--8296E08D474747FD9D7E9E423668112E--><AD_MESSAGE>
 <!--8296E08D474747FD9D7E9E423668112E-->  <AD_MESSAGE_ID><![CDATA[8296E08D474747FD9D7E9E423668112E]]></AD_MESSAGE_ID>
 <!--8296E08D474747FD9D7E9E423668112E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 661d21a689e2 -r be85b56f567d web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js
--- a/web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js	Fri Mar 31 11:46:41 2017 +0200
+++ b/web/org.openbravo.retail.posterminal/js/closecash/view/closekeyboard.js	Mon Apr 03 14:46:38 2017 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012 Openbravo S.L.U.
+ * Copyright (C) 2012-2017 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -25,6 +25,13 @@
       disabled: true,
       commands: ['%']
     });
+    this.addCommand('-', {
+      stateless: true,
+      action: function (keyboard, txt) {
+        var t = keyboard.$.editbox.getContent();
+        keyboard.$.editbox.setContent(t + '-');
+      }
+    });
     this.addToolbar({
       name: 'toolbarempty',
       buttons: []
@@ -138,6 +145,10 @@
                   OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [amt]));
                   return;
                 }
+                if (payment.get('paymentMethod').iscash && convAmt < 0) {
+                  OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_CashUpNegativeAmtForCashPayment', [amt]));
+                  return;
+                }
                 payment.set('foreignCounted', OB.DEC.add(0, convAmt));
                 payment.set('counted', OB.DEC.mul(convAmt, payment.get('rate')));
               }