Merge branch 'release' into line_no_sales_order

1 files changed, 6 insertions, 7 deletions

diff --git a/indoteknik_api/controllers/controller.py b/indoteknik_api/controllers/controller.py
index a1a81e37..59885148 100644
--- a/indoteknik_api/controllers/controller.py
+++ b/indoteknik_api/controllers/controller.py
@@ -7,11 +7,8 @@ from odoo import http
 from odoo.http import request
 from odoo.tools.config import config
 from pytz import timezone
-import logging
 import jwt
 
-_logger = logging.getLogger(__name__)
-
 
 class Controller(http.Controller):
     jwt_secret_key = "NTNv7j0TuYARvmNMmWXo6fKvM4o6nvaUi9ryX38ZHL1bkrnD1ObOQ8JAUmHCBq7Iy7otZcyAagBLHVKvvYaIpmMuxmARQ97jUVG16Jkpkp1wXOPsrF9zwew6TpczyHkHgX5EuLg2MeBuiTqJACs1J0apruOOJCggOtkjB4c"
@@ -89,6 +86,7 @@ class Controller(http.Controller):
         return time
 
     def response(self, data=[], code=200, description='OK'):
+        request.env['user.activity.log'].record_activity()
         response = {
             'status': {
                 'code': code,
@@ -138,10 +136,10 @@ class Controller(http.Controller):
             return False
     
     def get_partner_child_ids(self, partner_id):
-        parent_partner_id = request.env['res.partner'].search([('id', '=', partner_id)], limit=1)
-        parent_partner_id = parent_partner_id.parent_id.id or parent_partner_id.id 
-        partner_childs = request.env['res.partner'].search([('parent_id', '=', int(parent_partner_id))])
-        partner_child_ids = [v['id'] for v in partner_childs] + [partner_id]
+        partner = request.env['res.partner'].search([('id', '=', partner_id)], limit=1)
+        partner_child_ids = [x['id'] for x in partner.child_ids] + [partner.id]
+        if partner.parent_id:
+            partner_child_ids += [x['id'] for x in partner.parent_id.child_ids]
         return partner_child_ids
 
     @http.route('/api/token', auth='public', methods=['GET', 'OPTIONS'])
@@ -152,4 +150,5 @@ class Controller(http.Controller):
     def get_image(self, model, field, id):
         model = request.env[model].sudo().search([('id', '=', id)], limit=1)
         image = model[field] if model[field] else ''
+        request.env['user.activity.log'].record_activity()
         return request.make_response(base64.b64decode(image), [('Content-Type', 'image/jpg')])