Merge branch 'production' into iman/switch-account

11 files changed, 122 insertions, 21 deletions

diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index e62aad90..f6dbb92c 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -157,20 +157,26 @@ class User(controller.Controller):
         user.partner_id.email = email
         user.partner_id.mobile = phone
 
-        if type_acc == 'business':
-            parameter = [
-                ('company_type', '=', 'company'),
-                ('name', 'ilike', business_name)
-            ]
-            match_company = request.env['res.partner'].search(parameter, limit=1)
-            match_ratio = 0
-            if match_company:
-                match_ratio = SequenceMatcher(None, match_company.name, business_name).ratio()
-            if match_ratio > 0.8:
+        if type_acc == 'business' and business_name:
+            # Eksekusi query SQL menggunakan Levenshtein distance
+            query = """
+                SELECT name, levenshtein(name::text, %s) AS distance
+                FROM res_partner
+                WHERE 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]
+
                 # Create a user company request
                 request.env['user.company.request'].create({
                     'user_id': user.partner_id.id,
-                    'user_company_id': match_company.id,
+                    'user_company_id': match_company_id,
                     'user_input': business_name
                 })
             else:
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index ad7b1d09..4619147a 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -126,3 +126,4 @@ from . import sale_order_multi_uangmuka_penjualan
 from . import shipment_group
 from . import sales_order_reject
 from . import approval_date_doc
+from . import account_tax
diff --git a/indoteknik_custom/models/account_tax.py b/indoteknik_custom/models/account_tax.py
new file mode 100644
index 00000000..e39546f2
--- /dev/null
+++ b/indoteknik_custom/models/account_tax.py
@@ -0,0 +1,22 @@
+from odoo import fields, models, api, _
+from odoo.exceptions import AccessError, UserError, ValidationError
+
+class AccountTax(models.Model):
+    _inherit = 'account.tax'
+
+    @api.model
+    def create(self, vals):
+        group_id = self.env.ref('indoteknik_custom.group_role_it').id
+        users_in_group = self.env['res.users'].search([('groups_id', 'in', [group_id])])
+        if self.env.user.id not in users_in_group.mapped('id'):
+            raise UserError('Hanya IT yang bisa membuat tax')
+        result = super(AccountTax, self).create(vals)
+        return result
+    
+    def write(self, values):
+        group_id = self.env.ref('indoteknik_custom.group_role_it').id
+        users_in_group = self.env['res.users'].search([('groups_id', 'in', [group_id])])
+        if self.env.user.id not in users_in_group.mapped('id'):
+            raise UserError('Hanya IT yang bisa mengedit tax')
+        result = super(AccountTax, self).write(values)
+        return result
\ No newline at end of file
diff --git a/indoteknik_custom/models/promotion/promotion_program_line.py b/indoteknik_custom/models/promotion/promotion_program_line.py
index a57f1f2c..7a15ad11 100644
--- a/indoteknik_custom/models/promotion/promotion_program_line.py
+++ b/indoteknik_custom/models/promotion/promotion_program_line.py
@@ -34,6 +34,29 @@ class PromotionProgramLine(models.Model):
     active = fields.Boolean(string="Active", default=True)
     solr_flag = fields.Integer(string="Solr Flag", default=1)
     description = fields.Char('Description')
+    price_tier_1 = fields.Float('Price Tier 1')
+    price_tier_2 = fields.Float('Price Tier 2')
+    price_tier_3 = fields.Float('Price Tier 3')
+    price_tier_4 = fields.Float('Price Tier 4')
+    price_tier_5 = fields.Float('Price Tier 5')
+
+    def get_price_tier(self, product_id, qty):
+        product = self.env['product.product'].browse(product_id.id)  
+
+        tiers = ['1_v2', '2_v2', '3_v2', '4_v2', '5_v2']
+        
+        for index, tier in enumerate(tiers, start=1):  
+            
+            price_tier_data = product._get_pricelist_tier(tier)
+            
+            price_field = f'price_tier_{index}'  
+
+            if price_field in self._fields:  
+                price = price_tier_data.get(f'price_tier{tier}', 0) * qty  
+                self[price_field] = price
+
+                if index == 1:
+                    self.price = price
 
     def get_active_promotions(self, product_id):
         current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
diff --git a/indoteknik_custom/models/purchase_pricelist.py b/indoteknik_custom/models/purchase_pricelist.py
index 68fb796e..e5b35d7f 100755
--- a/indoteknik_custom/models/purchase_pricelist.py
+++ b/indoteknik_custom/models/purchase_pricelist.py
@@ -23,6 +23,13 @@ class PurchasePricelist(models.Model):
     brand_id = fields.Many2one('x_manufactures', string='Brand')
     count_brand_vendor = fields.Integer(string='Count Brand Vendor')
     is_winner = fields.Boolean(string='Winner', default=False, help='Pemenang yang direkomendasikan oleh Merchandise')
+
+    def sync_pricelist_tier(self):
+        for rec in self:
+            promotion_product = self.env['promotion.product'].search([('product_id', '=', rec.product_id.id)])
+
+            for promotion in promotion_product:
+                promotion.program_line_id.get_price_tier(promotion.product_id, promotion.qty)
     
     @api.depends('product_id', 'vendor_id')
     def _compute_name(self):
@@ -111,5 +118,6 @@ class PurchasePricelist(models.Model):
                 tier_prod_pricelist = self.env['product.pricelist.item'].search(product_domain + [('pricelist_id', '=', tier_pricelist.id)], limit=1)
                 tier_prod_pricelist.price_discount = tier_perc
             
+            rec.sync_pricelist_tier()
             rec.product_id.product_tmpl_id._create_solr_queue('_sync_price_to_solr')
         
\ No newline at end of file
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index aa5443c5..3a28bc54 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -38,14 +38,14 @@ class SaleOrder(models.Model):
     have_outstanding_po = fields.Boolean('Have Outstanding PO', compute='_have_outstanding_po')
     purchase_ids = fields.Many2many('purchase.order', string='Purchases', compute='_get_purchases')
     real_shipping_id = fields.Many2one(
-        'res.partner', string='Real Delivery Address', readonly=True, required=True,
+        'res.partner', string='Real Delivery Address', readonly=True,
         states={'draft': [('readonly', False)], 'sent': [('readonly', False)], 'sale': [('readonly', False)]},
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
-        help="Dipakai untuk alamat tempel")
+        help="Dipakai untuk alamat tempel", tracking=True)
     real_invoice_id = fields.Many2one(
         'res.partner', string='Delivery Invoice Address', required=True,
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
-        help="Dipakai untuk alamat tempel")
+        help="Dipakai untuk alamat tempel", tracking=True)
     fee_third_party = fields.Float('Fee Pihak Ketiga')
     so_status = fields.Selection([
         ('terproses', 'Terproses'),
@@ -116,6 +116,21 @@ class SaleOrder(models.Model):
     percent_margin_after_delivery_purchase = fields.Float(string='% Margin After Delivery Purchase', compute='_compute_margin_after_delivery_purchase')
     purchase_delivery_amt = fields.Float(string='Purchase Delivery Amount', compute='_compute_purchase_delivery_amount')
     type_promotion = fields.Char(string='Type Promotion', compute='_compute_type_promotion')
+    partner_invoice_id = fields.Many2one(
+        'res.partner', string='Invoice Address',
+        readonly=True, required=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)], 'sale': [('readonly', False)]},
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        tracking=True,  # Menambahkan tracking=True
+    )
+    partner_shipping_id = fields.Many2one(
+        'res.partner', string='Delivery Address', readonly=True, required=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)], 'sale': [('readonly', False)]},
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", tracking=True)
+    
+    payment_term_id = fields.Many2one(
+        'account.payment.term', string='Payment Terms', check_company=True,  # Unrequired company
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", tracking=True)
 
     def _compute_type_promotion(self):
         for rec in self:
@@ -430,10 +445,22 @@ class SaleOrder(models.Model):
     #         return [('id', 'not in', order_ids)]
     #     return ['&', ('order_line.invoice_lines.move_id.move_type', 'in', ('out_invoice', 'out_refund')), ('order_line.invoice_lines.move_id', operator, value)]
 
-    @api.onchange('partner_shipping_id')
-    def onchange_partner_shipping(self):
-        self.real_shipping_id = self.partner_shipping_id
-        self.real_invoice_id = self.partner_invoice_id
+
+    def check_data_real_delivery_address(self):
+        real_delivery_address = self.real_shipping_id
+
+        if not real_delivery_address.state_id:
+            raise UserError('State Real Delivery Address harus diisi')
+        if not real_delivery_address.zip:
+            raise UserError('Zip code Real Delivery Address harus diisi')
+        if not real_delivery_address.mobile:
+            raise UserError('Mobile Real Delivery Address harus diisi')
+        if not real_delivery_address.phone:
+            raise UserError('Phone Real Delivery Address harus diisi')
+        if not real_delivery_address.kecamatan_id:
+            raise UserError('Kecamatan Real Delivery Address harus diisi')
+        if not real_delivery_address.kelurahan_id:
+            raise UserError('Kelurahan Real Delivery Address harus diisi')
 
     @api.onchange('partner_id')
     def onchange_partner_contact(self):
@@ -675,6 +702,9 @@ class SaleOrder(models.Model):
             if not order.commitment_date and order.create_date > datetime(2024, 9, 12):
                 raise UserError("Expected Delivery Date kosong, wajib diisi")
             
+            if not order.real_shipping_id:
+                UserError('Real Delivery Address harus di isi')
+            
             if order.validate_partner_invoice_due():
                 return self._create_notification_action('Notification', 'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
             
diff --git a/indoteknik_custom/models/solr/product_template.py b/indoteknik_custom/models/solr/product_template.py
index d8dec47c..1eb6f31b 100644
--- a/indoteknik_custom/models/solr/product_template.py
+++ b/indoteknik_custom/models/solr/product_template.py
@@ -112,8 +112,8 @@ class ProductTemplate(models.Model):
                 "description_clean_t": cleaned_desc or '',
                 'has_product_info_b': True,
                 'publish_b': not template.unpublished,
-                'sni_b': template.unpublished,
-                'tkdn_b': template.unpublished,
+                'sni_b': template.sni,
+                'tkdn_b': template.tkdn,
                 "qty_sold_f": template.qty_sold,
                 "is_in_bu_b": is_in_bu,
                 "voucher_min_purchase_f" : voucher.min_purchase_amount or 0,
diff --git a/indoteknik_custom/models/solr/promotion_program_line.py b/indoteknik_custom/models/solr/promotion_program_line.py
index 3e3a2a28..64ad4209 100644
--- a/indoteknik_custom/models/solr/promotion_program_line.py
+++ b/indoteknik_custom/models/solr/promotion_program_line.py
@@ -53,6 +53,11 @@ class PromotionProgramLine(models.Model):
                 'package_limit_user_i': rec.package_limit_user,
                 'package_limit_trx_i': rec.package_limit_trx,
                 'price_f': rec.price,
+                'price_tier_1_f': rec.price_tier_1,
+                'price_tier_2_f': rec.price_tier_2,
+                'price_tier_3_f': rec.price_tier_3,
+                'price_tier_4_f': rec.price_tier_4,
+                'price_tier_5_f': rec.price_tier_5,
                 'sequence_i': sequence_value,
                 'product_ids': [x.product_id.id for x in rec.product_ids],
                 'products_s': json.dumps(products),
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index 09dbb45e..61ced26c 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -135,3 +135,4 @@ access_shipment_group,access.shipment.group,model_shipment_group,,1,1,1,1
 access_shipment_group_line,access.shipment.group.line,model_shipment_group_line,,1,1,1,1
 access_sales_order_reject,access.sales.order.reject,model_sales_order_reject,,1,1,1,1
 access_approval_date_doc,access.approval.date.doc,model_approval_date_doc,,1,1,1,1
+access_account_tax,access.account.tax,model_account_tax,,1,1,1,1
diff --git a/indoteknik_custom/views/promotion/promotion_program_line.xml b/indoteknik_custom/views/promotion/promotion_program_line.xml
index f3c2eea1..9cda67a8 100644
--- a/indoteknik_custom/views/promotion/promotion_program_line.xml
+++ b/indoteknik_custom/views/promotion/promotion_program_line.xml
@@ -32,6 +32,11 @@
                             <field name="package_limit_user" />
                             <field name="package_limit_trx" />
                             <field name="price" attrs="{'invisible': [('promotion_type', '=', 'special_price')]}" />
+                            <field name="price_tier_1"/>
+                            <field name="price_tier_2" invisible="1"/>
+                            <field name="price_tier_3" invisible="1"/>
+                            <field name="price_tier_4" invisible="1"/>
+                            <field name="price_tier_5" invisible="1"/>
                             <field name="sequence"/>
                             <field name="discount_type" attrs="{'invisible': [('promotion_type', '!=', 'special_price')]}" />
                             <field name="discount_amount" attrs="{'invisible': [('promotion_type', '!=', 'special_price')]}" />
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 0ef0aa7f..f6e5a1a4 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -36,7 +36,7 @@
                     <field name="approval_status"/>
                 </field>
                 <field name="approval_status" position="after">
-                    <field name="revisi_po" invisible="1"/>
+                    <field name="revisi_po"/>
                 </field>
                 <field name="incoterm_id" position="after">
                     <field name="amount_total_without_service"/>