diff options
Diffstat (limited to 'addons/purchase')
| -rw-r--r-- | addons/purchase/purchase_view.xml | 4 | ||||
| -rw-r--r-- | addons/purchase/res_config.py | 10 | ||||
| -rw-r--r-- | addons/purchase/res_config_view.xml | 13 | ||||
| -rw-r--r-- | addons/purchase/security/purchase_security.xml | 5 |
4 files changed, 30 insertions, 2 deletions
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 1cc9ce39611..1b0c4c0acb4 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -366,7 +366,7 @@ <field name="date_planned" widget="date"/> <field name="price_unit"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> - <field name="account_analytic_id" colspan="4" groups="base.group_analytic_account_for_purchase" domain="[('parent_id','!=',False)]" /> + <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" /> <group colspan="4" col="4" groups="purchase.group_taxes_on_order_line"> <separator colspan="4" string="Taxes"/> <field colspan="4" nolabel="1" name="taxes_id" @@ -429,7 +429,7 @@ <field name="date_planned" widget="date" readonly="1"/> <field name="price_unit"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/> - <field name="account_analytic_id" colspan="4" groups="base.group_analytic_account_for_purchase" domain="[('parent_id','!=',False)]"/> + <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/> <group colspan="4" col="4" groups="base.group_extended"> <separator colspan="4" string="Taxes"/> <field colspan="4" nolabel="1" name="taxes_id" diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 1ef2c87cad7..61b12284507 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -91,4 +91,14 @@ class purchase_config_settings(osv.osv_memory): 'group_purchase_taxes_on_order_line': tax_policy == 'on_order_line', }} + + +class account_config_settings(osv.osv_memory): + _inherit = 'account.config.settings' + _columns = { + 'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases', + implied_group='purchase.group_analytic_accounting', + help="Allows you to specify an analytic account on purchase orders."), + } + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml index 1009ac0d8d9..7fe1458afc0 100644 --- a/addons/purchase/res_config_view.xml +++ b/addons/purchase/res_config_view.xml @@ -42,5 +42,18 @@ <menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config" sequence="2" action="action_purchase_configuration"/> + <record id="view_account_config" model="ir.ui.view"> + <field name="name">account settings</field> + <field name="model">account.config.settings</field> + <field name="type">form</field> + <field name="inherit_id" ref="account.view_account_config_settings"/> + <field name="arch" type="xml"> + <group name="analytic_accounting" position="after"> + <field name="group_analytic_account_for_purchases"/> + <newline/> + </group> + </field> + </record> + </data> </openerp> diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml index ba5e7fe5256..cbf03cd32c7 100644 --- a/addons/purchase/security/purchase_security.xml +++ b/addons/purchase/security/purchase_security.xml @@ -23,6 +23,11 @@ <field name="category_id" ref="base.module_category_hidden"/> </record> + <record id="group_analytic_accounting" model="res.groups"> + <field name="name">Analytic Accounting for Purchases</field> + <field name="category_id" ref="base.module_category_hidden"/> + </record> + <record model="ir.rule" id="purchase_order_comp_rule"> <field name="name">Purchase Order multi-company</field> <field name="model_id" ref="model_purchase_order"/> |