Merged in ekspedisi (pull request #282)

Ekspedisi

1 files changed, 14 insertions, 0 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index bef2b00a..39d6fd0b 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -67,6 +67,17 @@ class ShippingOption(models.Model):
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
+    ongkir_ke_xpdc = fields.Float(string='Ongkir ke Ekspedisi', help='Biaya ongkir ekspedisi', copy=False, index=True, tracking=3)
+
+    metode_kirim_ke_xpdc = fields.Selection([
+        ('indoteknik_deliv', 'Indoteknik Delivery'),
+        ('lalamove', 'Lalamove'),
+        ('grab', 'Grab'),
+        ('gojek', 'Gojek'),
+        ('deliveree', 'Deliveree'),
+        ('other', 'Other'),
+    ], string='Metode Kirim Ke Ekspedisi', copy=False, index=True, tracking=3)
+
     koli_lines = fields.One2many('sales.order.koli', 'sale_order_id', string='Sales Order Koli', auto_join=True)
     fulfillment_line_v2 = fields.One2many('sales.order.fulfillment.v2', 'sale_order_id', string='Fullfillment2')
     fullfillment_line = fields.One2many('sales.order.fullfillment', 'sales_order_id', string='Fullfillment')
@@ -1471,6 +1482,9 @@ class SaleOrder(models.Model):
     def _compute_total_margin(self):
         for order in self:
             total_margin = sum(line.item_margin for line in order.order_line if line.product_id)
+            if order.ongkir_ke_xpdc:
+                total_margin -= order.ongkir_ke_xpdc
+
             order.total_margin = total_margin
     
     def _compute_total_percent_margin(self):