openerp-dev-web team mailing list archive

["ARA\(OpenERP\)" <ara@xxxxxxxxxxx>]

ARA(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #615522 Report Of Invoice  : Payment Term + Due date not printed
  https://bugs.launchpad.net/bugs/615522
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029
  #672553 opening entries from chart of account doesn't use context
  https://bugs.launchpad.net/bugs/672553
  #674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
  https://bugs.launchpad.net/bugs/674480


Hello,
         Account sequence: Rename the field name and add internal number in move line list, form and search view.

Thank you,
ara

-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/41277
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'account_sequence/__openerp__.py'
--- account_sequence/__openerp__.py	2010-11-10 06:07:22 +0000
+++ account_sequence/__openerp__.py	2010-11-19 10:12:35 +0000
@@ -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,

=== modified file 'account_sequence/account_sequence.py'
--- account_sequence/account_sequence.py	2010-11-19 05:22:31 +0000
+++ account_sequence/account_sequence.py	2010-11-19 10:12:35 +0000
@@ -26,7 +26,7 @@
     _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):
@@ -52,4 +52,12 @@
 
 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

=== modified file 'account_sequence/account_sequence.xml'
--- account_sequence/account_sequence.xml	2010-11-03 08:26:39 +0000
+++ account_sequence/account_sequence.xml	2010-11-19 10:12:35 +0000
@@ -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>

=== modified file 'account_sequence/account_sequence_data.xml'
--- account_sequence/account_sequence_data.xml	2010-11-11 06:01:03 +0000
+++ account_sequence/account_sequence_data.xml	2010-11-19 10:12:35 +0000
@@ -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