diff --git a/src-db/database/model/modifiedTables/AD_ORG.xml b/src-db/database/model/modifiedTables/AD_ORG.xml
--- a/src-db/database/model/modifiedTables/AD_ORG.xml
+++ b/src-db/database/model/modifiedTables/AD_ORG.xml
@@ -57,6 +57,9 @@
       <foreign-key foreignTable="OBPOS_PRINT_TEMPLATE" name="EM_OBPOS_ORG_LAYAWAYTEMP">
         <reference local="EM_OBPOS_LAYAWAY_TEMPLATE_ID" foreign="OBPOS_PRINT_TEMPLATE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="OBPOS_PRINT_TEMPLATE" name="EM_OBPOS_ORG_QUOTTEMP">
+        <reference local="EM_OBPOS_QUOT_TEMPLATE_ID" foreign="OBPOS_PRINT_TEMPLATE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="OBPOS_PRINT_TEMPLATE" name="EM_OBPOS_ORG_RETINVTEMP">
         <reference local="EM_OBPOS_RET_INV_TEMPLATE_ID" foreign="OBPOS_PRINT_TEMPLATE_ID"/>
       </foreign-key>
@@ -66,9 +69,6 @@
       <foreign-key foreignTable="OBPOS_PRINT_TEMPLATE" name="EM_OBPOS_ORG_TICKETTEMP">
         <reference local="EM_OBPOS_TICKET_TEMPLATE_ID" foreign="OBPOS_PRINT_TEMPLATE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="OBPOS_PRINT_TEMPLATE" name="EM_OBPOS_ORG_QUOTTEMP">
-        <reference local="EM_OBPOS_QUOT_TEMPLATE_ID" foreign="OBPOS_PRINT_TEMPLATE_ID"/>
-      </foreign-key>
       <check name="EM_OBPOS_ORG_FORMAT"><![CDATA[((EM_OBPOS_FORMAT_DECIMAL IS NULL) AND (EM_OBPOS_FORMAT_GROUP IS NULL)) OR ((EM_OBPOS_FORMAT_DECIMAL IS NOT NULL) AND (EM_OBPOS_FORMAT_GROUP IS NOT NULL))]]></check>
     </table>
   </database>
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
@@ -282,7 +282,7 @@
 <!--0FA21BFB69CC4ACE9140703D4AC9611E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0FA21BFB69CC4ACE9140703D4AC9611E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0FA21BFB69CC4ACE9140703D4AC9611E-->  <VALUE><![CDATA[OBPOS_MsgPaymentAmountError]]></VALUE>
-<!--0FA21BFB69CC4ACE9140703D4AC9611E-->  <MSGTEXT><![CDATA[Payment amount not valid.\nContact your administrator.]]></MSGTEXT>
+<!--0FA21BFB69CC4ACE9140703D4AC9611E-->  <MSGTEXT><![CDATA[Payment amount not valid. Contact your administrator.]]></MSGTEXT>
 <!--0FA21BFB69CC4ACE9140703D4AC9611E-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--0FA21BFB69CC4ACE9140703D4AC9611E-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--0FA21BFB69CC4ACE9140703D4AC9611E-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
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
@@ -792,9 +792,9 @@
       if (p.get('obposScale')) {
         OB.POS.hwserver.getWeight(function (data) {
           if (data.exception) {
-            alert(data.exception.message);
+        	OB.UTIL.showConfirmation.display('', data.exception.message);
           } else if (data.result === 0) {
-            alert(OB.I18N.getLabel('OBPOS_WeightZero'));
+        	OB.UTIL.showConfirmation.display('', OB.I18N.getLabel('OBPOS_WeightZero'));
           } else {
             line = me.createLine(p, data.result, options, attrs);
           }
@@ -1461,7 +1461,7 @@
     },
 
     rejectQuotation: function () {
-      alert('reject!!');
+      OB.UTIL.showWarning('reject!!');
     },
 
     resetOrderInvoice: function () {
@@ -1562,7 +1562,7 @@
       var i, max, p, order;
 
       if (!OB.DEC.isNumber(payment.get('amount'))) {
-        alert(OB.I18N.getLabel('OBPOS_MsgPaymentAmountError'));
+        OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_MsgPaymentAmountError'));
         return;
       }
 
@@ -2552,7 +2552,7 @@
       var i, max, p, order;
 
       if (!OB.DEC.isNumber(payment.get('amount'))) {
-        alert(OB.I18N.getLabel('OBPOS_MsgPaymentAmountError'));
+        OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_MsgPaymentAmountError'));
         return;
       }