Merge branch 'production' into iman/new-register

# Conflicts:
#	indoteknik_custom/models/res_users.py

1 files changed, 7 insertions, 2 deletions

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index 3561fc0f..548115e6 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -220,6 +220,7 @@ class AutomaticPurchase(models.Model):
         # i start from zero (0)
         for i in range(page):
             new_po = self.env['purchase.order'].create([param_header])
+            new_po.payment_term_id = new_po.partner_id.property_supplier_payment_term_id
             new_po.name = new_po.name + name + str(i + 1)
 
             self.env['automatic.purchase.match'].create([{
@@ -261,7 +262,7 @@ class AutomaticPurchase(models.Model):
                 new_po_line = self.env['purchase.order.line'].create([param_line])
                 line.current_po_id = new_po.id
                 line.current_po_line_id = new_po_line.id
-                self.update_purchase_price_so_line(line)
+                # self.update_purchase_price_so_line(line)
         
             self.create_purchase_order_sales_match(new_po)
 
@@ -292,6 +293,9 @@ class AutomaticPurchase(models.Model):
             sale_ids_set.add(sale_id_with_salesperson)
             sale_ids_name.add(sale_order.sale_id.name)
 
+            margin_item = sale_order.sale_line_id.item_margin / sale_order.qty_so if sale_order.qty_so else 0
+            margin_item = margin_item * sale_order.qty_po
+
             matches_so_line = {
                 'purchase_order_id': purchase_order.id,
                 'sale_id': sale_order.sale_id.id,
@@ -304,7 +308,8 @@ class AutomaticPurchase(models.Model):
                 'product_id': sale_order.product_id.id,
                 'qty_so': sale_order.qty_so,
                 'qty_po': sale_order.qty_po,
-                'margin_so': sale_order.sale_line_id.item_percent_margin
+                'margin_so': sale_order.sale_line_id.item_percent_margin,
+                'margin_item': margin_item
             }
             po_matches_so_line = self.env['purchase.order.sales.match'].create([matches_so_line])