diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 1112ebd73b6..c5317950f1a 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -37,16 +37,16 @@ class crm_make_sale(osv.osv_memory): @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @param context: A standard dictionary for contextual values - @return : default value of partner_id field. + @return: default value of partner_id field. """ if not context: context = {} - + lead_obj = self.pool.get('crm.lead') active_id = context and context.get('active_id', False) or False if not active_id: return False - + lead = lead_obj.read(cr, uid, active_id, ['partner_id']) return lead['partner_id'] @@ -63,7 +63,7 @@ class crm_make_sale(osv.osv_memory): @param uid: the current user’s ID for security checks, @param ids: List of crm make sale' ids @param context: A standard dictionary for contextual values - @return : Dictionary value of created sale order. + @return: Dictionary value of created sale order. """ if not context: context = {} diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py index 10f2606955a..f94d9a9381e 100644 --- a/addons/sale_journal/sale_journal.py +++ b/addons/sale_journal/sale_journal.py @@ -68,10 +68,11 @@ class sale_journal(osv.osv): def button_sale_cancel(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'cancel'}) + obj_sale_order = self.pool.get('sale.order') + wf_service = netsvc.LocalService("workflow") for id in ids: - sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')]) + sale_ids = obj_sale_order.search(cr, uid, [('journal_id','=',id),('state','=','draft')]) for saleid in sale_ids: - wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'sale.order', saleid, 'cancel', cr) for (id,name) in self.name_get(cr, uid, ids): message = _('Sale order of Journal') + " '" + name + "' "+ _("is cancelled") @@ -80,10 +81,11 @@ class sale_journal(osv.osv): def button_sale_confirm(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'confirm'}) + obj_sale_order = self.pool.get('sale.order') + wf_service = netsvc.LocalService("workflow") for id in ids: - sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')]) + sale_ids = obj_sale_order.search(cr, uid, [('journal_id','=',id),('state','=','draft')]) for saleid in sale_ids: - wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'sale.order', saleid, 'order_confirm', cr) for (id,name) in self.name_get(cr, uid, ids): message = _('Sale orders of Journal') + " '" + name + "' "+ _("is confirmed") @@ -161,10 +163,11 @@ class picking_journal(osv.osv): } def button_picking_cancel(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'cancel'}) + wf_service = netsvc.LocalService("workflow") + obj_stock_pick = self.pool.get('stock.picking') for id in ids: - pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)]) + pick_ids = obj_stock_pick.search(cr, uid, [('journal_id','=',id)]) for pickid in pick_ids: - wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_cancel', cr) return True @@ -188,12 +191,12 @@ class picking_journal(osv.osv): return True def button_picking_confirm(self, cr, uid, ids, context={}): - + wf_service = netsvc.LocalService("workflow") self.write(cr, uid, ids, {'state':'confirm'}) + obj_stock_pick = self.pool.get('stock.picking') for id in ids: - pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)]) + pick_ids = obj_stock_pick.search(cr, uid, [('journal_id','=',id)]) for pickid in pick_ids: - wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr) return True @@ -250,9 +253,10 @@ class sale(osv.osv): } def action_ship_create(self, cr, uid, ids, *args): result = super(sale, self).action_ship_create(cr, uid, ids, *args) + obj_stock_pick = self.pool.get('stock.picking') for order in self.browse(cr, uid, ids, context={}): pids = [ x.id for x in order.picking_ids] - self.pool.get('stock.picking').write(cr, uid, pids, { + obj_stock_pick.write(cr, uid, pids, { 'invoice_type_id': order.invoice_type_id.id, 'sale_journal_id': order.journal_id.id }) diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py index 3e61a6cd3e9..847c2cb4834 100755 --- a/addons/sale_layout/report/report_sale_layout.py +++ b/addons/sale_layout/report/report_sale_layout.py @@ -46,10 +46,10 @@ class sale_order_1(report_sxw.rml_parse): info = [] order_lines = [] res = {} - - ids = self.pool.get('sale.order.line').search(self.cr, self.uid, [('order_id', '=', sale_order.id)]) + obj_order_line = self.pool.get('sale.order.line') + ids = obj_order_line.search(self.cr, self.uid, [('order_id', '=', sale_order.id)]) for id in range(0, len(ids)): - order = self.pool.get('sale.order.line').browse(self.cr, self.uid, ids[id], self.context.copy()) + order = obj_order_line.browse(self.cr, self.uid, ids[id], self.context.copy()) order_lines.append(order) i = 1 diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index daa8011246e..03b16962a71 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -83,7 +83,7 @@ class stock_picking(osv.osv): invoice_ids = [] margin_deduce = 0.0 picking_obj = self.pool.get('stock.picking') - picking_obj.write(cr, uid, ids, {'invoice_state' : '2binvoiced'}) + picking_obj.write(cr, uid, ids, {'invoice_state': '2binvoiced'}) res = picking_obj.action_invoice_create(cr, uid, ids, type='out_invoice', context={}) invoice_ids = res.values() picking_obj.write(cr, uid, ids,{'invoice_ids': [[6,0,invoice_ids]]}) @@ -107,6 +107,6 @@ class account_invoice_line(osv.osv): res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price']) vals['cost_price'] = res[0]['standard_price'] return super(account_invoice_line, self).create(cr, uid, vals, context) - + account_invoice_line() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file