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/purchase | |
| parent | 4e08b80952c7f50357f8f97b69495562631e9d55 (diff) | |
| parent | f25ad676a34670f4ba1ac14bf2d6babd8ccc88b5 (diff) | |
[MERGE] merge with parent branch
bzr revid: cha@tinyerp.com-20120710102201-h5mjjkoyprp70lf0
Diffstat (limited to 'addons/purchase')
| -rw-r--r-- | addons/purchase/res_config_view.xml | 32 | ||||
| -rw-r--r-- | addons/purchase/security/ir.model.access.csv | 1 |
2 files changed, 16 insertions, 17 deletions
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml index 06b06c7bae4..1e8588bf618 100644 --- a/addons/purchase/res_config_view.xml +++ b/addons/purchase/res_config_view.xml @@ -12,25 +12,23 @@ or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> - <sheet> - <group string="Invoicing"> - <field name="default_invoice_method"/> - <field name="decimal_precision"/> + <group string="Invoicing"> + <field name="default_invoice_method"/> + <field name="decimal_precision"/> + </group> + <group string="Purchase Order"> + <group> + <field name="group_purchase_pricelist"/> + <field name="group_uom"/> + <field name="group_purchase_delivery_address"/> </group> - <group string="Purchase Order"> - <group> - <field name="group_purchase_pricelist"/> - <field name="group_uom"/> - <field name="group_purchase_delivery_address"/> - </group> - <group> - <field name="module_purchase_double_validation"/> - <field name="module_purchase_requisition"/> - <field name="module_warning"/> - <field name="module_purchase_analytic_plans"/> - </group> + <group> + <field name="module_purchase_double_validation"/> + <field name="module_purchase_requisition"/> + <field name="module_warning"/> + <field name="module_purchase_analytic_plans"/> </group> - </sheet> + </group> </form> </field> </record> diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index b19a62bf5d1..c45b8a9b070 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -64,3 +64,4 @@ access_account_account_purchase_manager,account.account purchase manager,account access_account_journal_purchase_manager,account.journal purchase manager,account.model_account_journal,purchase.group_purchase_manager,1,0,0,0
access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0
access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
+access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
|