summaryrefslogtreecommitdiff
path: root/indoteknik_api/models
diff options
context:
space:
mode:
authorIT Fixcomart <it@fixcomart.co.id>2024-11-29 03:18:21 +0000
committerIT Fixcomart <it@fixcomart.co.id>2024-11-29 03:18:21 +0000
commitfa3da08e5c0837e1492a3b00b17b7492c07ac676 (patch)
treea98cb41a39064f692d764338177b84fd14bed82a /indoteknik_api/models
parent0080b6b1da5f181cee32fae7bb5166ce65165374 (diff)
parent8906f678c23090d70d16191dc1fe76e518e8e9d9 (diff)
Merged in CR/quotation-noPo (pull request #254)
CR/quotation noPo
Diffstat (limited to 'indoteknik_api/models')
-rw-r--r--indoteknik_api/models/res_users.py6
-rw-r--r--indoteknik_api/models/sale_order.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/indoteknik_api/models/res_users.py b/indoteknik_api/models/res_users.py
index 230707cb..52a044dc 100644
--- a/indoteknik_api/models/res_users.py
+++ b/indoteknik_api/models/res_users.py
@@ -14,6 +14,9 @@ class ResUsers(models.Model):
'manager': 2,
'director': 3
}
+ partner_tempo = False
+ if main_partner:
+ partner_tempo = main_partner.get_check_tempo_partner()
data = {
'id': res_user.id,
@@ -32,7 +35,8 @@ class ResUsers(models.Model):
'feature': {
'so_approval': main_partner.use_so_approval,
'only_ready_stock': main_partner.use_only_ready_stock
- }
+ },
+ 'partner_tempo': partner_tempo
}
return data
diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index 54e1fd40..0771f97a 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -39,6 +39,8 @@ class SaleOrder(models.Model):
data['status'] = 'cancel'
if sale_order.state in ['draft', 'sent']:
data['status'] = 'draft'
+ if sale_order.is_continue_transaction:
+ data['status'] = 'waiting'
if sale_order.approval_status in ['pengajuan1', 'pengajuan2']:
data['status'] = 'waiting'
if sale_order.state == 'sale':