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

[gpa(OpenERP)]

changes in the milestone1 of the account_invoice_cash_discount

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-21 12:43:18 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-14 12:24:45 +0000
@@ -45,6 +45,8 @@
         'credit_account_id': fields.many2one('account.account', 'Credit Account'),
         'debit_account_id': fields.many2one('account.account', 'Debit Account'),
         'payment_term_ids': fields.one2many('account.payment.term.line', 'cash_account_discount_id', 'Payment Term Lines'),
+        'day_tolerance': fields.integer('Days Tolerance', digits=(16,6),required=True),
+        'sup_discount_account_id': fields.many2one('account.account', 'Supplier Discount Account',required=True),
     }
 account_cash_discount()
 
@@ -61,14 +63,11 @@
     _inherit = "account.invoice"
     
     def _get_amount(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
-        
         """
         This function return the Amount to paid  according to the payment term cash discount payment term lines
         """
-        
         if context is None:
            context = {}
-           
         tax_obj = self.pool.get('account.tax')
         invoice = self.browse(cr, uid, ids[0], context=context)
         
@@ -203,12 +202,14 @@
                     dis = 0.0
                     for discount_line in payment_term_lines.cash_discount_ids:
                         if diff_day >= dis and  diff_day <= discount_line.delay:
-                            account_id = discount_line.discount_account_id.id
+                            if invoice.type in ('in_invoice', 'in_refund'):
+                                account_id = discount_line.sup_discount_account_id.id
+                            else:    
+                                account_id = discount_line.discount_account_id.id
                         dis = discount_line.delay    
                     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=''):
-        
         if context is None:
             context = {}
         #TODO check if we can use different period for payment and the writeoff line
@@ -220,15 +221,12 @@
         move_line_obj = self.pool.get('account.move.line')
         move_obj = self.pool.get('account.move')
         
-        if 'amount_currency' in context and context['amount_currency']:
-            amount_currency = context['amount_currency']
-        else:
-            amount_currency = invoice.residual
         amount_discount = 0.0    
         if invoice.payment_term:
             # Return the discount on for the payment term
-            amount_discount = self._get_payment(cr, uid, ids, amount_currency, invoice.payment_term.id, context=context)
-            
+            amount_discount = self._get_payment(cr, uid, ids, pay_amount, invoice.payment_term.id, context=context)
+
+        
         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}
@@ -257,7 +255,7 @@
         
         if 'cash_amount' in context and context['cash_amount']:
             discount_amount = context['cash_amount']
-                
+            
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * (pay_amount)>0 and direction * (pay_amount),
@@ -270,7 +268,8 @@
             'amount_currency':amount_currency and direction * amount_currency or 0.0,
         }
         
-        ### if we change the amount paid and in the disocunt  then it used the changes discount 
+        ### if we change the amount paid and in the disocunt  then it used the changes discount
+            
         if amount_discount != discount_amount and discount_amount>0.0:
             amount_discount = discount_amount
             
@@ -291,7 +290,8 @@
         l1['name'] = name
         l2['name'] = name
         lines = [(0, 0, l1), (0, 0, l2)]
-        
+
+        ### When we make payment by pay invoice wizard and if found the taxes move then directly take the entry from the wizard  
         if 'tax_move_ids' in context and context['tax_move_ids']:
             move_line = context['tax_move_ids']
             for move_line_id in move_line:
@@ -337,25 +337,28 @@
                             }
                             l3['name'] = name
                             lines.append((0, 0, l3))
-                    
+                            
+        ### When we make payment by pay invoice wizard and if found the discount moves in wizard discount move then directly take the entry from the wizard
         if 'discount_move_ids' in context and context['discount_move_ids']: 
-            dis_move_id = context['discount_move_ids'][0]
-            move_id = move_line_obj.search(cr, uid,[('move_id','=',dis_move_id)])
-            move_line_data = move_line_obj.browse(cr, uid, move_id[0])
-            l4 = {
-                            'debit': move_line_data.debit,
-                            'credit':move_line_data.credit,
-                            'account_id': move_line_data.account_id.id,
-                            'partner_id': move_line_data.partner_id.id,
-                            'ref':move_line_data.ref,
-                            'date': move_line_data.date,
-                            'currency_id':currency_id,
-                            'amount_currency':amount_currency and direction * amount_currency or 0.0,
-                            'name':move_line_data.name,
-                        }
-            lines.append((0, 0, l4))
-            
-            move_obj.unlink(cr, uid, context['discount_move_ids'])
+            move_line = context['discount_move_ids']
+            for move_line_id in move_line:
+                move_line_data = move_line_obj.browse(cr, uid,move_line_id)
+                l4 = {
+                        'debit': move_line_data.debit,
+                        'credit':move_line_data.credit,
+                        'account_id': move_line_data.account_id.id,
+                        'partner_id': move_line_data.partner_id.id,
+                        'ref':move_line_data.ref,
+                        'date': move_line_data.date,
+                        'currency_id':currency_id,
+                        'amount_currency':amount_currency and direction * amount_currency or 0.0,
+                        'name':move_line_data.name,
+                        'tax_code_id':move_line_data.tax_code_id.id,
+                        'tax_amount':move_line_data.tax_amount,
+                      }
+                lines.append((0, 0, l4))
+                move_line_obj.unlink(cr, uid,[move_line_id])
+                move_obj.unlink(cr, uid,[move_line_data.move_id.id])
         else:
             if amount_discount>0:
                 if 'account_id' in context and context['account_id']:
@@ -376,7 +379,7 @@
                 }
                 l4['name'] = name
                 lines.append((0, 0, l4))
-
+        
         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)
         
@@ -420,5 +423,6 @@
           type='many2one', relation='account.invoice', fnct_search=_invoice_search),
     }
 account_move_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-08-21 12:43:18 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-07-14 12:24:45 +0000
@@ -15,6 +15,8 @@
                     <field name="delay" select="1"/>
                     <field name="discount" select="1"/>
                     <field name="discount_account_id" />
+                    <field name="day_tolerance"/>
+                    <field name="sup_discount_account_id"/>
                     <group colspan="4">
                     	<separator string="Related Payment Terms Lines" colspan="4"/>
                     	<field name="payment_term_ids" widget="one2many_list" nolabel="1"/>
@@ -96,8 +98,8 @@
             <field name="inherit_id" ref="account.view_payment_term_line_form"/>
             <field name="arch" type="xml">
             	<field name="days2" position="after">
-            		<label string="" colspan="2"/>
 					<field name="compl_cash_discount"/>
+					<label string="" colspan="2"/>
 				</field>      
             </field>
         </record>

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-06 13:32:32 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-14 12:24:45 +0000
@@ -66,7 +66,7 @@
         'cal_method_selection': fields.selection([('method_gross_methodology','Calculate Discount with Net Gross Methodology'),
                                             ('method_net_methodology','Calculate Discount with Net Methodology'),],
                                               'Method To Calculation'),
-        'discount_move_ids': fields.many2many('account.move', 'account_discount_move_rel', 'discount_account_id', 'discount_move_id', 'Account Discount Moves'),
+        'discount_move_ids': fields.many2many('account.move.line', 'account_discount_move_rel', 'discount_account_id', 'discount_move_id', 'Account Discount Moves'),
         'tax_move_ids': fields.many2many('account.move.line', 'account_tax_move_rel', 'tax_account_id', 'tax_move_id', 'Account Taxes Moves'),
         }
     
@@ -79,7 +79,10 @@
 
     def _get_amount(self, cr, uid, context=None):
         obj_inv = self.pool.get('account.invoice')
+        tax_obj = self.pool.get('account.tax')
         invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        total_tax_amount = 0.0 
+        total_amount = 0.0
         amount = obj_inv._get_amount(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
         context.update({'found':amount['found']})
         amount = amount['amount']
@@ -89,6 +92,7 @@
     
     def _get_discount(self, cr, uid, context=None):
         obj_inv = self.pool.get('account.invoice')
+        tax_obj = self.pool.get('account.tax')
         invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
         amount = obj_inv._get_amount(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
         amount = amount['amount']
@@ -149,6 +153,7 @@
         return {'value' : {'cash_amount':discount_amount,'cash_residual_amount':diff_amount}}
     
     def _calculation(self, cr, uid, ids, context=None):
+        
         invoice_obj = self.pool.get('account.invoice')
         data =  self.read(cr, uid, ids,context=context)[0]
         invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
@@ -161,13 +166,16 @@
         if data['tax_move_ids']:
             move_line = data['tax_move_ids']
             for move_line_id in move_line:
-                move_id = move_line_data = move_line_obj.browse(cr, uid,move_line_id).move_id.id
+                move_id = move_line_obj.browse(cr, uid,move_line_id).move_id.id
                 move_line_obj.unlink(cr, uid,[move_line_id])
                 move_obj.unlink(cr, uid,[move_id])
                 
         if data['discount_move_ids']: 
-            dis_move_id = data['discount_move_ids'][0]
-            move_obj.unlink(cr, uid, data['discount_move_ids'])
+            discount_move_line = data['discount_move_ids']
+            for move_line_id in discount_move_line:
+                move_id = move_line_obj.browse(cr, uid,move_line_id).move_id.id
+                move_line_obj.unlink(cr, uid,[move_line_id])
+                move_obj.unlink(cr, uid,[move_id])
             
         ######## to get ref
         if invoice.type in ('in_invoice', 'in_refund'):
@@ -182,23 +190,39 @@
         
         #### to get name
         name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
-        
         ##### Entry in the discount account moves and entry in the tax account moves
-        ### Entry for taxes in the line of wizard tax
+
         if data.get('cash_amount',0.0)>0.0:
-            lines3 = []
             tax_total_amount = 0.0
-            line_ids = []     
+            amount = 0.0
+            discount = 0.0
+            line_ids = []
+            discount_line_ids = []
+
+            discount_account_id = False
+            tax_code_id = False
+            
             for line in invoice.invoice_line:
+                tax_amount = 0.0
+                line_tax_amount = 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, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
+                        line_tax_amount = tax['amount']
+                line_total = line.price_subtotal + line_tax_amount
+                invoice_res_amount = invoice.amount_total
+                line_ratio = line_total / invoice_res_amount
+                ###########################
+
                 if line.invoice_line_tax_id:
                     for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, data['cash_amount'], line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
                         tax_amount = tax['amount']
-                        tax_total_amount += tax['amount']
                         tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
                         for tax_id in tax_invoice_id:
                             tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
                             tax_account_id = tax_value.account_id.id
-               
+                            tax_code_id = tax_value.tax_code_id.id
+                            
                         l3 = {
                             'debit': direction * tax_amount<0 and - direction * tax_amount,
                             'credit': direction * tax_amount>0 and  direction * tax_amount,
@@ -210,45 +234,42 @@
                             'period_id':data.get('period_id',False),
                             'name':name,
                             'tax_code_id':tax_value.tax_code_id.id,
-                            'tax_amount':tax_amount,
+                            'tax_amount':-tax_amount,
                         }
-                        line_id = move_line_obj.create(cr,uid,l3,context=context)
+                        line_id = move_line_obj.create(cr, uid, l3, context=context)
                         line_ids.append(line_id)
+                
+                ### if calculation on the Net Methology then in discount field it will take product income account or product category income account 
+                
+                if data['cal_method_selection'] == 'method_net_methodology':
+                    if line.product_id.property_account_income:
+                        discount_account_id = line.product_id.property_account_income.id
+                    else:
+                        discount_account_id = line.product_id.categ_id.property_account_income_categ.id
+                else:
+                     discount_account_id = data['account_id']
+                
+                discount = data['cash_amount'] * line_ratio
+                l4 = {
+                    'debit': direction * (discount - tax_amount)<0 and - direction * (discount - tax_amount),
+                    'credit': direction * (discount - tax_amount)>0 and  direction * (discount - tax_amount),
+                    'account_id': discount_account_id,
+                    'partner_id': invoice.partner_id.id,
+                    'ref':ref,
+                    'date': date,
+                    'name':name,
+                    'journal_id':data.get('journal_id',False),
+                    'period_id':data.get('period_id',False),
+                    'tax_code_id':tax_code_id,
+                    'tax_amount':-tax_amount,
+                    }
+                
+                discount_line_id = move_line_obj.create(cr, uid, l4, context=context)
+                discount_line_ids.append(discount_line_id)
+                        
             self.write(cr, uid, ids, {'tax_move_ids':[(6,0,line_ids)]}, context)
-            
-            ### Entry for discount in the line of wizard discount
-            lines4 = []
-            if tax_total_amount>0:
-                data['cash_amount'] = (data['cash_amount'] - tax_total_amount)
-            
-            ############################  if method type net methology than discount account journal account 
-            discount_account_id = False
-            
-            if data['cal_method_selection'] == 'method_net_methodology':
-                journal_id = data['journal_id']
-                if context['type'] == 'out_invoice':
-                    discount_account_id = self.pool.get('account.journal').browse(cr, uid, journal_id).default_debit_account_id.id
-                else:
-                    discount_account_id = self.pool.get('account.journal').browse(cr, uid, journal_id).default_credit_account_id.id
-            else:
-                 discount_account_id = data['account_id']
-            ###############################################
-                
-            l4 = {
-                'debit': direction * data.get('cash_amount',0.0)<0 and - direction * data.get('cash_amount',0.0),
-                'credit': direction * data.get('cash_amount',0.0)>0 and  direction * data.get('cash_amount',0.0),
-                'account_id': discount_account_id,
-                'partner_id': invoice.partner_id.id,
-                'ref':ref,
-                'date': date,
-                'name':name
-                }
-            
-            lines4.append((0, 0, l4))    
-            move = {'ref': ref, 'line_id': lines4, 'journal_id': data['journal_id'], 'period_id': data['period_id'], }
-            move_id = move_obj.create(cr, uid, move, context=context)
-            self.write(cr, uid, ids, {'discount_move_ids':[(6,0,[move_id])]}, context)
-
+            self.write(cr, uid, ids, {'discount_move_ids':[(6,0,discount_line_ids)]}, context)
+            
         return True
     
     def default_get(self, cr, uid, fields, context=None):
@@ -296,7 +317,6 @@
         if context is None:
             context = {}
         data =  self.read(cr, uid, ids,context=context)[0]
-
         invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context)
         journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context)
        # Here we need that:
@@ -327,38 +347,46 @@
             amount_paid+=abs(debit-credit)
 
         # Test if there is a difference according to currency rouding setting
-        amount = obj_inv._get_amount(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
-        found_h = amount['found']
-        
-        if found_h:
-            if context.get('discount_move_ids',False):
-                context.update({'discount_move_ids':context['discount_move_ids']})
-        
-            if context.get('tax_move_ids',False):
-                context.update({'tax_move_ids':context['tax_move_ids']})
-                
+#        amount = obj_inv._get_amount(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
+#
+#        found_h = amount['found']
+#
+#        if found_h:
+
+        ####### Here when we do make full payment then to get the previous Discount and Tax Move added in context
+          
+        if context.get('discount_move_ids',False):
+            context.update({'discount_move_ids':context['discount_move_ids']})
+        if context.get('tax_move_ids',False):
+            context.update({'tax_move_ids':context['tax_move_ids']})
+        if context.get('amount',False):
+            context.update({'amount':context['amount']})
+        if context.get('cash_amount',False):
+            context.update({'cash_amount':context['cash_amount']})
+
+#            return self.pay_and_reconcile(cr, uid, ids, context=context)
+#        else:
+
+        if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
+                (amount_paid - inv_amount_company_currency)) or data['cash_residual_amount'] == 0.0:
             return self.pay_and_reconcile(cr, uid, ids, context=context)
+        
         else:
-            
-            if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
-                    (amount_paid - inv_amount_company_currency)):
-                return self.pay_and_reconcile(cr, uid, ids, context=context)
-            
-            else:
-                model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_account_invoice_pay_writeoff')], context=context)
-                resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-                return {
-                    'name': _('Information addendum'),
-                    'context': context,
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'account.invoice.pay.writeoff',
-                    'views': [(resource_id,'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'new',
-                }
-    
+            model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_account_invoice_pay_writeoff')], context=context)
+            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            return {
+                'name': _('Information addendum'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.invoice.pay.writeoff',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+
     def pay_and_reconcile(self, cr, uid, ids, context=None):
+        
         cur_obj = self.pool.get('res.currency')
         if context is None:
             context = {}
@@ -373,8 +401,11 @@
             writeoff_journal_id = context['write_off']['writeoff_journal_id']
             comment = context['write_off']['comment']
         
-        amount = data['amount'] + data['cash_amount']
-            
+        if context.get('amount',False):
+            amount = context['amount'] +  context.get('cash_amount',0.0)
+        else:
+            amount = data['amount'] + data['cash_amount']
+        
         invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
         journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context=context)
         # Compute the amount in company's currency, with the journal currency (which is equal to payment currency)
@@ -384,39 +415,52 @@
             amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, amount, context=ctx)
             currency_id = journal.currency.id
             # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
-            context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
+            if context.get('amount',False):
+                context.update({'amount_currency':context['amount'] +  context.get('cash_amount',0.0),'currency_id':currency_id})
+            else:    
+                context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
 
         if invoice.company_id.currency_id.id<>invoice.currency_id.id:
             ctx = {'date':data['date']}
             amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, amount, context=ctx)
             currency_id = invoice.currency_id.id
             # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
-            context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
-
-        # Take the choosen date
-        if comment:
-            context.update({'date_p':data['date'],'comment':comment})
-        else:
-            context.update({'date_p':data['date'],'comment':False})
-
-        context.update({'account_id':data['account_id'],'cash_amount':data['cash_amount'],'amount_currency':data['amount'] + data['cash_amount']})        
+            if context.get('amount',False):
+                context.update({'amount_currency':context['amount'] +  context.get('cash_amount',0.0),'currency_id':currency_id})
+            else:    
+                context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
+
+        context.update({'account_id':data['account_id'],'date_p':data['date'],'comment':comment or False})        
         
         if context.get('discount_move_ids',False):
-            context = context
+            context.update({'discount_move_ids':context['discount_move_ids']})
         else:
             context.update({'discount_move_ids':data['discount_move_ids']})    
         
         if context.get('tax_move_ids',False):
-            context = context
+           context.update({'tax_move_ids':context['tax_move_ids']})
         else:
             context.update({'tax_move_ids':data['tax_move_ids']})
                 
-        if data['cash_amount']:
+        if context.get('cash_amount',False):
+            cash_amount = context['cash_amount']
+            context.update({'cash_amount':context['cash_amount']})        
+        else:
+            cash_amount = data['cash_amount']
             context.update({'cash_amount':data['cash_amount']})
-                
+        
+        if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
+            cash_amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, cash_amount, context=ctx)
+            context.update({'cash_amount':cash_amount})
+            
+        if invoice.company_id.currency_id.id<>invoice.currency_id.id:    
+            cash_amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, cash_amount, context=ctx)
+            context.update({'cash_amount':cash_amount})
+            
         acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
         if not acc_id:
             raise osv.except_osv(_('Error !'), _('Your journal must have a default credit and debit account.'))
+
         self.pool.get('account.invoice').pay_and_reconcile(cr, uid, [context['id']],
                 amount, acc_id, data['period_id'], data['journal_id'], writeoff_account_id,
                 data['period_id'], writeoff_journal_id, context, data['name'])
@@ -435,7 +479,28 @@
                 if 'Customers Cash Discount Account' in res['fields'][f]['string']:
                     res['fields'][f]['string'] = res['fields'][f]['string'].replace('Customers Cash Discount Account',word)
         return res
-        
+    
+    def _cancel_line(self, cr, uid, ids, context=None):
+         move_obj = self.pool.get('account.move')
+         move_line_obj = self.pool.get('account.move.line')
+         data =  self.read(cr, uid, ids,context=context)[0]
+
+         if data['tax_move_ids']:
+            move_line = data['tax_move_ids']
+            for move_line_id in move_line:
+                move_id = move_line_obj.browse(cr, uid,move_line_id).move_id.id
+                move_line_obj.unlink(cr, uid,[move_line_id])
+                move_obj.unlink(cr, uid,[move_id])
+                
+         if data['discount_move_ids']: 
+            discount_move_line = data['discount_move_ids']
+            for move_line_id in discount_move_line:
+                move_id = move_line_obj.browse(cr, uid,move_line_id).move_id.id
+                move_line_obj.unlink(cr, uid,[move_line_id])
+                move_obj.unlink(cr, uid,[move_id])
+
+         return {}
+
 account_invoice_pay()
 
 class account_message(osv.osv_memory):

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-08-21 12:43:18 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-07-14 12:24:45 +0000
@@ -32,7 +32,7 @@
                 	</group>
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" string="Cancel" name="_cancel_line" type="object"/>
                     	<button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
                     	<button icon="gtk-execute" string="Full-Payment" name="_message" type="object"/>
                    </group>

=== modified file 'account_invoice_cash_discount/wizard/invoice_statement_payment.py'
--- account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-06-30 05:22:29 +0000
+++ account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-07-14 12:24:45 +0000
@@ -134,7 +134,7 @@
                 amount=line.debit
             elif line.credit > 0:
                 amount=-line.credit
-                
+        print "amount::::::",amount        
         reconcile_id = statement_reconcile_obj.create(cursor, user, {
             'line_ids': [(6, 0, [line.id])]
             }, context=context)
@@ -145,13 +145,17 @@
             discount = 0.0
             account = False
             tax_total_amount = 0.0 
-            
+            total_discount = 0.0
             invoice = obj_inv.browse(cursor, user, line.invoice.id, context=context)
-            discount = obj_inv._get_payment(cursor, user, [invoice.id] , invoice.residual, invoice.payment_term.id, context=context)
-            account = obj_inv._get_account(cursor, user, [invoice.id] , invoice.residual, invoice.payment_term.id, context=context)
         
             for invoice_line in invoice.invoice_line:
                 if invoice_line.invoice_line_tax_id:
+                    amount_invoice_line = obj_inv._get_amount(cursor, user, [invoice.id]  , invoice_line.price_subtotal, invoice.payment_term.id, context=context)
+                    line_amount = amount_invoice_line['amount']
+                    discount = obj_inv._get_payment(cursor, user, [invoice.id]  , line_amount, invoice.payment_term.id, context=context)
+                    account = obj_inv._get_account(cursor, user, [invoice.id] , invoice.residual, invoice.payment_term.id, context=context)
+
+                    tax_amount = 0.0 
                     for tax in tax_obj.compute(cursor, user, invoice_line.invoice_line_tax_id, discount, invoice_line.quantity, invoice.address_invoice_id.id, invoice_line.product_id, invoice.partner_id):
                         tax_amount = tax['amount']
                         tax_total_amount += tax['amount']
@@ -167,13 +171,15 @@
                                 'account_id': tax_account_id,
                                 'line_id': reconcile_id,
                                 }, context=context)
-            if discount>0:
-                statement_reconcile_line_obj.create(cursor, user, {
-                    'name': line.name,
-                    'amount': discount - tax_total_amount,
-                    'account_id': account,
-                    'line_id': reconcile_id,
-                    }, context=context)
+                            
+                    if discount>0:
+                        total_discount += discount 
+                        statement_reconcile_line_obj.create(cursor, user, {
+                            'name': line.name,
+                            'amount': discount - tax_amount,
+                            'account_id': account,
+                            'line_id': reconcile_id,
+                            }, context=context)
         ##########################################################################
         
         if line.journal_id.type == 'sale':
@@ -182,6 +188,7 @@
             type = 'supplier'
         else:
             type = 'general'
+            
         statement_line_obj.create(cursor, user, {
             'name': line.name or '?',
             'amount': amount,