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

1 files changed, 26 insertions, 8 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 3e152f10..82f81642 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"""
@@ -806,6 +810,7 @@ class StockPicking(models.Model):
             self.biteship_tracking_id = data.get("courier", {}).get("tracking_id", "")
             self.biteship_waybill_id = data.get("courier", {}).get("waybill_id", "")
             self.delivery_tracking_no = self.biteship_waybill_id
+            self.biteship_shipping_price = data.get("price", 0.0)
 
             waybill_id = self.biteship_waybill_id
 
@@ -1055,16 +1060,23 @@ class StockPicking(models.Model):
         self.sale_id.date_doc_kirim = self.date_doc_kirim
 
     def action_assign(self):
-        res = super(StockPicking, self).action_assign()
-        for move in self:
-            # if not move.sale_id.hold_outgoing and move.location_id.id != 57 and move.location_dest_id.id != 60:
-            # TODO cant skip hold outgoing cause of not singleton method
-            current_time = datetime.datetime.utcnow()
-            move.real_shipping_id = move.sale_id.real_shipping_id
-            move.date_availability = current_time
-        # self.check_state_reserve()
+        if self.env.context.get('default_picking_type_id'):
+            pickings_to_assign = self.filtered(
+                lambda p: not (p.sale_id and p.sale_id.hold_outgoing)
+            )
+        else:
+            pickings_to_assign = self
+
+        res = super(StockPicking, pickings_to_assign).action_assign()
+
+        current_time = datetime.datetime.utcnow()
+        for picking in pickings_to_assign:
+            picking.real_shipping_id = picking.sale_id.real_shipping_id
+            picking.date_availability = current_time
+
         return res
 
+
     def ask_approval(self):
         if self.env.user.is_accounting:
             raise UserError("Bisa langsung Validate")
@@ -1380,6 +1392,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):