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

[gpa(OpenERP)]

added new changes in milestone1

[lp:~openbig/bigconsulting/improvement_changes_milestone1]

47. By gpa(OpenERP) on 2010-07-06

changes in wocheck context

Unmerged revisions

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-01 14:49:31 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-06 13:37:26 +0000
@@ -44,17 +44,88 @@
         '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'),
     }
 account_cash_discount()
 
+class account_payment_term_line(osv.osv):
+    _inherit = "account.payment.term.line"
+    _columns = {
+        'cash_account_discount_id': fields.many2one('account.cash.discount', 'Discount Lines',),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=False, select=True),
+        'compl_cash_discount':fields.boolean('Use Complete Cash Discount'),
+    }
+account_payment_term_line()
+
 class account_invoice(osv.osv):
     _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)
+        
+        if invoice.date_invoice:
+            date1 = invoice.date_invoice
+        else:
+            date1 =  time.strftime('%Y-%m-%d')
+                
+        if 'date_p' in context and context['date_p']:    
+            date2 = context['date_p']
+        else:
+            date2 =  time.strftime('%Y-%m-%d')   
+
+        if date1 >= date2:
+            from_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
+            to_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
+            diff_day = (from_dt-to_dt)/(3600*24)
+        else:
+            from_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
+            to_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
+            diff_day = (from_dt-to_dt)/(3600*24)
+        
+        discount = 0.0
+        amount = 0.0
+        payment_line_found = False    
+        if payment_term:
+            payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
+            for payment_term_line_id in payment_term_lines.line_ids:
+                payment_use_complete = payment_term_line_id.compl_cash_discount
+            if payment_use_complete:    
+                if payment_term_lines.cash_discount_ids:
+                        dis = 0
+                        for discount_line in payment_term_lines.cash_discount_ids:
+                            if diff_day >= dis and  diff_day <= discount_line.delay:
+                                if resudial_amonut:
+                                    dis1 = 0
+                                    if discount_line.payment_term_ids:
+                                        payment_line_found = True
+                                        for dis_payment_id in discount_line.payment_term_ids:
+                                            if diff_day >= dis1 and diff_day<= dis_payment_id.days:
+                                                if dis_payment_id.value == 'procent':
+                                                    amount = resudial_amonut * dis_payment_id.value_amount
+                                                elif dis_payment_id.value == 'fixed':
+                                                    amount = dis_payment_id.value_amount
+                                                else:
+                                                    amount = resudial_amonut
+                                            dis1 = dis_payment_id.days
+                            dis = discount_line.delay
+            else:
+                amount = resudial_amonut
+               
+        return {'amount':amount,'found':payment_line_found}
+     
     def _get_payment(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
         """
         This function return the Discount according to the payment term cash discount term
         """
-        
         if context is None:
            context = {}
            
@@ -79,6 +150,7 @@
             from_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
             to_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
             diff_day = (from_dt-to_dt)/(3600*24)
+        
         discount = 0.0
         if payment_term:
             payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
@@ -92,7 +164,7 @@
                             discount = res
                         dis = discount_line.delay
         return discount
-     
+    
     def _get_account(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
         """
         This function return the Account according to the payment term cash discount term
@@ -136,6 +208,7 @@
                     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
@@ -222,7 +295,7 @@
         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 = self.pool.get('account.move.line').browse(cr, uid,move_line_id)
+                move_line_data = move_line_obj.browse(cr, uid,move_line_id)
                 l3 = {
                         'debit': move_line_data.debit,
                         'credit': move_line_data.credit,
@@ -237,8 +310,8 @@
                         'tax_amount':move_line_data.tax_amount,
                         }
                 lines.append((0, 0, l3))
-                self.pool.get('account.move.line').unlink(cr, uid,[move_line_id])
-                self.pool.get('account.move').unlink(cr, uid,[move_line_data.move_id.id])
+                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:
@@ -267,8 +340,8 @@
                     
         if 'discount_move_ids' in context and context['discount_move_ids']: 
             dis_move_id = context['discount_move_ids'][0]
-            move_id = self.pool.get('account.move.line').search(cr, uid,[('move_id','=',dis_move_id)])
-            move_line_data = self.pool.get('account.move.line').browse(cr, uid, move_id[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,
@@ -282,7 +355,7 @@
                         }
             lines.append((0, 0, l4))
             
-            self.pool.get('account.move').unlink(cr, uid, context['discount_move_ids'])
+            move_obj.unlink(cr, uid, context['discount_move_ids'])
         else:
             if amount_discount>0:
                 if 'account_id' in context and context['account_id']:
@@ -305,7 +378,7 @@
                 lines.append((0, 0, l4))
 
         move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
-        move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
+        move_id = move_obj.create(cr, uid, move, context=context)
         
         line_ids = []
         total = 0.0
@@ -317,7 +390,6 @@
             if l.account_id.id==src_account_id:
                 line_ids.append(l.id)
                 total += (l.debit or 0.0) - (l.credit or 0.0)
-
         if (not round(total,int(config['price_accuracy']))) or writeoff_acc_id:
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
 
=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-06-29 13:22:59 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-07-06 13:37:26 +0000
@@ -15,6 +15,10 @@
                     <field name="delay" select="1"/>
                     <field name="discount" select="1"/>
                     <field name="discount_account_id" />
+                    <group colspan="4">
+                    	<separator string="Related Payment Terms Lines" colspan="4"/>
+                    	<field name="payment_term_ids" widget="one2many_list" nolabel="1"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -84,6 +88,19 @@
 				</xpath>    
             </field>
         </record>
+        
+        <record id="account_payment_term_line_view1" model="ir.ui.view">
+            <field name="name">account.payment.term.line.form</field>
+            <field name="model">account.payment.term.line</field>
+            <field name="type">form</field>
+            <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"/>
+				</field>      
+            </field>
+        </record>
 		
     </data>
 </openerp>
 
=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-01 14:49:31 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-06 13:37:26 +0000
@@ -22,7 +22,6 @@
 from lxml import etree
 from osv import fields, osv
 from tools.translate import _
-#import decimal_precision as dp
 
 class account_invoice_pay_writeoff(osv.osv_memory):
     """
@@ -41,6 +40,7 @@
         }
 
     def pay_and_reconcile_writeoff(self, cr, uid, ids, context=None):
+        pay_invoice = self.pool.get('account.invoice.pay')
         data =  self.read(cr, uid, ids,context=context)[0]
         context.update({'write_off':data})
         self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
@@ -58,7 +58,7 @@
         'amount': fields.float('Amount paid', required=True),
         'name': fields.char('Entry Name', size=64, required=True),
         'date': fields.date('Date payment', required=True),
-        'cash_residual_amount': fields.float('Residual Amount', readonly=True),
+        'cash_residual_amount': fields.float('Residual Amount'),
         'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True),
         'period_id': fields.many2one('account.period', 'Period', required=True),
         'cash_amount':fields.float('Cash Discount Amount',),
@@ -69,7 +69,7 @@
         'discount_move_ids': fields.many2many('account.move', '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'),
         }
-
+    
     def _get_period(self, cr, uid, context=None):
         ids = self.pool.get('account.period').find(cr, uid, context=context)
         period_id = False
@@ -80,34 +80,19 @@
     def _get_amount(self, cr, uid, context=None):
         obj_inv = self.pool.get('account.invoice')
         invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
-        discount = obj_inv._get_payment(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
-        residual_amount = invoice.residual - discount
+        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']
+        discount = obj_inv._get_payment(cr, uid, [context['id']] ,amount, invoice.payment_term.id, context=context)
+        residual_amount = amount - discount
         return residual_amount
     
-    def on_change_ammount(self, cr, uid, ids, amount, context=None):
-        """
-        Function return the Discount according to the Amount paid and Payment Term Cash Discount
-        """
-        res = {}
-        obj_inv = self.pool.get('account.invoice')
-        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
-        discount = obj_inv._get_payment(cr, uid, [context['id']] , invoice.residual, invoice.payment_term.id, context=context)
-        diff_amount = round(invoice.residual -  (amount + discount),2)
-        return {'value' : {'cash_residual_amount':diff_amount}}
-    
-    def on_change_cash_discount_amount(self, cr, uid, ids, discount_amount, amount, context=None):
-        ###  Return discount amount
-        res = {}
-        obj_inv = self.pool.get('account.invoice')
-        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
-        diff_amount = 0.0
-        diff_amount = round(invoice.residual -  (amount + discount_amount),2)
-        return {'value' : {'cash_amount':discount_amount,'cash_residual_amount':diff_amount}}
-    
     def _get_discount(self, cr, uid, context=None):
         obj_inv = self.pool.get('account.invoice')
         invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
-        discount = obj_inv._get_payment(cr, uid, [context['id']] , invoice.residual, invoice.payment_term.id, context=context)
+        amount = obj_inv._get_amount(cr, uid, [context['id']] ,invoice.residual, invoice.payment_term.id, context=context)
+        amount = amount['amount']
+        discount = obj_inv._get_payment(cr, uid, [context['id']] , amount, invoice.payment_term.id, context=context)
         return discount
     
     def _get_account(self, cr, uid, context=None):
@@ -122,13 +107,47 @@
             account = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account)
         return account
     
-    def default_get(self, cr, uid, fields, context=None):
-      res = super(account_invoice_pay, self).default_get(cr, uid, fields, context=context)
-      invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
-      if invoice.state in ['draft', 'proforma2', 'cancel']:
-          raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
-      return res
-  
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'period_id': _get_period,
+        'amount': _get_amount,
+        'cash_amount':_get_discount,
+        'account_id':_get_account,
+        'cash_residual_amount': lambda *a:0.0,
+        'cal_method_selection':lambda *a :'method_gross_methodology',
+        }
+    
+    def on_change_ammount(self, cr, uid, ids, amount, context=None):
+        """
+        Function return the Discount according to the Amount paid and Payment Term Cash Discount
+        """
+        res = {}
+        obj_inv = self.pool.get('account.invoice')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        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)
+        
+        return {'value' : {'cash_residual_amount':diff_amount}}
+    
+    def on_change_cash_discount_amount(self, cr, uid, ids, discount_amount, amount, context=None):
+        ###  Return discount amount
+        res = {}
+        obj_inv = self.pool.get('account.invoice')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        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']] , amount, invoice.payment_term.id, context=context)
+        old_amount = old_cal_amount
+
+        diff_amount = 0.0
+        diff_amount = old_amount -  (amount + discount_amount)
+        
+        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]
@@ -137,7 +156,19 @@
         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_data = 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'])
+            
         ######## to get ref
         if invoice.type in ('in_invoice', 'in_refund'):
             ref = invoice.reference
@@ -153,7 +184,6 @@
         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 = []
@@ -202,7 +232,7 @@
                     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']
-            ###############################################3
+            ###############################################
                 
             l4 = {
                 'debit': direction * data.get('cash_amount',0.0)<0 and - direction * data.get('cash_amount',0.0),
@@ -218,27 +248,57 @@
             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)
+
         return True
     
-    _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'period_id': _get_period,
-        'amount': _get_amount,
-        'cash_amount':_get_discount,
-        'account_id':_get_account,
-        'cash_residual_amount': lambda *a:0.0,
-        'cal_method_selection':lambda *a :'method_gross_methodology',
-        }
+    def default_get(self, cr, uid, fields, context=None):
+      res = super(account_invoice_pay, self).default_get(cr, uid, fields, context=context)
+      invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+      if invoice.state in ['draft', 'proforma2', 'cancel','paid']:
+          raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel/Done invoice.'))
+      return res
+     
+    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]
 
+        if data['discount_move_ids']:
+            context.update({'discount_move_ids':data['discount_move_ids']})
+        
+        if data['tax_move_ids']:
+            context.update({'tax_move_ids':data['tax_move_ids']})
+            
+        if data['amount']:
+            context.update({'amount':data['amount']})
+        
+        if data['cash_amount']:
+            context.update({'cash_amount':data['cash_amount']})
+                
+        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',
+        } 
+      
     def wo_check(self, cr, uid, ids, context=None):
         cur_obj = self.pool.get('res.currency')
         mod_obj = self.pool.get('ir.model.data')
+        obj_inv = self.pool.get('account.invoice')
+        
         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:
         #    The invoice total amount in company's currency <> paid amount in company currency
         #    (according to the correct day rate, invoicing rate and payment rate are may be different)
@@ -251,13 +311,13 @@
                 inv_amount_company_currency += aml.debit
                 inv_amount_company_currency -= aml.credit
         inv_amount_company_currency = abs(inv_amount_company_currency)
-
         # Get the current amount paid in company currency
         if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
             ctx = {'date':data['date']}
             amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['amount'], round=True, context=ctx)
         else:
-            amount_paid = data['amount']
+            amount_paid = data['amount'] + data['cash_amount']
+            
         # Get the old payment if there are some
         if invoice.payment_ids:
             debit=credit=0.0
@@ -267,27 +327,42 @@
             amount_paid+=abs(debit-credit)
 
         # Test if there is a difference according to currency rouding setting
-        if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
-                (amount_paid - inv_amount_company_currency)):
+        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']})
+                
             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',
-            }
-
+            
+            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',
+                }
+    
     def pay_and_reconcile(self, cr, uid, ids, context=None):
         cur_obj = self.pool.get('res.currency')
         if context is None:
             context = {}
+
         data =  self.read(cr, uid, ids,context=context)[0]
         writeoff_account_id = False
         writeoff_journal_id = False
@@ -297,9 +372,9 @@
             writeoff_account_id = context['write_off']['writeoff_acc_id']
             writeoff_journal_id = context['write_off']['writeoff_journal_id']
             comment = context['write_off']['comment']
-
+        
         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)
@@ -326,12 +401,16 @@
 
         context.update({'account_id':data['account_id'],'cash_amount':data['cash_amount'],'amount_currency':data['amount'] + data['cash_amount']})        
         
-        if data['discount_move_ids']:
-            context.update({'discount_move_ids':data['discount_move_ids']})
+        if context.get('discount_move_ids',False):
+            context = context
+        else:
+            context.update({'discount_move_ids':data['discount_move_ids']})    
         
-        if data['tax_move_ids']:
+        if context.get('tax_move_ids',False):
+            context = context
+        else:
             context.update({'tax_move_ids':data['tax_move_ids']})
-        
+                
         if data['cash_amount']:
             context.update({'cash_amount':data['cash_amount']})
                 
@@ -344,6 +423,7 @@
         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"
@@ -358,4 +438,13 @@
         
 account_invoice_pay()
 
+class account_message(osv.osv_memory):
+    _name = "account.message"
+    def _check(self, cr, uid, ids, context=None):
+        data =  self.read(cr, uid, ids,context=context)[0]
+        result = self.pool.get('account.invoice.pay').wo_check(cr, uid, ids, context=context)
+        return result
+
+account_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-01 12:19:51 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-07-06 13:37:26 +0000
@@ -34,7 +34,7 @@
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
-                    	<button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
+                    	<button icon="gtk-execute" string="Full-Payment" name="_message" type="object"/>
                    </group>
                </form>
             </field>
@@ -70,5 +70,18 @@
                </form>
             </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>
+			</field>
+		</record>
+        
 	</data>
 </openerp>
 \ No newline at end of file