From f3ed9fb05556df11ced830b2dc05d8eb283913dd Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Mon, 30 Aug 2010 11:43:34 +0530
Subject: [PATCH] [REM] Account: on invoice, remove completely the pay invoice
 wizard... this feature will not be needed anymore. The account_voucher module
 will add something similar => just remove the wizard)

bzr revid: mra@mra-laptop-20100830061334-tv8nex0jkdomotx0
---
 addons/account/__openerp__.py                 |   1 -
 addons/account/account_invoice_view.xml       |   3 -
 addons/account/wizard/__init__.py             |   1 -
 addons/account/wizard/account_pay_invoice.py  | 202 ------------------
 .../wizard/account_pay_invoice_view.xml       |  64 ------
 5 files changed, 271 deletions(-)
 delete mode 100644 addons/account/wizard/account_pay_invoice.py
 delete mode 100644 addons/account/wizard/account_pay_invoice_view.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 6f3675392e0..f7d2406dc61 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -75,7 +75,6 @@ module named account_voucher.
         'wizard/account_journal_select_view.xml',
         'wizard/account_change_currency_view.xml',
         'wizard/account_validate_move_view.xml',
-        'wizard/account_pay_invoice_view.xml',
         'wizard/account_unreconcile_view.xml',
         'wizard/account_report_general_ledger_view.xml',
         'wizard/account_invoice_state_view.xml',
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index db70d5e0e5a..ad48ea86c23 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -136,7 +136,6 @@
                     <field name="state"/>
 
                     <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
                 </tree>
             </field>
         </record>
@@ -210,7 +209,6 @@
                                 <group col="6" colspan="4">
                                     <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
@@ -307,7 +305,6 @@
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-camera_test"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                 </group>
                             </group>
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 6846e3b771f..06d77249f96 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -31,7 +31,6 @@ import account_reconcile_partner_process
 import account_reconcile
 import account_unreconcile
 import account_invoice_refund
-import account_pay_invoice
 import account_move_journal
 import account_journal_select
 import account_move_bank_reconcile
diff --git a/addons/account/wizard/account_pay_invoice.py b/addons/account/wizard/account_pay_invoice.py
deleted file mode 100644
index 93716dc65bf..00000000000
--- a/addons/account/wizard/account_pay_invoice.py
+++ /dev/null
@@ -1,202 +0,0 @@
-# -*- 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', domain=[('parent_id', '!=', False)])
-    }
-    _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, digits_compute = dp.get_precision('Account')),
-        '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, domain=[('type','=','cash')]),
-        'period_id': fields.many2one('account.period', 'Period', required=True),
-    }
-
-    def view_init(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        if context.get('active_id', False):
-            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):
-        period_id = False
-        ids = self.pool.get('account.period').find(cr, uid, context=context)
-        if len(ids):
-            period_id = ids[0]
-        return period_id
-
-    def _get_amount(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        if context.get('active_id', False):
-            return self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context).residual
-        return 0.0
-
-    _defaults = {
-        'date': time.strftime('%Y-%m-%d'),
-        'period_id': _get_period,
-        'amount': _get_amount,
-        }
-
-    def wo_check(self, cr, uid, ids, context=None):
-        cur_obj = self.pool.get('res.currency')
-        mod_obj = self.pool.get('ir.model.data')
-        inv_obj = self.pool.get('account.invoice')
-        if context is None:
-            context = {}
-        data =  self.read(cr, uid, ids,context=context)[0]
-        invoice = inv_obj.browse(cr, uid, context['active_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')
-        inv_obj = self.pool.get('account.invoice')
-        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']
-            context['analytic_id'] = context['write_off']['analytic_id']
-
-        amount = data['amount']
-
-        invoice = inv_obj.browse(cr, uid, context['active_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})
-
-        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.'))
-        inv_obj.pay_and_reconcile(cr, uid, [context['active_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:
diff --git a/addons/account/wizard/account_pay_invoice_view.xml b/addons/account/wizard/account_pay_invoice_view.xml
deleted file mode 100644
index a1576245946..00000000000
--- a/addons/account/wizard/account_pay_invoice_view.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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"/>
-                        <newline/>
-                        <field name="name"/>
-                        <field name="date"/>
-                        <field name="journal_id" widget="selection"/>
-                        <field name="period_id" widget="selection"/>
-                    </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>
-
-        <record id="action_account_invoice_pay" model="ir.actions.act_window">
-            <field name="name">Pay Invoice</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.invoice.pay</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_account_invoice_pay"/>
-            <field name="context">{'record_id' : active_id}</field>
-            <field name="target">new</field>
-        </record>
-
-
-        <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>