diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2024-11-29 10:35:39 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2024-11-29 10:35:39 +0700 |
| commit | 75cad0da1476a2e605ef5d0f35cfb58944831934 (patch) | |
| tree | 6cc7e014ef006e8d7794f2b6f50437bef61dd724 /indoteknik_api/models/sale_order.py | |
| parent | fd5617629243b879e020afbdb2f1957d2e419ae4 (diff) | |
| parent | fa3da08e5c0837e1492a3b00b17b7492c07ac676 (diff) | |
Merge branch 'production' into CR/website-improvment
Diffstat (limited to 'indoteknik_api/models/sale_order.py')
| -rw-r--r-- | indoteknik_api/models/sale_order.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py index 16a17200..727379c5 100644 --- a/indoteknik_api/models/sale_order.py +++ b/indoteknik_api/models/sale_order.py @@ -33,12 +33,14 @@ class SaleOrder(models.Model): 'id': picking.id, 'name': picking.name, 'tracking_number': picking.delivery_tracking_no or '', - 'delivered': picking.waybill_id.delivered or picking.driver_arrival_date != False, + 'delivered': picking.waybill_id.delivered or picking.driver_arrival_date != False or picking.sj_return_date != False, }) if sale_order.state == 'cancel': 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': |