diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
index 2440449bf..c9fef47bf 100644
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -2366,6 +2366,18 @@
 <!--33338723A5E0415CA035880185BBC47C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--33338723A5E0415CA035880185BBC47C--></AD_MESSAGE>
 
+<!--33A1011579184668A36E24B680CF4FC8--><AD_MESSAGE>
+<!--33A1011579184668A36E24B680CF4FC8-->  <AD_MESSAGE_ID><![CDATA[33A1011579184668A36E24B680CF4FC8]]></AD_MESSAGE_ID>
+<!--33A1011579184668A36E24B680CF4FC8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--33A1011579184668A36E24B680CF4FC8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--33A1011579184668A36E24B680CF4FC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--33A1011579184668A36E24B680CF4FC8-->  <VALUE><![CDATA[OBPOS_PrecisionDifferAfterFormat]]></VALUE>
+<!--33A1011579184668A36E24B680CF4FC8-->  <MSGTEXT><![CDATA[Please review the precision of entered value, Since Precision length is not same as Currency's POS Precision]]></MSGTEXT>
+<!--33A1011579184668A36E24B680CF4FC8-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--33A1011579184668A36E24B680CF4FC8-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--33A1011579184668A36E24B680CF4FC8-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--33A1011579184668A36E24B680CF4FC8--></AD_MESSAGE>
+
 <!--33BC881E38AE4E32A02012BD208D9363--><AD_MESSAGE>
 <!--33BC881E38AE4E32A02012BD208D9363-->  <AD_MESSAGE_ID><![CDATA[33BC881E38AE4E32A02012BD208D9363]]></AD_MESSAGE_ID>
 <!--33BC881E38AE4E32A02012BD208D9363-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmtkeyboard.js b/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmtkeyboard.js
index fdd864b17..d758e3c9e 100644
--- a/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmtkeyboard.js
+++ b/web/org.openbravo.retail.posterminal/js/cashmgmt/view/cashmgmtkeyboard.js
@@ -47,17 +47,20 @@ enyo.kind({
     return {
       permission: key,
       action: function(keyboard, txt) {
-        txt = OB.I18N.parseNumber(txt);
-        if (txt === 0) {
-          OB.UTIL.showI18NWarning(
-            'OBPOS_NoCashMgmtZero',
-            'OBPOS_NoCashMgmtZero'
-          );
+        let amt = OB.I18N.parseNumber(txt);
+        if (isNaN(amt)) {
+          OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [txt]));
+          return;
+        } else if (amt === 0) {
+          OB.UTIL.showI18NWarning('OBPOS_NoCashMgmtZero');
+          return;
+        } else if (amt !== OB.DEC.add(0, amt)) {
+          OB.UTIL.showI18NWarning('OBPOS_PrecisionDifferAfterFormat');
           return;
         }
         keyboard.owner.owner.owner.currentPayment = {
           id: id,
-          amount: txt,
+          amount: amt,
           identifier: identifier,
           destinationKey: key,
           type: type,