Update sale_order.py and sale_order.xml - calculate margin with input purchase price

2 files changed, 20 insertions, 18 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 08e7281e..4d1550aa 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -95,7 +95,7 @@ class SaleOrder(models.Model):
                 total_margin += line.item_margin
             order.total_margin = total_margin
             if order.amount_untaxed > 0:
-                total_percent_margin = round((total_margin / order.amount_untaxed), 4) * 100
+                total_percent_margin = round((total_margin / order.amount_untaxed), 2) * 100
             order.total_percent_margin = total_percent_margin
 
     def compute_count_line_product(self):
@@ -126,12 +126,7 @@ class SaleOrderLine(models.Model):
     item_percent_margin = fields.Float(
         '%Margin', compute='compute_item_margin',
         help="Total % Margin in Sales Order Header")
-    vendor = fields.Many2one(
-        'res.partner', string='Vendor', readonly=True,
-        states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
-        required=True, change_default=True, index=True, tracking=1,
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",)
-    vendor = fields.Many2one(
+    vendor_id = fields.Many2one(
         'res.partner', string='Vendor', readonly=True,
         states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
         change_default=True, index=True, tracking=1,
@@ -142,17 +137,24 @@ class SaleOrderLine(models.Model):
 
     def compute_item_margin(self):
         for line in self:
-            if not line.product_id or line.price_unit <= 0 or line.product_uom_qty <= 0:
+            if not line.product_id or line.product_id.type == 'service' \
+                    or line.price_unit <= 0 or line.product_uom_qty <= 0 \
+                    or not line.vendor_id or not line.purchase_tax_id:
                 line.item_margin = 0
                 line.item_percent_margin = 0
                 continue
-            subtotal_untaxed = line.price_subtotal
-            purchase_pricelist = self.env['purchase.pricelist'].search(
-                [('product_id', '=', line.product_id.id)], limit=1, order='product_price')
-            purchase_pricelist_untaxed = 0
-            if purchase_pricelist.product_price > 0:
-                purchase_pricelist_untaxed = purchase_pricelist.product_price / 1.11
-            margin_per_item = subtotal_untaxed - (purchase_pricelist_untaxed * line.product_uom_qty)
+            # calculate margin without tax
+            sales_price = line.price_reduce_taxexcl * line.product_uom_qty
+            # minus with delivery if covered by indoteknik
+            if line.order_id.shipping_cost_covered:
+                sales_price -= round((line.order_id.delivery_amount / line.order_id.count_line_product), 2)
+
+            purchase_price = line.purchase_price
+            if line.purchase_tax_id.price_include:
+                purchase_price = line.purchase_price / 1.11
+
+            purchase_price = purchase_price * line.product_uom_qty
+            margin_per_item = sales_price - purchase_price
             line.item_margin = margin_per_item
-            if subtotal_untaxed > 0:
-                line.item_percent_margin = round((margin_per_item / subtotal_untaxed), 4) * 100
+            # if sales_price > 0:
+            line.item_percent_margin = round((margin_per_item / sales_price), 2) * 100
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 03a6b45c..0e2d2923 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -19,7 +19,7 @@
                     <field name="approval_status" />
                 </field>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
-                    <field name="vendor" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
+                    <field name="vendor_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
                     <field name="purchase_price" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
                     <field name="purchase_tax_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
                     <field name="item_margin" groups="sales_team.group_sale_manager"/>