[IMP] Account: if statement.name =='/': the first statement created is St. 08/25...

if statement name !='/': do not append a sequence (if user typed 'QDP1', do not replace it by 'QDP1/x' where x is a sequence number autoincremented)

bzr revid: mra@mra-laptop-20100827033841-owws11we2s62e17m

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index c3809b4..4d5a322 100644 (file)
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -371,11 +371,11 @@ class account_bank_statement(osv.osv):
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
 
-            next_number = obj_seq.get(cr, uid, 'account.bank.statement')
             if not st.name == '/':
-                next_number = st.name + '/' + next_number[-1:]
+                next_number = st.name
                 account_move_obj.write(cr, uid, [move_id], {'name': next_number})
-
+            else:
+                next_number = obj_seq.get(cr, uid, 'account.bank.statement')
             account_move_obj.write(cr, uid, [move_id], {'state': 'posted'}) # Bank statements will not consider boolean on journal entry_posted
             self.write(cr, uid, [st.id], {'name': next_number}, context=context)
 

diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index b0f5f82..980834c 100644 (file)
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -247,8 +247,8 @@
             <field name="field">state</field>
             <field eval="14" name="sequence"/>
         </record>
-        
-        
+
+
         <record id="account_sp_journal_view" model="account.journal.view">
             <field name="name">Sale/Purchase Journal View</field>
         </record>
@@ -346,7 +346,7 @@
             <field name="field">reconcile_id</field>
             <field eval="20" name="sequence"/>
         </record>
-        
+
         <record id="account_sp_refund_journal_view" model="account.journal.view">
             <field name="name">Sale/Purchase Refund Journal View</field>
         </record>
@@ -444,7 +444,7 @@
             <field name="field">reconcile_id</field>
             <field eval="20" name="sequence"/>
         </record>
-        
+
         <!--
         Account Journal Sequences
         -->
@@ -495,10 +495,10 @@
             <field name="name">Account Bank Statement</field>
             <field name="code">account.bank.statement</field>
             <field name="prefix">St. %(month)s/%(day)s/</field>
-            <field eval="0" name="number_next"/>
+            <field eval="1" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
-        
+
         <record id="cash_sequence_statement_type" model="ir.sequence.type">
             <field name="name">Cash Statement</field>
             <field name="code">account.cash.statement</field>