diff options
| -rw-r--r-- | indoteknik_api/controllers/api_v1/sale_order.py | 8 | ||||
| -rw-r--r-- | indoteknik_api/models/product_product.py | 2 | ||||
| -rw-r--r-- | indoteknik_api/models/res_users.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 685d5a21..950d98db 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -268,10 +268,10 @@ class SaleOrder(controller.Controller): 'tier2': product._get_pricelist_tier2, 'tier3': product._get_pricelist_tier3, } - pricelist_id = pricelist.id or False - if pricelist_id == product_pricelist_tier1: price_tier = 'tier1' - if pricelist_id == product_pricelist_tier2: price_tier = 'tier2' - if pricelist_id == product_pricelist_tier3: price_tier = 'tier3' + partner_pricelist_id = partner_pricelist.id if partner_pricelist else False + if partner_pricelist_id == product_pricelist_tier1: price_tier = 'tier1' + if partner_pricelist_id == product_pricelist_tier2: price_tier = 'tier2' + if partner_pricelist_id == product_pricelist_tier3: price_tier = 'tier3' if price_tier: price = pricelist[price_tier]() diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py index b32a0129..49ea7804 100644 --- a/indoteknik_api/models/product_product.py +++ b/indoteknik_api/models/product_product.py @@ -42,7 +42,7 @@ class ProductProduct(models.Model): 'tier2': product_product._get_pricelist_tier2, 'tier3': product_product._get_pricelist_tier3, } - pricelist_id = pricelist.id or False + pricelist_id = pricelist.id if pricelist else False if pricelist_id == product_pricelist_tier1: price_tier = 'tier1' if pricelist_id == product_pricelist_tier2: price_tier = 'tier2' if pricelist_id == product_pricelist_tier3: price_tier = 'tier3' diff --git a/indoteknik_api/models/res_users.py b/indoteknik_api/models/res_users.py index 3993201e..efe98815 100644 --- a/indoteknik_api/models/res_users.py +++ b/indoteknik_api/models/res_users.py @@ -11,7 +11,7 @@ class ResUsers(models.Model): product_pricelist_tier3 = int(config.get_param('product.pricelist.tier3')) user_pricelist = res_user.property_product_pricelist - user_pricelist_id = user_pricelist.id or False + user_pricelist_id = user_pricelist.id if user_pricelist else False pricelist_tier = False if user_pricelist_id == product_pricelist_tier1: pricelist_tier = 'tier1' if user_pricelist_id == product_pricelist_tier2: pricelist_tier = 'tier2' |