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

1 files changed, 18 insertions, 5 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 9599548c..4049c535 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -95,13 +95,25 @@ class StockPicking(models.Model):
                 pick.approval_return_status = 'pengajuan1'
 
     def calculate_line_no(self):
-        line_no = 0
         for picking in self:
             for line in picking.move_ids_without_package:
-                if line.product_id.type == 'product':
-                    line_no += 1
-                    line.line_no = line_no
-                    # _logger.info('Calculate PO Line No %s' % line.id)
+                # order_lines = picking.group_id.order_line
+                name = picking.group_id.name
+                if picking.group_id.sale_id:
+                    order = self.env['sale.order'].search([('name', '=', name)], limit=1)
+                else:
+                    order = self.env['purchase.order'].search([('name', '=', name)], limit=1)
+
+                order_lines = order.order_line
+                set_line = 0
+
+                for order_line in order_lines:
+                    if line.product_id == order_line.product_id:
+                        set_line = order_line.line_no
+                        break
+                    else:
+                        continue
+                line.line_no = set_line
 
     def _compute_summary_qty(self):
         sum_qty_detail = sum_qty_operation = count_line_detail = count_line_operation = 0
@@ -153,6 +165,7 @@ class StockPicking(models.Model):
         self.approval_status = 'approved'
 
         res = super(StockPicking, self).button_validate()
+        self.calculate_line_no()
         return res
 
     @api.model