Merge lp:~serpentcs/openerp-usa/supp_credits-fix into lp:openerp-usa/6.0

[Serpent Consulting Services]

=== modified file 'account_voucher_credits_us/voucher.py'
--- account_voucher_credits_us/voucher.py	2014-03-10 14:54:29 +0000
+++ account_voucher_credits_us/voucher.py	2014-03-19 12:23:51 +0000
@@ -523,17 +523,16 @@
                         line.type = 'dr'
 
                 if line.type == 'dr':
-                    line_total += amount
-                    move_line['debit'] = amount
+                    line_total += amount + line.credit_used
+                    move_line['debit'] = move_line['amount_currency'] = amount + line.credit_used
                 else:
                     line_total -= amount + line.credit_used
-                    move_line['credit'] = amount + line.credit_used
+                    move_line['credit'] = move_line['amount_currency'] = amount + line.credit_used
 
-                if vch.tax_id and vch.type in ('sale', 'purchase'):
+                if vch.tax_id:
                     move_line.update({
                         'account_tax_id': vch.tax_id.id,
                         })
-
                 if line_total < 0.01 and line_total > -0.01:
                     line_total = 0.0
                 master_line = move_line_pool.create(cr, uid, move_line, context=context)
@@ -680,7 +679,6 @@
 
 #                 if line.type == 'dr':
 #                     line.write({'pending_credits': 0})
-
             move_line_credit_id = False
             ACC = False
             move_line = {
@@ -722,6 +720,7 @@
                     'debit': diff < 0 and -diff or 0.0,
                     'account_id':ACC,
                     'currency_id': vch.currency_id.id,
+                    'amount_currency' : abs(diff),
                    }
 #                 if vch.type in ('purchase', 'payment'):
 #                     move_line.update({