<hafid> merge conflict

1 files changed, 10 insertions, 0 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 3e152f10..92ca6e39 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -303,6 +303,10 @@ class StockPicking(models.Model):
     approval_invoice_date_id = fields.Many2one('approval.invoice.date', string='Approval Invoice Date')
     last_update_date_doc_kirim = fields.Datetime(string='Last Update Tanggal Kirim', copy=False)
     update_date_doc_kirim_add = fields.Boolean(string='Update Tanggal Kirim Lewat ADD')
+    reason_change_date_planned = fields.Selection([
+        ('delay', 'Delay By Vendor'),
+        ('urgent', 'Urgent Delivery'),
+    ], string='Reason Change Date Planned', tracking=True)
 
     def _get_kgx_awb_number(self):
         """Menggabungkan name dan origin untuk membuat AWB Number"""
@@ -1380,6 +1384,12 @@ class StockPicking(models.Model):
         self.send_mail_bills()
         if 'BU/PUT' in self.name:
             self.automatic_reserve_product()
+
+        if self.tukar_guling_id:
+            self.tukar_guling_id.update_doc_state()
+        elif self.tukar_guling_po_id:
+            self.tukar_guling_po_id.update_doc_state()
+
         return res
 
     def automatic_reserve_product(self):