From caf42da3e3decff49358cb4dc8cab7139dc5add1 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Fri, 30 Sep 2011 12:42:48 +0530 Subject: [PATCH 1/4] [FIX] point_of_sale: Fixed AttributeError on Make Payment wizard when no demo data loaded. lp bug: https://launchpad.net/bugs/856501 fixed bzr revid: uco@tinyerp.com-20110930071248-570qszd7rft2p6y3 --- addons/point_of_sale/point_of_sale.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index ee2173dcd49..650d421a38e 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -260,9 +260,16 @@ class pos_order(osv.osv): args['name'] = args['name'] + ': ' + data['payment_name'] account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context) args['account_id'] = order.partner_id and order.partner_id.property_account_receivable \ - and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id + and order.partner_id.property_account_receivable.id or account_def and account_def.id args['partner_id'] = order.partner_id and order.partner_id.id or None + if not args['account_id']: + msg = 'There is no receivable account defined' + if args['partner_id']: + msg += ' for this partner: "%s" (id:%d)' % \ + (order.partner_id.name, order.partner_id.id,) + raise osv.except_osv(_('Error !'), _('%s' %msg)) + statement_id = statement_obj.search(cr,uid, [ ('journal_id', '=', int(data['journal'])), ('company_id', '=', curr_company), From e8c77666e092284f34f8791ebc17cc998e56f9d6 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Fri, 30 Sep 2011 14:05:48 +0530 Subject: [PATCH 2/4] [IMP] point_of_sale: Improved string. bzr revid: uco@tinyerp.com-20110930083548-vm2x72t38dio33lo --- 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 650d421a38e..7ff11891653 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -264,7 +264,7 @@ class pos_order(osv.osv): args['partner_id'] = order.partner_id and order.partner_id.id or None if not args['account_id']: - msg = 'There is no receivable account defined' + msg = 'There is no receivable account defined to make payment' if args['partner_id']: msg += ' for this partner: "%s" (id:%d)' % \ (order.partner_id.name, order.partner_id.id,) From 0910749ef83bc553c059d53cea1b644f0501c4b6 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Fri, 30 Sep 2011 14:20:49 +0530 Subject: [PATCH 3/4] [IMP] point_of_sale: Small improvements. bzr revid: uco@tinyerp.com-20110930085049-53nfiptok3xcx37g --- addons/point_of_sale/point_of_sale.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 7ff11891653..799957444a3 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -260,7 +260,7 @@ class pos_order(osv.osv): args['name'] = args['name'] + ': ' + data['payment_name'] account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context) args['account_id'] = order.partner_id and order.partner_id.property_account_receivable \ - and order.partner_id.property_account_receivable.id or account_def and account_def.id + and order.partner_id.property_account_receivable.id or account_def and account_def.id or False args['partner_id'] = order.partner_id and order.partner_id.id or None if not args['account_id']: @@ -268,7 +268,7 @@ class pos_order(osv.osv): if args['partner_id']: msg += ' for this partner: "%s" (id:%d)' % \ (order.partner_id.name, order.partner_id.id,) - raise osv.except_osv(_('Error !'), _('%s' %msg)) + raise osv.except_osv(_('Configuration Error !'), _('%s' %msg)) statement_id = statement_obj.search(cr,uid, [ ('journal_id', '=', int(data['journal'])), From cab1f52242625bd6ffd6fb3038bf40ed9b06b45d Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 7 Oct 2011 15:22:46 +0200 Subject: [PATCH 4/4] [FIX] point_of_sale: error message translation if no receivable account defined for partner bzr revid: qdp-launchpad@openerp.com-20111007132246-2ilpi2t1ii6s4tnw --- addons/point_of_sale/point_of_sale.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 799957444a3..d87ece6994d 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -259,17 +259,17 @@ class pos_order(osv.osv): if data.get('payment_name', False): args['name'] = args['name'] + ': ' + data['payment_name'] account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context) - args['account_id'] = order.partner_id and order.partner_id.property_account_receivable \ - and order.partner_id.property_account_receivable.id or account_def and account_def.id or False + args['account_id'] = (order.partner_id and order.partner_id.property_account_receivable \ + and order.partner_id.property_account_receivable.id) or (account_def and account_def.id) or False args['partner_id'] = order.partner_id and order.partner_id.id or None if not args['account_id']: - msg = 'There is no receivable account defined to make payment' - if args['partner_id']: - msg += ' for this partner: "%s" (id:%d)' % \ - (order.partner_id.name, order.partner_id.id,) - raise osv.except_osv(_('Configuration Error !'), _('%s' %msg)) - + if not args['partner_id']: + msg = _('There is no receivable account defined to make payment') + else: + msg = _('There is no receivable account defined to make payment for the partner: "%s" (id:%d)') % (order.partner_id.name, order.partner_id.id,) + raise osv.except_osv(_('Configuration Error !'), msg) + statement_id = statement_obj.search(cr,uid, [ ('journal_id', '=', int(data['journal'])), ('company_id', '=', curr_company),