bzr revid: fp@tinyerp.com-20081209130737-rr5i220h2sbte8ov
This commit is contained in:
Fabien Pinckaers 2008-12-09 14:07:37 +01:00
commit 06cff838ec
4 changed files with 9 additions and 6 deletions

View File

@ -153,7 +153,10 @@ class base_module_record(osv.osv):
else:
fname = self.pool.get(model)._inherit_fields[key][2]._fields_id
valitem[2][fname] = record_id
newid = self._create_id(cr, uid, fields[key]['relation'], valitem[2])
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

View File

@ -225,8 +225,8 @@ membership_line()
class Partner(osv.osv):
'''Partner'''
def _membership_state_search_inv(self,cr,uid,ids):
data_inv = self.pool.get('account.invoice').browse(cr,uid,ids)
def _membership_state_search_inv(self, cr, uid, ids, context=None):
data_inv = self.pool.get('account.invoice').browse(cr, uid, ids, context)
list_partner = []
for data in data_inv:
list_partner.append(data.partner_id.id)

View File

@ -138,8 +138,8 @@ mrp_operations_operation_code()
class mrp_operations_operation(osv.osv):
_name="mrp_operations.operation"
def _order_date_search_production(self,cr,uid,ids):
operation_ids=self.pool.get('mrp_operations.operation').search(cr,uid,[('production_id','=',ids[0])])
def _order_date_search_production(self, cr, uid, ids, context=None):
operation_ids=self.pool.get('mrp_operations.operation').search(cr, uid, [('production_id','=',ids[0])], context=context)
return operation_ids
def _get_order_date(self, cr, uid, ids, field_name, arg, context):

View File

@ -57,7 +57,7 @@ class project_work(osv.osv):
if line_id in list_avail_ids:
obj = self.pool.get('hr.analytic.timesheet')
if 'name' in vals:
vals_line['name']=task.name+': '+vals['name']
vals_line['name']=task.name+': '+vals['name']
if 'user_id' in vals:
vals_line['user_id']=vals['user_id']
if 'date' in vals: