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

# Conflicts:
#	indoteknik_custom/models/stock_picking.py

1 files changed, 8 insertions, 8 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 02da5b61..0071bb1a 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1012,15 +1012,15 @@ class StockPicking(models.Model):
         self.sale_id.date_doc_kirim = self.date_doc_kirim
 
     def action_assign(self):
-        # if self.sale_id.hold_outgoing == True and self.location_id.id == 57 and self.location_dest_id.id == 60:
-        #     raise UserError("SO on hold")
-        res = super(StockPicking, self).action_assign()
-        # current_time = datetime.datetime.utcnow()
-        # self.real_shipping_id = self.sale_id.real_shipping_id
-        # self.date_availability = current_time
+        if self.sale_id.hold_outgoing and self.location_id.id == 57 and self.location_dest_id.id == 60:
+            print(1)
+        else:
+            res = super(StockPicking, self).action_assign()
+            current_time = datetime.datetime.utcnow()
+            self.real_shipping_id = self.sale_id.real_shipping_id
+            self.date_availability = current_time
         # self.check_state_reserve()
-        return res
-    
+            return res
 
     def ask_approval(self):
         if self.env.user.is_accounting: