Merge branch 'production' into iman/telegram

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/stock_picking.py

1 files changed, 9 insertions, 1 deletions

diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index 725dbb4b..727379c5 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -33,12 +33,14 @@ 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'
         if sale_order.state in ['draft', 'sent']:
             data['status'] = 'draft'
+            if sale_order.is_continue_transaction:
+                data['status'] = 'waiting'
             if sale_order.approval_status in ['pengajuan1', 'pengajuan2']:
                 data['status'] = 'waiting'
         if sale_order.state == 'sale': 
@@ -84,6 +86,12 @@ class SaleOrder(models.Model):
                         'subtotal': line.price_subtotal
                     }
                     product['quantity'] = line.product_uom_qty
+                    product['available_quantity'] = line.product_available_quantity
+                    for data_v2 in sale_order.fulfillment_line_v2:
+                        product_v2 = self.env['product.product'].api_single_response(data_v2.product_id)
+                        if product['id'] == product_v2['id']:
+                            product['so_qty'] = data_v2.so_qty
+                            product['reserved_stock_qty'] = data_v2.reserved_stock_qty
                     data_with_detail['products'].append(product)
                 for invoice in sale_order.invoice_ids:
                     if invoice.state == 'posted':