Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup

2 files changed, 39 insertions, 33 deletions

diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py
index 307165b3..d28aa8b4 100644
--- a/indoteknik_api/controllers/api_v1/partner.py
+++ b/indoteknik_api/controllers/api_v1/partner.py
@@ -64,37 +64,43 @@ class Partner(controller.Controller):
     @http.route(prefix + 'partner/<id>/address', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def write_partner_address_by_id(self, **kw):
-        params = self.get_request_params(kw, {
-            'id': ['required', 'number'],
-            'type': ['default:other'],
-            'name': ['required'],
-            'email': ['required'],
-            'mobile': ['required'],
-            'phone': [''],
-            'street': ['required'],
-            'state_id': ['required', 'number', 'alias:state_id'],
-            'city_id': ['required', 'number', 'alias:kota_id'],
-            'district_id': ['number', 'alias:kecamatan_id'],
-            'sub_district_id': ['number', 'alias:kelurahan_id', 'exclude_if_null'],
-            'zip': ['required'],
-            'longtitude': [],
-            'latitude': [],
-            'address_map': [],
-            'alamat_lengkap_text': []
-        })
+        try:
+            params = self.get_request_params(kw, {
+                'id': ['required', 'number'],
+                'type': ['default:other'],
+                'name': ['required'],
+                'email': ['required'],
+                'mobile': ['required'],
+                'phone': [''],
+                'street': ['required'],
+                'state_id': ['required', 'number', 'alias:state_id'],
+                'city_id': ['required', 'number', 'alias:kota_id'],
+                'district_id': ['number', 'alias:kecamatan_id'],
+                'sub_district_id': ['number', 'alias:kelurahan_id', 'exclude_if_null'],
+                'zip': ['required'],
+                'longitude': '',  # Perbaikan dari longtitude ke longitude
+                'latitude': '',
+                'address_map': [],
+                'alamat_lengkap_text': []
+            })
 
-        if not params['valid']:
-            return self.response(code=400, description=params)
-        
-        partner = request.env[self._name].search([('id', '=', params['value']['id'])], limit=1)
-        if not partner:
-            return self.response(code=404, description='User not found')
-            
-        partner.write(params['value'])
+            if not params['valid']:
+                return self.response(code=400, description=params)
 
-        return self.response({
-            'id': partner.id
-        })
+            partner = request.env[self._name].sudo().search([('id', '=', params['value']['id'])], limit=1)
+
+            if not partner:
+                return self.response(code=404, description='User not found')
+
+            try:
+                partner.write(params['value'])
+            except Exception as e:
+                return self.response(code=500, description=f'Error writing partner data: {str(e)}')
+
+            return self.response({'id': partner.id})
+
+        except Exception as e:
+            return self.response(code=500, description=f'Unexpected error: {str(e)}')
 
     @http.route(prefix + 'partner/address', auth='public', methods=['POST', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
@@ -111,8 +117,8 @@ class Partner(controller.Controller):
             'city_id': ['required', 'number', 'alias:kota_id'],
             'district_id': ['number', 'alias:kecamatan_id'],
             'sub_district_id': ['number', 'alias:kelurahan_id', 'exclude_if_null'],
-            'longtitude': [],
-            'latitude': [],
+            'longtitude': '',
+            'latitude': '',
             'address_map': [],
             'zip': ['required']
         })
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 4304d889..4f85027a 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -484,8 +484,8 @@ class SaleOrder(models.Model):
             max_slatime = 1  # Default SLA jika tidak ada
             for line in rec.order_line:
                 product_sla = self.env['product.sla'].search([('product_variant_id', '=', line.product_id.id)], limit=1)
-                if(product_sla == False):
-                    continue
+                # if(product_sla == False):
+                #     continue
                 slatime = int(product_sla.sla) if product_sla and product_sla.sla and product_sla.sla != 'Indent' and "hari" in product_sla.sla.lower() else 15
                 max_slatime = max(max_slatime, slatime)