From dd2d0a6c903b1f9b73b78c59512fccec8dc745d4 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 4 Feb 2009 14:12:10 +0100 Subject: [PATCH] modifs bzr revid: fp@tinyerp.com-20090204131210-5pzw9yundt57gja9 --- addons/account_invoice_layout/account_invoice_layout.py | 4 ++-- addons/mrp_repair/mrp_repair.py | 8 ++++---- addons/process/process.py | 8 ++++---- addons/project/project.py | 4 ++-- addons/project_gtd/project_gtd.py | 4 ++-- addons/purchase/purchase.py | 4 ++-- addons/sale/sale.py | 9 ++------- addons/wiki/wiki.py | 4 ++-- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py index 44f0f872a78..b0215cf9a50 100644 --- a/addons/account_invoice_layout/account_invoice_layout.py +++ b/addons/account_invoice_layout/account_invoice_layout.py @@ -125,11 +125,11 @@ class account_invoice_line(osv.osv): vals['name'] = ' ' return super(account_invoice_line, self).write(cr, user, ids, vals, context) - def copy(self, cr, uid, id, default=None, context=None): + def copy_data(self, cr, uid, id, default=None, context=None): if default is None: default = {} default['state'] = self.browse(cr, uid, id).state - return super(account_invoice_line, self).copy(cr, uid, id, default, context) + return super(account_invoice_line, self).copy_data(cr, uid, id, default, context) def _fnct(self, cr, uid, id, name, args, context): res = {} diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 3d1ab1fbfc0..eb9fe390bd9 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -471,10 +471,10 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): _name = 'mrp.repair.line' _description = 'Repair Operations Lines' - def copy(self, cr, uid, id, default=None, context=None): + def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} default.update( {'invoice_line_id':False,'move_id':False,'invoiced':False,'state':'draft'}) - return super(mrp_repair_line, self).copy(cr, uid, id, default, context) + return super(mrp_repair_line, self).copy_data(cr, uid, id, default, context) def _amount_line(self, cr, uid, ids, field_name, arg, context): res = {} @@ -539,10 +539,10 @@ mrp_repair_line() class mrp_repair_fee(osv.osv, ProductChangeMixin): _name = 'mrp.repair.fee' _description = 'Repair Fees line' - def copy(self, cr, uid, id, default=None, context=None): + def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} default.update( {'invoice_line_id':False,'invoiced':False}) - return super(mrp_repair_fee, self).copy(cr, uid, id, default, context) + return super(mrp_repair_fee, self).copy_data(cr, uid, id, default, context) def _amount_line(self, cr, uid, ids, field_name, arg, context): res = {} cur_obj=self.pool.get('res.currency') diff --git a/addons/process/process.py b/addons/process/process.py index 5f02b67b879..ea350b0bf7e 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -318,14 +318,14 @@ class process_node(osv.osv): 'flow_start': lambda *args: False, } - def copy(self, cr, uid, id, default=None, context={}): + def copy_data(self, cr, uid, id, default=None, context={}): if not default: default = {} default.update({ 'transition_in': [], 'transition_out': [] }) - return super(process_node, self).copy(cr, uid, id, default, context) + return super(process_node, self).copy_data(cr, uid, id, default, context) process_node() @@ -375,7 +375,7 @@ class process_transition_action(osv.osv): 'state': lambda *args: 'dummy', } - def copy(self, cr, uid, id, default=None, context={}): + def copy_data(self, cr, uid, id, default=None, context={}): if not default: default = {} @@ -383,7 +383,7 @@ class process_transition_action(osv.osv): if state: default['state'] = state - return super(process_transition_action, self).copy(cr, uid, id, default, context) + return super(process_transition_action, self).copy_data(cr, uid, id, default, context) process_transition_action() diff --git a/addons/project/project.py b/addons/project/project.py index 2c5dcdb2630..fc0fca5d04d 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -248,10 +248,10 @@ class task(osv.osv): # ('remaining_hours', 'CHECK (remaining_hours>=0)', 'Please increase and review remaining hours ! It can not be smaller than 0.'), #] - def copy(self, cr, uid, id, default={},context={}): + def copy_data(self, cr, uid, id, default={},context={}): default = default or {} default['work_ids'] = [] - return super(task, self).copy(cr, uid, id, default, context) + return super(task, self).copy_data(cr, uid, id, default, context) _columns = { 'active': fields.boolean('Active'), diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py index 91754e31b5c..8d855149e3f 100644 --- a/addons/project_gtd/project_gtd.py +++ b/addons/project_gtd/project_gtd.py @@ -159,12 +159,12 @@ class project_task(osv.osv): 'timebox_id': fields.many2one('project.gtd.timebox', "Timebox"), 'context_id': fields.many2one('project.gtd.context', "Context"), } - def copy(self, cr, uid, id, default=None, context=None): + def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} default['timebox_id']=False default['context_id']=False - return super(project_task,self).copy(cr, uid, id, default, context) + return super(project_task,self).copy_data(cr, uid, id, default, context) def _get_context(self,cr, uid, ctx): ids = self.pool.get('project.gtd.context').search(cr, uid, [], context=ctx) return ids and ids[0] or False diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 84d8d086405..63051813ec0 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -442,11 +442,11 @@ class purchase_order_line(osv.osv): _table = 'purchase_order_line' _name = 'purchase.order.line' _description = 'Purchase Order lines' - def copy(self, cr, uid, id, default=None,context={}): + def copy_data(self, cr, uid, id, default=None,context={}): if not default: default = {} default.update({'state':'draft', 'move_id':False}) - return super(purchase_order_line, self).copy(cr, uid, id, default, context) + return super(purchase_order_line, self).copy_data(cr, uid, id, default, context) def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom, partner_id, date_order=False, fiscal_position=False): diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 6a89a14cda3..297dfffa630 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -672,11 +672,6 @@ sale_order() # - update it on change product and unit price # - use it in report if there is a uos class sale_order_line(osv.osv): - def copy(self, cr, uid, id, default=None, context={}): - if not default: default = {} - default.update( {'invoice_lines':[]}) - return super(sale_order_line, self).copy(cr, uid, id, default, context) - def _amount_line_net(self, cr, uid, ids, field_name, arg, context): res = {} for line in self.browse(cr, uid, ids): @@ -842,11 +837,11 @@ class sale_order_line(osv.osv): pass return {'value' : value} - def copy(self, cr, uid, id, default=None,context={}): + def copy_data(self, cr, uid, id, default=None,context={}): if not default: default = {} default.update({'state':'draft', 'move_ids':[], 'invoiced':False, 'invoice_lines':[]}) - return super(sale_order_line, self).copy(cr, uid, id, default, context) + return super(sale_order_line, self).copy_data(cr, uid, id, default, context) def product_id_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False, qty_uos=0, uos=False, name='', partner_id=False, diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py index 15677c56367..8bcf87aa63a 100644 --- a/addons/wiki/wiki.py +++ b/addons/wiki/wiki.py @@ -102,8 +102,8 @@ class Wiki(osv.osv): 'section': section } } - def copy(self, cr, uid, id, default=None, context=None): - return super(Wiki, self).copy(cr, uid, id, {'wiki_id':False}, context) + def copy_data(self, cr, uid, id, default=None, context=None): + return super(Wiki, self).copy_data(cr, uid, id, {'wiki_id':False}, context) def write(self, cr, uid, ids, vals, context=None): result = super(Wiki,self).write(cr, uid, ids, vals, context)