BAH-3662 | Refactor. Markup price is not used when sale qu… (#97)

* [Karthi] | BAH-3410 | Refactor. Markup price is not used when sale quotation is created from REST API and price list logic has been updated.

* [Karthi] | BAH-3662 | Refactor. If condition has been updated.

bahmni_api_feed/models/order_save_service.py

@@ -380,9 +380,6 @@ def _create_sale_order_line_function(self, sale_order, order):
                 'expiry_date': prod_lot.expiration_date if prod_lot else False,
             }
 
-            if prod_lot != None:
-                if bool(self.env['ir.config_parameter'].sudo().get_param('bahmni_sale.sale_price_markup')) == True:
-                    sale_order_line['price_unit'] = prod_lot.sale_price if prod_lot.sale_price > 0.0 else sale_order_line['price_unit']
 
             sale_obj = self.env['sale.order'].browse(sale_order)
             sale_line = sale_order_line_obj.create(sale_order_line)
@@ -398,7 +395,10 @@ def _create_sale_order_line_function(self, sale_order, order):
                     uom = prod_obj.uom_id.id
                 )
                 price = self.env['account.tax']._fix_tax_included_price_company(sale_line._get_display_price(), prod_obj.taxes_id, sale_line.tax_id, sale_line.company_id)
-
+                if prod_lot != None and bool(self.env['ir.config_parameter'].sudo().get_param('bahmni_sale.sale_price_markup')) == True:
+                    sale_line.price_unit = prod_lot.sale_price if prod_lot.sale_price > 0.0 else sale_line.price_unit
+                else:
+                    sale_line.price_unit = price if price > 0.0 else sale_line.price_unit
 
             if product_uom_qty != order['quantity']:
                 order['quantity'] = order['quantity'] - product_uom_qty