Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into cr_renca_find

merge

1 files changed, 2 insertions, 2 deletions

diff --git a/indoteknik_custom/models/requisition.py b/indoteknik_custom/models/requisition.py
index 64ef4fc8..748642eb 100644
--- a/indoteknik_custom/models/requisition.py
+++ b/indoteknik_custom/models/requisition.py
@@ -85,7 +85,7 @@ class Requisition(models.Model):
                     ('product_id', '=', prod_line.product_id.id), ('order_id', '=', req.sale_order_id.id)
                 ])
                 if match:
-                    raise UserError ('Product sudah di SO tidak approve/create PO')
+                    raise UserError ('Product sudah ada di SO tidak bisa approve/create PO')
 
 
     def button_approve(self):
@@ -108,7 +108,7 @@ class Requisition(models.Model):
             raise UserError('Tidak ada Lines, belum bisa create PO')
         if self.is_po:
             raise UserError('Sudah pernah di create PO')
-        if not self.sale_order_id:
+        if not self.sale_order_id and (not self.sales_approve or not self.merchandise_approve):
             raise UserError('Tidak ada link dengan Sales Order, tidak bisa dihitung sebagai Plafon Qty di PO')
 
         vendor_ids = self.env['requisition.line'].read_group([