Merge lp:~odossmann/unifield-addons/UTP_594 into lp:unifield-addons

[jftempo]

[lp:~odossmann/unifield-addons/UTP_594]

4629. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Problems with reference in lines

4630. By Olivier DOSSMANN on 2014-09-30

UTP-594 [FIX] Problem of analytic lines after invoice validation that take the wrong reference

Unmerged revisions

4630. By Olivier DOSSMANN on 2014-09-30

UTP-594 [FIX] Problem of analytic lines after invoice validation that take the wrong reference

4629. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Problems with reference in lines

4628. By Olivier DOSSMANN on 2014-09-29

UTP-594 [FIX] Make reference from Journal Items that comes from an invoice that is a refund to be the origin name of the invoice. Add also the description of the original invoice.

4627. By Olivier DOSSMANN on 2014-09-29

UTP-594 [DEL] Useless code that will be included in unifield-wm and some elements of invoice.py file.

4626. By Vincent GREINER on 2014-09-29

UTP-594 [IMP] refund link with previous invoice and update of JE/JI ref with the invoice seq number for tracibility of original invoice of the refund entries (DRAFT)

=== modified file 'account/invoice.py'
--- account/invoice.py	2014-09-29 12:34:12 +0000
+++ account/invoice.py	2014-09-30 08:49:55 +0000
@@ -691,6 +691,8 @@
             if il['account_analytic_id']:
                 if inv.type in ('in_invoice', 'in_refund'):
                     ref = inv.reference
+                    if inv.refund_source_inv_id:
+                        ref = inv.origin
                 else:
                     ref = self._convert_ref(cr, uid, inv.number)
                 if not inv.journal_id.analytic_journal_id:
@@ -858,11 +860,15 @@
             iml += ait_obj.move_line_get(cr, uid, inv.id)
 
             entry_type = ''
+            name = inv['name'] or '/'
             if inv.type in ('in_invoice', 'in_refund'):
                 ref = inv.reference
                 entry_type = 'journal_pur_voucher'
                 if inv.type == 'in_refund':
                     entry_type = 'cont_voucher'
+                    if inv.refund_source_inv_id:
+                        ref = inv.origin
+                        name = inv.refund_source_inv_id.name
             else:
                 ref = self._convert_ref(cr, uid, inv.number)
                 entry_type = 'journal_sale_vou'
@@ -876,7 +882,6 @@
             total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml)
             acc_id = inv.account_id.id
 
-            name = inv['name'] or '/'
             totlines = False
             if inv.payment_term:
                 totlines = self.pool.get('account.payment.term').compute(cr,
@@ -909,6 +914,7 @@
                         'currency_id': diff_currency_p \
                                 and inv.currency_id.id or False,
                         'ref': ref,
+                        'reference': ref,
                         'is_counterpart': True,
                     })
             else:
@@ -924,6 +930,7 @@
                     'currency_id': diff_currency_p \
                             and inv.currency_id.id or False,
                     'ref': ref,
+                    'reference': ref,
                     'is_counterpart': True,
             })
 
@@ -1013,11 +1020,16 @@
 
             self.write(cr, uid, ids, {'internal_number':number})
 
+            from_si_refund = False
             if invtype in ('in_invoice', 'in_refund'):
                 if not reference:
                     ref = self._convert_ref(cr, uid, number)
                 else:
                     ref = reference
+                # UTP-594: Reference should be the origin of invoice. It should be done via action_move_create. So 
+                #+ we don't need to update analytic lines
+                if invtype == 'in_refund' and obj_inv.refund_source_inv_id:
+                    from_si_refund = True
             else:
                 ref = self._convert_ref(cr, uid, number)
 
@@ -1027,11 +1039,12 @@
             cr.execute('UPDATE account_move_line SET ref=%s ' \
                     'WHERE move_id=%s AND (ref is null OR ref = \'\')',
                     (ref, move_id))
-            cr.execute('UPDATE account_analytic_line SET ref=%s ' \
-                    'FROM account_move_line ' \
-                    'WHERE account_move_line.move_id = %s ' \
-                        'AND account_analytic_line.move_id = account_move_line.id',
-                        (ref, move_id))
+            if not from_si_refund:
+                cr.execute('UPDATE account_analytic_line SET ref=%s ' \
+                        'FROM account_move_line ' \
+                        'WHERE account_move_line.move_id = %s ' \
+                            'AND account_analytic_line.move_id = account_move_line.id',
+                            (ref, move_id))
 
             for inv_id, name in self.name_get(cr, uid, [id]):
                 ctx = context.copy()