summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafi Zadanly <zadanlyr@gmail.com>2024-04-26 11:12:56 +0700
committerRafi Zadanly <zadanlyr@gmail.com>2024-04-26 11:12:56 +0700
commitd026ce987698790c8424a1b88d7bfacf1508dad6 (patch)
treeb8eaa53d5bd2b4edf9ac2f27968bc41c33cdcc7b
parent175ee679cbd2af2245bc9468312a6ad28419e110 (diff)
Update approval by procurement
-rw-r--r--indoteknik_api/controllers/api_v1/sale_order.py2
-rw-r--r--indoteknik_api/models/sale_order.py3
-rwxr-xr-xindoteknik_custom/models/sale_order.py4
3 files changed, 5 insertions, 4 deletions
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 40936a82..3f31011c 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -160,7 +160,7 @@ class SaleOrder(controller.Controller):
if partner.web_role:
sale_order.web_approval = 'cust_%s' % partner.web_role
- if sale_order.web_approval == 'cust_procurement':
+ if sale_order.web_approval in ['cust_procurement', 'cust_director']:
sale_order.approval_status = 'pengajuan1'
return self.response('success')
diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index 1c0180ec..969fd79f 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -8,7 +8,8 @@ class SaleOrder(models.Model):
APPROVAL_STEP = {
'company': 1,
'cust_manager': 2,
- 'cust_director': 3,
+ 'cust_procurement': 3,
+ 'cust_director': 3
}
data = {
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 3b6879cd..88d9aec7 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -469,8 +469,8 @@ class SaleOrder(models.Model):
SYSTEM_UID = 25
FROM_WEBSITE = order.create_uid.id == SYSTEM_UID
- if FROM_WEBSITE and main_parent.use_so_approval and order.web_approval != 'cust_procurement':
- raise UserError("This order not yet approved by customer procurement")
+ if FROM_WEBSITE and main_parent.use_so_approval and order.web_approval not in ['cust_procurement', 'cust_director']:
+ raise UserError("This order not yet approved by customer procurement or director")
if order.validate_partner_invoice_due():
return self._create_notification_action('Notification', 'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')