Merge branch 'production' into commision-window

1 files changed, 19 insertions, 3 deletions

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index f81ecdcc..502761e0 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -105,15 +105,18 @@ class AutomaticPurchase(models.Model):
                     ('product_id', '=', point.product_id.id),
                     # ('product_id.x_manufacture.user_id.id', '=', self.responsible_id.id),
                     ('vendor_id', '=', self.vendor_id.id)
-                ], order='product_price asc', limit=1)
+                ], order='count_trx_po desc, count_trx_po_vendor desc', limit=1)
             else:
                 purchase_price = self.env['purchase.pricelist'].search([
                     ('product_id', '=', point.product_id.id),
                     # ('product_id.x_manufacture.user_id.id', '=', self.responsible_id.id),
-                ], order='product_price asc', limit=1)
+                ], order='count_trx_po desc, count_trx_po_vendor desc', limit=1)
 
             vendor_id = purchase_price.vendor_id.id
-            price = purchase_price.product_price or 0
+            price = self._get_valid_purchase_price(purchase_price)
+
+            if self.vendor_id and self.vendor_id.id != vendor_id:
+                continue
 
             self.env['automatic.purchase.line'].create([{
                 'automatic_purchase_id': self.id,
@@ -135,6 +138,19 @@ class AutomaticPurchase(models.Model):
             _logger.info('Create Automatic Purchase Line %s' % point.product_id.name)
         self.notification = "Automatic PO Created %s Lines" % count
 
+    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
+
 
 class AutomaticPurchaseLine(models.Model):
     _name = 'automatic.purchase.line'