margin po

1 files changed, 6 insertions, 5 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index a653738a..5c23b9b8 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -487,6 +487,10 @@ class PurchaseOrder(models.Model):
     def compute_total_margin_from_apo(self):
         sum_so_margin = sum_sales_price = sum_margin = 0
         for line in self.order_sales_match_line:
+            po_line = self.env['purchase.order.line'].search([
+                ('product_id', '=', line.product_id.id),
+                ('order_id', '=', line.purchase_order_id.id)
+            ], limit=1)
             sale_order_line = line.sale_line_id
             if not sale_order_line:
                 sale_order_line = self.env['sale.order.line'].search([
@@ -495,16 +499,13 @@ class PurchaseOrder(models.Model):
                 ], limit=1, order='price_reduce_taxexcl')
 
             sum_so_margin += sale_order_line.item_margin
-            sales_price = sale_order_line.price_reduce_taxexcl * sale_order_line.product_uom_qty
+            # sales_price = sale_order_line.price_reduce_taxexcl * sale_order_line.product_uom_qty
+            sales_price = sale_order_line.price_reduce_taxexcl * po_line.product_qty
             if sale_order_line.order_id.shipping_cost_covered == 'indoteknik':
                 sales_price -= sale_order_line.delivery_amt_line
             if sale_order_line.order_id.fee_third_party > 0:
                 sales_price -= sale_order_line.fee_third_party_line
             sum_sales_price += sales_price
-            po_line = self.env['purchase.order.line'].search([
-                ('product_id', '=', line.product_id.id),
-                ('order_id', '=', line.purchase_order_id.id)
-            ], limit=1)
             purchase_price = po_line.price_subtotal
             if line.purchase_order_id.delivery_amount > 0:
                 purchase_price += line.delivery_amt_line