Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into pum-v3

1 files changed, 7 insertions, 5 deletions

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 2ec1ec2a..fe82e665 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -1,5 +1,5 @@
 from .. import controller
-from odoo import http
+from odoo import http, fields
 from odoo.http import request, Response
 from pytz import timezone
 from datetime import datetime
@@ -8,7 +8,6 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
-_logger = logging.getLogger(__name__)
 
 class StockPicking(controller.Controller):
     prefix = '/api/v1/'
@@ -128,6 +127,7 @@ class StockPicking(controller.Controller):
         sj_document = kw.get('sj_document') if 'sj_document' in kw else None
         paket_document = kw.get('paket_document') if 'paket_document' in kw else None
         dispatch_document = kw.get('dispatch_document') if 'dispatch_document' in kw else None
+        self_pu= kw.get('self_pu') if 'self_pu' in kw else None
 
         # ===== Cari picking by id / picking_code =====
         picking_data = False
@@ -140,19 +140,21 @@ class StockPicking(controller.Controller):
         if not picking_data:
             return self.response(code=403, description='picking not found')
 
-        params = {
-            'driver_arrival_date': datetime.utcnow(),
-        }
+        params = {}
         if sj_document:
             params['sj_documentation'] = sj_document
+            if self_pu:
+                params['driver_arrival_date'] = datetime.utcnow()
         if paket_document:
             params['paket_documentation'] = paket_document
+            params['driver_arrival_date'] = datetime.utcnow()
         if dispatch_document:
             params['dispatch_documentation'] = dispatch_document
 
         picking_data.write(params)
         return self.response({'name': picking_data.name})
 
+
     @http.route(prefix + 'webhook/biteship', type='json', auth='public', methods=['POST'], csrf=False)
     def update_status_from_biteship(self, **kw):
         _logger.info("Biteship Webhook: Request received at controller start (type='json').")