From cf6595baf2887f8a7f99fa2254f15ead01b6659c Mon Sep 17 00:00:00 2001 From: "sgo@tinyerp.com" <> Date: Mon, 21 Jan 2013 15:35:42 +0530 Subject: [PATCH 01/22] [IMP]remove total sale.shop from sales bzr revid: sgo@tinyerp.com-20130121100542-36qmkrd82md97phv --- .../portal_sale/security/ir.model.access.csv | 1 - addons/sale/report/sale_report.py | 3 - addons/sale/report/sale_report_view.xml | 3 - addons/sale/sale.py | 37 +---------- addons/sale/sale_data.xml | 14 ----- addons/sale/sale_demo.xml | 7 --- addons/sale/sale_unit_test.xml | 1 - addons/sale/sale_view.xml | 62 ++----------------- addons/sale/security/ir.model.access.csv | 4 -- addons/sale/security/sale_security.xml | 7 --- 10 files changed, 5 insertions(+), 134 deletions(-) diff --git a/addons/portal_sale/security/ir.model.access.csv b/addons/portal_sale/security/ir.model.access.csv index c73be67e8c9..37e27c54d36 100644 --- a/addons/portal_sale/security/ir.model.access.csv +++ b/addons/portal_sale/security/ir.model.access.csv @@ -11,7 +11,6 @@ access_account_move,account.move,account.model_account_move,portal.group_portal, access_account_move_line,account.move.line,account.model_account_move_line,portal.group_portal,1,0,0,0 access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,portal.group_portal,1,0,0,0 access_account_fiscalyear,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,portal.group_portal,1,0,0,0 -access_sale_shop,sale.shop,sale.model_sale_shop,portal.group_portal,1,0,0,0 access_product_list,product.pricelist,product.model_product_pricelist,portal.group_portal,1,0,0,0 access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0 access_account_tax,account.tax,account.model_account_tax,portal.group_portal,1,0,0,0 diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index a20ba01f300..5d057489253 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -40,7 +40,6 @@ class sale_report(osv.osv): 'product_uom_qty': fields.float('# of Qty', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), - 'shop_id': fields.many2one('sale.shop', 'Shop', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'user_id': fields.many2one('res.users', 'Salesperson', readonly=True), 'price_total': fields.float('Total Price', readonly=True), @@ -79,7 +78,6 @@ class sale_report(osv.osv): to_char(s.date_order, 'YYYY-MM-DD') as day, s.partner_id as partner_id, s.user_id as user_id, - s.shop_id as shop_id, s.company_id as company_id, extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay, s.state, @@ -104,7 +102,6 @@ class sale_report(osv.osv): s.date_confirm, s.partner_id, s.user_id, - s.shop_id, s.company_id, s.state, s.pricelist_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 8f725a9eacb..69e9cc5e119 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -13,7 +13,6 @@ - @@ -58,7 +57,6 @@ - @@ -70,7 +68,6 @@ - diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 66653c61849..fe7c8752078 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -29,22 +29,6 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FO import openerp.addons.decimal_precision as dp from openerp import netsvc -class sale_shop(osv.osv): - _name = "sale.shop" - _description = "Sales Shop" - _columns = { - 'name': fields.char('Shop Name', size=64, required=True), - 'payment_default_id': fields.many2one('account.payment.term', 'Default Payment Term', required=True), - 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'), - 'project_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]), - 'company_id': fields.many2one('res.company', 'Company', required=False), - } - _defaults = { - 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.shop', context=c), - } - -sale_shop() - class sale_order(osv.osv): _name = "sale.order" _inherit = ['mail.thread', 'ir.needaction_mixin'] @@ -56,16 +40,6 @@ class sale_order(osv.osv): }, } - def onchange_shop_id(self, cr, uid, ids, shop_id, context=None): - v = {} - if shop_id: - shop = self.pool.get('sale.shop').browse(cr, uid, shop_id, context=context) - if shop.project_id.id: - v['project_id'] = shop.project_id.id - if shop.pricelist_id.id: - v['pricelist_id'] = shop.pricelist_id.id - return {'value': v} - def copy(self, cr, uid, id, default=None, context=None): if not default: default = {} @@ -178,17 +152,9 @@ class sale_order(osv.osv): result[line.order_id.id] = True return result.keys() - def _get_default_shop(self, cr, uid, context=None): - company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id - shop_ids = self.pool.get('sale.shop').search(cr, uid, [('company_id','=',company_id)], context=context) - if not shop_ids: - raise osv.except_osv(_('Error!'), _('There is no default shop for the current user\'s company!')) - return shop_ids[0] - _columns = { 'name': fields.char('Order Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True), - 'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}), 'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."), 'client_order_ref': fields.char('Customer Reference', size=64), 'state': fields.selection([ @@ -249,7 +215,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.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True,readonly=True) + 'company_id': fields.many2one('res.company','Company') } _defaults = { 'date_order': fields.date.context_today, @@ -258,7 +224,6 @@ class sale_order(osv.osv): 'user_id': lambda obj, cr, uid, context: uid, 'name': lambda obj, cr, uid, context: '/', 'invoice_quantity': 'order', - 'shop_id': _get_default_shop, 'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'], 'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'], } diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml index 6d7cd043c39..8a6b1a8cbe3 100644 --- a/addons/sale/sale_data.xml +++ b/addons/sale/sale_data.xml @@ -19,20 +19,6 @@ sale.order - - - - - - - - - - - - mail.group diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 428b586ffa8..3a0fe8b3bc5 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -6,7 +6,6 @@ - @@ -45,7 +44,6 @@ - manual @@ -75,7 +73,6 @@ - manual @@ -105,7 +102,6 @@ - @@ -154,7 +150,6 @@ - @@ -193,7 +188,6 @@ - @@ -261,7 +255,6 @@ - manual diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml index 18a59320d9c..8d7d54d9640 100644 --- a/addons/sale/sale_unit_test.xml +++ b/addons/sale/sale_unit_test.xml @@ -3,7 +3,6 @@ - diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 18fdb739923..cd82d99c546 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -13,59 +13,6 @@ - - - sale.shop - sale.shop - -
-
- - - - sale.shop - sale.shop - - - - - - - - - - - Shop - ir.actions.act_window - sale.shop - form - tree,form - - -

- Click to define a new sale shop. -

- Each quotation or sales order must be linked to a shop. The - shop also defines the warehouse from which the products will be - delivered for each particular sales. -

- - - - sale.order.calendar sale.order @@ -160,7 +107,6 @@ - @@ -178,13 +124,13 @@ From 6dac31941aa8a0eb9d4b037cb59a8de75a3f132a Mon Sep 17 00:00:00 2001 From: "sgo@tinyerp.com" <> Date: Thu, 7 Feb 2013 12:54:40 +0530 Subject: [PATCH 15/22] [IMP]improve code bzr revid: sgo@tinyerp.com-20130207072440-ekqkxi0o5cxe9iz0 --- addons/point_of_sale/point_of_sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index ebb87d02f26..bcdf3a55873 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -115,7 +115,7 @@ 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) + res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',user.company_id.id)], context=context) return res and res[0] or False def _default_pricelist(self, cr, uid, context=None): From d7bd9743a2580ec1ee9eb77743a151f8c3d71608 Mon Sep 17 00:00:00 2001 From: "sgo@tinyerp.com" <> Date: Thu, 7 Feb 2013 15:28:27 +0530 Subject: [PATCH 16/22] [IMP]improve pos config view bzr revid: sgo@tinyerp.com-20130207095827-oaya9xo9cjroqcex --- addons/point_of_sale/point_of_sale_view.xml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index a3628761173..dbd5e731db1 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -773,16 +773,12 @@

- - - - - - - - - - + + + + + + From d187245d7083ddcd8ffd61a6410296e74cb4b24f Mon Sep 17 00:00:00 2001 From: "sgo@tinyerp.com" <> Date: Wed, 17 Apr 2013 12:26:14 +0530 Subject: [PATCH 17/22] [IMP]improve code bzr revid: sgo@tinyerp.com-20130417065614-tobshhmomx82zkaa --- addons/point_of_sale/report/pos_receipt.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml index 0802114bb48..02b8a5b1a1a 100644 --- a/addons/point_of_sale/report/pos_receipt.rml +++ b/addons/point_of_sale/report/pos_receipt.rml @@ -75,7 +75,7 @@ [[ address and display_address(address)]] Tel : [[ address and address.phone ]] User : [[ o.user_id.name ]] - Shop : [[ o.shop_id.name ]] + Warehouse : [[ o.warehouse_id.name ]] Date : [[ o.date_order ]] From 5418e395731507f1ac2bd06642aeb05d4c481fea Mon Sep 17 00:00:00 2001 From: "sgo@tinyerp.com" <> Date: Fri, 7 Jun 2013 15:31:29 +0530 Subject: [PATCH 18/22] [IMP]make warehouse required true and improve warning when there is no warehouse define for current company bzr revid: sgo@tinyerp.com-20130607100129-vyvxbhbckakc7kr6 --- addons/sale_stock/sale_stock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 9c71382af17..8fcf6fc47a7 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -70,7 +70,7 @@ class sale_order(osv.osv): 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) if not warehouse_ids: - raise osv.except_osv(_('Error!'), _('There is no default location for the current user\'s company!')) + raise osv.except_osv(_('Error!'), _('There is no warehouse defined for the current company!')) return warehouse_ids[0] # This is False @@ -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'), + '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)]}), From 8f5433c9901c602591b46b6d7aaebc1bcc9a1d04 Mon Sep 17 00:00:00 2001 From: "sgo@tinyerp.com" <> Date: Fri, 7 Jun 2013 17:21:31 +0530 Subject: [PATCH 19/22] [IMP]add group by warehouse in sales analysis bzr revid: sgo@tinyerp.com-20130607115131-m72rx8ulr54sur9a --- addons/sale_stock/report/sale_report.py | 3 +++ addons/sale_stock/report/sale_report_view.xml | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py index c1f79e323b7..0feb3ee2392 100644 --- a/addons/sale_stock/report/sale_report.py +++ b/addons/sale_stock/report/sale_report.py @@ -27,6 +27,7 @@ class sale_report(osv.osv): _columns = { 'shipped': fields.boolean('Shipped', readonly=True), 'shipped_qty_1': fields.integer('Shipped', readonly=True), + 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',readonly=True), 'state': fields.selection([ ('draft', 'Quotation'), ('waiting_date', 'Waiting Schedule'), @@ -58,6 +59,7 @@ class sale_report(osv.osv): s.partner_id as partner_id, s.user_id as user_id, s.company_id as company_id, + s.warehouse_id as warehouse_id, extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay, s.state, t.categ_id as categ_id, @@ -82,6 +84,7 @@ class sale_report(osv.osv): s.date_confirm, s.partner_id, s.user_id, + s.warehouse_id, s.company_id, s.state, s.shipped, diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml index ae8b12ca168..6642bffcede 100644 --- a/addons/sale_stock/report/sale_report_view.xml +++ b/addons/sale_stock/report/sale_report_view.xml @@ -7,9 +7,20 @@ + + + sale.report.search.sale.stock + sale.report + + + + + + + \ No newline at end of file From c99ac69e618dc3c3a80d4c9b30173fa6f2b5599b Mon Sep 17 00:00:00 2001 From: "sgo@tinyerp.com" <> Date: Tue, 11 Jun 2013 14:08:59 +0530 Subject: [PATCH 20/22] [IMP]improve message string bzr revid: sgo@tinyerp.com-20130611083859-tamafus1vdohpjyg --- addons/sale_stock/sale_stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 8fcf6fc47a7..af3555d07f8 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -70,7 +70,7 @@ class sale_order(osv.osv): 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) if not warehouse_ids: - raise osv.except_osv(_('Error!'), _('There is no warehouse defined for the current company!')) + raise osv.except_osv(_('Error!'), _('There is no warehouse defined for current company.')) return warehouse_ids[0] # This is False 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 21/22] [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} From e738adfafe01a579ebc3359de860a07381fde0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 14 Jun 2013 16:33:17 +0200 Subject: [PATCH 22/22] [FIX] sale, sale_stock: fixed calls to get_company taking an extra uid bzr revid: tde@openerp.com-20130614143317-65mbgfugskxqnxp7 --- addons/sale/sale.py | 2 +- addons/sale_stock/sale_stock.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 49fa8521e27..67c6f82ced3 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -152,7 +152,7 @@ class sale_order(osv.osv): return result.keys() def _get_default_company(self, cr, uid, context=None): - company_id = self.pool.get('res.users')._get_company(cr, uid, uid, context=context) + company_id = self.pool.get('res.users')._get_company(cr, uid, context=context) if not company_id: raise osv.except_osv(_('Error!'), _('There is no default company for the current user!')) return company_id diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index a47a77a7e3d..3f7ac28c900 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -67,7 +67,7 @@ class sale_order(osv.osv): return order def _get_default_warehouse(self, cr, uid, context=None): - company_id = self.pool.get('res.users')._get_company(cr, uid, uid, context=context) + company_id = self.pool.get('res.users')._get_company(cr, 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.'))