Merge lp:~julie-w/unifield-server/US-4283 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-06-15 12:30:42 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-07-09 08:36:18 +0000
@@ -101265,3 +101265,12 @@
 msgid "Not Invoice"
 msgstr "Pas de Facture"
 
+#. module: register_accounting
+#: field:account.bank.statement.line,advance_invoice_move_id:0
+msgid "Account Move of the Invoice used to close the Advance"
+msgstr "Ecriture Comptable de la Facture utilisée pour clôturer l'Avance"
+
+#. module: register_accounting
+#: help:account.bank.statement.line,advance_invoice_move_id:0
+msgid "When a SI is used to close an Advance, the related JE is stored in this field"
+msgstr "Lorsqu'une facture est utilisée pour clôturer une avance, l'écriture comptable associée est stockée dans ce champ"

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-05-18 15:58:40 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-07-09 08:36:18 +0000
@@ -79,7 +79,7 @@
 msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'last_cor_was_only_analytic', 'move_id/id', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'reconcile_partial_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date', 'is_revaluated_ok', 'unreconcile_date', 'unreconcile_txt', 'is_manually_corrected', 'is_si_refund']",HQ + MISSION,account.move.line,instance_id,Account Move Line,Valid,,412
 msf_sync_data_server.account_move_line_correction,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",HQ + MISSION,account.move.line,instance_id,Account Move Line Correction,Valid,,413
 msf_sync_data_server.account_move_line_register_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_st_line_id/id', 'instance_id/id']",MISSION,account.move.line,instance_id,Account Move Line / Register Line,Valid,,414
-msf_sync_data_server.register_line_account_move_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['direct_invoice_move_id/id', 'first_move_line_id/id', 'from_import_cheque_id/id', 'imported_invoice_line_ids/id','instance_id/id', 'cash_return_move_line_id/id']",MISSION,account.bank.statement.line,instance_id,Register Line / Account Move Line,Valid,,415
+msf_sync_data_server.register_line_account_move_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['direct_invoice_move_id/id', 'first_move_line_id/id', 'from_import_cheque_id/id', 'imported_invoice_line_ids/id','instance_id/id', 'cash_return_move_line_id/id', 'advance_invoice_move_id/id']",MISSION,account.bank.statement.line,instance_id,Register Line / Account Move Line,Valid,,415
 msf_sync_data_server.account_move_state,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['instance_id/id', 'state']",HQ + MISSION,account.move,instance_id,Account Move State,Valid,,416
 msf_sync_data_server.account_move_line_corrected_upstream,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_upstream', 'instance_id/id']",HQ + MISSION,account.move.line,instance_id,Account Move Line Corrected Upstream,Valid,,417
 msf_sync_data_server.analytical_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING')]","['from_commitment_line', 'account_id/id', 'amount', 'amount_currency','correction_date', 'code', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distrib_line_id', 'distribution_id/id', 'document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'journal_id/id', 'move_id/id', 'name', 'partner_txt', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence', 'real_period_id/id']",HQ + MISSION,account.analytic.line,cost_center_id,Analytical Line,Valid,,420

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2018-06-11 13:34:07 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2018-07-09 08:36:18 +0000
@@ -1130,6 +1130,9 @@
                 # hard posted direct invoice regline case (and sync P1->C1)
                 if absl.direct_invoice_move_id:
                     res.add(absl.direct_invoice_move_id.id)
+            # advance closed by a SI in project => in upper inst. invoice_id is empty: use advance_invoice_move_id
+            elif not absl.invoice_id and absl.advance_invoice_move_id:
+                res.add(absl.advance_invoice_move_id.id)
         return list(res)
 
     def _get_fp_analytic_lines(self, cr, uid, ids, field_name=None, args=None, context=None):
@@ -1227,6 +1230,9 @@
         'red_on_supplier': fields.function(_check_red_on_supplier, method=True, type="boolean", string="Supplier flag", store=False, readonly=True, multi="m"),
         'journal_id': fields.related('statement_id','journal_id', string="Journal", type='many2one', relation='account.journal', readonly=True),
         'direct_invoice_move_id': fields.many2one('account.move', 'Direct Invoice Move', readonly=True, help="This field have been added to get the move that comes from the direct invoice because after synchronization some lines lost the direct invoice link. And so we can't see which move have been linked to the invoice in case the register line is temp posted."),
+        'advance_invoice_move_id': fields.many2one('account.move', 'Account Move of the Invoice used to close the Advance',
+                                                   readonly=True,
+                                                   help="When a SI is used to close an Advance, the related JE is stored in this field"),
     }
 
     _defaults = {
@@ -1269,7 +1275,7 @@
         cash_adv_return_move_line_ids = [
             absl.cash_return_move_line_id.id \
             for absl in absl_brs \
-            if not absl.invoice_id and absl.from_cash_return and \
+            if not absl.invoice_id and not absl.advance_invoice_move_id and absl.from_cash_return and \
             absl.cash_return_move_line_id
             # NOTE: for imported invoices we let the default behaviour
             # (display of invoice AJIs)
@@ -2224,6 +2230,8 @@
             'down_payment_id': False,
             'cash_return_move_line_id': False,  # BKLG-60
             'partner_move_ids': [],
+            'advance_invoice_move_id': False,
+            'direct_invoice_move_id': False,
         })
         # Copy analytic distribution if exists
         line = self.browse(cr, uid, [absl_id], context=context)[0]

=== modified file 'bin/addons/register_accounting/report/fully_report_xls.mako'
--- bin/addons/register_accounting/report/fully_report_xls.mako	2018-02-26 11:25:57 +0000
+++ bin/addons/register_accounting/report/fully_report_xls.mako	2018-07-09 08:36:18 +0000
@@ -807,8 +807,9 @@
 
 <!-- Direct invoice and invoice that comes from a PL (in a cash return) -->
 <% move_lines = [] %>
-% if line.invoice_id:
-<% move_lines = getMoveLines([line.invoice_id.move_id], line) %>
+<% invoice_move = line.invoice_id and line.invoice_id.move_id or line.advance_invoice_move_id %>
+% if invoice_move:
+<% move_lines = getMoveLines([invoice_move], line) %>
 % elif line.imported_invoice_line_ids:
 <% move_lines = getImportedMoveLines([ml for ml in line.imported_invoice_line_ids], line) %>
 % elif line.direct_invoice_move_id:

=== modified file 'bin/addons/register_accounting/wizard/wizard_cash_return.py'
--- bin/addons/register_accounting/wizard/wizard_cash_return.py	2018-02-22 14:45:02 +0000
+++ bin/addons/register_accounting/wizard/wizard_cash_return.py	2018-07-09 08:36:18 +0000
@@ -541,6 +541,7 @@
         # Fetch objects
         move_line_obj = self.pool.get('account.move.line')
         absl_obj = self.pool.get('account.bank.statement.line')
+        inv_obj = self.pool.get('account.invoice')
         move_line = move_line_obj.browse(cr, uid, move_line_id, context=context)
 
         # Prepare some values
@@ -588,6 +589,9 @@
         # Add invoice link if exists
         if invoice_id:
             vals.update({'invoice_id': invoice_id,})
+            # also store the invoice JE
+            inv = inv_obj.browse(cr, uid, invoice_id, fields_to_fetch=['move_id'], context=context)
+            vals.update({'advance_invoice_move_id': inv and inv.move_id and inv.move_id.id or False})
 
         # Create the statement line with vals
         st_line_id = absl_obj.create(cr, uid, vals, context=context)