changeset e5b788ae4ba2 in modules/sale_supply_drop_shipment:default
details: 
https://hg.tryton.org/modules/sale_supply_drop_shipment?cmd=changeset&node=e5b788ae4ba2
description:
        Check rule only if _check_access is set and enforce companies rule

        issue4080
        review343891009
diffstat:

 stock.xml                               |  10 +++++-----
 tests/test_sale_supply_drop_shipment.py |   5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r 6477e81fc995 -r e5b788ae4ba2 stock.xml
--- a/stock.xml Sat Apr 03 14:27:10 2021 +0200
+++ b/stock.xml Sat Apr 10 23:46:24 2021 +0200
@@ -197,17 +197,17 @@
                 search="[('model', '=', 'stock.shipment.drop')]"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_shipment_drop">
-            <field name="name">User in company</field>
+        <record model="ir.rule.group" id="rule_group_shipment_drop_companies">
+            <field name="name">User in companies</field>
             <field name="model"
                 search="[('model', '=', 'stock.shipment.drop')]"/>
             <field name="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_shipment_drop">
+        <record model="ir.rule" id="rule_shipment_drop_companies">
             <field name="domain"
-                eval="[('company', '=', Eval('user', {}).get('company', 
None))]"
+                eval="[('company', 'in', Eval('companies', []))]"
                 pyson="1"/>
-            <field name="rule_group" ref="rule_group_shipment_drop"/>
+            <field name="rule_group" ref="rule_group_shipment_drop_companies"/>
         </record>
 
         <record model="ir.action.act_window" 
id="act_shipment_drop_relate_party">
diff -r 6477e81fc995 -r e5b788ae4ba2 tests/test_sale_supply_drop_shipment.py
--- a/tests/test_sale_supply_drop_shipment.py   Sat Apr 03 14:27:10 2021 +0200
+++ b/tests/test_sale_supply_drop_shipment.py   Sat Apr 10 23:46:24 2021 +0200
@@ -8,12 +8,11 @@
 from trytond.tests.test_tryton import doctest_checker
 
 from trytond.modules.company.tests import (
-    PartyCompanyCheckEraseMixin, CompanyMultiValueTestMixin)
+    PartyCompanyCheckEraseMixin, CompanyTestMixin)
 
 
 class SaleSupplyDropShipmentTestCase(
-        PartyCompanyCheckEraseMixin, CompanyMultiValueTestMixin,
-        ModuleTestCase):
+        PartyCompanyCheckEraseMixin, CompanyTestMixin, ModuleTestCase):
     'Test SaleSupplyDropShipment module'
     module = 'sale_supply_drop_shipment'
 

Reply via email to