From b6f186758d86ffa254c3bcf1f7bf683b57d701ed Mon Sep 17 00:00:00 2001 From: Victor Martin - Elico Corp Date: Thu, 25 May 2017 11:45:50 +0800 Subject: [PATCH] [FIX] business_requirement_deliverable (#143) * [FIX] business_requirement_deliverable - Add the estimation pricelist from customer to Deliverable calculation. * [FIX] business_requirement_deliverable - Fix remove unnecessary else --- .../models/business.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/business_requirement_deliverable/models/business.py b/business_requirement_deliverable/models/business.py index 59896603c..67c20d06d 100644 --- a/business_requirement_deliverable/models/business.py +++ b/business_requirement_deliverable/models/business.py @@ -189,14 +189,12 @@ def _compute_get_currency(self): @api.multi def _get_pricelist(self): for brd in self: - partner_id = False - if brd.business_requirement_id and ( - brd.business_requirement_id.partner_id - ): - partner_id = brd.business_requirement_id.partner_id - if partner_id and partner_id.property_product_pricelist: - return partner_id.property_product_pricelist - return partner_id + if brd.business_requirement_partner_id: + partner_id = brd.business_requirement_partner_id + return ( + partner_id.property_product_estimation_pricelist or + partner_id.property_product_pricelist) + return False @api.multi @api.depends('sale_price_unit', 'qty')