summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2017-05-16 17:17:46 +0200
committerJeremy Kersten <jke@odoo.com>2017-05-16 17:47:51 +0200
commit5bbe4a8ce79579628e7cc4fbb8a7e50afc4ce77b (patch)
treeac209bb6babb8d2f6b712bdb7b88b0655b7aaa88
parent490764ae11f1e435507e7813dfd5638de6b568d3 (diff)
[FIX] website_portal_sale: fix vat and name comparison in /my/account
Before this commit, we compare in some case False != u'' Commit #56c798a fix u'' != False but in case of the partner has been edited from front end, partner.vat will be u'' and not False
-rw-r--r--addons/website_portal_sale/controllers/main.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_portal_sale/controllers/main.py b/addons/website_portal_sale/controllers/main.py
index f3b7983c024..1b03ba6620d 100644
--- a/addons/website_portal_sale/controllers/main.py
+++ b/addons/website_portal_sale/controllers/main.py
@@ -178,10 +178,10 @@ class website_account(website_account):
partner = request.env['res.users'].browse(request.uid).partner_id
invoices = request.env['account.invoice'].sudo().search_count([('partner_id', '=', partner.id), ('state', 'not in', ['draft', 'cancel'])])
if invoices:
- if (data.get('vat', partner.vat) or False) != partner.vat:
+ if 'vat' in partner and (data['vat'] or False) != (partner.vat or False):
error['vat'] = 'error'
error_message.append(_('Changing VAT number is not allowed once invoices have been issued for your account. Please contact us directly for this operation.'))
- if data.get('name', partner.name) != partner.name:
+ if 'name' in data and (data['name'] or False) != (partner.name or False):
error['name'] = 'error'
error_message.append(_('Changing your name is not allowed once invoices have been issued for your account. Please contact us directly for this operation.'))
return error, error_message