validation duplicate barcode product and barcode box, cr date doc kirim, validation duplicate product id on so line

1 files changed, 6 insertions, 6 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 6168d3b2..f812df86 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -102,10 +102,9 @@ class StockPicking(models.Model):
     ], 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", tracking=True, copy=False)
     note_logistic = fields.Selection([
-        ('hold', 'Hold by Sales'),
+        ('wait_so_together', 'Tunggu SO Barengan'),
         ('not_paid', 'Customer belum bayar'),
-        ('partial', 'Kirim Parsial'),
-        ('indent', 'Indent'),
+        ('reserve_stock', 'Reserve Stock'),
         ('waiting_schedule', 'Menunggu Jadwal Kirim'),
         ('self_pickup', 'Barang belum di pickup Customer'),
         ('expedition_closed', 'Eskpedisi belum buka')
@@ -141,7 +140,8 @@ class StockPicking(models.Model):
         ('done', 'Done'),
         ('cancel', 'Cancelled'),
     ], string='Status Reserve', tracking=True, copy=False, help="The current state of the stock picking.")
-    notee = fields.Text(string="Note")
+    notee = fields.Text(string="Note SJ", help="Catatan untuk kirim barang")
+    note_info = fields.Text(string="Note", help="Catatan untuk pengiriman")
     state_approve_md = fields.Selection([
         ('waiting', 'Waiting For Approve by MD'),
         ('pending', 'Pending (perlu koordinasi dengan MD)'),
@@ -253,7 +253,7 @@ class StockPicking(models.Model):
 
     def _check_date_doc_kirim_modification(self):
         for record in self:
-            if record.last_update_date_doc_kirim:
+            if record.last_update_date_doc_kirim and not self.env.context.get('from_button_approve'):
                 kirim_date = fields.Datetime.from_string(record.last_update_date_doc_kirim)
                 now = fields.Datetime.now()
                 
@@ -275,7 +275,7 @@ class StockPicking(models.Model):
 
                 if invoice and not self.env.context.get('active_model') == 'stock.picking':
                     rec._check_date_doc_kirim_modification()
-                    if rec.date_doc_kirim != invoice.invoice_date:
+                    if rec.date_doc_kirim != invoice.invoice_date and not self.env.context.get('from_button_approve'):
                         get_approval_invoice_date = self.env['approval.invoice.date'].search([('picking_id', '=', rec.id),('state', '=', 'draft')], limit=1)
 
                         if get_approval_invoice_date and get_approval_invoice_date.state == 'draft':