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

[gpa(OpenERP)]

changes in the calculation of discount and changes name of the variables

[lp:~openbig/bigconsulting/new_changes_in_account_invoice_cash_discount]

25. By gpa(OpenERP) on 2010-06-18

remove extra lines

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-05 13:41:54 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-06-18 10:00:47 +0000
@@ -61,8 +61,8 @@
         tax_obj = self.pool.get('account.tax')
         invoice = self.browse(cr, uid, ids[0], context=context)
         
-        if invoice.date_due:
-            date1 = invoice.date_due
+        if invoice.date_invoice:
+            date1 = invoice.date_invoice
         else:
             date1 =  time.strftime('%Y-%m-%d')
                 
@@ -81,24 +81,16 @@
             diff_day = (from_dt-to_dt)/(3600*24)
         discount = 0.0
         if payment_term:
-            pt = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
-            if pt.cash_discount_ids:
+            payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
+            if payment_term_lines.cash_discount_ids:
                     res = 0.0
                     dis = 0
-                    for d in pt.cash_discount_ids:
-                        if diff_day > dis and  diff_day <= d.delay:
+                    for discount_line in payment_term_lines.cash_discount_ids:
+                        if diff_day > dis and  diff_day <= discount_line.delay:
                             if resudial_amonut:
-                                res = resudial_amonut * d.discount
-                            ted = 0.0
-                            for line in invoice.invoice_line:
-                                if line.invoice_line_tax_id:
-                                    tt = tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res, line.quantity)
-                                    for tex in tt:
-                                        rr = 0.0 
-                                        rr += tex['amount']
-                                    ted +=rr
-                            discount = res + ted
-                        dis = d.delay
+                                res = resudial_amonut * discount_line.discount
+                            discount = res
+                        dis = discount_line.delay
         return discount
      
     def _get_account(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
@@ -113,9 +105,9 @@
         tax_obj = self.pool.get('account.tax')
         invoice = self.browse(cr, uid, ids[0], context=context)
         
-        if invoice.date_due:
-            date1 = invoice.date_due
-        else:
+        if invoice.date_invoice:
+            date1 = invoice.date_invoice
+        else: 
             date1 =  time.strftime('%Y-%m-%d')
                 
         if 'date_p' in context and context['date_p']:    
@@ -133,12 +125,12 @@
             diff_day = (from_dt-to_dt)/(3600*24)    
 
         if payment_term:
-            pt = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
-            if pt.cash_discount_ids:
+            payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
+            if payment_term_lines.cash_discount_ids:
                     res = 0.0
-                    for d in pt.cash_discount_ids:
-                        if diff_day == d.delay or diff_day < d.delay:
-                            account_id = d.discount_account_id.id
+                    for discount_line in payment_term_lines.cash_discount_ids:
+                        if diff_day == discount_line.delay or diff_day < discount_line.delay:
+                            account_id = discount_line.discount_account_id.id
                     return account_id 
             
     def pay_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, period_id, pay_journal_id, writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context=None, name=''):