Merge branch 'production' into CR/quotation-noPo

# Conflicts:
#	indoteknik_custom/models/user_company_request.py

3 files changed, 24 insertions, 5 deletions

diff --git a/indoteknik_api/controllers/api_v1/product.py b/indoteknik_api/controllers/api_v1/product.py
index 9673b3ef..32362582 100644
--- a/indoteknik_api/controllers/api_v1/product.py
+++ b/indoteknik_api/controllers/api_v1/product.py
@@ -96,6 +96,21 @@ class Product(controller.Controller):
 
         return self.response(data, headers=[('Cache-Control', 'max-age=600, private')])
 
+    @http.route(prefix + 'product_variant/<id>/qty_available', auth='public', methods=['GET', 'OPTIONS'])
+    @controller.Controller.must_authorized()
+    def get_product_variant_stock_available_by_id(self, **kw):
+        id = int(kw.get('id'))
+        product = request.env['product.product'].search(
+            [('id', '=', id)], limit=1)
+
+        qty_available = product.qty_free_bandengan
+
+        data = {
+            'qty': qty_available,
+        }
+
+        return self.response(data, headers=[('Cache-Control', 'max-age=600, private')])
+
     @http.route(prefix + 'product/template/price/<id>', auth='public', methods=['GET', 'OPTIONS'])
     def get_product_template_price_by_id(self, **kw):
         if not self.authenticate():
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 99ba2573..8b95ade8 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -450,7 +450,8 @@ class SaleOrder(controller.Controller):
                     'company_id': 1,
                     'order_id': sale_order.id,
                     'product_id': cart['id'],
-                    'product_uom_qty': cart['quantity']
+                    'product_uom_qty': cart['quantity'],
+                    'product_available_quantity': cart['available_quantity']
                 })
                 order_line.product_id_change()
                 order_line.onchange_vendor_id()
@@ -467,6 +468,7 @@ class SaleOrder(controller.Controller):
         
         if len(promotions) > 0:
             sale_order.apply_promotion_program()
+            sale_order.add_free_product(promotions)
 
         voucher_code = params['value']['voucher']
         voucher = request.env['voucher'].search([('code', '=', voucher_code),('apply_type', 'in', ['all', 'brand'])], limit=1)
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