Merge lp:~unifield-team/unifield-addons/UF_437_refund_hooks into lp:unifield-addons

[Olivier DOSSMANN]

Permit to pass analytic distribution from invoice to refund and from invoice to new invoice in case of "modify" type in refund wizard.

Hooks permits to pass other fields or modify fields that would be taken from initial invoice to make a refund.

=== modified file 'account/invoice.py'
--- account/invoice.py	2011-06-21 14:56:58 +0000
+++ account/invoice.py	2011-10-05 15:03:44 +0000
@@ -1074,8 +1074,33 @@
                 line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
         return map(lambda x: (0,0,x), lines)
 
+    def _hook_fields_for_refund(self, cr, uid, *args):
+        """
+        Permits to change fields list to be use for creating invoice refund from an invoice.
+        """
+        res = ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 
+            'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id']
+        return res
+
+    def _hook_fields_m2o_for_refund(self, cr, uid, *args):
+        """
+        Permits to change field that would be use for invoice refund.
+        NB: This fields should be many2one fields.
+        """
+        res = ['address_contact_id', 'address_invoice_id', 'partner_id',
+                    'account_id', 'currency_id', 'payment_term', 'journal_id']
+        return res
+
+    def _hook_refund_data(self, cr, uid, data, *args):
+        """
+        Permits to change data for new refund before their creation
+        """
+        if not data:
+            return False
+        return data
+
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
-        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+        invoices = self.read(cr, uid, ids, self._hook_fields_for_refund(cr, uid))
         obj_invoice_line = self.pool.get('account.invoice.line')
         obj_invoice_tax = self.pool.get('account.invoice.tax')
         obj_journal = self.pool.get('account.journal')
@@ -1123,9 +1148,9 @@
                     'name': description,
                 })
             # take the id part of the tuple returned for many2one fields
-            for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
-                    'account_id', 'currency_id', 'payment_term', 'journal_id'):
+            for field in self._hook_fields_m2o_for_refund(cr, uid):
                 invoice[field] = invoice[field] and invoice[field][0]
+            invoice = self._hook_refund_data(cr, uid, invoice) or invoice
             # create the new invoice
             new_ids.append(self.create(cr, uid, invoice))
 

=== modified file 'account/wizard/account_invoice_refund.py'
--- account/wizard/account_invoice_refund.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_invoice_refund.py	2011-10-05 15:03:44 +0000
@@ -69,6 +69,29 @@
                 res['fields'][field]['selection'] = journal_select
         return res
 
+    def _hook_fields_for_modify_refund(self, cr, uid, *args):
+        """
+        Permits to change values that are taken from initial invoice to new invoice(s)
+        """
+        res = ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id',
+            'partner_insite', 'partner_contact', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line',
+            'journal_id', 'period_id']
+        return res
+
+    def _hook_fields_m2o_for_modify_refund(self, cr, uid, *args):
+        """
+        Permits to change values for m2o fields taken from initial values to new invoice(s)
+        """
+        res = ['address_contact_id', 'address_invoice_id', 'partner_id', 'account_id', 'currency_id', 'payment_term', 'journal_id']
+        return res
+
+    def _hook_create_invoice(self, cr, uid, data, *args):
+        """
+        Permits to adapt invoice creation
+        """
+        res = inv_obj.create(cr, uid, data, {})
+        return res
+
     def compute_refund(self, cr, uid, ids, mode='refund', context=None):
         """
         @param cr: the current row, from the database cursor,
@@ -165,14 +188,7 @@
                                         writeoff_acc_id=inv.account_id.id
                                         )
                     if mode == 'modify':
-                        invoice = inv_obj.read(cr, uid, [inv.id],
-                                    ['name', 'type', 'number', 'reference',
-                                    'comment', 'date_due', 'partner_id',
-                                    'address_contact_id', 'address_invoice_id',
-                                    'partner_insite', 'partner_contact',
-                                    'partner_ref', 'payment_term', 'account_id',
-                                    'currency_id', 'invoice_line', 'tax_line',
-                                    'journal_id', 'period_id'], context=context)
+                        invoice = inv_obj.read(cr, uid, [inv.id], self._hook_fields_for_modify_refund(cr, uid), context=context)
                         invoice = invoice[0]
                         del invoice['id']
                         invoice_lines = inv_line_obj.read(cr, uid, invoice['invoice_line'], context=context)
@@ -189,10 +205,9 @@
                             'period_id': period,
                             'name': description
                         })
-                        for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
-                                'account_id', 'currency_id', 'payment_term', 'journal_id'):
+                        for field in self._hook_fields_m2o_for_modify_refund(cr, uid):
                                 invoice[field] = invoice[field] and invoice[field][0]
-                        inv_id = inv_obj.create(cr, uid, invoice, {})
+                        inv_id = self._hook_create_invoice(cr, uid, invoice)
                         if inv.payment_term.id:
                             data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], inv.payment_term.id, date)
                             if 'value' in data and data['value']:
@@ -217,4 +232,4 @@
 
 account_invoice_refund()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: