Merge branch 'odoo-backup' into feature/feedback_bitehisp

# Conflicts:
#	indoteknik_custom/models/__init__.py

1 files changed, 6 insertions, 1 deletions

diff --git a/indoteknik_custom/models/delivery_order.py b/indoteknik_custom/models/delivery_order.py
index 3473197b..2dd0c802 100644
--- a/indoteknik_custom/models/delivery_order.py
+++ b/indoteknik_custom/models/delivery_order.py
@@ -25,7 +25,8 @@ class DeliveryOrder(models.TransientModel):
             picking = False
             if delivery_order_line[2]['name']:
                 picking = self.env['stock.picking'].search([('picking_code', '=', delivery_order_line[2]['name'])], limit=1)
-
+                if not picking:
+                    picking = self.env['stock.picking'].search([('out_code', '=', delivery_order_line[2]['name'])], limit=1)
             if picking:
                 line_tracking_no = delivery_order_line[2]['tracking_no']
 
@@ -86,6 +87,10 @@ class DeliveryOrderLine(models.TransientModel):
             if len(self.name) == 13:
                 self.name = self.name[:-1]
             picking = self.env['stock.picking'].search([('picking_code', '=', self.name)], limit=1)
+
+            if not picking:
+                picking = self.env['stock.picking'].search([('out_code', '=', self.name)], limit=1)
+
             if picking:
                 if picking.driver_id:
                     self.driver_id = picking.driver_id