Improve recorder for copy and one2many
bzr revid: hda@hda-20090416094059-mhen66pj1lge4nn2
This commit is contained in:
parent
7b496b57b5
commit
c36008b0aa
|
@ -151,10 +151,13 @@ class base_module_record(osv.osv):
|
|||
else:
|
||||
fname = self.pool.get(model)._inherit_fields[key][2]._fields_id
|
||||
valitem[2][fname] = record_id
|
||||
if valitem[0]==0:
|
||||
newid,update = self._get_id(cr, uid, fields[key]['relation'], valitem[1])
|
||||
if not newid:
|
||||
newid = self._create_id(cr, uid, fields[key]['relation'], valitem[2])
|
||||
else:
|
||||
newid,update = self._get_id(cr, uid, fields[key]['relation'], valitem[1])
|
||||
# if valitem[0]==0:
|
||||
# newid = self._create_id(cr, uid, fields[key]['relation'], valitem[2])
|
||||
# else:
|
||||
# newid,update = self._get_id(cr, uid, fields[key]['relation'], valitem[1])
|
||||
childrecord, update = self._create_record(cr, uid, doc, fields[key]['relation'],valitem[2], newid)
|
||||
noupdate = noupdate or update
|
||||
record_list += childrecord
|
||||
|
@ -186,7 +189,7 @@ class base_module_record(osv.osv):
|
|||
record.appendChild(field)
|
||||
return record_list, noupdate
|
||||
|
||||
def get_copy_data(self, cr, uid,model,id,result):
|
||||
def get_copy_data(self, cr, uid, model, id, result):
|
||||
res = []
|
||||
obj=self.pool.get(model)
|
||||
data=obj.read(cr, uid,[id])
|
||||
|
@ -279,10 +282,7 @@ 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,update = self._get_id(cr, uid, rec[3], rec[5])
|
||||
if not id:
|
||||
id = self._create_id(cr, uid, rec[3],rec[6])
|
||||
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
|
||||
|
@ -324,7 +324,6 @@ class base_module_record(osv.osv):
|
|||
data.appendChild(res)
|
||||
elif rec[0]=='assert':
|
||||
pass
|
||||
|
||||
return doc.toprettyxml(indent="\t").encode('utf-8')
|
||||
base_module_record()
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
Loading…
Reference in New Issue