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

[gpa(OpenERP)]

improvement for the currency difference.

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-09-22 14:21:33 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-09-23 08:35:54 +0000
@@ -786,7 +786,7 @@
                     new_amount_currency = 0.0
                     newline_amount_currency = 0.0
                     for newline in move.reconcile_id.line_new_ids:
-                        newline_amount_currency += newline.amount
+                        newline_amount_currency = newline.amount
                         if st.currency.id <> company_currency_id:
                             newline_amount_currency = res_currency_obj.compute(cr, uid, st.currency.id,
                                     company_currency_id, newline.amount, context=context)
@@ -817,8 +817,7 @@
                 
                 for line in move.reconcile_id.line_ids:
                     move_line_data = self.pool.get('account.move.line').browse(cr, uid, line.id, context=context)
-                    if st.currency.id <> (move_line_data.currency_id.id or company_currency_id):
-    
+                    if st.currency.id <> company_currency_id:
                         expense_acc = res_users_obj.browse(cr, uid, uid, context=context).company_id.expense_account_id.id
                         revene_acc = res_users_obj.browse(cr, uid, uid, context=context).company_id.revenue_account_id.id
                         currency_id = st.currency.id
@@ -836,6 +835,19 @@
                         for line in reconcile_data.line_new_ids:
                             reconcile_sum += line.amount
                         balance = round((balance_sum - reconcile_sum),2)
+                        
+                        if st.currency.id <> move_line_data.currency_id.id:
+                            invoice_cret_balance = 0.0 
+                            payment_balance = 0.0
+                            context.update({'date': move_line_data.date})
+                            inv_create_balance = res_currency_obj.compute(cr, uid, company_currency_id, 
+                                                        st.currency.id, amount, context=context)
+                            currenct_date = time.strftime('%Y-%m-%d')
+                            context.update({'date': currenct_date})
+                            payment_balance = res_currency_obj.compute(cr, uid, company_currency_id, 
+                                                st.currency.id, amount, context=context)
+                            balance = inv_create_balance - payment_balance
+
                         ###### set fisical position for the currency_diff account and partner account
                         fpos = move_line_data.invoice.fiscal_position or False
                         if expense_acc:
@@ -895,6 +907,7 @@
                     amount_currency = res_currency_obj.compute(cr, uid, company_currency_id, st.currency.id,
                         (amount+st_tax_amount-newline_sum), context=context,
                         account=acc_cur)
+                    currency_id = st.currency.id
 
                 account_move_line_obj.create(cr, uid, {
                     'name': move.name,