Merge branch 'master' into po-approval

1 files changed, 19 insertions, 1 deletions

diff --git a/indoteknik_custom/models/delivery_order.py b/indoteknik_custom/models/delivery_order.py
index 06cdd878..aa0d6e6e 100644
--- a/indoteknik_custom/models/delivery_order.py
+++ b/indoteknik_custom/models/delivery_order.py
@@ -27,15 +27,25 @@ class DeliveryOrder(models.TransientModel):
                 picking = self.env['stock.picking'].search([('picking_code', '=', delivery_order_line[2]['name'])], limit=1)
 
             if picking:
+                line_tracking_no = delivery_order_line[2]['tracking_no']
+
                 if not picking.driver_id:
                     picking.driver_id = self.env.uid
-                picking.delivery_tracking_no = delivery_order_line[2]['tracking_no']
+                picking.delivery_tracking_no = line_tracking_no
 
                 delivery_type = self.env['delivery.order.line'].get_delivery_type(picking.driver_departure_date, picking.driver_arrival_date)
                 if delivery_type == 'departure':
                     picking.driver_departure_date = current_time
                 elif delivery_type == 'arrival':
                     picking.driver_arrival_date = current_time
+
+                    sale_order = False
+                    if picking.origin:
+                        sale_order = self.env['sale.order'].search([('name', '=', picking.origin)], limit=1)
+                    if sale_order.carrier_id:
+                        if not line_tracking_no and not (sale_order.carrier_id.id == 1 or sale_order.carrier_id.name == 'INDOTEKNIK DELIVERY'):
+                            raise UserError('Pengiriman selain Indoteknik Delivery, nomor tracking harus diisi')
+
         return super(DeliveryOrder, self).create(vals)
 
     def save_delivery(self):
@@ -58,6 +68,7 @@ class DeliveryOrderLine(models.TransientModel):
     driver_id = fields.Many2one(comodel_name='res.users', string='Driver')
     departure_date = fields.Char(string='Departure Date')
     arrival_date = fields.Char(string='Arrival Date')
+    carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method')
     tracking_no = fields.Char(string='Tracking No')
     delivery_order_id = fields.Many2one('delivery.order', string='Delivery Order')
 
@@ -75,6 +86,13 @@ class DeliveryOrderLine(models.TransientModel):
                 else:
                     self.driver_id = self.env.uid
 
+                sale_order = False
+                if picking.origin:
+                    sale_order = self.env['sale.order'].search([('name', '=', picking.origin)], limit=1)
+
+                if sale_order.carrier_id:
+                    self.carrier_id = sale_order.carrier_id
+
                 self.tracking_no = picking.delivery_tracking_no
 
                 delivery_type = self.get_delivery_type(picking.driver_departure_date, picking.driver_arrival_date)