Merge branch 'production' into feature/fulfillment_v2

2 files changed, 15 insertions, 15 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 31ea8902..4d05f61e 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -491,8 +491,8 @@ class SaleOrder(models.Model):
             raise UserError('Phone Real Delivery Address harus diisi')
         if not real_delivery_address.kecamatan_id:
             raise UserError('Kecamatan Real Delivery Address harus diisi')
-        if not real_delivery_address.kelurahan_id:
-            raise UserError('Kelurahan Real Delivery Address harus diisi')
+        # if not real_delivery_address.kelurahan_id:
+        #     raise UserError('Kelurahan Real Delivery Address harus diisi')
 
     def generate_payment_link_midtrans_sales_order(self):
         # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions' # dev - sandbox
@@ -626,19 +626,19 @@ class SaleOrder(models.Model):
     #     return ['&', ('order_line.invoice_lines.move_id.move_type', 'in', ('out_invoice', 'out_refund')), ('order_line.invoice_lines.move_id', operator, value)]
 
 
-    def check_data_real_delivery_address(self):
-        real_delivery_address = self.real_shipping_id
+    # def check_data_real_delivery_address(self):
+    #     real_delivery_address = self.real_shipping_id
 
-        if not real_delivery_address.state_id:
-            raise UserError('State Real Delivery Address harus diisi')
-        if not real_delivery_address.zip:
-            raise UserError('Zip code Real Delivery Address harus diisi')
-        if not real_delivery_address.mobile:
-            raise UserError('Mobile Real Delivery Address harus diisi')
-        if not real_delivery_address.phone:
-            raise UserError('Phone Real Delivery Address harus diisi')
-        if not real_delivery_address.kecamatan_id:
-            raise UserError('Kecamatan Real Delivery Address harus diisi')
+    #     if not real_delivery_address.state_id:
+    #         raise UserError('State Real Delivery Address harus diisi')
+    #     if not real_delivery_address.zip:
+    #         raise UserError('Zip code Real Delivery Address harus diisi')
+    #     if not real_delivery_address.mobile:
+    #         raise UserError('Mobile Real Delivery Address harus diisi')
+    #     if not real_delivery_address.phone:
+    #         raise UserError('Phone Real Delivery Address harus diisi')
+    #     if not real_delivery_address.kecamatan_id:
+    #         raise UserError('Kecamatan Real Delivery Address harus diisi')
 
     @api.onchange('partner_id')
     def onchange_partner_contact(self):
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 02531966..ca27c2ed 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -29,7 +29,7 @@
                     <field name="create_date" invisible="1"/>
                     <field name="shipping_cost_covered" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
                     <field name="shipping_paid_by" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
-                    <field name="delivery_amt"/>
+                    <field name="delivery_amt" attrs="{'readonly': [('state', 'in', ['sale', 'cancel', 'done'])]}"/>
                     <field name="fee_third_party"/>
                     <field name="total_percent_margin"/>
                     <field name="type_promotion"/>