diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 37e044d1399..a00a2448928 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -285,7 +285,10 @@ class base_module_record(osv.osv): rec=copy_rec rec_data=[(self.recording_data[0][0],rec,self.recording_data[0][2],self.recording_data[0][3])] self.recording_data=rec_data - id = self._create_id(cr, uid, rec[3],rec[6]) + + id,update = self._get_id(cr, uid, rec[3], rec[5]) + if not id: + id = self._create_id(cr, uid, rec[3],rec[6]) record,noupdate = self._create_record(cr, uid, doc, rec[3], rec[6], id) self.ids[(rec[3],result)] = id record_list += record @@ -294,6 +297,7 @@ class base_module_record(osv.osv): def _generate_assert_xml(self, rec, doc): pass + def generate_xml(self, cr, uid): # Create the minidom document if len(self.recording_data): diff --git a/addons/base_module_record/base_module_record_wizard.xml b/addons/base_module_record/base_module_record_wizard.xml index 095d5fa81c8..11113e12f5a 100644 --- a/addons/base_module_record/base_module_record_wizard.xml +++ b/addons/base_module_record/base_module_record_wizard.xml @@ -49,7 +49,7 @@ name="base_module_record.module_record_objects"/> diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py index 55862399917..6fb50376018 100644 --- a/addons/base_module_record/wizard/base_module_record_objects.py +++ b/addons/base_module_record/wizard/base_module_record_objects.py @@ -78,7 +78,7 @@ def _record_objects(self, cr, uid, data, context): elif filter =='modified': search_condition =[('write_date','>',check_date)] elif filter =='created_modified': - search_condition =[('create_date','>',check_date),('write_date','>',check_date)] + search_condition =['|',('create_date','>',check_date),('write_date','>',check_date)] if '_log_access' in dir(obj_pool): if not (obj_pool._log_access): search_condition=[]