From 584ee8dfd4010ddd809c3dfde4b95230bc56eccf Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Thu, 15 Jul 2021 15:24:47 -0400
Subject: [PATCH] Fixed BUG-47200: Rename "Web POS action Print Invoice
 Automatically"  to "Web POS action Print Receipts Automatically" preference
 and check this preference before print receipt

---
 src-db/database/sourcedata/AD_PREFERENCE.xml  | 22 ++++++-------
 src-db/database/sourcedata/AD_REF_LIST.xml    |  4 +--
 .../js/data/dataordersave.js                  | 17 +++-------
 .../js/utils/ticketCloseUtils.js              | 31 +++++++------------
 4 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
index dc068d0d0..1ef703fe1 100644
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -517,17 +517,6 @@
 <!--363AB18897EC4E7D95BA02F7CAA77862-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--363AB18897EC4E7D95BA02F7CAA77862--></AD_PREFERENCE>
 
-<!--3734ACEDEF274F43A8663C89E55B1495--><AD_PREFERENCE>
-<!--3734ACEDEF274F43A8663C89E55B1495-->  <AD_PREFERENCE_ID><![CDATA[3734ACEDEF274F43A8663C89E55B1495]]></AD_PREFERENCE_ID>
-<!--3734ACEDEF274F43A8663C89E55B1495-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3734ACEDEF274F43A8663C89E55B1495-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3734ACEDEF274F43A8663C89E55B1495-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3734ACEDEF274F43A8663C89E55B1495-->  <VALUE><![CDATA[Y]]></VALUE>
-<!--3734ACEDEF274F43A8663C89E55B1495-->  <PROPERTY><![CDATA[OBPOS_print.invoicesautomatically]]></PROPERTY>
-<!--3734ACEDEF274F43A8663C89E55B1495-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
-<!--3734ACEDEF274F43A8663C89E55B1495-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
-<!--3734ACEDEF274F43A8663C89E55B1495--></AD_PREFERENCE>
-
 <!--376946B697A54678BC4E1000BB7E8FE5--><AD_PREFERENCE>
 <!--376946B697A54678BC4E1000BB7E8FE5-->  <AD_PREFERENCE_ID><![CDATA[376946B697A54678BC4E1000BB7E8FE5]]></AD_PREFERENCE_ID>
 <!--376946B697A54678BC4E1000BB7E8FE5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1298,6 +1287,17 @@
 <!--8F66C515916F437381E6B09987885D8B-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--8F66C515916F437381E6B09987885D8B--></AD_PREFERENCE>
 
+<!--9029371ED54A456B9298C3D55FE85BB1--><AD_PREFERENCE>
+<!--9029371ED54A456B9298C3D55FE85BB1-->  <AD_PREFERENCE_ID><![CDATA[9029371ED54A456B9298C3D55FE85BB1]]></AD_PREFERENCE_ID>
+<!--9029371ED54A456B9298C3D55FE85BB1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9029371ED54A456B9298C3D55FE85BB1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9029371ED54A456B9298C3D55FE85BB1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9029371ED54A456B9298C3D55FE85BB1-->  <VALUE><![CDATA[Y]]></VALUE>
+<!--9029371ED54A456B9298C3D55FE85BB1-->  <PROPERTY><![CDATA[OBPOS_print.receiptsautomatically]]></PROPERTY>
+<!--9029371ED54A456B9298C3D55FE85BB1-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--9029371ED54A456B9298C3D55FE85BB1-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--9029371ED54A456B9298C3D55FE85BB1--></AD_PREFERENCE>
+
 <!--9083F0F2EB174A0E9604714432262597--><AD_PREFERENCE>
 <!--9083F0F2EB174A0E9604714432262597-->  <AD_PREFERENCE_ID><![CDATA[9083F0F2EB174A0E9604714432262597]]></AD_PREFERENCE_ID>
 <!--9083F0F2EB174A0E9604714432262597-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
index 3b332dcaa..ba73859e8 100644
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -1133,8 +1133,8 @@
 <!--4EFD057F459F43F1BD12FEBA7994320B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--4EFD057F459F43F1BD12FEBA7994320B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4EFD057F459F43F1BD12FEBA7994320B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4EFD057F459F43F1BD12FEBA7994320B-->  <VALUE><![CDATA[OBPOS_print.invoicesautomatically]]></VALUE>
-<!--4EFD057F459F43F1BD12FEBA7994320B-->  <NAME><![CDATA[Web POS action Print invoices automatically]]></NAME>
+<!--4EFD057F459F43F1BD12FEBA7994320B-->  <VALUE><![CDATA[OBPOS_print.receiptsautomatically]]></VALUE>
+<!--4EFD057F459F43F1BD12FEBA7994320B-->  <NAME><![CDATA[Web POS action Print Receipts automatically]]></NAME>
 <!--4EFD057F459F43F1BD12FEBA7994320B-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
 <!--4EFD057F459F43F1BD12FEBA7994320B-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
 <!--4EFD057F459F43F1BD12FEBA7994320B--></AD_REF_LIST>
diff --git a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
index bddb850d2..2b8ac9b24 100644
--- a/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
+++ b/web/org.openbravo.retail.posterminal/js/data/dataordersave.js
@@ -835,18 +835,11 @@
                           ) {
                             invoiceLine.unset('product');
                           });
-                          if (
-                            OB.MobileApp.model.hasPermission(
-                              'OBPOS_print.invoicesautomatically',
-                              true
-                            )
-                          ) {
-                            me.context
-                              .get('multiOrders')
-                              .trigger('print', invoiceToPrint, {
-                                offline: true
-                              });
-                          }
+                          me.context
+                            .get('multiOrders')
+                            .trigger('print', invoiceToPrint, {
+                              offline: true
+                            });
                         }
 
                         me.context
diff --git a/web/org.openbravo.retail.posterminal/js/utils/ticketCloseUtils.js b/web/org.openbravo.retail.posterminal/js/utils/ticketCloseUtils.js
index 16f0bc349..6894d3525 100644
--- a/web/org.openbravo.retail.posterminal/js/utils/ticketCloseUtils.js
+++ b/web/org.openbravo.retail.posterminal/js/utils/ticketCloseUtils.js
@@ -217,9 +217,16 @@
                 });
             });
             orderToPrint.set('hasbeenpaid', 'Y');
-            receipt.trigger('print', orderToPrint, {
-              offline: true
-            });
+            if (
+              OB.MobileApp.model.hasPermission(
+                'OBPOS_print.receiptsautomatically',
+                true
+              )
+            ) {
+              receipt.trigger('print', orderToPrint, {
+                offline: true
+              });
+            }
             if (invoice && invoice.get('id')) {
               var invoiceToPrint = OB.UTIL.clone(invoice),
                 printInvoice = function() {
@@ -262,24 +269,10 @@
                     }
                   );
                 } else {
-                  if (
-                    OB.MobileApp.model.hasPermission(
-                      'OBPOS_print.invoicesautomatically',
-                      true
-                    )
-                  ) {
-                    printInvoice();
-                  }
-                }
-              } else {
-                if (
-                  OB.MobileApp.model.hasPermission(
-                    'OBPOS_print.invoicesautomatically',
-                    true
-                  )
-                ) {
                   printInvoice();
                 }
+              } else {
+                printInvoice();
               }
             }
 
-- 
2.28.0