Merge commit '24649f8e939484759ef34e5e68f251d951f63c02'

Conflicts:
	indoteknik_custom/__manifest__.py
	indoteknik_custom/security/ir.model.access.csv

1 files changed, 12 insertions, 0 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index e63370f5..c8424121 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -59,6 +59,10 @@ class StockPicking(models.Model):
         ('approved', 'Approved'),
     ], string='Approval Return Status', readonly=True, copy=False, index=True, tracking=3, help="Approval Status untuk Return")
     date_doc_kirim = fields.Datetime(string='Tanggal Kirim di SJ', help="Tanggal Kirim di cetakan SJ, tidak berpengaruh ke Accounting")
+    note_logistic = fields.Selection([
+        ('hold', 'Hold by Sales'),
+        ('not_paid', 'Customer belum bayar')
+    ], string='Note', help='jika field ini diisi maka tidak akan dihitung ke lead time')
 
     def action_create_invoice_from_mr(self):
         """Create the invoice associated to the PO.
@@ -248,6 +252,9 @@ class StockPicking(models.Model):
         return
 
     def button_validate(self):
+        if self._name != 'stock.picking':
+            return super(StockPicking, self).button_validate()
+        
         if not self.picking_code:
             self.picking_code = self.env['ir.sequence'].next_by_code('stock.picking.code') or '0'
 
@@ -256,6 +263,11 @@ class StockPicking(models.Model):
 
         if self.is_internal_use and not self.env.user.is_accounting:
             raise UserError("Harus di Approve oleh Accounting")
+        
+        if self.group_id.sale_id:
+            if self.group_id.sale_id.payment_link_midtrans:
+                if self.group_id.sale_id.payment_status != 'settlement':
+                    raise UserError('Uang belum masuk (settlement), mohon konfirmasi ke sales atau finance')
 
         if self.is_internal_use:
             stock_move_lines = self.env['stock.move.line'].search([