From ad3729afff7c24e1c3283f29c84134352759ad76 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 19 Nov 2010 15:35:20 +0530
Subject: [PATCH 1/6] [ADD] account_sequence:Add internal number in move line
 and rename the field

bzr revid: ara@tinyerp.com-20101119100520-y4w0qdi9anu308wx
---
 addons/account_sequence/__openerp__.py        |  2 +-
 addons/account_sequence/account_sequence.py   | 10 +++-
 addons/account_sequence/account_sequence.xml  | 54 ++++++++++++++++++-
 .../account_sequence_data.xml                 | 48 +++++++++++++++--
 4 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index e6580c4088c..09b5def282f 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -30,7 +30,7 @@
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
-    'update_xml': ['account_sequence_data.xml','account_sequence.xml'],
+    'update_xml': ['account_sequence_data.xml','account_sequence.xml',],
     'demo_xml': ['account_sequence_minimal.xml'],
     'installable': True,
     'active': False,
diff --git a/addons/account_sequence/account_sequence.py b/addons/account_sequence/account_sequence.py
index 496fb08bc05..a020590d2a6 100644
--- a/addons/account_sequence/account_sequence.py
+++ b/addons/account_sequence/account_sequence.py
@@ -26,7 +26,7 @@ class account_move(osv.osv):
     _inherit = 'account.move'
 
     _columns = {
-        'internal_sequence_number': fields.char('Internal Sequence Number', size=64, readonly=True),
+        'internal_sequence_number': fields.char('Internal Number', size=64, readonly=True),
     }
 
     def post(self, cr, uid, ids, context=None):
@@ -50,4 +50,12 @@ class account_journal(osv.osv):
     }
 account_journal()
 
+class account_move_line(osv.osv):
+    _inherit = "account.move.line"
+
+    _columns = {
+        'internal_sequence_number': fields.related('move_id','internal_sequence_number', type='char', relation='account.move', string='Internal Number'),
+    }
+account_move_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index 92c145a9b2e..f434d336875 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -13,7 +13,32 @@
             </field>
        </field>
     </record>
-    
+
+    <record id="view_account_move_tree_inherit" model="ir.ui.view">
+       <field name="name">account.move.tree.inherit</field>
+       <field name="model">account.move</field>
+       <field name="type">tree</field>
+       <field name="inherit_id" ref="account.view_move_tree"/>
+       <field name="arch" type="xml">
+            <field name="ref" position="after">
+                <field name="internal_sequence_number"/>
+            </field>
+       </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_move_search_inherit">
+        <field name="name">view.move.search.inherit</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_account_move_filter"/>
+        <field name="arch" type="xml">
+        <data>
+            <xpath expr="//field[@name='ref']" position="after">
+                <field name="internal_sequence_number"/>
+    		</xpath>
+		</data>
+        </field>
+    </record>
+
     <record id="view_account_journal_form_inherit" model="ir.ui.view">
        <field name="name">account.journal.form.inherit</field>
        <field name="model">account.journal</field>
@@ -26,5 +51,32 @@
        </field>
     </record>
 
+
+    <record model="ir.ui.view" id="view_move_line_form_inherit">
+        <field name="name">view.move.line.form.inherit</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_form"/>
+        <field name="arch" type="xml">
+        <data>
+            <xpath expr="//field[@name='ref']" position="after">
+                <field name="internal_sequence_number"/>
+    		</xpath>
+		</data>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_move_line_search_inherit">
+        <field name="name">view.move.line.search.inherit</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+        <field name="arch" type="xml">
+        <data>
+			<xpath expr="//field[@name='ref']" position="after">
+                <field name="internal_sequence_number"/>
+		</xpath>
+		</data>
+        </field>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/account_sequence/account_sequence_data.xml b/addons/account_sequence/account_sequence_data.xml
index f5d1117f51d..db2c8e4d0ed 100644
--- a/addons/account_sequence/account_sequence_data.xml
+++ b/addons/account_sequence/account_sequence_data.xml
@@ -2,14 +2,56 @@
 <openerp>
     <data>
          <!--Account Journal Internal Sequences-->
-        
+
         <record id="internal_sequence_journal" model="ir.sequence">
             <field name="name">Internal Sequence Journal</field>
             <field name="code">account.journal</field>
             <field name="number_next">1</field>
         </record>
-        
+
         <function eval="('default', False, 'internal_sequence', [('account.journal', False)], internal_sequence_journal, True, False, False, False, True)" id="internal_seq_default_set" model="ir.values" name="set"/>
-        
+
+		<!--Account Journal Internal Number of account move line-->
+
+    	<record id="sp_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account.account_sp_journal_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="bank_col3" model="account.journal.column">
+            <field name="view_id" ref="account.account_journal_bank_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="bank_col3_multi" model="account.journal.column">
+            <field name="view_id" ref="account.account_journal_bank_view_multi"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="sp_refund_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
     </data>
+
 </openerp>
\ No newline at end of file

From fec4573c6b0caf97311cfa0939e238fd44b45b35 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 19 Nov 2010 17:01:32 +0530
Subject: [PATCH 2/6] [REF] account_sequence:fix the indentation

bzr revid: ara@tinyerp.com-20101119113132-spayua3uly2tzpt5
---
 addons/account_sequence/account_sequence.xml  | 139 +++++++++---------
 .../account_sequence_data.xml                 |  42 +++---
 2 files changed, 90 insertions(+), 91 deletions(-)

diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index f434d336875..ad8ea7a7e38 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -2,81 +2,80 @@
 <openerp>
     <data>
 
-    <record id="view_account_move_form_inherit" model="ir.ui.view">
-       <field name="name">account.move.form.inherit</field>
-       <field name="model">account.move</field>
-       <field name="type">form</field>
-       <field name="inherit_id" ref="account.view_move_form"/>
-       <field name="arch" type="xml">
-            <field name="to_check" position="after">
-                <field name="internal_sequence_number"/>
-            </field>
-       </field>
+	<record id="view_account_move_form_inherit" model="ir.ui.view">
+		<field name="name">account.move.form.inherit</field>
+		<field name="model">account.move</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="account.view_move_form"/>
+		<field name="arch" type="xml">
+			<field name="to_check" position="after">
+				<field name="internal_sequence_number"/>
+			</field>
+		</field>
     </record>
 
-    <record id="view_account_move_tree_inherit" model="ir.ui.view">
-       <field name="name">account.move.tree.inherit</field>
-       <field name="model">account.move</field>
-       <field name="type">tree</field>
-       <field name="inherit_id" ref="account.view_move_tree"/>
-       <field name="arch" type="xml">
-            <field name="ref" position="after">
-                <field name="internal_sequence_number"/>
-            </field>
-       </field>
-    </record>
+	<record id="view_account_move_tree_inherit" model="ir.ui.view">
+		<field name="name">account.move.tree.inherit</field>
+		<field name="model">account.move</field>
+		<field name="type">tree</field>
+		<field name="inherit_id" ref="account.view_move_tree"/>
+		<field name="arch" type="xml">
+			<field name="ref" position="after">
+				<field name="internal_sequence_number"/>
+			</field>
+		</field>
+	</record>
 
-    <record model="ir.ui.view" id="view_move_search_inherit">
-        <field name="name">view.move.search.inherit</field>
-        <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_account_move_filter"/>
-        <field name="arch" type="xml">
-        <data>
-            <xpath expr="//field[@name='ref']" position="after">
-                <field name="internal_sequence_number"/>
-    		</xpath>
-		</data>
-        </field>
-    </record>
+	<record model="ir.ui.view" id="view_move_search_inherit">
+		<field name="name">view.move.search.inherit</field>
+		<field name="model">account.move</field>
+		<field name="inherit_id" ref="account.view_account_move_filter"/>
+		<field name="arch" type="xml">
+			<data>
+				<xpath expr="//field[@name='ref']" position="after">
+					<field name="internal_sequence_number"/>
+				</xpath>
+			</data>
+		</field>
+	</record>
 
-    <record id="view_account_journal_form_inherit" model="ir.ui.view">
-       <field name="name">account.journal.form.inherit</field>
-       <field name="model">account.journal</field>
-       <field name="type">form</field>
-       <field name="inherit_id" ref="account.view_account_journal_form"/>
-       <field name="arch" type="xml">
-            <field name="code" position="after">
-                <field name="internal_sequence"/>
-            </field>
-       </field>
-    </record>
+	<record id="view_account_journal_form_inherit" model="ir.ui.view">
+		<field name="name">account.journal.form.inherit</field>
+		<field name="model">account.journal</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="account.view_account_journal_form"/>
+		<field name="arch" type="xml">
+			<field name="code" position="after">
+				<field name="internal_sequence"/>
+			</field>
+		</field>
+	</record>
 
+	<record model="ir.ui.view" id="view_move_line_form_inherit">
+		<field name="name">view.move.line.form.inherit</field>
+		<field name="model">account.move.line</field>
+		<field name="inherit_id" ref="account.view_move_line_form"/>
+		<field name="arch" type="xml">
+			<data>
+				<xpath expr="//field[@name='ref']" position="after">
+					<field name="internal_sequence_number"/>
+				</xpath>
+			</data>
+		</field>
+	</record>
 
-    <record model="ir.ui.view" id="view_move_line_form_inherit">
-        <field name="name">view.move.line.form.inherit</field>
-        <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_move_line_form"/>
-        <field name="arch" type="xml">
-        <data>
-            <xpath expr="//field[@name='ref']" position="after">
-                <field name="internal_sequence_number"/>
-    		</xpath>
-		</data>
-        </field>
-    </record>
+	<record model="ir.ui.view" id="view_move_line_search_inherit">
+		<field name="name">view.move.line.search.inherit</field>
+		<field name="model">account.move.line</field>
+		<field name="inherit_id" ref="account.view_account_move_line_filter"/>
+		<field name="arch" type="xml">
+			<data>
+				<xpath expr="//field[@name='ref']" position="after">
+					<field name="internal_sequence_number"/>
+				</xpath>
+			</data>
+		</field>
+	</record>
 
-    <record model="ir.ui.view" id="view_move_line_search_inherit">
-        <field name="name">view.move.line.search.inherit</field>
-        <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_account_move_line_filter"/>
-        <field name="arch" type="xml">
-        <data>
-			<xpath expr="//field[@name='ref']" position="after">
-                <field name="internal_sequence_number"/>
-		</xpath>
-		</data>
-        </field>
-    </record>
-
-    </data>
+	</data>
 </openerp>
diff --git a/addons/account_sequence/account_sequence_data.xml b/addons/account_sequence/account_sequence_data.xml
index db2c8e4d0ed..8ce28befcb4 100644
--- a/addons/account_sequence/account_sequence_data.xml
+++ b/addons/account_sequence/account_sequence_data.xml
@@ -3,8 +3,8 @@
     <data>
          <!--Account Journal Internal Sequences-->
 
-        <record id="internal_sequence_journal" model="ir.sequence">
-            <field name="name">Internal Sequence Journal</field>
+		<record id="internal_sequence_journal" model="ir.sequence">
+			<field name="name">Internal Sequence Journal</field>
             <field name="code">account.journal</field>
             <field name="number_next">1</field>
         </record>
@@ -13,26 +13,26 @@
 
 		<!--Account Journal Internal Number of account move line-->
 
-    	<record id="sp_journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account.account_sp_journal_view"/>
-            <field name="name">Internal Number</field>
-            <field name="field">internal_sequence_number</field>
-            <field eval="True" name="required"/>
-            <field eval="2" name="sequence"/>
-        </record>
+		<record id="sp_journal_col3" model="account.journal.column">
+			<field name="view_id" ref="account.account_sp_journal_view"/>
+			<field name="name">Internal Number</field>
+			<field name="field">internal_sequence_number</field>
+			<field eval="True" name="required"/>
+			<field eval="2" name="sequence"/>
+		</record>
 
-        <record id="journal_col1" model="account.journal.column">
-            <field name="view_id" ref="account.account_journal_view"/>
-            <field name="name">Internal Number</field>
-            <field name="field">internal_sequence_number</field>
-            <field eval="True" name="required"/>
-            <field eval="2" name="sequence"/>
-        </record>
+		<record id="journal_col1" model="account.journal.column">
+			<field name="view_id" ref="account.account_journal_view"/>
+			<field name="name">Internal Number</field>
+			<field name="field">internal_sequence_number</field>
+			<field eval="True" name="required"/>
+			<field eval="2" name="sequence"/>
+		</record>
 
-        <record id="bank_col3" model="account.journal.column">
-            <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="name">Internal Number</field>
-            <field name="field">internal_sequence_number</field>
+		<record id="bank_col3" model="account.journal.column">
+			<field name="view_id" ref="account.account_journal_bank_view"/>
+			<field name="name">Internal Number</field>
+			<field name="field">internal_sequence_number</field>
             <field eval="True" name="required"/>
             <field eval="2" name="sequence"/>
         </record>
@@ -54,4 +54,4 @@
         </record>
     </data>
 
-</openerp>
\ No newline at end of file
+</openerp>

From 7303b9b76a58793ace4f5870dea35b290d40bc88 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 19 Nov 2010 17:58:29 +0530
Subject: [PATCH 3/6] [MERGE] resolve conflicts

bzr revid: ara@tinyerp.com-20101119122829-wx2e1zst75hghumr
---
 addons/account_sequence/__openerp__.py       |  5 --
 addons/account_sequence/account_sequence.py  | 11 ---
 addons/account_sequence/account_sequence.xml | 81 +-------------------
 3 files changed, 1 insertion(+), 96 deletions(-)

diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 2c6aeaea7e5..28c7ac44e7f 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -30,13 +30,8 @@
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
-<<<<<<< TREE
-    'update_xml': ['account_sequence_data.xml','account_sequence.xml',],
-    'demo_xml': ['account_sequence_minimal.xml'],
-=======
     'update_xml': ['account_sequence_data.xml','account_sequence.xml'],
     'demo_xml': [],
->>>>>>> MERGE-SOURCE
     'installable': True,
     'active': False,
     'certificate': '',
diff --git a/addons/account_sequence/account_sequence.py b/addons/account_sequence/account_sequence.py
index f68973032af..3765bea5715 100644
--- a/addons/account_sequence/account_sequence.py
+++ b/addons/account_sequence/account_sequence.py
@@ -51,15 +51,4 @@ class account_journal(osv.osv):
 
 account_journal()
 
-<<<<<<< TREE
-class account_move_line(osv.osv):
-    _inherit = "account.move.line"
-
-    _columns = {
-        'internal_sequence_number': fields.related('move_id','internal_sequence_number', type='char', relation='account.move', string='Internal Number'),
-    }
-account_move_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:=======
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
->>>>>>> MERGE-SOURCE
diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index ada650f80eb..f8d2213edbc 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -2,84 +2,6 @@
 <openerp>
     <data>
 
-<<<<<<< TREE
-	<record id="view_account_move_form_inherit" model="ir.ui.view">
-		<field name="name">account.move.form.inherit</field>
-		<field name="model">account.move</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="account.view_move_form"/>
-		<field name="arch" type="xml">
-			<field name="to_check" position="after">
-				<field name="internal_sequence_number"/>
-			</field>
-		</field>
-    </record>
-
-	<record id="view_account_move_tree_inherit" model="ir.ui.view">
-		<field name="name">account.move.tree.inherit</field>
-		<field name="model">account.move</field>
-		<field name="type">tree</field>
-		<field name="inherit_id" ref="account.view_move_tree"/>
-		<field name="arch" type="xml">
-			<field name="ref" position="after">
-				<field name="internal_sequence_number"/>
-			</field>
-		</field>
-	</record>
-
-	<record model="ir.ui.view" id="view_move_search_inherit">
-		<field name="name">view.move.search.inherit</field>
-		<field name="model">account.move</field>
-		<field name="inherit_id" ref="account.view_account_move_filter"/>
-		<field name="arch" type="xml">
-			<data>
-				<xpath expr="//field[@name='ref']" position="after">
-					<field name="internal_sequence_number"/>
-				</xpath>
-			</data>
-		</field>
-	</record>
-
-	<record id="view_account_journal_form_inherit" model="ir.ui.view">
-		<field name="name">account.journal.form.inherit</field>
-		<field name="model">account.journal</field>
-		<field name="type">form</field>
-		<field name="inherit_id" ref="account.view_account_journal_form"/>
-		<field name="arch" type="xml">
-			<field name="code" position="after">
-				<field name="internal_sequence"/>
-			</field>
-		</field>
-	</record>
-
-	<record model="ir.ui.view" id="view_move_line_form_inherit">
-		<field name="name">view.move.line.form.inherit</field>
-		<field name="model">account.move.line</field>
-		<field name="inherit_id" ref="account.view_move_line_form"/>
-		<field name="arch" type="xml">
-			<data>
-				<xpath expr="//field[@name='ref']" position="after">
-					<field name="internal_sequence_number"/>
-				</xpath>
-			</data>
-		</field>
-	</record>
-
-	<record model="ir.ui.view" id="view_move_line_search_inherit">
-		<field name="name">view.move.line.search.inherit</field>
-		<field name="model">account.move.line</field>
-		<field name="inherit_id" ref="account.view_account_move_line_filter"/>
-		<field name="arch" type="xml">
-			<data>
-				<xpath expr="//field[@name='ref']" position="after">
-					<field name="internal_sequence_number"/>
-				</xpath>
-			</data>
-		</field>
-	</record>
-
-	</data>
-=======
     <record id="view_account_move_form_inherit" model="ir.ui.view">
        <field name="name">account.move.form.inherit</field>
        <field name="model">account.move</field>
@@ -91,7 +13,7 @@
             </field>
        </field>
     </record>
-    
+
     <record id="view_account_journal_form_inherit" model="ir.ui.view">
        <field name="name">account.journal.form.inherit</field>
        <field name="model">account.journal</field>
@@ -105,5 +27,4 @@
     </record>
 
     </data>
->>>>>>> MERGE-SOURCE
 </openerp>

From 4784c10244b9974879c7138901c2c47df51a2f2c Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 19 Nov 2010 18:20:46 +0530
Subject: [PATCH 4/6] [ADD] account_sequence:Add internal number in move line
 and rename the field

bzr revid: ara@tinyerp.com-20101119125046-u5feo6ll7kxhnma6
---
 addons/account_sequence/__openerp__.py       |  2 +-
 addons/account_sequence/account_sequence.py  |  9 +-
 addons/account_sequence/account_sequence.xml | 93 +++++++++++++++-----
 3 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 28c7ac44e7f..966cbcbc8ca 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -37,4 +37,4 @@
     'certificate': '',
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_sequence/account_sequence.py b/addons/account_sequence/account_sequence.py
index 3765bea5715..39b2327452d 100644
--- a/addons/account_sequence/account_sequence.py
+++ b/addons/account_sequence/account_sequence.py
@@ -51,4 +51,11 @@ class account_journal(osv.osv):
 
 account_journal()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class account_move_line(osv.osv):
+    _inherit = "account.move.line"
+
+    _columns = {
+        'internal_sequence_number': fields.related('move_id','internal_sequence_number', type='char', relation='account.move', string='Internal Number'),
+    }
+account_move_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index f8d2213edbc..330907b03ff 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -2,29 +2,80 @@
 <openerp>
     <data>
 
-    <record id="view_account_move_form_inherit" model="ir.ui.view">
-       <field name="name">account.move.form.inherit</field>
-       <field name="model">account.move</field>
-       <field name="type">form</field>
-       <field name="inherit_id" ref="account.view_move_form"/>
-       <field name="arch" type="xml">
-            <field name="to_check" position="after">
-                <field name="internal_sequence_number"/>
-            </field>
-       </field>
-    </record>
+        <record id="view_account_move_form_inherit" model="ir.ui.view">
+           <field name="name">account.move.form.inherit</field>
+           <field name="model">account.move</field>
+           <field name="type">form</field>
+           <field name="inherit_id" ref="account.view_move_form"/>
+           <field name="arch" type="xml">
+                <field name="to_check" position="after">
+                    <field name="internal_sequence_number"/>
+                </field>
+           </field>
+        </record>
 
-    <record id="view_account_journal_form_inherit" model="ir.ui.view">
-       <field name="name">account.journal.form.inherit</field>
-       <field name="model">account.journal</field>
-       <field name="type">form</field>
-       <field name="inherit_id" ref="account.view_account_journal_form"/>
-       <field name="arch" type="xml">
-            <field name="sequence_id" position="after">
-                <field name="internal_sequence"/>
+        <record id="view_account_journal_form_inherit" model="ir.ui.view">
+           <field name="name">account.journal.form.inherit</field>
+           <field name="model">account.journal</field>
+           <field name="type">form</field>
+           <field name="inherit_id" ref="account.view_account_journal_form"/>
+           <field name="arch" type="xml">
+                <field name="sequence_id" position="after">
+                    <field name="internal_sequence"/>
+                </field>
+           </field>
+        </record>
+
+        <record id="view_account_move_tree_inherit" model="ir.ui.view">
+            <field name="name">account.move.tree.inherit</field>
+            <field name="model">account.move</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="account.view_move_tree"/>
+            <field name="arch" type="xml">
+                <field name="ref" position="after">
+                    <field name="internal_sequence_number"/>
+                </field>
             </field>
-       </field>
-    </record>
+        </record>
+
+        <record model="ir.ui.view" id="view_move_search_inherit">
+            <field name="name">view.move.search.inherit</field>
+            <field name="model">account.move</field>
+            <field name="inherit_id" ref="account.view_account_move_filter"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='ref']" position="after">
+                    <field name="internal_sequence_number"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_move_line_form_inherit">
+            <field name="name">view.move.line.form.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_move_line_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='ref']" position="after">
+                    <field name="internal_sequence_number"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_move_line_search_inherit">
+            <field name="name">view.move.line.search.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='ref']" position="after">
+                    <field name="internal_sequence_number"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
 
     </data>
 </openerp>

From 8403529381673b35db53fbdf4e08d602a8231118 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 19 Nov 2010 18:32:01 +0530
Subject: [PATCH 5/6] [REF] account_sequence:fix the indentation

bzr revid: ara@tinyerp.com-20101119130201-p13l0rmf0mzjhdlq
---
 .../account_sequence_data.xml                 | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account_sequence/account_sequence_data.xml b/addons/account_sequence/account_sequence_data.xml
index 8ce28befcb4..24d3d75472a 100644
--- a/addons/account_sequence/account_sequence_data.xml
+++ b/addons/account_sequence/account_sequence_data.xml
@@ -11,28 +11,28 @@
 
         <function eval="('default', False, 'internal_sequence', [('account.journal', False)], internal_sequence_journal, True, False, False, False, True)" id="internal_seq_default_set" model="ir.values" name="set"/>
 
-		<!--Account Journal Internal Number of account move line-->
+        <!--Account Journal Internal Number of account move line-->
 
-		<record id="sp_journal_col3" model="account.journal.column">
-			<field name="view_id" ref="account.account_sp_journal_view"/>
-			<field name="name">Internal Number</field>
-			<field name="field">internal_sequence_number</field>
-			<field eval="True" name="required"/>
-			<field eval="2" name="sequence"/>
-		</record>
+        <record id="sp_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account.account_sp_journal_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
 
-		<record id="journal_col1" model="account.journal.column">
-			<field name="view_id" ref="account.account_journal_view"/>
-			<field name="name">Internal Number</field>
-			<field name="field">internal_sequence_number</field>
-			<field eval="True" name="required"/>
-			<field eval="2" name="sequence"/>
-		</record>
+        <record id="journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
 
-		<record id="bank_col3" model="account.journal.column">
-			<field name="view_id" ref="account.account_journal_bank_view"/>
-			<field name="name">Internal Number</field>
-			<field name="field">internal_sequence_number</field>
+        <record id="bank_col3" model="account.journal.column">
+            <field name="view_id" ref="account.account_journal_bank_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
             <field eval="True" name="required"/>
             <field eval="2" name="sequence"/>
         </record>

From 1f449f955916e2594356b5e09bef27a9ce826435 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 19 Nov 2010 19:23:29 +0530
Subject: [PATCH 6/6] [REF] account_sequence:change sequence of internal number
 in account move

bzr revid: ara@tinyerp.com-20101119135329-pt7uqa7dh6djcopr
---
 addons/account_sequence/account_sequence.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index 330907b03ff..dd9c1a36cd4 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -32,7 +32,7 @@
             <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_move_tree"/>
             <field name="arch" type="xml">
-                <field name="ref" position="after">
+                <field name="ref" position="before">
                     <field name="internal_sequence_number"/>
                 </field>
             </field>
@@ -44,7 +44,7 @@
             <field name="inherit_id" ref="account.view_account_move_filter"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='ref']" position="after">
+                <xpath expr="//field[@name='ref']" position="before">
                     <field name="internal_sequence_number"/>
                 </xpath>
             </data>