Merge branch 'production' into change/feature/promotion-program

1 files changed, 27 insertions, 5 deletions

diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 69328325..eda003c7 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -18,7 +18,13 @@ class SaleOrderLine(models.Model):
     delivery_amt_line = fields.Float('DeliveryAmtLine', compute='compute_delivery_amt_line')
     fee_third_party_line = fields.Float('FeeThirdPartyLine', compute='compute_fee_third_party_line', default=0)
     line_no = fields.Integer('No', default=0, copy=False)
-    note_procurement = fields.Char(string='Note', help="Harap diisi jika ada keterangan tambahan dari Procurement, agar dapat dimonitoring")
+    note = fields.Selection([
+        ('eta', 'ETA'),
+        ('info_sales', 'Info Sales'),
+        ('info_vendor', 'Info Vendor'),
+        ('penggabungan', 'Penggabungan'),
+    ], string='Note', help="Harap diisi jika ada keterangan tambahan dari Procurement, agar dapat dimonitoring")
+    note_procurement = fields.Char(string='Note Detail', help="Harap diisi jika ada keterangan tambahan dari Procurement, agar dapat dimonitoring")
     vendor_subtotal = fields.Float(string='Vendor Subtotal', compute="_compute_vendor_subtotal")
     amount_voucher_disc = fields.Float(string='Voucher Discount')
     
@@ -66,21 +72,37 @@ class SaleOrderLine(models.Model):
             cost = self.product_id.standard_price
             self.purchase_price = cost
         else:
+            # purchase_price = self.env['purchase.pricelist'].search(
+            #     [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)], limit=1)
             purchase_price = self.env['purchase.pricelist'].search(
-                [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)], limit=1)
-            self.purchase_price = purchase_price.product_price
+                [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)], 
+                limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
+            self.purchase_price = self._get_valid_purchase_price(purchase_price)
         self.purchase_tax_id = 22
 
+    def _get_valid_purchase_price(self, purchase_price):
+        p_price = 0
+        if purchase_price.system_price > 0 and purchase_price.product_price > 0:
+            if purchase_price.human_last_update > purchase_price.system_last_update:
+                p_price = purchase_price.product_price
+            else:
+                p_price = purchase_price.system_price
+        elif purchase_price.system_price > 0 and purchase_price.product_price == 0:
+            p_price = purchase_price.system_price
+        elif purchase_price.system_price == 0 and purchase_price.product_price > 0:
+            p_price = purchase_price.product_price
+        return p_price
+
     @api.onchange('product_id')
     def product_id_change(self):
         super(SaleOrderLine, self).product_id_change()
         for line in self:
             if line.product_id and line.product_id.type == 'product':
                 purchase_price = self.env['purchase.pricelist'].search(
-                    [('product_id', '=', self.product_id.id)], limit=1, order='product_price ASC')
+                    [('product_id', '=', self.product_id.id)], limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
                 line.vendor_id = purchase_price.vendor_id
                 line.tax_id = line.order_id.sales_tax_id
-                line.purchase_price = purchase_price.product_price
+                line.purchase_price = self._get_valid_purchase_price(purchase_price)
 
     def compute_delivery_amt_line(self):
         for line in self: