diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-07 17:42:02 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-07 17:42:02 +0100 |
| commit | d67b410dfcd67d2540628d4f6be0daf8861c4a46 (patch) | |
| tree | 8803e293900a271cfa5f09645733e97e3c840bc0 /addons/delivery/security | |
| parent | 43f0cbcc86008cedc6c184a994159d03795c233e (diff) | |
| parent | cb87388d727b9ec3f447d6212f5b9aeb0c16865f (diff) | |
[MERGE] forward port branch saas-15 up to cb87388d727
Diffstat (limited to 'addons/delivery/security')
| -rw-r--r-- | addons/delivery/security/delivery_carrier_security.xml | 1 | ||||
| -rw-r--r-- | addons/delivery/security/delivery_security.xml | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/addons/delivery/security/delivery_carrier_security.xml b/addons/delivery/security/delivery_carrier_security.xml index 8fad0891676..db718fbf361 100644 --- a/addons/delivery/security/delivery_carrier_security.xml +++ b/addons/delivery/security/delivery_carrier_security.xml @@ -6,6 +6,7 @@ <field name="model_id" ref="model_delivery_carrier"/> <field name="global" eval="True"/> <field name="domain_force"> ['|',('company_id','=',user.company_id.id),('company_id','=',False)]</field> + <field name="active" eval="False"/> </record> </data> </odoo> diff --git a/addons/delivery/security/delivery_security.xml b/addons/delivery/security/delivery_security.xml new file mode 100644 index 00000000000..ae588bc245c --- /dev/null +++ b/addons/delivery/security/delivery_security.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<odoo> +<data noupdate="1"> + <record id="delivery_comp_rule" model="ir.rule"> + <field name="name">Delivery multi-company</field> + <field name="model_id" ref="model_delivery_carrier"/> + <field name="global" eval="True"/> + <field name="domain_force"> ['|',('product_id.company_id','=',user.company_id.id),('product_id.company_id','=',False)]</field> + <field name="active" eval="False"/> + </record> +</data> +</odoo> |