Merge branch 'production' into iman/pengajuan-tempo

# Conflicts:
#	indoteknik_custom/models/res_partner.py

4 files changed, 11 insertions, 8 deletions

diff --git a/indoteknik_api/controllers/api_v1/product.py b/indoteknik_api/controllers/api_v1/product.py
index b68eb0f9..32362582 100644
--- a/indoteknik_api/controllers/api_v1/product.py
+++ b/indoteknik_api/controllers/api_v1/product.py
@@ -103,7 +103,7 @@ class Product(controller.Controller):
         product = request.env['product.product'].search(
             [('id', '=', id)], limit=1)
 
-        qty_available = product.free_qty
+        qty_available = product.qty_free_bandengan
 
         data = {
             'qty': qty_available,
diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index ea8c6400..110cde8a 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -32,7 +32,9 @@ class StockPicking(controller.Controller):
 
         pending_domain = [('driver_departure_date', '=', False), ('driver_arrival_date', '=', False)]
         shipment_domain = [('driver_departure_date', '!=', False), ('driver_arrival_date', '=', False)]
-        completed_domain = [('driver_departure_date', '!=', False), ('driver_arrival_date', '!=', False)]
+        shipment_domain2 = [('driver_departure_date', '!=', False), ('sj_return_date', '=', False)]
+        completed_domain = [('driver_departure_date', '!=', False),'|', ('driver_arrival_date', '!=', False), ('sj_return_date', '!=', False)]
+        completed_domain2 = [('driver_departure_date', '!=', False), ('sj_return_date', '!=', False)]
 
         picking_model = request.env['stock.picking']
         domain = [
@@ -74,7 +76,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,
+                'delivered': picking.waybill_id.delivered or picking.driver_arrival_date != False or picking.sj_return_date != False,
                 'status': picking.shipping_status,
                 'carrier_name': picking.carrier_id.name or '',
                 'last_manifest': next(iter(manifests), None)
@@ -83,8 +85,8 @@ class StockPicking(controller.Controller):
         return self.response({
             'summary': {
                 'pending_count': picking_model.search_count(default_domain + pending_domain),
-                'shipment_count': picking_model.search_count(default_domain + shipment_domain),
-                'completed_count': picking_model.search_count(default_domain + completed_domain)
+                'shipment_count': picking_model.search_count(default_domain + shipment_domain + shipment_domain2),
+                'completed_count': picking_model.search_count(default_domain + completed_domain )
             },
             'picking_total': picking_model.search_count(domain),
             'pickings': res_pickings
diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py
index 386ddb6a..f8869c7d 100644
--- a/indoteknik_api/models/product_product.py
+++ b/indoteknik_api/models/product_product.py
@@ -61,8 +61,9 @@ class ProductProduct(models.Model):
         price_for = self.env.context.get('price_for', 'odoo')
         pricelist = pricelist or self.env.context.get('user_pricelist')
         default_price_tier = '1_v2'
-
-        price_tier = pricelist.get_tier_level()
+        price_tier = []
+        if pricelist:
+            price_tier = pricelist.get_tier_level()
         price_tier = price_tier if price_tier else default_price_tier
 
         pricelist = self._get_pricelist_tier(price_tier)
diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index 8e0371a3..54e1fd40 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -33,7 +33,7 @@ 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'