Merge branch 'odoo-backup' into feature/feedback_bitehisp

# Conflicts:
#	indoteknik_custom/models/__init__.py

1 files changed, 5 insertions, 0 deletions

diff --git a/indoteknik_custom/models/logbook_sj.py b/indoteknik_custom/models/logbook_sj.py
index 9f349882..75b2622f 100644
--- a/indoteknik_custom/models/logbook_sj.py
+++ b/indoteknik_custom/models/logbook_sj.py
@@ -26,6 +26,8 @@ class LogbookSJ(models.TransientModel):
         report_logbook = self.env['report.logbook.sj'].create([parameters_header])
         for line in logbook_line:
             picking = self.env['stock.picking'].search([('picking_code', '=', line.name)], limit=1)
+            if not picking:
+                picking = self.env['stock.picking'].search([('out_code', '=', line.name)], limit=1)
             stock = picking
             parent_id = stock.partner_id.parent_id.id
             parent_id =  parent_id if parent_id else stock.partner_id.id
@@ -80,6 +82,9 @@ class LogbookSJLine(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