Update sale_order.py and sale_order.xml

2 files changed, 5 insertions, 0 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index f1f281a8..6410c150 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -46,6 +46,8 @@ class SaleOrder(models.Model):
                 raise UserError("Status harus draft atau sent")
             if not order.sales_tax_id:
                 raise UserError("Tax di Header harus diisi")
+            if not order.carrier_id:
+                raise UserError("Shipping Method harus diisi")
             approval1 = approval2 = 0
             for line in order.order_line:
                 if not line.product_id or line.product_id.type == 'service':
@@ -74,6 +76,8 @@ class SaleOrder(models.Model):
         for order in self:
             if not order.sales_tax_id:
                 raise UserError("Tax di Header harus diisi")
+            if not order.carrier_id:
+                raise UserError("Shipping Method harus diisi")
             approval1 = approval2 = 0
             for line in order.order_line:
                 if not line.product_id or line.product_id.type == 'service':
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 297d0045..0abbae94 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -20,6 +20,7 @@
                 <field name="partner_shipping_id" position="after">
                     <field name="approval_status" />
                     <field name="sales_tax_id" domain="[('type_tax_use','=','sale')]"/>
+                    <field name="carrier_id"/>
                 </field>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
                     <field name="vendor_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>