Merge lp:~unifield-team/unifield-wm/sync-852-acc_move_line_empty into lp:unifield-wm/sync

[jftempo]

Unmerged revisions

639. By Duy VO on 2016-03-01

SP-228: Do not reset the log message when the update got run. Keep for analysis purpose

638. By Duy VO on 2016-02-29

US-852: Moved code

637. By Duy VO on 2016-02-29

US-852: if account_move_line is given and if the value does not exist, then do not import the current update sync

=== modified file 'sync_client/update.py'
--- sync_client/update.py	2016-02-26 09:14:22 +0000
+++ sync_client/update.py	2016-03-10 09:45:25 +0000
@@ -449,7 +449,7 @@
                         'execution_date': execution_date,
                         'editable' : False,
                         'run' : True,
-                        'log' : '',
+                        #'log' : '', #SP-228: Do not reset the log message even the update got run.
                     }, context=context)
                 for update_id, log in logs.items():
                     self.write(cr, uid, [update_id], {
@@ -484,23 +484,31 @@
             for update in updates:
 
                 row = eval(update.values)
-
+                
                 #4 check for fallback value : report missing fallback_value
-                self._check_and_replace_missing_id(cr, uid, import_fields, row, fallback, message, context=context)
+                #US-852: in case the account_move_line is given but not exist, then do not let the import of the current entry
+                ret_fb = self._check_and_replace_missing_id(cr, uid, import_fields, row, fallback, message, context=context)
 
                 if bad_fields :
                     row = [row[i] for i in range(len(import_fields)) if i not in bad_fields]
 
-                values.append(row)
-                update_ids.append(update.id)
-                versions.append( (update.sdref, update.version) )
-
-                #1 conflict detection
-                if self._conflict(cr, uid, update.sdref, update.version, context=context):
-                    #2 if conflict => manage conflict according rules : report conflict and how it's solve
-                    index_id = eval(update.fields).index('id')
-                    sd_ref = eval(update.values)[index_id]
-                    logs[update.id] = "Warning: Conflict detected! in content: (%s, %r)" % (update.id, sd_ref)
+                if ret_fb: #US-852: if everything is Ok, then do import as normal
+                    values.append(row)
+                    update_ids.append(update.id)
+                    versions.append( (update.sdref, update.version) )
+    
+                    #1 conflict detection
+                    if self._conflict(cr, uid, update.sdref, update.version, context=context):
+                        #2 if conflict => manage conflict according rules : report conflict and how it's solve
+                        index_id = eval(update.fields).index('id')
+                        sd_ref = eval(update.values)[index_id]
+                        logs[update.id] = "Warning: Conflict detected! in content: (%s, %r)" % (update.id, sd_ref)
+                else: #US-852: if account_move_line is missing then ignore the import, and set it as not run
+                    self.write(cr, uid, [update.id], {
+                        'execution_date': datetime.now(),
+                        'run' : False,
+                        'log' : "Cannot execute due to missing the account_move_line"
+                    }, context=context)                    
 
             if bad_fields:
                 import_fields = [import_fields[i] for i in range(len(import_fields)) if i not in bad_fields]
@@ -790,6 +798,10 @@
                         raise ValueError
                 except ValueError:
                     try:
+                        #US-852: if account_move_line is given, then cannot use the fallback value, but exit the import!
+                        # THIS FIX COULD ALSO OPEN FOR OTHER BUG, BUT CHECK IF THE RULES THAT CONTAIN THE OBJECT (HERE account_move_line) 
+                        if 'account_move_line' in xmlid:
+                            return False
                         fb = fallback.get(field, False)
                         if not fb:
                             raise ValueError("no fallback value defined")
@@ -806,7 +818,8 @@
                 else:
                     res_val.append(xmlid)
             values[i] = ','.join(res_val) if res_val else False
-
+        return True
+        
     _order = 'create_date desc, id desc'
 
 update_received()