diff options
| author | IT Fixcomart <it@fixcomart.co.id> | 2025-09-16 09:09:39 +0000 |
|---|---|---|
| committer | IT Fixcomart <it@fixcomart.co.id> | 2025-09-16 09:09:39 +0000 |
| commit | 07a46fdbd16d72e60895d38047b6bb2e344dc18f (patch) | |
| tree | e9e34e7564d0257ccc781085959f7140b849335d | |
| parent | 19a286c49f2ae626d9d6c12829d7bc094ba563b2 (diff) | |
| parent | 41b9e8084b388dca0b5b18daf0dfe9537db1ed1c (diff) | |
Merged in refund_system (pull request #417)
Refund system
| -rw-r--r-- | indoteknik_api/controllers/api_v1/sale_order.py | 2 | ||||
| -rw-r--r-- | indoteknik_api/models/sale_order.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index accc7531..1a75c830 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -198,7 +198,7 @@ class SaleOrder(controller.Controller): if status in ['dikemas', 'dikirim', 'selesai', 'partial']: filtered_orders = [] for sale_order in sale_orders: - bu_pickings = [p for p in sale_order.picking_ids if p.picking_type_id and p.picking_type_id.id == 29] + bu_pickings = [p for p in sale_order.picking_ids if p.picking_type_id and p.picking_type_id.id == 29 and p.state != 'cancel'] total = len(bu_pickings) done_pickings = [p for p in bu_pickings if p.state == 'done'] done_with_driver = [p for p in done_pickings if p.sj_return_date] diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py index c59dead9..23be358a 100644 --- a/indoteknik_api/models/sale_order.py +++ b/indoteknik_api/models/sale_order.py @@ -75,7 +75,7 @@ class SaleOrder(models.Model): if sale_order.state == 'sale': bu_pickings = [ p for p in sale_order.picking_ids - if p.picking_type_id and p.picking_type_id.id == 29 + if p.picking_type_id and p.picking_type_id.id == 29 and p.state != 'cancel' ] # Hitung status masing-masing picking |