diff options
| -rw-r--r-- | indoteknik_api/controllers/api_v1/stock_picking.py | 3 | ||||
| -rw-r--r-- | indoteknik_custom/models/stock_picking.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index 0ffce16b..7d397b4d 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -28,7 +28,7 @@ class StockPicking(controller.Controller): child_ids = request.env['res.partner'].browse(partner_id).get_child_ids() picking_model = request.env['stock.picking'] - default_domain = [('partner_id', 'in', child_ids), ('sale_id', '!=', False)] + default_domain = [('partner_id', 'in', child_ids), ('sale_id', '!=', False), ('origin', 'ilike', 'SO%')] domain = default_domain if params['q']: @@ -48,6 +48,7 @@ class StockPicking(controller.Controller): 'name': picking.sale_id.name, 'client_order_ref': picking.sale_id.client_order_ref or '' }, + 'delivered': picking.waybill_id.delivered or picking.driver_arrival_date != False, 'carrier_name': picking.carrier_id.name or '' }) diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index f9b077ba..8d1a85ea 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -407,6 +407,7 @@ class StockPicking(models.Model): response['delivery_order']['receiver_name'] = self.waybill_id.receiver_name, response['delivery_order']['receiver_city'] = self.waybill_id.receiver_city, response['delivery_status'] = self.waybill_id._get_history('delivery_status') + response['delivered'] = self.waybill_id.delivered response['manifests'] = [self.create_manifest_data(x.description, x.datetime) for x in self.waybill_id.manifest_ids] return response |