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

2 files changed, 9 insertions, 0 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 6550b859..b5f69fa2 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -372,6 +372,13 @@ class SaleOrder(models.Model):
         if self.hold_outgoing == True:
             self.hold_outgoing = False
         else:
+            pick = self.env['stock.picking'].search([
+                ('sale_id', '=', self.id),
+                ('state', 'not in', ['cancel', 'done']),
+                ('name', 'ilike', 'BU/PICK/%')
+            ])
+            for picking in pick:
+                picking.do_unreserve()
             self.hold_outgoing = True
 
     def _validate_uniform_taxes(self):
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index ac812a32..9b8f6775 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1012,6 +1012,8 @@ 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