diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-07-10 15:52:01 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-07-10 15:52:01 +0530 |
| commit | 6dbd4e000dcb22d2ffcfeb7a9080eeffcbbcc7f8 (patch) | |
| tree | 5d1c3d763d9282312b22ca9e226515f20ce37d47 /addons/mrp | |
| parent | 4e08b80952c7f50357f8f97b69495562631e9d55 (diff) | |
| parent | f25ad676a34670f4ba1ac14bf2d6babd8ccc88b5 (diff) | |
[MERGE] merge with parent branch
bzr revid: cha@tinyerp.com-20120710102201-h5mjjkoyprp70lf0
Diffstat (limited to 'addons/mrp')
| -rw-r--r-- | addons/mrp/mrp_view.xml | 5 | ||||
| -rw-r--r-- | addons/mrp/res_config_view.xml | 36 | ||||
| -rw-r--r-- | addons/mrp/security/ir.model.access.csv | 1 |
3 files changed, 20 insertions, 22 deletions
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 0b725108be4..6fe3d61a804 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -957,9 +957,8 @@ </xpath> <xpath expr="//field[@name='close_move']" position="after"> <group colspan="4" groups="product.group_mrp_properties"> - <separator colspan="4" string="Properties" /> - <field colspan="4" name="property_ids" nolabel="1"/> - </group> + <field colspan="4" name="property_ids" widget="many2many_tags"/> + </group> </xpath> </data> </field> diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml index 48938972f60..db337c9b178 100644 --- a/addons/mrp/res_config_view.xml +++ b/addons/mrp/res_config_view.xml @@ -12,25 +12,23 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group string="Manufacturing Order"> - <field name="module_mrp_operations"/> - <field name="module_stock_planning"/> - <field name="module_mrp_subproduct"/> - <field name="module_mrp_repair"/> - </group> - <group string="Logistics"> - <field name="module_mrp_jit"/> - <field name="module_stock_no_autopicking"/> - </group> - <group string="Bill Of Material"> - <field name="group_mrp_routings"/> - <field name="group_mrp_properties"/> - </group> - <group string="Products"> - <field name="module_product_manufacturer"/> - </group> - </sheet> + <group string="Manufacturing Order"> + <field name="module_mrp_operations"/> + <field name="module_stock_planning"/> + <field name="module_mrp_subproduct"/> + <field name="module_mrp_repair"/> + </group> + <group string="Logistics"> + <field name="module_mrp_jit"/> + <field name="module_stock_no_autopicking"/> + </group> + <group string="Bill Of Material"> + <field name="group_mrp_routings"/> + <field name="group_mrp_properties"/> + </group> + <group string="Products"> + <field name="module_product_manufacturer"/> + </group> </form> </field> </record> diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index cd6b8db2195..5d254f86b4e 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -80,3 +80,4 @@ access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,pro access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,mrp.group_mrp_user,1,0,0,0
access_account_journal_mrp_manager,account.journal mrp manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0
access_purchase_order_stock_user,purchase.order stock user,purchase.model_purchase_order,stock.group_stock_user,1,1,1,0
+access_mrp_bom_purchase_manager,mrp.bom,model_mrp_bom,purchase.group_purchase_manager,1,0,0,0
|