From d5a50fd3465bd333abb3137874cb72c19a3fc920 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Wed, 4 Feb 2015 13:06:00 +0100 Subject: [PATCH] [FIX] sale: fiscal position wrongly taken based on country group. An automatic fiscal position with a country group can only match with a sale order from a customer who has a country defined. opw:627087 --- addons/account/partner.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/account/partner.py b/addons/account/partner.py index e23a2436c72..f6eaeb5fc08 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -127,14 +127,14 @@ class account_fiscal_position(osv.osv): ('auto_apply', '=', True), '|', ('vat_required', '=', False), ('vat_required', '=', partner.vat_subjected), ] + if delivery.country_id.id: + fiscal_position_ids = self.search(cr, uid, domain + [('country_id', '=', delivery.country_id.id)], context=context, limit=1) + if fiscal_position_ids: + return fiscal_position_ids[0] - fiscal_position_ids = self.search(cr, uid, domain + [('country_id', '=', delivery.country_id.id)], context=context, limit=1) - if fiscal_position_ids: - return fiscal_position_ids[0] - - fiscal_position_ids = self.search(cr, uid, domain + [('country_group_id.country_ids', '=', delivery.country_id.id)], context=context, limit=1) - if fiscal_position_ids: - return fiscal_position_ids[0] + fiscal_position_ids = self.search(cr, uid, domain + [('country_group_id.country_ids', '=', delivery.country_id.id)], context=context, limit=1) + if fiscal_position_ids: + return fiscal_position_ids[0] fiscal_position_ids = self.search(cr, uid, domain + [('country_id', '=', None), ('country_group_id', '=', None)], context=context, limit=1) if fiscal_position_ids: