diff options
| author | IT Fixcomart <it@fixcomart.co.id> | 2024-05-10 07:43:40 +0000 |
|---|---|---|
| committer | IT Fixcomart <it@fixcomart.co.id> | 2024-05-10 07:43:40 +0000 |
| commit | e2cf27c1fc540ad24b457d23c89ddd1ea4e6034a (patch) | |
| tree | a635964dbd0b9729c1d161e16ca7e8dabb02a3c8 /indoteknik_api | |
| parent | cb9ae6021dd4858372ed78d16ab491226c95f1d2 (diff) | |
| parent | 844339e517540826f6990456a63945dc879e37d5 (diff) | |
Merged in dev/request-by-abl (pull request #141)
Dev/request by abl
Diffstat (limited to 'indoteknik_api')
| -rw-r--r-- | indoteknik_api/controllers/api_v1/sale_order.py | 2 | ||||
| -rw-r--r-- | indoteknik_api/models/__init__.py | 1 | ||||
| -rw-r--r-- | indoteknik_api/models/res_partner.py | 14 | ||||
| -rw-r--r-- | indoteknik_api/models/sale_order.py | 2 |
4 files changed, 2 insertions, 17 deletions
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 50f57c9a..957d49c7 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_director': + 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/__init__.py b/indoteknik_api/models/__init__.py index 8c85938c..892d2657 100644 --- a/indoteknik_api/models/__init__.py +++ b/indoteknik_api/models/__init__.py @@ -9,4 +9,3 @@ from . import sale_order from . import x_manufactures from . import website_content from . import coupon_program -from . import res_partner diff --git a/indoteknik_api/models/res_partner.py b/indoteknik_api/models/res_partner.py deleted file mode 100644 index 57200ac1..00000000 --- a/indoteknik_api/models/res_partner.py +++ /dev/null @@ -1,14 +0,0 @@ -from odoo import models - - -class ResPartner(models.Model): - _inherit = 'res.partner' - - def get_main_parent(self): - partner = self - - while partner.parent_id: - partner = partner.parent_id - - return partner -
\ No newline at end of file diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py index 1c0180ec..c98834bf 100644 --- a/indoteknik_api/models/sale_order.py +++ b/indoteknik_api/models/sale_order.py @@ -8,7 +8,7 @@ class SaleOrder(models.Model): APPROVAL_STEP = { 'company': 1, 'cust_manager': 2, - 'cust_director': 3, + 'cust_director': 3 } data = { |