From 8d679b79c6cd3931d97befb7e6ae1e2ee9e74b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 20 Mar 2016 22:58:17 +0100
Subject: [PATCH] Merge invoice and credit note

issue5225
review18921002
---
 invoice.xml | 89 ++++++++++++-----------------------------------------
 1 file changed, 20 insertions(+), 69 deletions(-)

diff --git a/invoice.xml b/invoice.xml
index ed964fd6f5..35df8a8e75 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -18,101 +18,52 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">invoice_line_tree</field>
         </record>
 
-        <record model="ir.action.act_window" id="act_invoice_line_out_invoice_form">
+        <record model="ir.action.act_window" id="act_invoice_line_out_form">
             <field name="name">Invoice Lines</field>
             <field name="res_model">account.invoice.line</field>
             <field name="domain"
-                eval="[('invoice_type', '=', 'out_invoice'), ('invoice', '=', None)]"
+                eval="[('invoice_type', '=', 'out'), ('invoice', '=', None)]"
                 pyson="1"/>
             <field name="context"
-                eval="{'invoice_type': 'out_invoice', 'standalone': True}"
+                eval="{'invoice_type': 'out', 'standalone': True}"
                 pyson="1"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_invoice_line_out_invoice_form_view1">
+        <record model="ir.action.act_window.view" id="act_invoice_line_out_form_view1">
             <field name="sequence" eval="10"/>
             <field name="view" ref="account_invoice.invoice_line_view_tree"/>
-            <field name="act_window" ref="act_invoice_line_out_invoice_form"/>
+            <field name="act_window" ref="act_invoice_line_out_form"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_invoice_line_out_invoice_form_view2">
+        <record model="ir.action.act_window.view" id="act_invoice_line_out_form_view2">
             <field name="sequence" eval="20"/>
             <field name="view" ref="account_invoice.invoice_line_view_form"/>
-            <field name="act_window" ref="act_invoice_line_out_invoice_form"/>
+            <field name="act_window" ref="act_invoice_line_out_form"/>
         </record>
-        <menuitem parent="account_invoice.menu_invoice_out_invoice_form"
-            action="act_invoice_line_out_invoice_form"
-            id="menu_invoice_line_out_invoice_form" sequence="5"/>
+        <menuitem parent="account_invoice.menu_invoice_out_form"
+            action="act_invoice_line_out_form"
+            id="menu_invoice_line_out_form" sequence="5"/>
 
-        <record model="ir.action.act_window" id="act_invoice_line_out_credit_note_form">
-            <field name="name">Credit Note Lines</field>
-            <field name="res_model">account.invoice.line</field>
-            <field name="domain"
-                eval="[('invoice_type', '=', 'out_credit_note'), ('invoice', '=', None)]"
-                pyson="1"/>
-            <field name="context"
-                eval="{'invoice_type': 'out_credit_note', 'standalone': True}"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_invoice_line_out_credit_note_form_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="account_invoice.invoice_line_view_tree"/>
-            <field name="act_window" ref="act_invoice_line_out_credit_note_form"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_invoice_line_out_credit_note_form_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="account_invoice.invoice_line_view_form"/>
-            <field name="act_window" ref="act_invoice_line_out_credit_note_form"/>
-        </record>
-        <menuitem parent="account_invoice.menu_invoice_out_credit_note_form"
-            action="act_invoice_line_out_credit_note_form"
-            id="menu_invoice_line_out_credit_note_form" sequence="5"/>
-
-        <record model="ir.action.act_window" id="act_invoice_line_in_invoice_form">
+        <record model="ir.action.act_window" id="act_invoice_line_in_form">
             <field name="name">Supplier Invoice Lines</field>
             <field name="res_model">account.invoice.line</field>
             <field name="domain"
-                eval="[('invoice_type', '=', 'in_invoice'), ('invoice', '=', None)]"
+                eval="[('invoice_type', '=', 'in'), ('invoice', '=', None)]"
                 pyson="1"/>
             <field name="context"
-                eval="{'invoice_type': 'in_invoice', 'standalone': True}"
+                eval="{'invoice_type': 'in', 'standalone': True}"
                 pyson="1"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_invoice_line_in_invoice_form_view1">
+        <record model="ir.action.act_window.view" id="act_invoice_line_in_form_view1">
             <field name="sequence" eval="10"/>
             <field name="view" ref="account_invoice.invoice_line_view_tree"/>
-            <field name="act_window" ref="act_invoice_line_in_invoice_form"/>
+            <field name="act_window" ref="act_invoice_line_in_form"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_invoice_line_in_invoice_form_view2">
+        <record model="ir.action.act_window.view" id="act_invoice_line_in_form_view2">
             <field name="sequence" eval="20"/>
             <field name="view" ref="account_invoice.invoice_line_view_form"/>
-            <field name="act_window" ref="act_invoice_line_in_invoice_form"/>
+            <field name="act_window" ref="act_invoice_line_in_form"/>
         </record>
-        <menuitem parent="account_invoice.menu_invoice_in_invoice_form"
-            action="act_invoice_line_in_invoice_form"
-            id="menu_invoice_line_in_invoice_form" sequence="5"/>
-
-        <record model="ir.action.act_window" id="act_invoice_line_in_credit_note_form">
-            <field name="name">Supplier Credit Note Lines</field>
-            <field name="res_model">account.invoice.line</field>
-            <field name="domain"
-                eval="[('invoice_type', '=', 'in_credit_note'), ('invoice', '=', None)]"
-                pyson="1"/>
-            <field name="context"
-                eval="{'invoice_type': 'in_credit_note', 'standalone': True}"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_invoice_line_in_credit_note_form_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="account_invoice.invoice_line_view_tree"/>
-            <field name="act_window" ref="act_invoice_line_in_credit_note_form"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_invoice_line_in_credit_note_form_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="account_invoice.invoice_line_view_form"/>
-            <field name="act_window" ref="act_invoice_line_in_credit_note_form"/>
-        </record>
-        <menuitem parent="account_invoice.menu_invoice_in_credit_note_form"
-            action="act_invoice_line_in_credit_note_form"
-            id="menu_invoice_line_in_credit_note_form" sequence="5"/>
-
+        <menuitem parent="account_invoice.menu_invoice_in_form"
+            action="act_invoice_line_in_form"
+            id="menu_invoice_line_in_form" sequence="5"/>
     </data>
 </tryton>