Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into reminder-tempo-v2

1 files changed, 4 insertions, 4 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 2348a126..6f5a3d44 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -206,8 +206,8 @@ class SaleOrder(controller.Controller):
                 ]
                 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.driver_arrival_date]
-                done_without_driver = [p for p in done_pickings if not p.driver_arrival_date]
+                done_with_driver = [p for p in done_pickings if p.sj_return_date]
+                done_without_driver = [p for p in done_pickings if not p.sj_return_date]
 
                 if status == 'dikemas' and len(done_pickings) == 0:
                     filtered_orders.append(sale_order)
@@ -424,8 +424,8 @@ class SaleOrder(controller.Controller):
             return self.response('Unauthorized')
 
         sale_order = request.env['sale.order'].sudo().search_read([('id', '=', id)], ['name'])
-        pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'quotation_so_new')]).render_jasper([id], {})
-        # pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'indoteknik_custom.report_saleorder_website')])._render_qweb_pdf([id])
+        # pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'quotation_so_new')]).render_jasper([id], {})
+        pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'indoteknik_custom.report_saleorder_website')])._render_qweb_pdf([id])
         
         if pdf and len(sale_order) > 0:
             return rest_api.response_attachment({