From 7d47c62f0c8eb0b37c0f4342e024e378da08341b Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 3 Apr 2013 12:21:04 +0200
Subject: [PATCH] [FIX] Only give analytic distribution on customer/supplier
 invoice if sale/purchase checked

bzr revid: jco@openerp.com-20130403102104-udpyg90w8jrdg3lg
---
 .../account_analytic_plans_view.xml           | 23 -------------------
 .../purchase_analytic_plans_view.xml          | 17 ++++++++++++++
 .../sale_analytic_plans_view.xml              | 14 +++++++++++
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 58d5f71793d..19d6179e4eb 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -64,30 +64,7 @@
         </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','&lt;&gt;',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','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
-            </field>
-        </field>
-    </record>
 
     <record model="ir.ui.view" id="invoice_form_inherit">
         <field name="name">account.invoice.form.inherit</field>
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','&lt;&gt;',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','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
+            </field>
+        </field>
+    </record>
+
   </data>
 </openerp>