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

[gpa(OpenERP)]

Improvement in milestone1

=== modified file 'account_invoice_cash_discount/__terp__.py'
--- account_invoice_cash_discount/__terp__.py	2010-06-30 07:25:25 +0000
+++ account_invoice_cash_discount/__terp__.py	2010-07-27 09:18:44 +0000
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 {
-    "name" : "Payement Term with Cash Discount",
+    "name" : "Payment Term with Cash Discount",
     "version" : "1.0",
     "depends" : ["account",],
     "author" : "Big Consulting",

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-23 11:30:07 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-27 09:18:44 +0000
@@ -45,8 +45,6 @@
         'payment_id': fields.many2one('account.payment.term','Associated Payment Term'),
         '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()
@@ -54,7 +52,6 @@
 class account_payment_term_line(osv.osv):
     _inherit = "account.payment.term.line"
     _columns = {
-#        'cash_account_discount_id': fields.many2one('account.cash.discount', 'Discount Lines',),
         'day_tolerance': fields.integer('Days Tolerance', digits=(16,6),required=True),
         'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=False, select=True),
         'compl_cash_discount':fields.boolean('Use Complete Cash Discount'),
@@ -115,6 +112,8 @@
                                     res = resudial_amonut
                             amount = res
                         dis = payment_line.days
+        else:
+            amount = resudial_amonut
                         
         return {'amount':amount,'tol_days':tol_days,'found':payment_line_found}
      
@@ -223,6 +222,7 @@
         invoice_tax_obj = self.pool.get("account.invoice.tax")
         move_line_obj = self.pool.get('account.move.line')
         move_obj = self.pool.get('account.move')
+        move_line_obj_memory = self.pool.get('account.move.line.memory')
         
         amount_discount = 0.0    
         if invoice.payment_term:
@@ -298,23 +298,21 @@
         if 'tax_move_ids' in context and context['tax_move_ids']:
             move_line = context['tax_move_ids']
             for move_line_id in move_line:
-                move_line_data = move_line_obj.browse(cr, uid,move_line_id)
+                move_line_data = move_line_obj_memory.browse(cr, uid,move_line_id)
                 l3 = {
                         '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,
+                        'partner_id': invoice.partner_id.id,
+                        'ref':ref,
                         'date': move_line_data.date,
-                        'currency_id':currency_id,
-                        'amount_currency':amount_currency and direction * amount_currency or 0.0,
+                        'currency_id':move_line_data.currency_id.id,
+                        'amount_currency':move_line_data.amount_currency and direction * move_line_data.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, l3))
-                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.0:         
                 for line in invoice.invoice_line:
@@ -345,44 +343,60 @@
         if 'discount_move_ids' in context and 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)
+                move_line_data = move_line_obj_memory.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,
+                        'partner_id': invoice.partner_id.id,
+                        'ref':ref,
                         'date': move_line_data.date,
-                        'currency_id':currency_id,
-                        'amount_currency':amount_currency and direction * amount_currency or 0.0,
+                        'currency_id':move_line_data.currency_id.id,
+                        'amount_currency':move_line_data.amount_currency and direction * move_line_data.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:
+                account_id = False
                 if 'account_id' in context and context['account_id']:
-                    account_id = context['account_id']  
-                if tax_total_amount>0:
-                    amount_discount = (amount_discount - tax_total_amount)
-                else:
-                    amount_discount = amount_discount
-                l4 = {
-                    'debit': direction * amount_discount<0 and - direction * amount_discount,
-                    'credit': direction * amount_discount>0 and  direction * amount_discount,
-                    'account_id': account_id,
-                    'partner_id': invoice.partner_id.id,
-                    'ref':ref,
-                    'date': date,
-                    'currency_id':currency_id,
-                    'amount_currency':amount_currency and direction * amount_currency or 0.0,
-                }
-                l4['name'] = name
-                lines.append((0, 0, l4))
-        
+                    account_id = context['account_id']
+#                if tax_total_amount>0:
+#                    amount_discount = (amount_discount - tax_total_amount)
+#                else:
+#                    amount_discount = amount_discount
+                for line in invoice.invoice_line:
+                    line_tax_amount = 0.0
+                    tax_amount = 0.0
+                    discount = 0.0
+                    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
+                    
+                    discount = amount_discount * line_ratio
+                    
+                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, amount_discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
+                        tax_amount = tax['amount']
+                    
+                    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': account_id,
+                        'partner_id': invoice.partner_id.id,
+                        'ref':ref,
+                        'date': date,
+                        'currency_id':currency_id,
+                        'amount_currency':amount_currency and direction * amount_currency or 0.0,
+                    }
+                    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)
         
@@ -407,25 +421,16 @@
     
 account_invoice()
 
-class account_move_line(osv.osv):
-    _name = 'account.move.line'
-    _inherit = 'account.move.line'
-    
-    def _invoice(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        if ids:
-            return super(account_move_line, self)._invoice(cr, uid, ids, name, arg, context)
-        else:
-            return res
-        
-    def _invoice_search(self, cr, uid, obj, name, args, context={}):
-        return super(account_move_line, self)._invoice_search(cr, uid, obj, name, args, context=context)
-        
-    _columns = {
-       'invoice': fields.function(_invoice, method=True, string='Invoice',
-          type='many2one', relation='account.invoice', fnct_search=_invoice_search),
-    }
-account_move_line()
+class account_bank_statement_reconcile(osv.osv):
+    _inherit='account.bank.statement.reconcile'
+    def name_get(self, cursor, user, ids, context=None):
+        res = []
+        res = super(account_bank_statement_reconcile, self).name_get(cursor, user, ids, context)   
+        for o in self.browse(cursor, user, ids, context=context):
+            data = res[0][1]  + o.name
+            res.append((o.id,data))
+        return res
+account_bank_statement_reconcile()    
 
 # 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-23 12:13:39 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-07-27 09:18:44 +0000
@@ -72,6 +72,22 @@
             </field>
         </record>
         
+        <record id="view_bank_statement_reconcile_tree" model="ir.ui.view">
+            <field name="name">account.bank.statement.reconcile.tree</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Reconcile">
+                    <field name="name" select="1"/>
+                    <field name="total_amount"/>
+                    <field name="total_currency"/>
+                    <field name="total_entry"/>
+                    <field name="total_new"/>
+                    <field name="total_balance"/>
+                </tree>
+            </field>
+        </record>
+        
         <record id="bank_statement_reconcile_form_view2" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement.reconcile</field>

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-23 11:30:07 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-27 09:18:44 +0000
@@ -66,8 +66,8 @@
         '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.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'),
+        'discount_move_ids': fields.many2many('account.move.line.memory', 'account_discount_move_rel', 'discount_account_id', 'discount_move_id', 'Account Discount Moves'),
+        'tax_move_ids': fields.many2many('account.move.line.memory', 'account_tax_move_rel', 'tax_account_id', 'tax_move_id', 'Account Taxes Moves'),
         }
     
     def _get_period(self, cr, uid, context=None):
@@ -111,6 +111,135 @@
             account = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account)
         return account
     
+    def _get_discount_move(self, cr, uid, context=None):
+        
+        cur_obj = self.pool.get('res.currency')
+        invoice_obj = self.pool.get('account.invoice')
+
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+        tax_obj = self.pool.get('account.tax')
+        invoice_tax_obj = self.pool.get("account.invoice.tax")
+        move_line_obj_memory = self.pool.get('account.move.line.memory')
+        
+        #### to get direction
+        types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+        direction = types[invoice.type]
+        date=time.strftime('%Y-%m-%d')
+        
+        #### 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
+        
+        amount = 0.0
+        discount = 0.0
+        discount_line_ids = []
+        discount_account_id = False
+        base_code_id = False
+        
+        discount = self._get_discount(cr, uid, context=context)
+        discount_account_id = self._get_account(cr, uid, context=context)
+        if discount>0.0:
+            for line in invoice.invoice_line:
+                tax_amount = 0.0
+                line_tax_amount = 0.0
+                
+                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, discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
+                        tax_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
+                            base_code_id = tax_value.base_code_id.id
+    
+                        if invoice.company_id.currency_id.id<>invoice.currency_id.id:
+                            amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_amount, context=context)
+    
+                discount_pay = discount * line_ratio
+                if invoice.company_id.currency_id.id<>invoice.currency_id.id:
+                    discount_amount = discount - tax_amount
+                    amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, discount_amount, context=context)
+                    
+                l4 = {
+                    'debit': direction * (discount_pay - tax_amount)<0 and - direction * (discount_pay - tax_amount),
+                    'credit': direction * (discount_pay - tax_amount)>0 and  direction * (discount_pay - tax_amount),
+                    'account_id': discount_account_id,
+                    'date': date,
+                    'name':name,
+                    'currency_id':invoice.currency_id.id or False,
+                    'journal_id':invoice.journal_id.id,
+                    'tax_code_id':base_code_id,
+                    'tax_amount':tax_amount,
+                    'amount_currency':amount and direction * amount or 0.0,
+                    'analytic_account_id':line.account_analytic_id.id or False,
+                    }
+                
+                discount_line_id = move_line_obj_memory.create(cr, uid, l4, context=context)
+                discount_line_ids.append(l4)
+        return discount_line_ids
+    
+    def _get_taxes_move(self, cr, uid, context=None):
+        cur_obj = self.pool.get('res.currency')
+        invoice_obj = self.pool.get('account.invoice')
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+        tax_obj = self.pool.get('account.tax')
+        invoice_tax_obj = self.pool.get("account.invoice.tax")
+        move_line_obj_memory = self.pool.get('account.move.line.memory')
+        
+        #### to get direction
+        types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
+        direction = types[invoice.type]
+        date=time.strftime('%Y-%m-%d')
+        
+        #### 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
+        amount = 0.0
+        discount = 0.0
+        line_ids = []
+
+        tax_code_id = False
+        discount = self._get_discount(cr, uid, context=context)
+        if discount>0.0:
+            for line in invoice.invoice_line:
+                tax_amount = 0.0
+                line_tax_amount = 0.0
+                if line.invoice_line_tax_id:
+                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
+                        tax_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
+                        
+                        if invoice.company_id.currency_id.id<>invoice.currency_id.id:
+                            amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_amount, context=context)
+                            
+                        l3 = {
+                            'debit': direction * tax_amount<0 and - direction * tax_amount,
+                            'credit': direction * tax_amount>0 and  direction * tax_amount,
+                            'account_id': tax_account_id,
+                            'date': date,
+                            'journal_id':invoice.journal_id.id or False,
+                            'name':name,
+                            'currency_id':invoice.currency_id.id or False,
+                            'tax_code_id':tax_value.tax_code_id.id,
+                            'tax_amount':-tax_amount,
+                            'amount_currency':amount and direction * amount or 0.0,
+                            'analytic_account_id':line.account_analytic_id.id or False,
+                        }
+                        line_id = move_line_obj_memory.create(cr, uid, l3, context=context)
+                        line_ids.append(l3)
+        return line_ids
+         
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'period_id': _get_period,
@@ -119,9 +248,11 @@
         'account_id':_get_account,
         'cash_residual_amount': lambda *a:0.0,
         'cal_method_selection':lambda *a :'method_gross_methodology',
+        'discount_move_ids':_get_discount_move,
+        'tax_move_ids':_get_taxes_move,
         }
     
-    def on_change_ammount(self, cr, uid, ids, amount, context=None):
+    def on_change_ammount(self, cr, uid, ids, amount, cash_amount, context=None):
         """
         Function return the Discount according to the Amount paid and Payment Term Cash Discount
         """
@@ -131,10 +262,8 @@
         cal_amount = obj_inv._get_amount(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
         
         old_cal_amount = cal_amount['amount']
-        discount = obj_inv._get_payment(cr, uid, [context['id']] , old_cal_amount, invoice.payment_term.id, context=context)
         old_amount = old_cal_amount 
-        diff_amount = round(old_amount -  (amount + discount),2)
-        
+        diff_amount = round(old_amount -  (amount + cash_amount),2)
         return {'value' : {'cash_residual_amount':diff_amount}}
     
     def on_change_cash_discount_amount(self, cr, uid, ids, discount_amount, amount, context=None):
@@ -153,35 +282,13 @@
         return {'value' : {'cash_amount':discount_amount,'cash_residual_amount':diff_amount}}
     
     def _calculation(self, cr, uid, ids, context=None):
-
+        cur_obj = self.pool.get('res.currency')
         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)
         tax_obj = self.pool.get('account.tax')
         invoice_tax_obj = self.pool.get("account.invoice.tax")
-        move_obj = self.pool.get('account.move')
-        move_line_obj = self.pool.get('account.move.line')
-
-        ############## Delete another lines of taxes and discount
-        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])
-            
-        ######## to get ref
-        if invoice.type in ('in_invoice', 'in_refund'):
-            ref = invoice.reference
-        else:
-            ref = invoice_obj._convert_ref(cr, uid, invoice.number)        
+        move_line_obj_memory = self.pool.get('account.move.line.memory')
         
         #### to get direction
         types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
@@ -192,84 +299,102 @@
         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
 
-        if data.get('cash_amount',0.0)>0.0:
-            tax_total_amount = 0.0
-            amount = 0.0
-            discount = 0.0
-            line_ids = []
-            discount_line_ids = []
+        if data.get('cash_amount', 0.0) <= 0.0:
+            return True
+        
+        tax_total_amount = 0.0
+        amount = 0.0
+        discount = 0.0
+        line_ids = []
+        discount_line_ids = []
 
-            discount_account_id = False
-            tax_code_id = False
+        discount_account_id = False
+        tax_code_id = False
+        base_code_id = False
+        
+        for line in invoice.invoice_line:
+            tax_amount = 0.0
+            line_tax_amount = 0.0
             
-            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_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,
-                            'account_id': tax_account_id,
-                            'partner_id': invoice.partner_id.id,
-                            'ref':ref,
-                            'date': date,
-                            'journal_id':data.get('journal_id',False) ,
-                            'period_id':data.get('period_id',False),
-                            'name':name,
-                            'tax_code_id':tax_value.tax_code_id.id,
-                            'tax_amount':-tax_amount,
-                        }
-                        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':
+            #####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_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
+                        base_code_id = tax_value.base_code_id.id
+                    
+                    if invoice.company_id.currency_id.id<>invoice.currency_id.id:
+                        amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_amount, context=context)
+                        
+                    l3 = {
+                        'debit': direction * tax_amount<0 and - direction * tax_amount,
+                        'credit': direction * tax_amount>0 and  direction * tax_amount,
+                        'account_id': tax_account_id,
+                        'date': date,
+                        'journal_id':data.get('journal_id',False) ,
+                        'name':name,
+                        'currency_id':invoice.currency_id.id or False,
+                        'tax_code_id':tax_value.tax_code_id.id,
+                        'tax_amount':-tax_amount,
+                        'amount_currency':amount and direction * amount or 0.0,
+                        'analytic_account_id':line.account_analytic_id.id or False,
+                    }
+                    line_id = move_line_obj_memory.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 invoice.type == 'in_invoice':
                     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)
-            self.write(cr, uid, ids, {'discount_move_ids':[(6,0,discount_line_ids)]}, context)
-            
+                    if line.product_id.property_account_income:
+                        discount_account_id = line.product_id.property_account_expense.id
+                    else:
+                        discount_account_id = line.product_id.categ_id.property_account_expense_categ.id
+                            
+            else:
+                 discount_account_id = data['account_id']
+            
+            discount = data['cash_amount'] * line_ratio
+            if invoice.company_id.currency_id.id<>invoice.currency_id.id:
+                discount_amount = discount - tax_amount
+                amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, discount_amount, context=context)
+                
+            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,
+                'date': date,
+                'name':name,
+                'currency_id':invoice.currency_id.id or False,
+                'journal_id':data.get('journal_id',False),
+                'tax_code_id':base_code_id,
+                'tax_amount':tax_amount,
+                'amount_currency':amount and direction * amount or 0.0,
+                'analytic_account_id':line.account_analytic_id.id or False,
+                }
+            
+            discount_line_id = move_line_obj_memory.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)],
+                'discount_move_ids' : [(6, 0, discount_line_ids)],
+               }, context=context)
+
         return True
     
     def default_get(self, cr, uid, fields, context=None):
@@ -282,35 +407,79 @@
     def _message(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         data =  self.read(cr, uid, ids,context=context)[0]
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context)
+        
         if data.get('discount_move_ids',False):
             context.update({'discount_move_ids':data['discount_move_ids']})
-        
-        if data.get('id',False):
-            context.update({'t_ids':ids})
-            
         if data.get('tax_move_ids',False):
             context.update({'tax_move_ids':data['tax_move_ids']})
-
         if data.get('amount',False):
             context.update({'amount':data['amount']})
-        
         if data.get('cash_amount',False):
             context.update({'cash_amount':data['cash_amount']})
-                
+            
+        total_data_amount = 0.00
+        total_invoice_amount = 0.00
+        total_data_amount = data['amount'] + data['cash_amount']
+        total_invoice_amount = invoice.residual
+        
+                      
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_account_message')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        
-        return {
-            'name': _('Message'),
-            'context': context,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'account.message',
-            'views': [(resource_id,'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        } 
-      
+        if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,(total_invoice_amount - total_data_amount)):
+            self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
+            return {}
+        else:
+            return {
+                'name': _('Message'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.message',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+                  
+    
+    def _message_partial(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        data =  self.read(cr, uid, ids,context=context)[0]
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context)
+
+        total_data_amount = 0.0
+        total_invoice_amount = 0.0
+        
+        if data.get('discount_move_ids',False):
+            context.update({'discount_move_ids':data['discount_move_ids']})
+        if data.get('tax_move_ids',False):
+            context.update({'tax_move_ids':data['tax_move_ids']})
+
+        if data.get('amount',False):
+            context.update({'amount':data['amount']})
+        if data.get('cash_amount',False):
+            context.update({'cash_amount':data['cash_amount']})
+        
+        total_data_amount = data['amount'] + data['cash_amount']
+        total_invoice_amount = invoice.residual
+        
+        if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,(total_invoice_amount - total_data_amount)):
+            model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_account_partial_message')], context=context)
+            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            return {
+                'name': _('Message'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'account.partial.message',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',   
+            }
+        else:
+            self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
+            return {}      
+            
     def wo_check(self, cr, uid, ids, context=None):
         cur_obj = self.pool.get('res.currency')
         mod_obj = self.pool.get('ir.model.data')
@@ -347,32 +516,10 @@
                 debit+=payment.debit
                 credit+=payment.credit
             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:
-
-        ####### 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']})
-        if context.get('t_ids',False):
-            ids = context['t_ids']    
-#            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:
+            
+        if data['cash_residual_amount'] == 0.0 or  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']
@@ -401,7 +548,7 @@
             writeoff_account_id = context['write_off']['writeoff_acc_id']
             writeoff_journal_id = context['write_off']['writeoff_journal_id']
             comment = context['write_off']['comment']
-        
+       
         if context.get('amount',False):
             amount = context['amount'] +  context.get('cash_amount',0.0)
         else:
@@ -421,6 +568,7 @@
             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)
@@ -442,21 +590,11 @@
             context.update({'tax_move_ids':context['tax_move_ids']})
         else:
             context.update({'tax_move_ids':data['tax_move_ids']})
-                
+        
         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:
@@ -468,7 +606,6 @@
         return {}
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
-        
         res = super(account_invoice_pay,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
         fields=res.get('fields',{})
         word = "Supplier Cash Discount Account"
@@ -481,29 +618,26 @@
                     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_move_line_memory(osv.osv_memory):
+    _name= "account.move.line.memory"
+    _description = "Account move line memory "
+    _columns = {
+        'date': fields.date('Effective Date', required=True),
+        'name': fields.char('Name', size=64, required=True),
+        'account_id': fields.many2one('account.account', 'Account',),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
+        'debit': fields.float('Debit', digits=(16,2)),
+        'credit': fields.float('Credit', digits=(16,2)),
+        'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
+        'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
+        'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry."),
+        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
+        }
+account_move_line_memory()
+
 class account_message(osv.osv_memory):
     _name = "account.message"
     def _check(self, cr, uid, ids, context=None):
@@ -511,6 +645,15 @@
         result = self.pool.get('account.invoice.pay').wo_check(cr, uid, ids, context=context)
         return result
 
-account_message()    
+account_message()
+
+class account_partial_message(osv.osv_memory):
+    _name = "account.partial.message"
+    def _check_partial(self, cr, uid, ids, context=None):
+        data =  self.read(cr, uid, ids,context=context)[0]
+        result = self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
+        return result
+
+account_partial_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-07-28 12:20:14 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-07-27 09:18:44 +0000
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Pay invoice">
                 	<group colspan="4" >
-						<field name="amount" on_change="on_change_ammount(amount,context)"/>
+						<field name="amount" on_change="on_change_ammount(amount,cash_amount,context)"/>
 					    <field name="cash_residual_amount"/>
 					    <field name="name"/>
 					    <field name="date"/>
@@ -32,8 +32,8 @@
                 	</group>
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<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-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Partial Payment" name="_message_partial" type="object"/>
                     	<button icon="gtk-execute" string="Full-Payment" name="_message" type="object"/>
                    </group>
                </form>
@@ -71,14 +71,62 @@
             </field>
         </record>
         
+        <record id="view_account_move_line_memory" model="ir.ui.view">
+            <field name="name">account.move.line.memory.form</field>
+            <field name="model">account.move.line.memory</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+				<tree string="Account Move Line">
+               		 <field name="date"/>
+               		 <field name="name"/>
+               		 <field name="account_id"/>
+               		 <field name="journal_id"/>
+               		 <field name="debit"/>
+               		 <field name="credit"/>
+               		 <field name="tax_code_id"/>
+               		 <field name="tax_amount"/>
+               		 <field name="currency_id"/>
+               		 <field name="amount_currency"/>
+               		 <field name="analytic_account_id"/>
+				</tree>
+			</field>
+		</record>
+        
         <record id="view_account_message" model="ir.ui.view">
 			<field name="name">account.message.form</field>
 			<field name="model">account.message</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
-				<form string="Your Messages">
-					<label colspan="8" string="Are you really want to reconcile this invoice" />
-					<button icon="gtk-execute" string="OK" name="_check" type="object"/> 
+				<form string="Messages">
+					<group>
+						<separator string="Full Payment" colspan="4"/>
+						<label string ="Are you really want to reconcile this invoice.
+						The proposed payment does not cover 100 percent of the invoice.
+						Please check payment term lines. Normally a user would click 
+						on Partial Payment to avoid ready / paid state for this invoice." colspan="2"/>
+						<newline/>
+						<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="1"/>
+						<button icon="gtk-execute" string="OK" name="_check" type="object" colspan="1"/>
+					</group>
+				</form>
+			</field>
+		</record>
+		
+		<record id="view_account_partial_message" model="ir.ui.view">
+			<field name="name">account.partial.message.form</field>
+			<field name="model">account.partial.message</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Messages">
+					<group>
+						<separator string="Partial Payment" colspan="4"/>
+						<label string ="Don't you really want to reconcile this invoice.
+						 The proposed payment balances this invoice. Please check payment term lines.
+						 Normally a user would click on Full Payment to receive ready / paid state for this invoice." colspan="2"/>
+						<newline/>
+						<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="1"/>
+						<button icon="gtk-execute" string="OK" name="_check_partial" type="object" colspan="1"/>
+					</group>
 				</form>
 			</field>
 		</record>