Merge branch 'odoo-production' into dev/wms

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

4 files changed, 35 insertions, 16 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 8b95ade8..a7e027c8 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -394,7 +394,8 @@ class SaleOrder(controller.Controller):
 
         # Fetch partner details
         sales_partner = request.env['res.partner'].browse(params['value']['partner_id'])
-
+        partner_invoice = request.env['res.partner'].browse(params['value']['partner_invoice_id'])
+        main_partner = partner_invoice.get_main_parent()
         parameters = {
             'warehouse_id': 8,
             'carrier_id': 1,
@@ -410,7 +411,7 @@ class SaleOrder(controller.Controller):
             'partner_id': params['value']['partner_id'],
             'partner_shipping_id': params['value']['partner_shipping_id'],
             'real_shipping_id': params['value']['partner_shipping_id'],
-            'partner_invoice_id': params['value']['partner_invoice_id'],
+            'partner_invoice_id': main_partner.id,
             'real_invoice_id': params['value']['partner_invoice_id'],
             'partner_purchase_order_name': params['value']['po_number'],
             'partner_purchase_order_file': params['value']['po_file'],
@@ -426,7 +427,7 @@ class SaleOrder(controller.Controller):
             'npwp': sales_partner.npwp or '0',  # Get NPWP from partner
             'sppkp': sales_partner.sppkp,  # Get SPPKP from partner
             'email': sales_partner.email,  # Get Email from partner
-            'user_id': 3222  # User ID: Nadia Rauhadatul Firdaus
+            'user_id': 11314  # User ID: Boy Revandi
         }
         
         sales_partner = request.env['res.partner'].browse(parameters['partner_id'])
diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 110cde8a..2e0c4ad0 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -57,7 +57,7 @@ class StockPicking(controller.Controller):
         if params['status'] == 'pending':
             domain += pending_domain
         elif params['status'] == 'shipment':
-            domain += shipment_domain
+            domain +=  shipment_domain + shipment_domain2
         elif params['status'] == 'completed':
             domain += completed_domain
 
diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index f651d9fa..c0974367 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -98,7 +98,7 @@ class User(controller.Controller):
             user.partner_id.npwp = '00.000.000.0-000.000'
             user.partner_id.sppkp = '-'
             user.partner_id.nama_wajib_pajak = user.name
-            user.partner_id.user_id = 3222
+            user.partner_id.user_id = 11314
             user.partner_id.property_account_receivable_id = 395
             user.partner_id.property_account_payable_id = 438
         data = {
@@ -130,6 +130,7 @@ class User(controller.Controller):
         alamat_bisnis = kw.get('alamat_bisnis', False)
         nama_wajib_pajak = kw.get('nama_wajib_pajak', False)
         is_pkp = kw.get('is_pkp')
+        is_terdaftar = kw.get('is_terdaftar', False)
         type_acc = kw.get('type_acc', 'individu') or 'individu'
 
         if not name or not email or not password:
@@ -168,18 +169,19 @@ class User(controller.Controller):
         if type_acc == 'business' and business_name:
             # Eksekusi query SQL menggunakan Levenshtein distance
             query = """
-                SELECT name, levenshtein(name::text, %s) AS distance
+                SELECT id, name, levenshtein(name::text, %s) AS distance
                 FROM res_partner
-                WHERE levenshtein(name::text, %s) < 3   
+                WHERE is_company = true AND active = true
+                AND levenshtein(name::text, %s) < 3 
                 ORDER BY distance ASC
             """
             params = (business_name, business_name)
             request.env.cr.execute(query, params)
             result = request.env.cr.fetchone()
 
-            if result:
-                match_company_name = result[0]
-                match_company_id = result[2]
+            if result and is_terdaftar:
+                match_company_name = result[2]
+                match_company_id = result[0]
 
                 # Create a user company request
                 request.env['user.company.request'].create({
@@ -206,7 +208,7 @@ class User(controller.Controller):
                     'email': email_partner,
                     'street': alamat_bisnis,
                     'company_type': 'company',
-                    'user_id': 3222,
+                    'user_id': 11314,
                     'property_account_receivable_id': 395,
                     'property_account_payable_id': 438,
                     'active': False,
@@ -251,7 +253,7 @@ class User(controller.Controller):
             user.partner_id.npwp = '00.000.000.0-000.000'
             user.partner_id.sppkp = '-'
             user.partner_id.nama_wajib_pajak = name
-            user.partner_id.user_id = 3222
+            user.partner_id.user_id = 11314
             user.partner_id.property_account_receivable_id= 395
             user.partner_id.property_account_payable_id = 438
 
@@ -603,7 +605,7 @@ class User(controller.Controller):
                         'email': email_partner,
                         'street': alamat_bisnis,
                         'company_type': 'company',
-                        'user_id': 3222,
+                        'user_id': 11314,
                         'property_account_receivable_id': 395,
                         'property_account_payable_id': 438,
                         'active': False,
diff --git a/indoteknik_api/controllers/api_v1/voucher.py b/indoteknik_api/controllers/api_v1/voucher.py
index 910488d1..9ffeeace 100644
--- a/indoteknik_api/controllers/api_v1/voucher.py
+++ b/indoteknik_api/controllers/api_v1/voucher.py
@@ -22,9 +22,14 @@ class Voucher(controller.Controller):
         code = kw.get('code')
         type = kw.get('type')
         user_id = int(kw.get('user_id', 0))
+        partner_id = int(kw.get('partner_id', 0))
         source = kw.get('source')
         visibility = ['public']
 
+        user = request.env['res.users'].search([('id', '=', user_id)], limit=1)
+        if not user:
+            return self.response([])
+
         domain = []
         if code:
             visibility.append('private')
@@ -37,14 +42,19 @@ class Voucher(controller.Controller):
             type = type.split(',')
             domain += [('apply_type', 'in', type)]
 
+        if partner_id:
+            partner =  request.env['res.partner'].search([('id', '=', partner_id)], limit=1)
+            main_parent = partner.get_main_parent()
+            if main_parent and main_parent.company_type:
+                domain += [('account_type', 'in', ['all',main_parent.company_type])]
+                # domain += [('account_type', 'in', main_parent.company_type)]
+
+
         domain += [('visibility', 'in', visibility)]
         vouchers = request.env['voucher'].get_active_voucher(domain)
         checkout = cart.get_user_checkout(user_id, source=source)
         products = checkout['products']
 
-        user = request.env['res.users'].search([('id', '=', user_id)], limit=1)
-        if not user:
-            return self.response([])
 
         order_line = []
         for product in products:
@@ -89,3 +99,9 @@ class Voucher(controller.Controller):
         sorted_results = sorted(results, key=lambda x: x['can_apply'], reverse=True)
 
         return self.response(sorted_results)
+
+    def get_user_by_email(self, email):
+        return request.env['res.users'].search([
+            ('login', '=', email),
+            ('active', 'in', [True, False])
+        ])
\ No newline at end of file