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

1 files changed, 12 insertions, 1 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 2465fa96..065b1484 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -203,6 +203,16 @@ class StockPicking(models.Model):
     is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif', tracking=3)
     payment_term = fields.Char('Payment Term', compute='_get_partner_payment_term')
     is_rev_tg = fields.Boolean('Administrasi')
+    shipment_group_id = fields.Many2one('shipment.group', string='Shipment Group', compute='_compute_shipment_group_id')
+
+    @api.depends('shipment_group_id')
+    def _compute_shipment_group_id(self):
+        for record in self:
+            shipment_line = self.env['shipment.group.line'].search([('picking_id', '=', record.id)], limit=1)
+            if shipment_line:
+                record.shipment_group_id = shipment_line.shipment_id.id
+            else:
+                record.shipment_group_id = False
 
     @api.depends('sale_id.payment_term_id')
     def _get_partner_payment_term(self):
@@ -1387,7 +1397,8 @@ class StockPicking(models.Model):
                 ])
 
                 if quant:
-                    return quant.quantity
+                    return sum(quant.mapped('quantity'))
+                    # return quant.quantity
 
                 return 0