From bc58a5a2241a887da8445c693c42d95d68b15a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 14 Jun 2013 16:16:43 +0200 Subject: [PATCH] [CLEAN] Misc cleaning before merging. bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j --- addons/point_of_sale/point_of_sale.py | 6 +++--- addons/sale/sale.py | 6 +++--- addons/sale_stock/sale_stock.py | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 7ad2cc64b04..370aa2e55ff 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -115,11 +115,11 @@ class pos_config(osv.osv): def _default_warehouse(self, cr, uid, context=None): user = self.pool.get('res.users').browse(cr, uid, uid, context) - res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',user.company_id.id)], context=context) + res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', user.company_id.id)], limit=1, context=context) return res and res[0] or False - + def _default_pricelist(self, cr, uid, context=None): - res = self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale')]) + res = self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale')], limit=1, context=context) return res and res[0] or False _defaults = { diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 61168d92464..6f4275e7730 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -150,9 +150,9 @@ class sale_order(osv.osv): for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context): result[line.order_id.id] = True return result.keys() - + def _get_default_company(self, cr, uid, context=None): - company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id + company_id = self.pool.get('res.users')._get_company(cr, uid, uid, context=context) if not company_id: raise osv.except_osv(_('Error!'), _('There is no default company for the current user!')) return company_id @@ -219,7 +219,7 @@ class sale_order(osv.osv): 'invoice_quantity': fields.selection([('order', 'Ordered Quantities')], 'Invoice on', help="The sales order will automatically create the invoice proposition (draft invoice).", required=True, readonly=True, states={'draft': [('readonly', False)]}), 'payment_term': fields.many2one('account.payment.term', 'Payment Term'), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'), - 'company_id': fields.many2one('res.company','Company') + 'company_id': fields.many2one('res.company', 'Company'), } _defaults = { 'date_order': fields.date.context_today, diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index af3555d07f8..f8f6a4dd8a5 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -63,12 +63,12 @@ class sale_order(osv.osv): vals.update({'invoice_quantity': 'order'}) if vals['order_policy'] == 'picking': vals.update({'invoice_quantity': 'procurement'}) - order = super(sale_order, self).create(cr, uid, vals, context=context) + order = super(sale_order, self).create(cr, uid, vals, context=context) return order - + def _get_default_warehouse(self, cr, uid, context=None): - company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id - warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',company_id)], context=context) + company_id = self.pool.get('res.users')._get_company(cr, uid, uid, context=context) + warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', company_id)], context=context) if not warehouse_ids: raise osv.except_osv(_('Error!'), _('There is no warehouse defined for current company.')) return warehouse_ids[0] @@ -140,7 +140,7 @@ class sale_order(osv.osv): 'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."), 'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."), 'picked_rate': fields.function(_picked_rate, string='Picked', type='float'), - 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',required=True), + 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True), 'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sales order will automatically create the invoice proposition (draft invoice).\ You have to choose if you want your invoice based on ordered ", required=True, readonly=True, states={'draft': [('readonly', False)]}), @@ -163,12 +163,12 @@ class sale_order(osv.osv): raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it.\nTo do so, you must first cancel related picking for delivery orders.')) return osv.osv.unlink(self, cr, uid, unlink_ids, context=context) - + def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context=None): val = {} if warehouse_id: warehouse = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context=context) - if warehouse.company_id.id: + if warehouse.company_id: val['company_id'] = warehouse.company_id.id return {'value': val}