Merge lp:~unifield-team/unifield-wm/sync-2389-duy into lp:unifield-wm/sync

[jftempo]

Unmerged revisions

463. By dvo@dvo on 2014-05-08

UF-2389: Minor fix

462. By dvo@dvo on 2014-05-08

UF-2389: Various modif to calculate the history in sync case

461. By dvo@dvo on 2014-05-08

UF-2389: Added new fields to rule 422

460. By Duy VO on 2014-05-08

UF-2389: WIP

=== modified file 'msf_sync_data_server/data/sync_server.sync_rule.csv'
--- msf_sync_data_server/data/sync_server.sync_rule.csv	2014-05-06 07:48:20 +0000
+++ msf_sync_data_server/data/sync_server.sync_rule.csv	2014-05-09 07:10:45 +0000
@@ -70,7 +70,7 @@
 msf_sync_data_server.account_move_state,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['instance_id/id', 'state']",OC,account.move,instance_id,Account Move State,Valid,,416
 msf_sync_data_server.analytical_line,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING'), ('imported_commitment','=',False)]","['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', 'ref', 'source_date', 'entry_sequence']",OC,account.analytic.line,cost_center_id,Analytical Line,Valid,,420
 msf_sync_data_server.analytical_line_free,TRUE,TRUE,TRUE,bidirectional,Up,"[('account_id.category', 'in', ['FREE1', 'FREE2'])]","['account_id/id', 'amount', 'amount_currency', 'code', 'currency_id/id', 'date', 'distrib_line_id', 'correction_date','document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'journal_id/id', 'move_id/id', 'name', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence']",MISSION,account.analytic.line,,Analytic Line (Free 1 and Free 2),Valid,,421
-msf_sync_data_server.analytical_line_correction,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING'), ('imported_commitment','=',False)]","['last_corrected_id/id', 'cost_center_id/id', 'reversal_origin/id']",OC,account.analytic.line,cost_center_id,Analytical Line,Valid,,422
+msf_sync_data_server.analytical_line_correction,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING'), ('imported_commitment','=',False)]","['corrected_original_xml_ids', 'is_reversal', 'last_corrected_id/id', 'cost_center_id/id', 'reversal_origin/id']",OC,account.analytic.line,cost_center_id,Analytical Line,Valid,,422
 msf_sync_data_server.budget,TRUE,TRUE,FALSE,bidirectional,Up,"[('type','=','normal'), ('state', '!=', 'draft')]","['code', 'cost_center_id/id', 'currency_id/id', 'decision_moment_id/id', 'decision_moment_order', 'fiscalyear_id/id', 'name', 'type', 'version']",OC,msf.budget,,Budget,Valid,,430
 msf_sync_data_server.budget_line,TRUE,TRUE,FALSE,bidirectional,Up,"[('budget_id','in',('msf.budget','id',[('type','=','normal'), ('state', '!=', 'draft')]))]","['account_id/id', 'budget_id/id', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12', 'destination_id/id', 'line_type']",OC,msf.budget.line,,Budget line,Valid,,431
 msf_sync_data_server.budget_status,TRUE,TRUE,FALSE,bidirectional,Up,"[('type','=','normal'), ('state', '!=', 'draft')]",['state'],OC,msf.budget,,Budget status,Valid,,432

=== modified file 'sync_so/specific_xml_id.py'
--- sync_so/specific_xml_id.py	2014-05-06 14:27:37 +0000
+++ sync_so/specific_xml_id.py	2014-05-09 07:10:45 +0000
@@ -6,6 +6,7 @@
 
 from osv import osv
 from osv import fields
+from sync_common import xmlid_to_sdref
 
 # Note:
 #
@@ -297,6 +298,15 @@
         'correction_date': fields.datetime('Correction Date'), # UF-2343: Add timestamp when making the correction, to be synced
     }
 
+    def get_corrected_xml_ids(self, cr, uid, ids, context=None):
+        # UFTP-182: Calculate the xml_id for the corrected lines 
+        identifier = self.pool.get('sync.client.entity')._get_entity(cr).identifier
+        list_xml_ids = []
+        for res_id in ids:
+            name = self.get_unique_xml_name(cr, uid, identifier, self._table, res_id)
+            list_xml_ids.append(name)
+        return ','.join(list_xml_ids)
+
     def get_instance_name_from_cost_center(self, cr, uid, cost_center_id, context=None):
         if cost_center_id:
             target_ids = self.pool.get('account.target.costcenter').search(cr, uid, [('cost_center_id', '=', cost_center_id),
@@ -395,12 +405,39 @@
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+
+        # UFTP-182: Treat the correction history when the link is randomly picked for the reference 
+        if 'corrected_original_xml_ids' in vals:
+            identifier = self.pool.get('sync.client.entity')._get_entity(cr).identifier
+            name = self.get_unique_xml_name(cr, uid, identifier, self._table, ids[0])
+            
+            xml_ids = vals['corrected_original_xml_ids']
+            if xml_ids:
+                if name in xml_ids:
+                    vals['corrected_original_xml_ids'] = ''
+                    
+                # For sync update: calculate the xml_id provided to res_id of the original corrected line
+                if context.get('sync_update_execution', False):
+                    # If come from sync, then calculate the xml_ids to put in the right column: last_corrected_id or reversal_origin
+                    xml_ids = xml_ids.split(',')
+                    # get the res_id from the given xml_ids
+                    res_id = None
+                    for xml_id in xml_ids: # some xml_ids provided may not have res_id in the local system
+                        xml_id = xml_id.strip()
+                        res_id = self.pool.get('account.analytic.line').find_sd_ref(cr, uid, xml_id, context=context)
+                        if res_id:
+                            break
+                    if vals.get('is_reversal', False):
+                        if not vals.get('reversal_origin', False):
+                            vals['reversal_origin'] = res_id
+                    elif not vals.get('last_corrected_id', False):
+                        vals['last_corrected_id'] = res_id
+
         if not 'cost_center_id' in vals:
             return super(account_analytic_line, self).write(cr, uid, ids, vals, context=context)
 
-        if isinstance(ids, (long, int)):
-            ids = [ids]
-
         # Only set the correction date if data not come from sync
         if not context.get('sync_update_execution', False):
             vals['correction_date'] = fields.datetime.now() # This timestamp is used for the write, but need to set BEFORE