diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2013-04-05 15:51:26 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2013-04-05 15:51:26 +0200 |
| commit | 9a219f241eea663e2cd8f1a7204a1483067fdd0a (patch) | |
| tree | 43e36f41c9de04d9da0a89b3aa498f32bd1ed32d | |
| parent | ecdc3b18735465112eda8efb5dc4758fc9b4adc6 (diff) | |
| parent | 7d47c62f0c8eb0b37c0f4342e024e378da08341b (diff) | |
[MERGE] better use of analytic distribution options on sale & purchase settings that now have an impact only on dedicated invoice view
bzr revid: qdp-launchpad@openerp.com-20130405135126-mnzv9o5dbiflvfo0
3 files changed, 31 insertions, 24 deletions
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml index 3dcbcda6952..be46b9a6923 100644 --- a/addons/account_analytic_plans/account_analytic_plans_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_view.xml @@ -64,30 +64,6 @@ </field> </record> -<!-- Replace analytic_id with analytics_id in account.invoice.line --> - - <record model="ir.ui.view" id="view_invoice_line_form_inherit"> - <field name="name">account.invoice.line.form.inherit</field> - <field name="model">account.invoice.line</field> - <field name="inherit_id" ref="account.view_invoice_line_form"/> - <field name="arch" type="xml"> - <field name="account_analytic_id" position="replace"> - <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','<>',False)]" groups="analytic.group_analytic_accounting"/> - </field> - </field> - </record> - - <record model="ir.ui.view" id="invoice_supplier_form_inherit"> - <field name="name">account.invoice.supplier.form.inherit</field> - <field name="model">account.invoice</field> - <field name="inherit_id" ref="account.invoice_supplier_form"/> - <field name="priority">2</field> - <field name="arch" type="xml"> - <field name="account_analytic_id" position="replace"> - <field name="analytics_id" domain="[('plan_id','<>',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/> - </field> - </field> - </record> <!-- views for account.analytic.plan.instance --> <record model="ir.ui.view" id="account_analytic_plan_instance_form"> diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml index bcc67a2a215..d1db411f68c 100644 --- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml +++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml @@ -38,5 +38,22 @@ </field> </record> + + + <!-- Replace analytic_id with analytics_id in account.invoice.line --> + + + + <record model="ir.ui.view" id="invoice_supplier_form_inherit"> + <field name="name">account.invoice.supplier.form.inherit</field> + <field name="model">account.invoice</field> + <field name="inherit_id" ref="account.invoice_supplier_form"/> + <field name="priority">2</field> + <field name="arch" type="xml"> + <field name="account_analytic_id" position="replace"> + <field name="analytics_id" domain="[('plan_id','<>',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/> + </field> + </field> + </record> </data> </openerp> diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml index 6c788866520..3600d71b7d4 100644 --- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml +++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml @@ -38,5 +38,19 @@ </field> </record> + + <!-- Replace analytic_id with analytics_id in account.invoice.line --> + + <record model="ir.ui.view" id="view_invoice_line_form_inherit"> + <field name="name">account.invoice.line.form.inherit</field> + <field name="model">account.invoice.line</field> + <field name="inherit_id" ref="account.view_invoice_line_form"/> + <field name="arch" type="xml"> + <field name="account_analytic_id" position="replace"> + <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','<>',False)]" groups="analytic.group_analytic_accounting"/> + </field> + </field> + </record> + </data> </openerp> |