Merge lp:~openbig/bigconsulting/endbalance_changes into lp:bigconsulting

[gpa(OpenERP)]

Changes in the end balance value

[lp:~openbig/bigconsulting/endbalance_changes]

68. By gpa(OpenERP) on 2010-08-09

remove default for the account

69. By gpa(OpenERP) on 2010-08-09

remove default for the account

Unmerged revisions

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-06 12:28:07 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-09 10:15:53 +0000
@@ -565,6 +565,7 @@
             # for bank.statement.lines
             # In line we get reconcile_id on bank.ste.rec.
             # in bank stat.rec we get line_new_ids on bank.stat.rec.line
+            new_end_value = 0.0
             for move in st.line_ids:
                 context.update({'date':move.date})
                 move_id = account_move_obj.create(cr, uid, {
@@ -773,6 +774,9 @@
                             'amount_currency': amount_currency,
                             'currency_id': currency_id,
                             }, context=context)
+                        
+                new_end_value += amount+st_tax_amount-newline_sum
+
                 account_move_line_obj.create(cr, uid, {
                     'name': move.name,
                     'date': move.date,
@@ -820,7 +824,12 @@
                 if st.journal_id.entry_posted:
                     account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
             done.append(st.id)
-        self.write(cr, uid, done, {'state':'confirm'}, context=context)
+        
+        #### to write the balace value in the ending balance
+        balance_end_value = 0.0
+        balance_start_value = self.browse(cr, uid, st.id, context=context).balance_start
+        balance_end_value = balance_start_value + new_end_value
+        self.write(cr, uid, done, {'state':'confirm','balance_end_real':balance_end_value}, context=context)
 
         return True
 
@@ -829,13 +838,6 @@
 class account_bank_statement_line(osv.osv):
     _inherit="account.bank.statement.line"
     
-    def _get_account(self, cr, uid, context={}):
-        account_id = self.pool.get('account.account').search(cr, uid, [('type','!=','view')])[0]
-        if account_id:
-            return account_id
-        else:
-            return False
-        
     def _get_tax(self, cr, uid, context={}):
         tax_id = self.pool.get('account.tax').search(cr, uid, [])
         if tax_id:
@@ -862,8 +864,8 @@
            result['tax_id'] = False
            
         return {'value': result}
+    
     _defaults = {
-        'account_id': _get_account,
         'tax_id': _get_tax,
         'tax_type':lambda *a :'tax_included',
     }