[IMP]: improve bank and cash statement

bzr revid: mga@tinyerp.com-20100802185355-vb9v6ezi8uw75hwx

addons/account/account_bank_statement.py

@@ -126,7 +126,7 @@ class account_bank_statement(osv.osv):
             currency_id = res[statement_id]
             res[statement_id] = (currency_id, currency_names[currency_id])
         return res
-
+        
     _order = "date desc"
     _name = "account.bank.statement"
     _description = "Bank Statement"
@@ -158,8 +158,7 @@ class account_bank_statement(osv.osv):
     }
 
     _defaults = {
-        'name': lambda self, cr, uid, context=None: \
-                self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement'),
+        'name': lambda *a: "/",
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'draft',
         'balance_start': _default_balance_start,
@@ -192,7 +191,7 @@ class account_bank_statement(osv.osv):
             'value':res,
             'context':context,
         }
-
+    
     def button_confirm_bank(self, cr, uid, ids, context={}):
         done = []
         res_currency_obj = self.pool.get('res.currency')
@@ -368,8 +367,13 @@ class account_bank_statement(osv.osv):
 
                 if st.journal_id.entry_posted:
                     account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
+                    
             self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
+
+            next_number = self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement')
+            self.write(cr, uid, [st.id], {'name':next_number}, context)
+
         self.write(cr, uid, done, {'state':'confirm'}, context=context)
         return True
 
@@ -432,7 +436,6 @@ class account_bank_statement(osv.osv):
 
 account_bank_statement()
 
-
 class account_bank_statement_reconcile(osv.osv):
     _name = "account.bank.statement.reconcile"
     _description = "Statement Reconcile"

addons/account/account_cash_statement.py

@@ -215,7 +215,6 @@ class account_cash_statement(osv.osv):
     }
     _defaults = {
         'state': lambda *a: 'draft',
-        'name': lambda *a: '/',
         'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
         'user_id': lambda self, cr, uid, context=None: uid,
         'company_id': _get_company,
@@ -314,7 +313,7 @@ class account_cash_statement(osv.osv):
         if not self._user_allow(cr, uid, ids, statement, context={}):
             raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
         
-        number = self.pool.get('ir.sequence').get(cr, uid, statement.journal_id.sequence_id.code)
+        number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
         
 #        if len(statement.starting_details_ids) > 0:
 #            sid = []

addons/account/data/account_data2.xml

@@ -460,7 +460,6 @@
             <field eval="1" name="number_increment"/>
         </record>
 
-
         <record id="sequence_statement_type" model="ir.sequence.type">
             <field name="name">Bank Statement</field>
             <field name="code">account.bank.statement</field>
@@ -468,10 +467,21 @@
         <record id="sequence_statement" model="ir.sequence">
             <field name="name">Account Bank Statement</field>
             <field name="code">account.bank.statement</field>
-            <field name="prefix">St. %(month)s/%(day)s</field>
+            <field name="prefix">St. %(month)s/%(day)s/</field>
+            <field eval="0" 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>
+        </record>
+        <record id="cash_sequence_statement" model="ir.sequence">
+            <field name="name">Account Cash Statement</field>
+            <field name="code">account.cash.statement</field>
+            <field name="prefix">Cr. %(month)s/%(day)s/</field>
             <field eval="0" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
-
     </data>
 </openerp>

addons/account/data/account_invoice.xml

@@ -7,8 +7,8 @@
         </record>
 
         <!--
-    Sequences types for invoices
-    -->
+        Sequences types for invoices
+        -->
         <record id="seq_type_out_invoice" model="ir.sequence.type">
             <field name="name">Account Invoice Out</field>
             <field name="code">account.invoice.out_invoice</field>