diff options
| author | Olivier Dony <odo@openerp.com> | 2012-12-19 00:20:01 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-12-19 00:20:01 +0100 |
| commit | 3fe6987ce7788524ad54d403ed6473da69dc04a5 (patch) | |
| tree | 9b92230077de676aacd4a7c7cf2753e3e862ad7c /addons/product/security | |
| parent | 72387cef3b4e43a1d33df7a25e10981e090612c7 (diff) | |
| parent | 5101771cd9ea7218695d31ce7c7bf2b12a1d417f (diff) | |
[MERGE] Harmonization of noupdate flag on security XML data, courtesy of Alexis de Lattre (Akretion)
ir.rule records are in noupdate data blocks to let the admin
alter them without fear of them being reset at next update.
Other records such as groups are in normal mode, so they
can be updated whenever necessary
bzr revid: odo@openerp.com-20121218232001-t425t4hi7qbmsip2
Diffstat (limited to 'addons/product/security')
| -rw-r--r-- | addons/product/security/product_security.xml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index 73ab6f8a3d5..2e6bdac9fca 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -1,13 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data noupdate="1"> - - <record id="product_comp_rule" model="ir.rule"> - <field name="name" >Product multi-company</field> - <field name="model_id" ref="model_product_template"/> - <field name="global" eval="True"/> - <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> - </record> +<data noupdate="0"> <record id="group_product_variant" model="res.groups"> <field name="name">Product Variant</field> @@ -49,6 +42,16 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> +</data> +<data noupdate="1"> + + <record id="product_comp_rule" model="ir.rule"> + <field name="name" >Product multi-company</field> + <field name="model_id" ref="model_product_template"/> + <field name="global" eval="True"/> + <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field> + </record> + <record model="ir.rule" id="product_pricelist_comp_rule"> <field name="name">product pricelist company rule</field> <field name="model_id" ref="model_product_pricelist"/> |