summaryrefslogtreecommitdiff
path: root/addons/stock/security
diff options
context:
space:
mode:
authorSimon Lejeune <sle@openerp.com>2019-08-22 09:29:08 +0000
committerSimon Lejeune <sle@openerp.com>2019-09-03 15:05:03 +0000
commitb6f053b25ef80599086797a41521c9e5679a015e (patch)
tree6b340fb2ceee9e5ad80a2270f5291912d293dbfe /addons/stock/security
parent504b5fe5a9613bb836bd865475c4b17713b78864 (diff)
[REF] stock: multi company
Ensure proper domains are applied and enforced on relation fields thanks to the `check_company` attributes. product.template - make responsible a property field in order to ensure proper next activities when a product is used between multiple companies stock.putaway.rule - added a company_id field stock.move.line - company_id is not related anymore since a move line can exist without a move until its validation stock.package_level - added a company_id field stock.picking.type - company_id is now required stock.production.lot - added a company_id field, adapted the constraint accordingly stock.quant - check the consistency only in inventory mode stock.quant.package - company_id is now empty if the package is empty stock.picking - company_id is now related to the one of its picking type Added some tests. Moved stock_traceability in the `report` directory. Removed useless /tests/tours/route.js. task-1985992
Diffstat (limited to 'addons/stock/security')
-rw-r--r--addons/stock/security/stock_security.xml33
1 files changed, 19 insertions, 14 deletions
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 81f7d341d77..f4ea1c0ae29 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -69,23 +69,35 @@
<field name="name">stock_picking multi-company</field>
<field name="model_id" search="[('model','=','stock.picking')]" model="ir.model"/>
<field name="global" eval="True"/>
- <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+ <field name="domain_force">[('company_id', 'in', company_ids)]</field>
</record>
<record model="ir.rule" id="stock_picking_type_rule">
<field name="name">Stock Operation Type multi-company</field>
<field name="model_id" search="[('model','=','stock.picking.type')]" model="ir.model"/>
<field name="global" eval="True"/>
- <field name="domain_force">['|', ('warehouse_id', '=', False), '|',('warehouse_id.company_id','=',False),('warehouse_id.company_id','in', company_ids)]</field>
+ <field name="domain_force">[('company_id','in', company_ids)]</field>
</record>
+ <record model="ir.rule" id="stock_putaway_rule_rule">
+ <field name="name">Stock Operation Type multi-company</field>
+ <field name="model_id" search="[('model','=','stock.putaway.rule')]" model="ir.model"/>
+ <field name="global" eval="True"/>
+ <field name="domain_force">[('company_id','in', company_ids)]</field>
+ </record>
+ <record model="ir.rule" id="stock_production_lot_rule">
+ <field name="name">Stock Production Lot multi-company</field>
+ <field name="model_id" search="[('model','=','stock.production.lot')]" model="ir.model"/>
+ <field name="global" eval="True"/>
+ <field name="domain_force">[('company_id','in', company_ids)]</field>
+ </record>
<record model="ir.rule" id="stock_warehouse_comp_rule">
<field name="name">Warehouse multi-company</field>
<field name="model_id" ref="model_stock_warehouse"/>
<field name="global" eval="True"/>
- <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+ <field name="domain_force">[('company_id', 'in', company_ids)]</field>
</record>
<record model="ir.rule" id="stock_location_comp_rule">
@@ -99,7 +111,7 @@
<field name="name">stock_move multi-company</field>
<field name="model_id" search="[('model','=','stock.move')]" model="ir.model"/>
<field name="global" eval="True"/>
- <field name="domain_force">['|', '|', ('company_id','=',False), ('company_id', 'in', company_ids), ('location_dest_id.company_id', '=', False)]</field>
+ <field name="domain_force">['|', ('company_id', 'in', company_ids), ('location_dest_id.company_id', '=', False)]</field>
</record>
<record model="ir.rule" id="stock_move_line_rule">
@@ -120,21 +132,21 @@
<field name="name">Inventory Line multi-company</field>
<field name="model_id" ref="model_stock_inventory_line"/>
<field name="global" eval="True"/>
- <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+ <field name="domain_force">[('company_id', 'in', company_ids)]</field>
</record>
<record model="ir.rule" id="stock_inventory_comp_rule">
<field name="name">Inventory multi-company</field>
<field name="model_id" ref="model_stock_inventory"/>
<field name="global" eval="True"/>
- <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+ <field name="domain_force">[('company_id', 'in', company_ids)]</field>
</record>
<record model="ir.rule" id="stock_warehouse_orderpoint_rule">
<field name="name">stock_warehouse.orderpoint multi-company</field>
<field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
<field name="global" eval="True"/>
- <field name="domain_force">['|',('company_id', 'in', company_ids),('company_id','=',False)]</field>
+ <field name="domain_force">[('company_id', 'in', company_ids)]</field>
</record>
<record model="ir.rule" id="product_pulled_flow_comp_rule">
@@ -151,13 +163,6 @@
<field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
</record>
- <record model="ir.rule" id="product_pulled_flow_comp_rule">
- <field name="name">product_pulled_flow multi-company</field>
- <field name="model_id" ref="model_stock_rule"/>
- <field name="global" eval="True"/>
- <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
- </record>
-
<record model="ir.rule" id="stock_quant_package_comp_rule">
<field name="name">stock_quant_package multi-company</field>
<field name="model_id" ref="model_stock_quant_package"/>