[IMP] price_security_planned_price: View cleaning

Remove fields that used to be manipulated because they are now treated in other module
ingadhoc · Oct 10, 2023 · cbeda59 · cbeda59
1 parent 29ad49e
commit cbeda59
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/price_security_planned_price/models/product_product.py b/price_security_planned_price/models/product_product.py
@@ -15,13 +15,7 @@ def _get_view(self, view_id=None, view_type='form', **options):
                                     + arch.xpath("//field[@name='other_currency_list_price']")
                                     + arch.xpath("//field[@name='other_currency_id']")
                                     + arch.xpath("//field[@name='sale_margin']")
-                                    + arch.xpath("//field[@name='sale_surcharge']")
-                                    + arch.xpath("//field[@name='replenishment_cost_type']")
-                                    + arch.xpath("//field[@name='replenishment_cost_last_update']")
-                                    + arch.xpath("//field[@name='replenishment_base_cost']")
-                                    + arch.xpath("//field[@name='replenishment_base_cost_currency_id']")
-                                    + arch.xpath("//field[@name='replenishment_cost']")
-                                    + arch.xpath("//field[@name='replenishment_cost_rule_id']"))
+                                    + arch.xpath("//field[@name='sale_surcharge']"))
                 for node in readonly_fields:
                     node.set('readonly', '1')
                     modifiers = json.loads(node.get("modifiers") or "{}")

diff --git a/price_security_planned_price/models/product_template.py b/price_security_planned_price/models/product_template.py
@@ -15,13 +15,7 @@ def _get_view(self, view_id=None, view_type='form', **options):
                                     + arch.xpath("//field[@name='other_currency_list_price']")
                                     + arch.xpath("//field[@name='other_currency_id']")
                                     + arch.xpath("//field[@name='sale_margin']")
-                                    + arch.xpath("//field[@name='sale_surcharge']")
-                                    + arch.xpath("//field[@name='replenishment_cost_type']")
-                                    + arch.xpath("//field[@name='replenishment_cost_last_update']")
-                                    + arch.xpath("//field[@name='replenishment_base_cost']")
-                                    + arch.xpath("//field[@name='replenishment_base_cost_currency_id']")
-                                    + arch.xpath("//field[@name='replenishment_cost']")
-                                    + arch.xpath("//field[@name='replenishment_cost_rule_id']"))
+                                    + arch.xpath("//field[@name='sale_surcharge']"))
                 for node in readonly_fields:
                     node.set('readonly', '1')
                     modifiers = json.loads(node.get("modifiers") or "{}")

diff --git a/price_security_sale_margin/models/sale_order.py b/price_security_sale_margin/models/sale_order.py
@@ -21,7 +21,8 @@ def _get_view(self, view_id=None, view_type='form', **options):
             if self.env.user.has_group('price_security.group_only_view_sale_price'):
                 invisible_fields = (arch.xpath("//field[@name='purchase_price']")
                                     + arch.xpath("//field[@name='margin']")
-                                    + arch.xpath("//field[@name='margin_percent']"))
+                                    + arch.xpath("//field[@name='margin_percent']")
+                                    + arch.xpath("//field[@name='margin_percent']/.."))
                 for node in invisible_fields:
                     node.set('invisible', '1')
                     modifiers = json.loads(node.get("modifiers") or "{}")

diff --git a/price_security_sale_margin/models/sale_order_line.py b/price_security_sale_margin/models/sale_order_line.py
@@ -5,6 +5,15 @@
 class SaleOrder(models.Model):
     _inherit = 'sale.order.line'
 
+    @api.model
+    def _get_view_cache_key(self, view_id=None, view_type='form', **options):
+        """The override of fields_get making fields readonly for price security users
+        makes the view cache dependent on the fact the user has the group price security or not
+        """
+        key = super()._get_view_cache_key(view_id, view_type, **options)
+        return key + (self.env.user.has_group('price_security.group_only_view'),) + \
+            (self.env.user.has_group('price_security.group_only_view_sale_price'),)
+
     @api.model
     def _get_view(self, view_id=None, view_type='form', **options):
         arch, view = super()._get_view(view_id, view_type, **options)