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

[jftempo]

=== modified file 'bin/addons/account_hq_entries/hq_entries.py'
--- bin/addons/account_hq_entries/hq_entries.py	2018-02-26 09:49:40 +0000
+++ bin/addons/account_hq_entries/hq_entries.py	2018-04-17 09:11:48 +0000
@@ -260,9 +260,9 @@
 
         for line in self.browse(cr, uid, ids, context=context):
             res.add(line.id)
-            if line.is_original:
+            if line.is_original and line.split_ids:
                 add_split(line)
-            if line.is_split:
+            if line.is_split and line.original_id:
                 # add original one
                 res.add(line.original_id.id)
                 # then other split lines
@@ -282,7 +282,9 @@
         # Prepare some values
         res = set()
         for line in self.browse(cr, uid, ids, context=context):
-            if line.user_validated == False and (line.is_original or line.is_split):
+            line_original = line.is_original and line.split_ids
+            line_split = line.is_split and line.original_id
+            if not line.user_validated and (line_original or line_split):
                 # First add original and split linked lines
                 for el in self.get_linked_lines(cr, uid, [line.id]):
                     res.add(el)
@@ -466,8 +468,13 @@
 
         #US-921: Only save the user_validated value if the update comes from sync!
         if context.get('sync_update_execution', False):
-            if 'user_validated' in  vals:
-                return super(hq_entries, self).write(cr, uid, ids, {'user_validated': vals['user_validated']}, context)
+            sync_vals = {}
+            if 'user_validated' in vals:
+                sync_vals.update({'user_validated': vals['user_validated']})
+            if 'is_original' in vals:  # US-4169 also enable to sync the is_original tag
+                sync_vals.update({'is_original': vals['is_original']})
+            if sync_vals:
+                return super(hq_entries, self).write(cr, uid, ids, sync_vals, context)
             return True
 
         if 'account_id' in vals:
@@ -480,6 +487,7 @@
 
     def unlink(self, cr, uid, ids, context=None):
         """
+        At synchro. only delete the entries having the tag is_split (= sync of an unsplit done in coordo). Otherwise:
         Do not permit user to delete:
          - validated HQ entries
          - split entries
@@ -487,10 +495,18 @@
         """
         if isinstance(ids, (int, long)):
             ids = [ids]
+        if context is None:
+            context = {}
+        if context.get('sync_update_execution', False):
+            new_ids = []
+            for hq_entry in self.browse(cr, uid, ids, fields_to_fetch=['is_split'], context=context):
+                if hq_entry.is_split:
+                    new_ids.append(hq_entry.id)
+            ids = new_ids
         if not context.get('from', False) or context.get('from') != 'code' and ids:
             if self.search(cr, uid, [('id', 'in', ids), ('user_validated', '=', True)]):
                 raise osv.except_osv(_('Error'), _('You cannot delete validated HQ Entries lines!'))
-            if self.search(cr, uid, [('id', 'in', ids), ('is_split', '=', True)]):
+            if self.search(cr, uid, [('id', 'in', ids), ('is_split', '=', True)]) and not context.get('sync_update_execution'):
                 raise osv.except_osv(_('Error'), _('You cannot delete split entries!'))
             if self.search(cr, uid, [('id', 'in', ids), ('is_original', '=', True)]):
                 raise osv.except_osv(_('Error'), _('You cannot delete original entries!'))
 
=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_unsplit.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_unsplit.py	2015-05-27 15:54:46 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_unsplit.py	2018-04-17 09:11:48 +0000
@@ -61,10 +61,10 @@
             split_ids = []
             original_ids = []
             for line in wiz.process_ids:
-                if line.is_original:
+                if line.is_original and line.split_ids:
                     original_ids.append(line.id)
                     continue
-                if line.is_split:
+                if line.is_split and line.original_id:
                     split_ids.append(line.id)
                     continue
             # Process
 
=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_validation.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2018-04-03 10:18:51 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_validation.py	2018-04-17 09:11:48 +0000
@@ -88,19 +88,21 @@
         return view
 
     # UTP-1101: Extract the method to create AD for being called also for the REV move
-    def create_distribution_id(self, cr, uid, currency_id, line, account):
+    def create_distribution_id(self, cr, uid, currency_id, line, account, split=False):
         current_date = strftime('%Y-%m-%d')
         line_cc_first = line.cost_center_id_first_value and line.cost_center_id_first_value.id or False
         line_cc_id = line.cost_center_id and line.cost_center_id.id  or False
         line_account_first = line.account_id_first_value and line.account_id_first_value.id or False
 
-        cc_id = line_cc_first or line_cc_id or False
+        # if split is True the line is a split line: use the current values instead of the original ones
+        cc_id = (not split and line_cc_first) or line_cc_id or False
         fp_id = line.analytic_id and line.analytic_id.id or False
-        if line_cc_id != line_cc_first or line_account_first != line.account_id.id:
+        if not split and (line_cc_id != line_cc_first or line_account_first != line.account_id.id):
             fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
         f1_id = line.free_1_id and line.free_1_id.id or False
         f2_id = line.free_2_id and line.free_2_id.id or False
-        destination_id = line.destination_id_first_value and line.destination_id_first_value.id or account.default_destination_id and account.default_destination_id.id or False
+        destination_id = (split and line.destination_id.id) or line.destination_id_first_value.id or \
+                         (account.default_destination_id and account.default_destination_id.id) or False
         distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {})
         if distrib_id:
             common_vals = {'distribution_id':distrib_id,
@@ -124,10 +126,12 @@
         return distrib_id
 
     def create_move(self, cr, uid, ids, period_id=False, currency_id=False,
-                    date=None, journal=None, orig_acct=None, doc_date=None, context=None):
+                    date=None, journal=None, orig_acct=None, doc_date=None, split=False, context=None):
         """
         Create a move with given hq entries lines
         Return created lines (except counterpart lines)
+        Note: if split is True, the lines handled are split lines => the account used is the last given by the user and
+        not the account_id_first_value
         """
         # Some verifications
         if context is None:
@@ -173,9 +177,10 @@
                 if not line.account_id_first_value:
                     raise osv.except_osv(_('Error'), _('An account is missing!'))
                 # create new distribution (only for expense accounts)
-                distrib_id = self.create_distribution_id(cr, uid, currency_id, line, line.account_id_first_value)
+                line_account = split and line.account_id or line.account_id_first_value
+                distrib_id = self.create_distribution_id(cr, uid, currency_id, line, line_account, split=split)
                 vals = {
-                    'account_id': line.account_id_first_value.id,
+                    'account_id': line_account.id,
                     'period_id': period_id,
                     'journal_id': journal_id,
                     'date': line.date,
@@ -261,10 +266,10 @@
         #+ original ones
         #+ split ones
         for line in lines:
-            if line.is_original:
+            if line.is_original and line.split_ids:
                 original_lines.add(line)
                 all_lines.add(line.id)
-            elif line.is_split:
+            elif line.is_split and line.original_id:
                 original_lines.add(line.original_id)
                 all_lines.add(line.original_id.id)
         # Create the original line as it is (and its reverse)
@@ -284,7 +289,9 @@
             aml_obj.write(cr, uid, original_move.id, {'corrected': True, 'have_an_historic': True} , context=context)
             original_account_id = original_move.account_id.id
 
-            new_res_move = self.create_move(cr, uid, [x.id for x in line.split_ids], line.period_id.id, line.currency_id.id, date=line.date, doc_date=line.document_date, journal=od_journal_id, orig_acct=original_account_id)
+            new_res_move = self.create_move(cr, uid, [x.id for x in line.split_ids], line.period_id.id,
+                                            line.currency_id.id, date=line.date, doc_date=line.document_date,
+                                            journal=od_journal_id, orig_acct=original_account_id, split=True, context=context)
             # original move line
             original_ml_result = res_move[line.id]
             # Mark new journal items as corrections for the first one
@@ -434,7 +441,7 @@
                     self.write(cr, uid, [wiz.id], {'running': False})
                     raise osv.except_osv(_('Warning'), _('Invalid analytic distribution!'))
                 # UTP-760: Do other modifications for split lines
-                if line.is_original or line.is_split:
+                if (line.is_original and line.split_ids) or (line.is_split and line.original_id):
                     split_change.append(line)
                     continue
                 if not line.user_validated:
 
=== 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-03-15 14:46:24 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-04-17 09:11:48 +0000
@@ -38,7 +38,8 @@
 msf_sync_data_server.fp_distribution_line_intermission,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,"[('cost_center_id' , 'in' , ('account.analytic.account' , 'id' , [('code','=','cc-intermission')]))]","['amount', 'analytic_id/id', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",COORDINATIONS,funding.pool.distribution.line,,FP Distribution Line - Intermission ,Valid,,211
 msf_sync_data_server.free_1_distribution_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,[],"['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",HQ + MISSION,free.1.distribution.line,,Free 1 Distribution Line,Valid,,220
 msf_sync_data_server.free_2_distribution_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional,[],"['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",HQ + MISSION,free.2.distribution.line,,Free 2 Distribution Line,Valid,,221
-msf_sync_data_server.hq_entries,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['account_id/id', 'account_id_first_value/id', 'amount', 'analytic_id/id', 'analytic_id_first_value/id', 'analytic_state', 'cost_center_id/id', 'cost_center_id_first_value/id', 'currency_id/id', 'date', 'destination_id/id', 'destination_id_first_value/id', 'document_date', 'free_1_id/id', 'free_2_id/id', 'name', 'partner_txt', 'period_id/id', 'ref', 'user_validated']",OC,hq.entries,cost_center_id,HQ Entries,Valid,,250
+msf_sync_data_server.hq_entries,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,[],"['account_id/id', 'account_id_first_value/id', 'amount', 'analytic_id/id', 'analytic_id_first_value/id', 'analytic_state', 'cost_center_id/id', 'cost_center_id_first_value/id', 'currency_id/id', 'date', 'destination_id/id', 'destination_id_first_value/id', 'document_date', 'free_1_id/id', 'free_2_id/id', 'name', 'partner_txt', 'period_id/id', 'ref', 'user_validated', 'is_split', 'is_original']",OC,hq.entries,cost_center_id,HQ Entries,Valid,,250
+msf_sync_data_server.hq_entries_deletion,TRUE,TRUE,TRUE,FALSE,bidirectional,Up,"[('id', '=', 0)]","['name']",OC,hq.entries,,HQ Entries deletion,Valid,,251
 msf_sync_data_server.gl_journal_non_registers,TRUE,TRUE,FALSE,TRUE,bidirectional,Up,"[('type', '!=', 'cash'),('type', '!=', 'cheque'),('type', '!=', 'bank')]","['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']",OC,account.journal,,GL Journal (Non Registers),Valid,,260
 msf_sync_data_server.gl_journals_registers_hq_bank,FALSE,TRUE,FALSE,TRUE,bidirectional,Down,"[('type', '=', 'bank'),('instance_id.level', '=', 'section')]","['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']",OC,account.journal,,GL Journals – Bank Registers (HQ),Valid,,261
 msf_sync_data_server.gl_journals_registers_coordo_bank,FALSE,TRUE,FALSE,TRUE,bidirectional,Down,"[('type', '=', 'bank'),('instance_id.level', '=', 'coordo')]","['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']",MISSION,account.journal,,GL Journals – Bank Registers (Coordo),Valid,,262