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

[gpa(OpenERP)]

convert wizard pay invoice to osv memroy wizard make onchange on Amount Paid field

[lp:~openbig/bigconsulting/changes_account_invoice_cash_discount]

10. By gpa(OpenERP) on 2010-06-01

changes on account_invoice_cash_discount

=== modified file 'account_invoice_cash_discount/__terp__.py'
--- account_invoice_cash_discount/__terp__.py	2010-05-28 10:52:25 +0000
+++ account_invoice_cash_discount/__terp__.py	2010-06-01 08:53:22 +0000
@@ -35,7 +35,7 @@
     ],
     "update_xml" : [
         "account_invoice_cash_discount_view.xml",
-        "account_wizard.xml"
+        'wizard/account_pay_invoice_view.xml',
     ],
     "active": False,
     "installable": True,
 
=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-05-28 10:52:25 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-06-01 08:53:22 +0000
@@ -49,8 +49,10 @@
     _inherit = "account.invoice"
     
     def _get_payment(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
-
-        #This function used to count the discount payment term
+        """
+        This function return the Discount according to the payment term cash discount term
+        """
+        
         if context is None:
            context = {}
            
@@ -88,6 +90,38 @@
                                     ted +=rr
                             discunt = res + ted
                             return discunt
+     
+    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
+        """
+        if context is None:
+           context = {}
+
+        tax_obj = self.pool.get('account.tax')
+        invoice = self.browse(cr, uid, ids[0], context=context)
+        
+        if invoice.date_due:
+            date1 = invoice.date_due
+        else:
+            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')   
+
+        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)
+        if payment_term:
+            pt = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
+            if pt.cash_discount_ids:
+                    res = 0.0
+                    for d in pt.cash_discount_ids:
+                        if diff_day == d.delay or diff_day < d.delay:
+                            account_id = d.discount_account_id.id
+                            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=''):
         
 
=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-05-26 13:32:15 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-06-01 08:53:22 +0000
@@ -14,6 +14,7 @@
                     <field name="name" select="1"/>
                     <field name="delay" select="1"/>
                     <field name="discount" select="1"/>
+                    <field name="discount_account_id" />
                 </form>
             </field>
         </record>
@@ -27,6 +28,7 @@
                     <field name="name" select="1"/>
                     <field name="delay" select="1"/>
                     <field name="discount" select="1"/>
+                    <field name="discount_account_id" />
                 </tree>
             </field>
         </record>
 
=== removed file 'account_invoice_cash_discount/account_wizard.xml'
--- account_invoice_cash_discount/account_wizard.xml	2010-05-26 13:32:15 +0000
+++ account_invoice_cash_discount/account_wizard.xml	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay1" string="Pay invoice" groups="base.group_user"/>
-    </data>
-</openerp>
 
=== modified file 'account_invoice_cash_discount/wizard/__init__.py'
--- account_invoice_cash_discount/wizard/__init__.py	2010-05-26 13:32:15 +0000
+++ account_invoice_cash_discount/wizard/__init__.py	2010-06-01 08:53:22 +0000
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-import wizard_pay_invoice
+import account_pay_invoice
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== added file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-06-01 08:53:22 +0000
@@ -0,0 +1,224 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+from tools.translate import _
+#import decimal_precision as dp
+
+class account_invoice_pay_writeoff(osv.osv_memory):
+    """
+    Opens the write off amount pay form.
+    """
+    _name = "account.invoice.pay.writeoff"
+    _description = "Pay Invoice  "
+    _columns = {
+        'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', required=True),
+        'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', required=True),
+        'comment': fields.char('Comment', size=64, required=True),
+        'analytic_id': fields.many2one('account.analytic.account','Analytic Account'),
+        }
+    _defaults = {
+        'comment': 'Write-Off',
+        }
+
+    def pay_and_reconcile_writeoff(self, cr, uid, ids, context=None):
+        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)
+        return {}
+
+account_invoice_pay_writeoff()
+
+class account_invoice_pay(osv.osv_memory):
+    """
+    Generate pay invoice wizard, user can make partial or full payment for invoice.
+    """
+    _name = "account.invoice.pay"
+    _description = "Pay Invoice  "
+    _columns = {
+        'amount': fields.float('Amount paid', required=True),
+        'name': fields.char('Entry Name', size=64, required=True),
+        'date': fields.date('Date payment', required=True),
+        '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', required=True),
+        'account_id': fields.many2one('account.account', 'Account For Discount', required=True),
+        }
+
+    def view_init(self, cr, uid, ids, context=None):
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context)
+        if invoice.state in ['draft', 'proforma2', 'cancel']:
+            raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
+        pass
+
+    def _get_period(self, cr, uid, context=None):
+        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        period_id = False
+        if len(ids):
+            period_id = ids[0]
+        return period_id
+
+    def _get_amount(self, cr, uid, context=None):
+        return self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context).residual
+    
+    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']] , amount, invoice.payment_term.id, context=context)
+        return {'value' : {'cash_amount':discount}}
+    
+    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)
+        return discount
+    
+    def _get_account(self, cr, uid, context=None):
+        """
+        This function return the Account according to the payment term cash term and map the account with fiscal position
+        """
+        obj_inv = self.pool.get('account.invoice')
+        invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
+        account = obj_inv._get_account(cr, uid, [context['id']] , invoice.residual, invoice.payment_term.id, context=context)
+        fpos = invoice.fiscal_position or False
+        account = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account)
+        return account
+    
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'period_id': _get_period,
+        'amount': _get_amount,
+        'cash_amount':_get_discount,
+        'account_id':_get_account
+        }
+
+    def wo_check(self, cr, uid, ids, context=None):
+        cur_obj = self.pool.get('res.currency')
+        mod_obj = self.pool.get('ir.model.data')
+        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)
+        #    => Ask to a write-off of the difference. This could happen even if both amount are equal,
+        #    because if the currency rate
+        # Get the amount in company currency for the invoice (according to move lines)
+        inv_amount_company_currency = 0
+        for aml in invoice.move_id.line_id:
+            if aml.account_id.id == invoice.account_id.id or aml.account_id.type in ('receivable', 'payable'):
+                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']
+        # Get the old payment if there are some
+        if invoice.payment_ids:
+            debit=credit=0.0
+            for payment in invoice.payment_ids:
+                debit+=payment.debit
+                credit+=payment.credit
+            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)):
+            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
+        comment = False
+
+        if 'write_off' in context and context['write_off'] :
+            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']
+
+        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)
+        # when it is needed :  If payment currency (according to selected journal.currency) is <> from company currency
+        if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
+            ctx = {'date':data['date']}
+            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'],'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'],'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']})        
+        
+        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'])
+        return {}
+
+account_invoice_pay()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== added file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-06-01 08:53:22 +0000
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_invoice_pay" model="ir.ui.view">
+            <field name="name">account.invoice.pay.form</field>
+            <field name="model">account.invoice.pay</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay invoice">
+                	<group colspan="4" >
+						<field name="amount" on_change="on_change_ammount(amount,context)"/>
+					    <newline/>
+					    <field name="name"/>
+					    <field name="date"/>
+					    <field name="journal_id"/>
+					    <field name="period_id"/>
+					    <field name="cash_amount"/>
+					    <field name="account_id"/>
+                	</group>
+                    <group colspan="4" col="6">
+                       	<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"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<act_window name="Pay Invoice"
+				res_model="account.invoice.pay"
+				src_model="account.invoice"
+				view_mode="form"
+				target="new"
+				context="{'id': active_id}"
+			id="action_view_account_invoice_pay"/>
+
+		<record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
+            <field name="name">account.invoice.pay.writeoff.form</field>
+            <field name="model">account.invoice.pay.writeoff</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Information addendum">
+                	<group colspan="4" >
+					    <separator string="Write-Off Move" colspan="4"/>
+					    <field name="writeoff_journal_id"/>
+    					<field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+    					<field name="comment"/>
+    					<separator string="Analytic" colspan="4"/>
+    					<field name="analytic_id"/>
+                	</group>
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+
+	</data>
+</openerp>
 \ No newline at end of file
 
=== removed file 'account_invoice_cash_discount/wizard/wizard_pay_invoice.py'
--- account_invoice_cash_discount/wizard/wizard_pay_invoice.py	2010-05-27 07:24:45 +0000
+++ account_invoice_cash_discount/wizard/wizard_pay_invoice.py	1970-01-01 00:00:00 +0000
@@ -1,203 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-from tools.translate import _
-import tools
-
-pay_form = '''<?xml version="1.0"?>
-<form string="Pay invoice">
-    <field name="amount"/>
-    <newline/>
-    <field name="name"/>
-    <field name="date"/>
-    <field name="journal_id"/>
-    <field name="period_id"/>
-    <field name="cash_amount"/>
-    <field name="account_id"/>
-</form>'''
-
-pay_fields = {
-    'amount': {'string': 'Amount paid', 'type':'float', 'required':True, 'digits': (16,int(tools.config['price_accuracy']))},
-    'name': {'string': 'Entry Name', 'type':'char', 'size': 64, 'required':True},
-    'cash_amount': {'string': 'Cash Discount Amount', 'type':'float', 'required':True, 'digits': (16,int(tools.config['price_accuracy']))},
-    'account_id': {'string': 'Account For Discount', 'type': 'many2one', 'relation':'account.account', 'required':True},
-    'date': {'string': 'Payment date', 'type':'date', 'required':True, 'default':lambda *args: time.strftime('%Y-%m-%d')},
-    'journal_id': {'string': 'Journal/Payment Mode', 'type': 'many2one', 'relation':'account.journal', 'required':True, 'domain':[('type','=','cash')]},
-    'period_id': {'string': 'Period', 'type': 'many2one', 'relation':'account.period', 'required':True},
-}
-
-def _pay_and_reconcile(self, cr, uid, data, context):
-    form = data['form']
-    period_id = form.get('period_id', False)
-    journal_id = form.get('journal_id', False)
-    writeoff_account_id = form.get('writeoff_acc_id', False)
-    writeoff_journal_id = form.get('writeoff_journal_id', False)
-    pool = pooler.get_pool(cr.dbname)
-    cur_obj = pool.get('res.currency')
-    amount = form['amount']
-    context['analytic_id'] = form.get('analytic_id', False)
-
-    invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
-    journal = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context)
-    # Compute the amount in company's currency, with the journal currency (which is equal to payment currency) 
-    # when it is needed :  If payment currency (according to selected journal.currency) is <> from company currency
-    if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
-        ctx = {'date':data['form']['date']}
-        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':form['amount'],'currency_id':currency_id})
-    
-    if invoice.company_id.currency_id.id<>invoice.currency_id.id:
-        ctx = {'date':data['form']['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':form['amount'],'currency_id':currency_id})
-        
-    # Take the choosen date
-    if form.has_key('comment'):
-        context.update({'date_p':form['date'],'comment':form['comment']})
-    else:
-        context.update({'date_p':form['date'],'comment':False})      
-    
-    context.update({'account_id':form['account_id'],'cash_amount':form['cash_amount'],'amount_currency':form['amount']})    
-    
-    acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
-    if not acc_id:
-        raise wizard.except_wizard(_('Error !'), _('Your journal must have a default credit and debit account.'))
-    pool.get('account.invoice').pay_and_reconcile(cr, uid, [data['id']],
-            amount, acc_id, period_id, journal_id, writeoff_account_id,
-            period_id, writeoff_journal_id, context, data['form']['name'])
-    return {}
-
-def _wo_check(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
-    journal = pool.get('account.journal').browse(cr, uid, data['form']['journal_id'], context)
-    cur_obj = pool.get('res.currency')
-    # 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)
-    #    => Ask to a write-off of the difference. This could happen even if both amount are equal,
-    #    because if the currency rate
-    # Get the amount in company currency for the invoice (according to move lines)
-    inv_amount_company_currency = 0
-    for aml in invoice.move_id.line_id:
-        if aml.account_id.id == invoice.account_id.id or aml.account_id.type in ('receivable', 'payable'):
-            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['form']['date']}
-        amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['form']['amount'], round=True, context=ctx)
-    else:
-        amount_paid = data['form']['amount']
-    # Get the old payment if there are some
-    if invoice.payment_ids:
-        debit=credit=0.0
-        for payment in invoice.payment_ids:
-            debit+=payment.debit
-            credit+=payment.credit
-        amount_paid+=abs(debit-credit)
-        
-    # Test if there is a difference according to currency rouding setting
-    if pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
-            (amount_paid - inv_amount_company_currency)):
-        return 'reconcile'
-    return 'addendum'
-
-_transaction_add_form = '''<?xml version="1.0"?>
-<form string="Information addendum">
-    <separator string="Write-Off Move" colspan="4"/>
-    <field name="writeoff_journal_id"/>
-    <field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-    <field name="comment"/>
-    <separator string="Analytic" colspan="4"/>
-    <field name="analytic_id"/>
-</form>'''
-
-_transaction_add_fields = {
-    'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
-    'writeoff_journal_id': {'string': 'Write-Off journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
-    'comment': {'string': 'Comment', 'type':'char', 'size': 64 , 'required':True},
-    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
-}
-
-def _get_value_addendum(self, cr, uid, data, context={}):
-    return {'comment': _('Write-Off')}
-
-def _compute(self, cr, uid, data, context={}):
-    pool = pooler.get_pool(cr.dbname)
-    invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
-    
-
-def _get_period(self, cr, uid, data, context={}):
-    pool = pooler.get_pool(cr.dbname)
-    ids = pool.get('account.period').find(cr, uid, context=context)
-    period_id = False
-    if len(ids):
-        period_id = ids[0]
-    invoice = pool.get('account.invoice').browse(cr, uid, data['id'], context)
-    cash_amount = pool.get('account.invoice')._get_payment(cr, uid, [data['id']], invoice.residual, invoice.payment_term.id, context=context)
-    if invoice.state in ['draft', 'proforma2', 'cancel']:
-        raise wizard.except_wizard(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
-    return {
-        'period_id': period_id,
-        'amount': invoice.residual,
-        'date': time.strftime('%Y-%m-%d'),
-        'cash_amount': cash_amount,
-    }
-
-class wizard_pay_invoice(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_period],
-            'result': {'type':'form', 'arch':pay_form, 'fields':pay_fields, 'state':[('end','Cancel'),('reconcile','Partial Payment'),('writeoff_check','Full Payment')]}
-        },
-        'writeoff_check': {
-            'actions': [],
-            'result' : {'type': 'choice', 'next_state': _wo_check }
-        },
-        'addendum': {
-            'actions': [_get_value_addendum],
-            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end','Cancel'),('reconcile','Pay and reconcile')]}
-        },
-        'reconcile': {
-            'actions': [_pay_and_reconcile],
-            'result': {'type':'state', 'state':'end'}
-        },
-        'compute_dis': {
-            'actions': [_compute],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-wizard_pay_invoice('account.invoice.pay1')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-