From 38f28065798e3d248cc8df2458e9bb5f10241d6a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 14 Aug 2013 15:45:11 +0200 Subject: [PATCH] [FIX] point_of_sale: better default sale journal for new pos.config, use company of current user done to fix test in 01_order_to_payment.yml when creating pos.order default config can have journal of different company, will get exception if done with a journal of main company bzr revid: mat@openerp.com-20130814134511-c0f3z27f9p2gflt6 --- addons/point_of_sale/point_of_sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index cd87117310c..a965ce33dbd 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -109,7 +109,8 @@ class pos_config(osv.osv): return result def _default_sale_journal(self, cr, uid, context=None): - res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale')], limit=1) + company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context) + res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', company_id)], limit=1, context=context) return res and res[0] or False def _default_shop(self, cr, uid, context=None):