diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 1eef18d6df4..53f413582e0 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -41,7 +41,8 @@ def fnct_call(fnct):
if args[4] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc'):
if _old_args is not None:
args[5].update(_old_args)
- mod.recording_data.append(('query', args, argv,res))
+ if args[5]:
+ mod.recording_data.append(('query', args, argv,res))
return res
return execute
@@ -105,12 +106,10 @@ class base_module_record(osv.osv):
return obj.module+'.'+obj.name, obj.noupdate
def _create_record(self, cr, uid, doc, model, data, record_id, noupdate=False):
- record_list=[]
- if record_id not in self.ids.values():
- record = doc.createElement('record')
- record.setAttribute("id", record_id)
- record.setAttribute("model", model)
- record_list = [record]
+ record = doc.createElement('record')
+ record.setAttribute("id", record_id)
+ record.setAttribute("model", model)
+ record_list = [record]
lids = self.pool.get('ir.model.data').search(cr, uid, [('model','=',model)])
res = self.pool.get('ir.model.data').read(cr, uid, lids[:1], ['module'])
if res:
@@ -148,7 +147,7 @@ class base_module_record(osv.osv):
record.appendChild(field)
elif fields[key]['type'] in ('one2many',):
for valitem in (val or []):
- if valitem[0]==0:
+ if valitem[0]==(0,1):
if key in self.pool.get(model)._columns:
fname = self.pool.get(model)._columns[key]._fields_id
else:
@@ -183,47 +182,47 @@ class base_module_record(osv.osv):
val = val and ('"""%s"""' % val.replace('\\', '\\\\').replace('"', '\"')) or 'False'
if isinstance(val, basestring):
- val=val.encode('utf8')
val = val.decode('utf8')
field.setAttribute(u"eval", val)
record.appendChild(field)
return record_list, noupdate
- def get_o2m_list(self,cr,uid,model,id):
- result={}
- data=self.pool.get(model).read(cr, uid,id)
- del data['id']
- fields = self.pool.get(model).fields_get(cr, uid)
- res=[0,0]
- for key,val in data.items():
- if fields[key]['type'] == 'many2one':
- result[key]=data[key][0]
- else:
- result[key]=data[key]
- res.append(result)
- return res
- def get_copy_data(self, cr, uid,model,id):
- result={}
+
+ def get_copy_data(self, cr, uid,model,id,result):
res = []
- data=self.pool.get(model).read(cr, uid,id)
- del data['id']
- fields = self.pool.get(model).fields_get(cr, uid)
+ obj=self.pool.get(model)
+ data=obj.read(cr, uid,[id])
+ if type(data)==type([]):
+ del data[0]['id']
+ data=data[0]
+ else:
+ del data['id']
+ mod_fields = obj.fields_get(cr, uid)
+
+ for f in filter(lambda a: isinstance(obj._columns[a], fields.function)\
+ and (not obj._columns[a].store),obj._columns):
+ del data[f]
for key,val in data.items():
- if fields[key]['type'] == 'many2one':
- if type(data[key])==type(True):
+ if result.has_key(key):
+ continue
+ if mod_fields[key]['type'] == 'many2one':
+ if type(data[key])==type(True) or type(data[key])==type(1):
result[key]=data[key]
else:
result[key]=data[key][0]
- elif fields[key]['type'] in ('one2many',):
- rel = fields[key]['relation']
+ elif mod_fields[key]['type'] in ('one2many',):
+ rel = mod_fields[key]['relation']
if len(data[key]):
+ res1=[]
for rel_id in data[key]:
- res.append((self.get_o2m_list(cr, uid,rel,rel_id)))
- result[key]=res
+ res=[0,0]
+ res.append(self.get_copy_data(cr, uid,rel,rel_id,{}))
+ res1.append(res)
+ result[key]=res1
else:
result[key]=data[key]
@@ -256,7 +255,7 @@ class base_module_record(osv.osv):
record_list += record
elif rec[4]=='copy':
- data=self.get_copy_data(cr,uid,rec[3],rec[5])
+ data=self.get_copy_data(cr,uid,rec[3],rec[5],rec[6])
copy_rec=(rec[0],rec[1],rec[2],rec[3],rec[4],rec[5],data,rec[7])
rec=copy_rec
rec_data=[(self.recording_data[0][0],rec,self.recording_data[0][2],self.recording_data[0][3])]
diff --git a/addons/base_module_record/base_module_record_wizard.xml b/addons/base_module_record/base_module_record_wizard.xml
index 76b902382b1..095d5fa81c8 100644
--- a/addons/base_module_record/base_module_record_wizard.xml
+++ b/addons/base_module_record/base_module_record_wizard.xml
@@ -41,5 +41,18 @@
action="wizard_base_module_save"
id="menu_wizard_base_module_save"/>
+
+
+
diff --git a/addons/base_module_record/wizard/__init__.py b/addons/base_module_record/wizard/__init__.py
index 35353054f32..8cd013423e6 100644
--- a/addons/base_module_record/wizard/__init__.py
+++ b/addons/base_module_record/wizard/__init__.py
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
-# OpenERP, Open Source Management Solution
+# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved
# $Id$
#
@@ -22,5 +22,6 @@
import base_module_record
import base_module_save
+import base_module_record_objects
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
new file mode 100644
index 00000000000..a645b3063d5
--- /dev/null
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -0,0 +1,145 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import wizard
+import osv
+import pooler
+import time
+import base_module_save
+info = '''
+'''
+
+intro_start_form = '''
+'''
+
+intro_start_fields = {
+ 'check_date': {'string':"Record from Date",'type':'datetime','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')},
+ 'objects':{'string': 'Objects', 'type': 'many2many', 'relation': 'ir.model', 'help': 'List of objects to be recorded'},
+ 'filter_cond':{'string':'Records only', 'type':'selection','selection':[('created','Created'),('modified','Modified'),('created_modified','Created & Modified')], 'required':True, 'default': lambda *args:'created'},
+
+}
+
+def _info_default(self, cr, uid, data, context):
+ pool = pooler.get_pool(cr.dbname)
+ mod = pool.get('ir.model')
+ list=('ir.ui.view','ir.ui.menu','ir.model','ir.model.fields','ir.model.access',\
+ 'res.partner','res.partner.address','res.partner.category','workflow',\
+ 'workflow.activity','workflow.transition','ir.actions.server','ir.server.object.lines')
+ data['form']['objects']=mod.search(cr,uid,[('model','in',list)])
+ cr.execute('select max(create_date) from ir_model_data')
+ c=(((cr.fetchone())[0]).partition('.'))[0]
+ c = time.strptime(c,"%Y-%m-%d %H:%M:%S")
+ sec=c.tm_sec + 1
+ c=(c[0],c[1],c[2],c[3],c[4],sec,c[6],c[7],c[8])
+ data['form']['check_date']=time.strftime("%Y-%m-%d %H:%M:%S",c)
+ return data['form']
+
+def _record_objects(self, cr, uid, data, context):
+ check_date=data['form']['check_date']
+ filter=data['form']['filter_cond']
+ pool = pooler.get_pool(cr.dbname)
+ user=(pool.get('res.users').browse(cr,uid,uid)).login
+ mod = pool.get('ir.module.record')
+ mod_obj = pool.get('ir.model')
+
+ for id in data['form']['objects'][0][2]:
+ obj_name=(mod_obj.browse(cr,uid,id)).model
+ obj_pool=pool.get(obj_name)
+ if filter =='created':
+ search_condition =[('create_date','>',check_date)]
+ elif filter =='modified':
+ search_condition =[('write_date','>',check_date)]
+ elif filter =='created_modified':
+ 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=[]
+ if '_auto' in dir(obj_pool):
+ if not obj_pool._auto:
+ continue
+ search_ids=obj_pool.search(cr,uid,search_condition)
+ for s_id in search_ids:
+ args=(cr.dbname,uid,user,obj_name,'copy',s_id,{},context)
+ mod.recording_data.append(('query',args, {},s_id))
+ return {}
+
+def inter_call(self,cr,uid,data,context):
+ res=base_module_save._create_module(self,cr, uid, data, context)
+ return res
+
+class base_module_record_objects(wizard.interface):
+ states = {
+ 'init': {
+ 'actions': [_info_default],
+ 'result': {
+ 'type':'form',
+ 'arch':intro_start_form,
+ 'fields': intro_start_fields,
+ 'state':[
+ ('end', 'Cancel', 'gtk-cancel'),
+ ('record', 'Record', 'gtk-ok'),
+ ]
+ }
+ },
+ 'record': {
+ 'actions': [],
+ 'result': {'type':'action','action':_record_objects,'state':'intro'}
+ },
+ 'intro': {
+ 'actions': [],
+ 'result': {
+ 'type':'form',
+ 'arch':base_module_save.intro_start_form,
+ 'fields':base_module_save.intro_start_fields,
+ 'state':[
+ ('end', 'Cancel', 'gtk-cancel'),
+ ('save', 'Continue', 'gtk-ok'),
+ ]
+ },
+ },
+ 'save': {
+ 'actions': [inter_call],
+ 'result': {
+ 'type':'form',
+ 'arch':base_module_save.intro_save_form,
+ 'fields': base_module_save.intro_save_fields,
+ 'state':[('end', 'Close', 'gtk-ok'),]
+ },
+ },
+ 'end': {
+ 'actions': [],
+ 'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','OK')]}
+ },
+ }
+base_module_record_objects('base_module_record.module_record_objects')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+