push

2 files changed, 41 insertions, 4 deletions

diff --git a/indoteknik_custom/models/shipment_group.py b/indoteknik_custom/models/shipment_group.py
index df3f1bb4..b7d7ac12 100644
--- a/indoteknik_custom/models/shipment_group.py
+++ b/indoteknik_custom/models/shipment_group.py
@@ -14,6 +14,13 @@ class ShipmentGroup(models.Model):
     number = fields.Char(string='Document No', index=True, copy=False, readonly=True, tracking=True)
     shipment_line = fields.One2many('shipment.group.line', 'shipment_id', string='Shipment Group Lines', auto_join=True)
     partner_id = fields.Many2one('res.partner', string='Customer')
+    carrier_id = fields.Many2one('delivery.carrier', string='Ekspedisi')
+    total_colly_line = fields.Float(string='Total Colly', compute='_compute_total_colly_line')
+
+    @api.depends('shipment_line.total_colly')
+    def _compute_total_colly_line(self):
+        for rec in self:
+            rec.total_colly_line = sum(rec.shipment_line.mapped('total_colly'))
 
     @api.model
     def create(self, vals):
@@ -35,6 +42,26 @@ class ShipmentGroupLine(models.Model):
         ('indoteknik', 'Indoteknik'),
         ('customer', 'Customer')
     ], string='Shipping Paid by', copy=False)
+    total_colly = fields.Float(string='Total Colly')
+    carrier_id = fields.Many2one('delivery.carrier', string='Ekspedisi')
+
+    @api.constrains('picking_id')
+    def _check_picking_id(self):
+        for rec in self:
+            if not rec.picking_id:
+                continue
+                
+            duplicates = self.env['shipment.group.line'].search([
+                ('picking_id', '=', rec.picking_id.id),
+                ('id', '!=', rec.id)
+            ])
+            
+            if duplicates:
+                shipment_numbers = duplicates.mapped('shipment_id.number')
+                raise UserError(
+                    f"Picking {rec.picking_id.name} sudah discan dalam shipment group berikut: {', '.join(shipment_numbers)}! "
+                    "Satu picking hanya boleh dimasukkan dalam satu shipment group."
+                )
 
     @api.depends('picking_id.state')
     def _compute_state(self):
@@ -63,12 +90,20 @@ class ShipmentGroupLine(models.Model):
             if self.shipment_id.partner_id and self.shipment_id.partner_id != picking.partner_id:
                 raise UserError('Partner must be same as shipment group')
 
+            if self.shipment_id.carrier_id and self.shipment_id.carrier_id != picking.carrier_id:
+                raise UserError('carrier must be same as shipment group')
+            
             self.partner_id = picking.partner_id
             self.shipping_paid_by = picking.sale_id.shipping_paid_by
+            self.carrier_id = picking.carrier_id.id
+            self.total_colly = picking.total_mapping_koli
 
             if not self.shipment_id.partner_id:
                 self.shipment_id.partner_id = picking.partner_id
 
+            if not self.shipment_id.carrier_id:
+                self.shipment_id.carrier_id = picking.carrier_id
+
             self.sale_id = picking.sale_id
 
     @api.model
diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml
index e9eec41b..d2c661ba 100644
--- a/indoteknik_custom/views/shipment_group.xml
+++ b/indoteknik_custom/views/shipment_group.xml
@@ -7,6 +7,8 @@
             <tree default_order="create_date desc">
                 <field name="number"/>
                 <field name="partner_id"/>
+                <field name="carrier_id"/>
+                <field name="total_colly_line"/>
             </tree>
         </field>
     </record>
@@ -16,11 +18,9 @@
         <field name="model">shipment.group.line</field>
         <field name="arch" type="xml">
             <tree editable="bottom">
-                <field name="picking_id" required="1"/>
-                <field name="partner_id" readonly="1"/>
                 <field name="sale_id" readonly="1"/>
-                <field name="shipping_paid_by" readonly="1"/>
-                <field name="state" readonly="1"/>
+                <field name="picking_id" required="1"/>
+                <field name="total_colly" readonly="1"/>
             </tree>
         </field>
     </record>
@@ -37,6 +37,8 @@
                         </group>
                         <group>
                             <field name="partner_id" readonly="1"/> 
+                            <field name="carrier_id" readonly="1"/> 
+                            <field name="total_colly_line" readonly="1"/> 
                         </group>
                     </group>
                     <notebook>