Merge lp:~unifield-team/unifield-wm/utp-594 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/utp-594]

2233. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Missing comma in the code

2234. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Bug from UTP-1044 about a missing value in journal's data

2235. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Problems to make a refund

2236. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Ajout de la référence aux Journal Items depuis une refund

2237. By Olivier DOSSMANN on 2014-09-30

UTP-594 [MERGE] Last unifield trunk

Unmerged revisions

2237. By Olivier DOSSMANN on 2014-09-30

UTP-594 [MERGE] Last unifield trunk

2236. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Ajout de la référence aux Journal Items depuis une refund

2235. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Problems to make a refund

2234. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Bug from UTP-1044 about a missing value in journal's data

2233. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Missing comma in the code

2232. By Olivier DOSSMANN on 2014-09-29

UTP-594 [ADD] Link to the previous invoice when we are in a refund

2231. By Olivier DOSSMANN on 2014-09-29

UTP-594 [ADD] New link to the original invoice from which this refund comes from

2230. By Vincent GREINER on 2014-09-29

[IMP] invoice refund: hook when validate a refund

2228. By jftempo on 2014-09-19

UTP-1209 [FIX] Unable to save an AD on PO/FO

=== modified file 'account_override/invoice.py'
--- account_override/invoice.py	2014-09-05 08:12:52 +0000
+++ account_override/invoice.py	2014-09-30 15:29:14 +0000
@@ -217,6 +217,7 @@
             states={'draft':[('readonly',False)]}),
         'register_posting_date': fields.date(string="Register posting date for Direct Invoice", required=False),
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False, readonly=True),
+        'refund_source_inv_id': fields.many2one('account.invoice', 'Source invoice of the refund', readonly=True, invisible=True, help="Link to the invoice from which this one exists. The original one have generated this one via a refund wizard/button."),
     }
 
     _defaults = {
@@ -744,7 +745,10 @@
         if not context:
             context = {}
         res = super(account_invoice, self).line_get_convert(cr, uid, x, part, date, context)
-        res.update({'invoice_line_id': x.get('invoice_line_id', False)})
+        res.update({
+            'invoice_line_id': x.get('invoice_line_id', False),
+            'reference': x.get('reference', False),
+        })
         return res
 
     def finalize_invoice_move_lines(self, cr, uid, inv, line):
@@ -765,6 +769,8 @@
         for el in line:
             if el[2]:
                 el[2].update({'document_date': inv.document_date})
+                if inv.refund_source_inv_id:
+                    el[2].update({'reference': inv.origin})
             if el[2] and is_partner_line(el[2]):
                 el[2].update({'invoice_partner_link': inv.id})
                 new_line.append((el[0], el[1], el[2]))
 
=== modified file 'analytic_distribution/invoice.py'
--- analytic_distribution/invoice.py	2014-05-09 12:41:01 +0000
+++ analytic_distribution/invoice.py	2014-09-30 15:29:14 +0000
@@ -143,15 +143,26 @@
         """
         Reverse lines for given invoice
         """
+        # Prepare some values
         if isinstance(ids, (int, long)):
             ids = [ids]
+        new_ids = []
+        # Process source invoices
         for inv in self.browse(cr, uid, ids):
             # Check for dates (refund must be done after invoice)
             if date and date < inv.date_invoice:
                 raise osv.except_osv(_('Error'), _("Posting date for the refund is before the invoice's posting date!"))
             if document_date and document_date < inv.document_date:
                 raise osv.except_osv(_('Error'), _("Document date for the refund is before the invoice's document date!"))
-        new_ids = super(account_invoice, self).refund(cr, uid, ids, date, period_id, description, journal_id)
+            new_id = super(account_invoice, self).refund(cr, uid, [inv.id], date, period_id, description, journal_id)
+            # UTP-594: Add Source Document on new invoice (origin field) and a link to the original invoice
+            if isinstance(new_id, (int, long)):
+                new_id = [new_id]
+            self.write(cr, uid, new_id, {
+                'origin': inv.number,
+                'refund_source_inv_id': inv.id,
+            })
+            new_ids += new_id
         # add document date
         if document_date:
             self.write(cr, uid, new_ids, {'document_date': document_date})
 
=== modified file 'msf_chart_of_account/data/journal_data.xml'
--- msf_chart_of_account/data/journal_data.xml	2013-12-16 16:30:03 +0000
+++ msf_chart_of_account/data/journal_data.xml	2014-09-30 15:29:14 +0000
@@ -166,6 +166,7 @@
             <field name="default_debit_account_id" ref="msf_chart_of_account.3001" />
             <field name="default_credit_account_id" ref="msf_chart_of_account.3001" />
             <field name="analytic_journal_id" ref="cheque_analytic_journal"/>
+            <field name="bank_journal_id" ref="bank_chf_journal"/>
         </record>
 
         <record id="cheque_euro_journal" model="account.journal">
@@ -176,6 +177,7 @@
             <field name="default_debit_account_id" ref="msf_chart_of_account.3001" />
             <field name="default_credit_account_id" ref="msf_chart_of_account.3001" />
             <field name="analytic_journal_id" ref="cheque_analytic_journal"/>
+            <field name="bank_journal_id" ref="bank_euro_journal"/>
         </record>
 
         <record id="account_journal.engagement_journal" model="account.analytic.journal">