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

[jftempo]

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2016-09-16 08:46:57 +0000
+++ bin/addons/account/account_move_line.py	2016-11-04 08:23:09 +0000
@@ -1138,10 +1138,21 @@
         unlink_ids += rec_ids
         unlink_ids += part_rec_ids
         if unlink_ids:
+            # get all the JIs linked to the same reconciliations
+            linked_aml = self.search(cr, uid, ['|',
+                                               ('reconcile_id', 'in', unlink_ids),
+                                               ('reconcile_partial_id', 'in', unlink_ids)],
+                                     order='NO_ORDER', context=context)
+            # first update reconciliation/unreconciliation dates and unreconcile_txt for all the JIs of the reconciliations
+            for aml in linked_aml:
+                obj_move_line.write(cr, uid, aml, {
+                        'reconcile_date': False,  # US-533 reset reconcilation date
+                        # US-1868 add unreconciliation date and unreconcile number
+                        'unreconcile_date': time.strftime('%Y-%m-%d'),
+                        'unreconcile_txt': obj_move_line.browse(cr, uid, aml, context=context, fields_to_fetch=['reconcile_txt']).reconcile_txt,
+                    }, context=context)
+            # then delete the account.move.reconciles
             obj_move_rec.unlink(cr, uid, unlink_ids)
-        obj_move_line.write(cr, uid, move_ids, {
-                'reconcile_date': False,  # US-533 reset reconcilation date
-            }, context=context)
         return True
 
     def check_unlink(self, cr, uid, ids, context=None):
 
=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2016-10-06 14:02:52 +0000
+++ bin/addons/account_mcdb/account_view.xml	2016-11-04 08:23:09 +0000
@@ -278,6 +278,8 @@
                     <field name="functional_currency_id"/>
                     <field name="reconcile_total_partial_id"/>
                     <field name="reconcile_date" invisible="1"/>
+                    <field name="unreconcile_date" invisible="1"/>
+                    <field name="unreconcile_txt" invisible="1"/>
                     <field name="state"/>
                 </tree>
             </field>
 
=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2016-10-14 15:15:37 +0000
+++ bin/addons/account_override/account_move_line.py	2016-11-04 08:23:09 +0000
@@ -155,13 +155,17 @@
 
     def _get_reconciled_move_lines(self, cr, uid, ids, context=None):
         res = []
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context,
+                                fields_to_fetch=['reconcile_id', 'reconcile_partial_id', 'reconcile_txt']):
             if line.reconcile_id:
                 for t in line.reconcile_id.line_id:
                     res.append(t.id)
             elif line.reconcile_partial_id:
                 for p in line.reconcile_partial_id.line_partial_ids:
                     res.append(p.id)
+            # when an "unreconciliation" is synchronized the reconcile_txt must be reset
+            elif line.reconcile_txt and context.get('sync_update_execution'):
+                res.append(line.id)
         return res
 
     def _balance_currency(self, cr, uid, ids, name, arg, context=None):
@@ -498,7 +502,11 @@
 
     def copy(self, cr, uid, aml_id, default=None, context=None):
         """
-        When duplicate a JI, don't copy the link to register lines
+        When duplicate a JI, don't copy:
+        - the link to register lines
+        - the reconciliation date
+        - the unreconciliation date
+        - the old reconciliation ref (unreconcile_txt)
         """
         if context is None:
             context = {}
@@ -506,6 +514,9 @@
             default = {}
         default.update({
             'imported_invoice_line_ids': [],
+            'reconcile_date': None,
+            'unreconcile_date': None,
+            'unreconcile_txt': '',
         })
         return super(account_move_line, self).copy(cr, uid, aml_id, default, context=context)
 
 
=== modified file 'bin/addons/account_reconciliation/account.py'
--- bin/addons/account_reconciliation/account.py	2016-10-14 10:06:21 +0000
+++ bin/addons/account_reconciliation/account.py	2016-11-04 08:23:09 +0000
@@ -42,6 +42,9 @@
                 map(lambda x: x.id, rec.line_partial_ids), {
                     'reconcile_id': rec.id,
                     'reconcile_date': time.strftime('%Y-%m-%d'),  # US-533 date of JI reconciliation
+                    # US-1868 reset unreconcilation date and unreconcile_txt
+                    'unreconcile_date': False,
+                    'unreconcile_tx': '',
                 }
             )
         # @@@end
 
=== modified file 'bin/addons/account_reconciliation/account_move_line.py'
--- bin/addons/account_reconciliation/account_move_line.py	2016-10-14 13:21:00 +0000
+++ bin/addons/account_reconciliation/account_move_line.py	2016-11-04 08:23:09 +0000
@@ -35,6 +35,10 @@
     _columns = {
         'reconcile_date': fields.date('Reconcile date',
             help="Date of reconciliation"),
+        'unreconcile_date': fields.date('Unreconcile date',
+            help="Date of unreconciliation"),
+        'unreconcile_txt': fields.text(string='Unreconcile number', required=False, readonly=True,
+                                       help="Store the old reconcile number when the entry has been unreconciled"),
     }
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
@@ -175,6 +179,8 @@
         # above (4, 0)
         self.pool.get('account.move.line').write(cr, uid, merges+unmerge, {
                 'reconcile_date': time.strftime('%Y-%m-%d'),
+                'unreconcile_date': False,
+                'unreconcile_txt': '',
             })
 
         # UF-2011: synchronize move lines (not "marked" after reconcile creation)
@@ -289,7 +295,7 @@
         # bypass orm methods: for specific lines:
         #  - US-1766 FXA AJI should not be recomputed
         #  - US-1682 yealry REV JI have a dedicated rate
-        cr.execute('update account_move_line set reconcile_date=%s where id in %s',
+        cr.execute("UPDATE account_move_line SET reconcile_date=%s, unreconcile_date=NULL, unreconcile_txt='' WHERE id IN %s",
             (time.strftime('%Y-%m-%d'), tuple(ids))
         )
 
 
=== 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	2016-09-30 09:15:44 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2016-11-04 08:23:09 +0000
@@ -70,7 +70,7 @@
 msf_sync_data_server.account_move_reconcile,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,[],"['name', 'type', 'is_multi_instance', 'multi_instance_level_creation', 'instance_id']",OC,account.move.reconcile,,Account Move Reconcile,Valid,,410
 msf_sync_data_server.register_line_deleted,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['statement_id/id', 'sequence','instance_id/id']",MISSION,account.bank.statement.line.deleted,instance_id,Register Deleted Line,Valid,,405
 msf_sync_data_server.account_move,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['date', 'document_date', 'imported', 'journal_id/id', 'name', 'narration', 'period_id/id', 'ref', 'statement_line_ids/id', 'to_check','instance_id/id','status','employee_id/id','transfer_journal_id/id','manual_currency_id/id','block_manual_currency_id','partner_id2/id','analytic_distribution_id/id', 'register_line_id/id']",OC,account.move,instance_id,Account Move,Valid,,411
-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']",OC,account.move.line,instance_id,Account Move Line,Valid,,412
+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']",OC,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']",OC,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
@@ -177,7 +177,7 @@
 msf_usb_sync_data_server.cp_gl_journals_registers,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"['|',('type', '=', 'cash'),('type', '=', 'cheque')]","['bank_journal_id/id','analytic_journal_id/id', 'code', 'currency/id', 'default_credit_account_id/id', 'default_debit_account_id/id', 'name', 'type','instance_id/id']",USB,account.journal,,[MASTER] GL Journals - Registers,Valid,,1507
 msf_usb_sync_data_server.cp_account_move_reconcile,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['name', 'type']",USB,account.move.reconcile,,[MASTER] Account Move Reconcile,Valid,,1510
 msf_usb_sync_data_server.cp_account_move,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['date', 'document_date', 'imported', 'journal_id/id', 'name', 'narration', 'period_id/id', 'ref', 'statement_line_ids/id', 'to_check','instance_id/id','status','employee_id/id','transfer_journal_id/id','manual_currency_id/id','block_manual_currency_id','partner_id2/id','analytic_distribution_id/id']",USB,account.move,,[MASTER] Account Move,Valid,,1520
-msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', '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', 'move_state', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521
+msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', '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', 'move_state', 'name', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount', 'is_downpayment', 'reconcile_date', 'unreconcile_date', 'unreconcile_txt']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521
 msf_usb_sync_data_server.cp_account_move_line_correction,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",USB,account.move.line,,[MASTER] Account Move Line Correction,Valid,,1522
 msf_usb_sync_data_server.cp_account_move_line_register_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['corrected_st_line_id/id', 'instance_id/id']",USB,account.move.line,,[MASTER] Account Move Line / Register Line,Valid,,1523
 msf_usb_sync_data_server.cp_register_line_account_move_line,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['first_move_line_id/id', 'instance_id/id']",USB,account.bank.statement.line,,[MASTER] Register Line / Account Move Line,Valid,,1530