Merge lp:~openerp-dev/openobject-addons/trunk-bug-1132898-sunil into lp:openobject-addons

[sunil prajapati(OpenERP Trainee)]

hello,

issue: account_analytics_plan has not been enabled for the customer invoice.
now solve :
 account_analytics_plan has been enabled for the customer invoice...
 -fixes..

thanks,
sunil prajapati

[lp:~openerp-dev/openobject-addons/trunk-bug-1132898-sunil]

8603. By sunil prajapati(OpenERP Trainee) on 2013-03-12

MERGE with trunk

Unmerged revisions

8603. By sunil prajapati(OpenERP Trainee) on 2013-03-12

MERGE with trunk

8602. By sunil prajapati(OpenERP Trainee) on 2013-03-11

[FIX]:addons:account_analytics_plan not enabled for customer invoice

=== modified file 'account_analytic_plans/account_analytic_plans_view.xml'
--- account_analytic_plans/account_analytic_plans_view.xml	2012-11-29 22:26:45 +0000
+++ account_analytic_plans/account_analytic_plans_view.xml	2013-03-12 05:37:22 +0000
@@ -87,8 +87,17 @@
                 <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
             </field>
         </field>
+    </record><record model="ir.ui.view" id="invoice_customer_form_inherit">
+        <field name="name">account.invoice.form.inherit</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="account.invoice_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','&lt;&gt;',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">
         <field name="name">account.analytic.plan.instance.form</field>