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

[gpa(OpenERP)]

Currency difference entry for the customer and supplier invoice.

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-09-15 10:48:59 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-09-17 09:51:17 +0000
@@ -229,13 +229,15 @@
         move_obj = self.pool.get('account.move')
         move_line_obj_memory = self.pool.get('account.move.line.memory')
         cur_obj = self.pool.get('res.currency')
+        journal_obj = self.pool.get('account.journal')
+        res_users_obj = self.pool.get('res.user')
         
         amount_discount = 0.0    
         if invoice.payment_term:
             # Return the discount on for the payment term
             amount_discount = self._get_payment(cr, uid, ids, pay_amount, invoice.payment_term.id, context=context)
-
-
+        journal_currency = journal_obj.browse(cr, uid, pay_journal_id, context=context).currency.id
+         
         src_account_id = invoice.account_id.id
         # Take the seq as name for move
         types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
@@ -253,7 +255,7 @@
         else:
             amount_currency = False
             currency_id = False
-
+            
         if invoice.type in ('in_invoice', 'in_refund'):
             ref = invoice.reference
         else:
@@ -454,6 +456,87 @@
                     }
                     l4['name'] = name
                     lines.append((0, 0, l4))
+        
+        
+        ########################### for currency difference#################
+        currency_diff = 0.0
+        invoice_amount = 0.0
+        payment_line_amount = 0.0
+        
+        for line in invoice.move_id.line_id:
+            move_line_data = move_line_obj.browse(cr, uid, line.id, context=context)
+            invoice_amount += line.debit
+        
+        for payment_line in invoice.payment_ids:
+            if payment_line.debit > 0.0:
+                payment_line_amount += payment_line.debit 
+            elif payment_line.credit > 0.0:
+                payment_line_amount += payment_line.credit
+                
+        payment_line_amount += pay_amount
+                            
+        if journal_currency != invoice.currency_id.id and payment_line_amount >= invoice_amount:
+            currency_diff = invoice_amount - payment_line_amount
+            expense_acc = invoice.company_id.expense_account_id
+            revene_acc = invoice.company_id.revenue_account_id
+            partner_acc_id = False
+
+            if invoice.type=='out_invoice':
+               partner_acc_id = invoice.partner_id.property_account_receivable.id
+            elif invoice.type=='in_invoice':
+                partner_acc_id = invoice.partner_id.property_account_payable.id
+
+            if currency_diff < 0.00:
+                l5 = {
+                    'ref': ref,
+                    'date': date,
+                    'partner_id':invoice.partner_id.id,
+                    'account_id': expense_acc.id,
+                    'credit': abs(currency_diff),
+                    'debit': 0.0,
+                    'amount_currency':0.0,
+                }
+                
+                l5['name'] = name
+                lines.append((0, 0, l5))
+                
+                l6 = {
+                    'ref': ref,
+                    'date': date,
+                    'partner_id':invoice.partner_id.id,
+                    'account_id': partner_acc_id,
+                    'credit':  0.0,
+                    'debit': abs(currency_diff),
+                    'amount_currency':0.0,
+                }
+                l6['name'] = name
+                lines.append((0, 0, l6))
+                 
+            elif currency_diff > 0.00:
+                l5 = {
+                    'ref': ref,
+                    'date': date,
+                    'partner_id':invoice.partner_id.id,
+                    'account_id':revene_acc.id,
+                    'credit': abs(currency_diff),
+                    'debit': 0.0,
+                    'amount_currency':0.0,
+                 }
+                l5['name'] = name
+                lines.append((0, 0, l5))
+                
+                l6 = {
+                    'date':date,
+                    'ref': ref,
+                    'partner_id':invoice.partner_id.id,
+                    'account_id': partner_acc_id,
+                    'credit': 0.0,
+                    'debit': abs(currency_diff),
+                    'amount_currency':0.0
+                    }            
+                l6['name'] = name
+                lines.append((0, 0, l6))
+
         move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = move_obj.create(cr, uid, move, context=context)
 
 
=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-08-06 10:33:20 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-09-17 09:51:17 +0000
@@ -345,6 +345,7 @@
         for line in invoice.invoice_line:
             line_tax_amount = 0.0
             total_tax_amount = 0.0
+            tax_real_amt = 0.0
             #####get the ratio of the line in the total invoice amount 
             for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal/line.quantity, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
                 line_tax_amount += tax['amount']