summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzka Nathan <darizkyfaz@gmail.com>2025-03-26 15:02:37 +0700
committerAzka Nathan <darizkyfaz@gmail.com>2025-03-26 15:02:37 +0700
commit20cf871492e9de61669c577d31d2219d092796bf (patch)
tree1eac4d4e43cbdc9a70c8697727bd83fdec968826
parent659387826b7d4a8db4afac158065ca125d6d98a6 (diff)
fix bug on stock picking
-rwxr-xr-xindoteknik_custom/models/sale_order.py2
-rw-r--r--indoteknik_custom/models/stock_picking.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index c7fcabbb..1778536b 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -656,7 +656,7 @@ class SaleOrder(models.Model):
def _validate_delivery_amt(self):
if self.delivery_amt < 1:
- if(self.carrier_id.id == 1 or self.shipping_cost_covered == 'indoteknik'):
+ if(self.carrier_id.id == 1 or self.shipping_cost_covered == 'indoteknik') and not self.env.context.get('active_id', []):
if(self.carrier_id.id == 1):
raise UserError('Untuk Kurir Indoteknik Delivery, Estimasi Ongkos Kirim Harus di isi')
else:
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 6c6cbaa1..a1b28385 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -96,6 +96,7 @@ class StockPicking(models.Model):
('not_paid', 'Customer belum bayar'),
('partial', 'Kirim Parsial'),
('indent', 'Indent'),
+ ('waiting_schedule', 'Menunggu Jadwal Kirim'),
('self_pickup', 'Barang belum di pickup Customer'),
('expedition_closed', 'Eskpedisi belum buka')
], string='Note Logistic', help='jika field ini diisi maka tidak akan dihitung ke lead time')