From 1a3dcfeae658bf3d6411662cbb2c8c340c34f07f Mon Sep 17 00:00:00 2001
From: Robin Heinz <rhe@odoo.com>
Date: Wed, 11 Sep 2019 06:25:50 +0000
Subject: [PATCH] [FIX] point_of_sale: default global discount

Change the default value of the miscellaneous product to a discount product. When the module pos_discount is installed, the default value will now be the discount product.

closes odoo/odoo#36665

Task: bug fix
Signed-off-by: pimodoo <pimodoo@users.noreply.github.com>
---
 .../point_of_sale/data/point_of_sale_data.xml |  12 ++++-----
 .../static/img/product_product_49-image.jpg   | Bin 14912 -> 0 bytes
 .../static/tests/tours/point_of_sale.js       |  14 +++++------
 addons/pos_discount/models/pos_config.py      |  23 +++++++++---------
 .../pos_discount/views/pos_discount_views.xml |   4 +++
 5 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 addons/point_of_sale/static/img/product_product_49-image.jpg

diff --git a/addons/point_of_sale/data/point_of_sale_data.xml b/addons/point_of_sale/data/point_of_sale_data.xml
index 58a70c4cc87..aaf8008c0a4 100644
--- a/addons/point_of_sale/data/point_of_sale_data.xml
+++ b/addons/point_of_sale/data/point_of_sale_data.xml
@@ -30,17 +30,17 @@
         </record>
 
         <record id="product_product_consumable" model="product.product">
-            <field name="name">Miscellaneous</field>
+            <field name="name">Discount</field>
             <field name="available_in_pos">True</field>
-            <field name="standard_price">13.0</field>
-            <field name="list_price">18.0</field>
-            <field name="weight">0.01</field>
+            <field name="standard_price">0.00</field>
+            <field name="list_price">0.00</field>
+            <field name="weight">0.00</field>
             <field name="type">consu</field>
             <field name="categ_id" ref="point_of_sale.product_category_pos"/>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
-            <field name="default_code">MISC</field>
-            <field name="image_1920" type="base64" file="point_of_sale/static/img/product_product_49-image.jpg"/>
+            <field name="default_code">DISC</field>
+            <field name="purchase_ok">False</field>
         </record>
 
         <record id="uom.product_uom_categ_unit" model="uom.category">
diff --git a/addons/point_of_sale/static/img/product_product_49-image.jpg b/addons/point_of_sale/static/img/product_product_49-image.jpg
deleted file mode 100644
index 5aa7c3278bbfd9a79ae007faa99ad27b86c0b0ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14912
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
TFAqaJ017C}tI1W$ScLpvY~)<d

diff --git a/addons/point_of_sale/static/tests/tours/point_of_sale.js b/addons/point_of_sale/static/tests/tours/point_of_sale.js
index 4f0a774ff09..77890a56b5a 100644
--- a/addons/point_of_sale/static/tests/tours/point_of_sale.js
+++ b/addons/point_of_sale/static/tests/tours/point_of_sale.js
@@ -55,7 +55,7 @@ odoo.define('point_of_sale.tour.pricelist', function (require) {
             var product_desk_pad = posmodel.db.search_product_in_category(0, 'Desk Pad')[0];
             var product_letter_tray = posmodel.db.search_product_in_category(0, 'Letter Tray')[0];
             var product_whiteboard = posmodel.db.search_product_in_category(0, 'Whiteboard')[0];
-            var product_miscellaneous = posmodel.db.search_product_in_category(0, 'Miscellaneous')[0];
+            var product_miscellaneous = posmodel.db.search_product_in_category(0, 'Discount')[0];
 
             compare_backend_frontend(product_letter_tray, 'Public Pricelist', 0, undefined)()
                 .then(compare_backend_frontend(product_letter_tray, 'Public Pricelist', 1, undefined))
@@ -107,7 +107,7 @@ odoo.define('point_of_sale.tour.pricelist', function (require) {
         trigger: ".selection-item:contains('Fixed')",
     }, {
         content: "prices should be updated in the product screen",
-        trigger: ".product:contains('Miscellaneous'):contains('$ 1.00')",
+        trigger: ".product:contains('Discount'):contains('$ 1.00')",
         run: function () {}, // it's a check
     }, {
         content: "open customer list",
@@ -130,7 +130,7 @@ odoo.define('point_of_sale.tour.pricelist', function (require) {
         trigger: ".button.cancel:visible",
     }, {
         content: "prices should be updated in the product screen",
-        trigger: ".product:contains('Miscellaneous'):contains('$ 18.00')",
+        trigger: ".product:contains('Discount'):contains('$ 0.00')",
         run: function () {}, // it's a check
     }, {
         content: "open customer list",
@@ -196,16 +196,16 @@ shelf have not (their price was manually overridden)",
         trigger: ".selection-item:contains('min_quantity ordering')",
     }, {
         content: "order 1 miscellaneous product",
-        trigger: ".product:contains('Miscellaneous')",
+        trigger: ".product:contains('Discount')",
     }, {
         content: "order 1 miscellaneous product",
-        trigger: ".product:contains('Miscellaneous')",
+        trigger: ".product:contains('Discount')",
     }, {
         content: "order 1 miscellaneous product",
-        trigger: ".product:contains('Miscellaneous')",
+        trigger: ".product:contains('Discount')",
     }, {
         content: "verify there is one line with 3 miscellaneous products",
-        trigger: ".orderline:contains('Miscellaneous') em:contains('3.000')",
+        trigger: ".orderline:contains('Discount') em:contains('3.000')",
         run: function () {}, // it's a check
     }, {
         content: "close the Point of Sale frontend",
diff --git a/addons/pos_discount/models/pos_config.py b/addons/pos_discount/models/pos_config.py
index 46272218f67..0bc2d846a43 100644
--- a/addons/pos_discount/models/pos_config.py
+++ b/addons/pos_discount/models/pos_config.py
@@ -8,18 +8,17 @@ class PosConfig(models.Model):
     _inherit = 'pos.config'
 
     iface_discount = fields.Boolean(string='Order Discounts', help='Allow the cashier to give discounts on the whole order.')
-    discount_pc = fields.Float(string='Discount Percentage', help='The default discount percentage')
+    discount_pc = fields.Float(string='Discount Percentage', help='The default discount percentage', default=10.0)
     discount_product_id = fields.Many2one('product.product', string='Discount Product',
         domain="[('available_in_pos', '=', True), ('sale_ok', '=', True)]", help='The product used to model the discount.')
 
-    @api.onchange('module_pos_discount')
-    def _onchange_module_pos_discount(self):
-        if self.module_pos_discount:
-            self.discount_product_id = self.env.ref('point_of_sale.product_product_consumable', raise_if_not_found=False)
-            if not self.discount_product_id or not self.discount_product_id.available_in_pos or not self.discount_product_id.sale_ok:
-                domain = [('available_in_pos', '=', True), ('sale_ok', '=', True)]
-                self.discount_product_id = self.env['product.product'].search(domain, limit=1)
-            self.discount_pc = 10.0
-        else:
-            self.discount_product_id = False
-            self.discount_pc = 0.0
+    @api.onchange('company_id','module_pos_discount')
+    def _default_discount_product_id(self):
+        product = self.env.ref("point_of_sale.product_product_consumable", raise_if_not_found=False)
+        self.discount_product_id = product if self.module_pos_discount and product and (not product.company_id or product.company_id == self.company_id) else False
+
+    @api.model
+    def _default_discount_value_on_module_install(self):
+        configs = self.env['pos.config'].search([])
+        for conf in configs:
+            conf._default_discount_product_id()
diff --git a/addons/pos_discount/views/pos_discount_views.xml b/addons/pos_discount/views/pos_discount_views.xml
index 7f7cc0c2dd9..0e38b16af64 100644
--- a/addons/pos_discount/views/pos_discount_views.xml
+++ b/addons/pos_discount/views/pos_discount_views.xml
@@ -17,4 +17,8 @@
                 </div>
             </field>
         </record>
+
+        <data noupdate="1">
+            <function model="pos.config" name="_default_discount_value_on_module_install"/>
+        </data>
 </odoo>