Merge branch 'odoo-backup' into CR/md-bom

2 files changed, 4 insertions, 4 deletions

diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index 8523d90b..b5b7e055 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -131,6 +131,7 @@ class User(controller.Controller):
         nama_wajib_pajak = kw.get('nama_wajib_pajak', False)
         is_pkp = kw.get('is_pkp')
         is_terdaftar = kw.get('is_terdaftar', False)
+        is_terdaftar = False if is_terdaftar == 'false' else is_terdaftar
         type_acc = kw.get('type_acc', 'individu') or 'individu'
 
         if not name or not email or not password:
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index adc9bb98..4d186c8d 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -208,8 +208,7 @@ class SaleOrder(models.Model):
     )
     expected_ready_to_ship = fields.Datetime(
         string='ET Ready to Ship',
-        copy=False,
-        store=True
+        copy=False
     )
     shipping_method_picking = fields.Char(string='Shipping Method Picking', compute='_compute_shipping_method_picking')
     
@@ -557,7 +556,7 @@ class SaleOrder(models.Model):
 
         return {'slatime': max_slatime, 'include_instant': include_instant}
 
-    @api.depends("order_line.product_id") 
+    # @api.depends("order_line.product_id") 
     def _compute_etrts_date(self): #Function to calculate Estimated Ready To Ship Date
         for rec in self:
             max_slatime = 1  # Default SLA jika tidak ada
@@ -1274,7 +1273,7 @@ class SaleOrder(models.Model):
             order._set_sppkp_npwp_contact()
             order.calculate_line_no()
             order.send_notif_to_salesperson()
-            order._compute_etrts_date()
+            # order._compute_etrts_date()
             # order.order_line.get_reserved_from()
 
         res = super(SaleOrder, self).action_confirm()