Merge lp:~openerp-dev/openobject-addons/trunk-bug-1083276-kbh into lp:openobject-addons

[Khushboo Bhatt(openerp)]

Hello,

 account:fixed the issue of customer/supplier invoice continuously refund as many times as user wants.

Thank you,
Khushboo.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Suggestion:

First of all I think we can raise refund invoice of already refund order and If its not the case any time we can improve the fix by using "type" field on invoice. No need to create separate field on invoice.

Please check that possibility.

Thanks,
Mustufa Rangwala

[qdp (OpenERP) (qdp)]

please see my comment on the bug

thanks

review: Disapprove

Unmerged revisions

8375. By Khushboo Bhatt(openerp) on 2012-12-18

[FIX]account:infinite refund of invoice issue

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-12-17 15:23:03 +0000
+++ account/account_invoice.py	2012-12-18 09:01:24 +0000
@@ -279,7 +279,8 @@
         'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, states={'draft':[('readonly',False)]}),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]}),
+        'refund_invoice': fields.boolean("Refund Invoice"),
     }
     _defaults = {
         'type': _get_type,
@@ -1216,7 +1217,7 @@
                 invoice[field] = invoice[field] and invoice[field][0]
             # create the new invoice
             new_ids.append(self.create(cr, uid, invoice))
-
+        self.write(cr, uid, ids, {'refund_invoice': True})
         return new_ids
 
     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/account_invoice_view.xml'
--- account/account_invoice_view.xml	2012-12-15 16:44:49 +0000
+++ account/account_invoice_view.xml	2012-12-18 09:01:24 +0000
@@ -144,7 +144,7 @@
                 <form string="Supplier Invoice" version="7.0">
                 <header>
                         <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
-                        <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="account.group_account_invoice"/>
+                        <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' attrs="{'invisible':['|', ('state', 'not in', ('open', 'paid')), ('refund_invoice', '=', True)]}" groups="account.group_account_invoice"/>
                         <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                         <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="account.group_account_invoice"/>
                         <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
@@ -161,6 +161,7 @@
                         </h1>
                     </div>
                     <field name="type" invisible="1"/>
+                    <field name="refund_invoice" invisible="1"/>
                     <group>
                         <group>
                             <field string="Supplier" name="partner_id"
@@ -291,6 +292,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice" version="7.0">
                 <header>
+                    
                     <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
                     <button name="invoice_print" string="Print" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
                     <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
@@ -298,7 +300,7 @@
                     <button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
                     <button name="invoice_open" states="proforma2" string="Validate" groups="base.group_user"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid' groups="base.group_user"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' attrs="{'invisible':['|', ('state', 'not in', ('open', 'proforma2', 'paid')), ('refund_invoice', '=', True)]}" groups="base.group_user"/>
                     <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one"/>
                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" groups="base.group_user"/>
                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
@@ -315,6 +317,7 @@
                         <field name="number" readonly="1" class="oe_inline"/>
                     </h1>
                     <field name="type" invisible="1"/>
+                    <field name="refund_invoice" invisible="1"/>
                     <group>
                         <group>
                             <field string="Customer" name="partner_id"