Merged in production (pull request #126)

Production

19 files changed, 298 insertions, 100 deletions

diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index f51f95af..95defed6 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -86,4 +86,6 @@ from . import cost_centre
 from . import account_account
 from . import account_move_line
 from . import stock_scheduler_compute
-from . import promotion
\ No newline at end of file
+from . import promotion
+from . import sale_orders_multi_update
+from . import quotation_so_multi_update
\ No newline at end of file
diff --git a/indoteknik_custom/models/price_group.py b/indoteknik_custom/models/price_group.py
index 50f0520f..2a1bbc91 100644
--- a/indoteknik_custom/models/price_group.py
+++ b/indoteknik_custom/models/price_group.py
@@ -15,6 +15,9 @@ class PriceGroup(models.Model):
     group3 = fields.Float(string='Kelompok 3 (%)')
     group4 = fields.Float(string='Kelompok 4 (%)')
     group5 = fields.Float(string='Kelompok 5 (%)')
+    group6 = fields.Float(string='Kelompok 6 (%)')
+    group7 = fields.Float(string='Kelompok 7 (%)')
+    group8 = fields.Float(string='Kelompok 8 (%)')
     
 class Manufacture(models.Model):
     _inherit = 'x_manufactures'
@@ -25,4 +28,7 @@ class Manufacture(models.Model):
         ('group3', 'Kelompok 3'),
         ('group4', 'Kelompok 4'),
         ('group5', 'Kelompok 5'),
+        ('group6', 'Kelompok 6'),
+        ('group7', 'Kelompok 7'),
+        ('group8', 'Kelompok 8'),
     ], string='Pricing Group', copy=False)
diff --git a/indoteknik_custom/models/product_attribute.py b/indoteknik_custom/models/product_attribute.py
index 784ccd81..e3076805 100644
--- a/indoteknik_custom/models/product_attribute.py
+++ b/indoteknik_custom/models/product_attribute.py
@@ -5,11 +5,16 @@ import re
 class ProductAttributeValue(models.Model):
     _inherit = 'product.attribute.value'
 
+   
     @api.constrains('name')
     def _validate_name(self):
-        pattern = r'^[a-zA-Z0-9\[\]\(\)\.\s/%]+$' 
+        rule_regex = self.env['ir.config_parameter'].sudo().get_param('product.product.rule_name_regex') or ''
+        pattern = rf'^{rule_regex}$'
         if not re.match(pattern, self.name):
-            pattern_suggest = r'[a-zA-Z0-9\[\]\(\)\.\s/%]+'
+            pattern_suggest = rf"{rule_regex}"
             suggest = ''.join(re.findall(pattern_suggest, self.name))
-            raise UserError(f'Nama hanya bisa menggunakan angka, huruf kecil, huruf besar, titik, kurung lengkung, kurung siku, garis miring. Contoh: {suggest}')
+            raise UserError(f'Contoh yang benar adalah {suggest}')
+
+
+
         
\ No newline at end of file
diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py
index 4c11dcef..d35188b4 100755
--- a/indoteknik_custom/models/product_template.py
+++ b/indoteknik_custom/models/product_template.py
@@ -1,5 +1,5 @@
 from odoo import fields, models, api
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
 from odoo.exceptions import UserError
 import logging
 import requests
@@ -52,11 +52,30 @@ class ProductTemplate(models.Model):
                                     help='Centang jika ingin ditammpilkan di website sebagai segment Produk Baru')
     seq_new_product = fields.Integer(string='Seq New Product', help='Urutan Sequence New Product')
     is_edited = fields.Boolean(string='Is Edited')
+    publish = fields.Boolean(string='Publish', default=True)
+
+    @api.constrains('active')
+    def constrains_active_publish(self):
+        if not self.active or self.type != 'product':
+            self.publish = False
+        else:
+            self.publish = True
+
+        self._create_solr_queue('_sync_product_template_to_solr')
+
+    def day_product_to_edit(self):
+        day_products = []
+        
+        for product in self:
+            day_product = (product.write_date - product.create_date).days
+            day_products.append(day_product)
+
+        return day_products
 
     @api.constrains('name', 'default_code')
     def _check_duplicate_product(self):
         for product in self:
-            if not self.env.user.is_purchasing_manager:
+            if not self.env.user.is_purchasing_manager and not self.env.user.is_editor_product:
                 domain = [('default_code', '!=', False)]
                 
                 if product.product_variant_ids:
@@ -76,22 +95,21 @@ class ProductTemplate(models.Model):
                 
                 if product.write_date == product.create_date:
                     message = "SKU atau Name yang Anda gunakan sudah digunakan di produk lain"
-                else:
+                elif all(day_product > 0 for day_product in product.day_product_to_edit()):
                     domain = [('id', '=', product.id)]
                     message = "Hanya Pak Tyas yang dapat merubah data produk"
-                
                 existing_purchase = self.search(domain, limit=1)
-                
                 if existing_purchase:
                     raise UserError(message)
     
     @api.constrains('name')
     def _validate_name(self):
-        pattern = r'^[a-zA-Z0-9\[\]\(\)\.\s/%-]+$' 
+        rule_regex = self.env['ir.config_parameter'].sudo().get_param('product.product.rule_name_regex') or ''
+        pattern = rf'^{rule_regex}$'
         if not re.match(pattern, self.name):
-            pattern_suggest = r'[a-zA-Z0-9\[\]\(\)\.\s/%-]+'
+            pattern_suggest = rf"{rule_regex}"
             suggest = ''.join(re.findall(pattern_suggest, self.name))
-            raise UserError(f'Nama hanya bisa menggunakan angka, strip, huruf kecil, huruf besar, titik, kurung lengkung, kurung siku, garis miring. Contoh: {suggest}')
+            raise UserError(f'Contoh yang benar adalah {suggest}')
     
     # def write(self, vals):
     #     if 'solr_flag' not in vals and self.solr_flag == 1:
@@ -175,13 +193,7 @@ class ProductTemplate(models.Model):
 
     def _compute_web_price(self):
         for template in self:
-            # product = self.env['product.product'].search([('product_tmpl_id', '=', template.id)], limit=1)
-
-            product_pricelist_item = self.env['product.pricelist.item'].search([
-                ('pricelist_id', '=', 1),
-                ('product_id', '=', template.product_variant_id.id)], limit=1)
-            price = product_pricelist_item.fixed_price
-            template.web_price = price
+            template.web_price = template.product_variant_ids[0].web_price
 
     def _have_promotion_program(self):
         for template in self:
@@ -324,10 +336,19 @@ class ProductProduct(models.Model):
     sla_version = fields.Integer(string="SLA Version", default=0)
     is_edited = fields.Boolean(string='Is Edited')
 
+    def day_product_to_edit(self):
+        day_products = []
+        
+        for product in self:
+            day_product = (product.write_date - product.create_date).days
+            day_products.append(day_product)
+
+        return day_products
+
     @api.constrains('name','default_code')
     def _check_duplicate_product(self):
-        if not self.env.user.is_purchasing_manager:
-            for product in self:
+        for product in self:
+            if not self.env.user.is_purchasing_manager and not self.env.user.is_editor_product:
                 if product.write_date == product.create_date:
                     domain = [
                         ('default_code', '!=', False),
@@ -340,25 +361,20 @@ class ProductProduct(models.Model):
                     existing_purchase = self.search(domain, limit=1)
                     if existing_purchase:
                         raise UserError(massage)
-                else:
-                    domain = [
-                        ('id', '=', product.id),
-                        ('is_edited', '=', True),
-                        ]
+                elif all(day_product > 0 for day_product in product.day_product_to_edit()):
+                    domain = [('id', '=', product.id)]
                     existing_purchase = self.search(domain)
                     if existing_purchase:
                         raise UserError('Hanya Pak Tyas Yang Dapat Merubah Data Product')
-                    if not existing_purchase:
-                        true = True
-                        self.is_edited = true
-
+    
     @api.constrains('name')
     def _validate_name(self):
-        pattern = r'^[a-zA-Z0-9\[\]\(\)\.\s/%-]+$' 
+        rule_regex = self.env['ir.config_parameter'].sudo().get_param('product.product.rule_name_regex') or ''
+        pattern = rf'^{rule_regex}$'
         if not re.match(pattern, self.name):
-            pattern_suggest = r'[a-zA-Z0-9\[\]\(\)\.\s/%-]+'
+            pattern_suggest = rf"{rule_regex}"
             suggest = ''.join(re.findall(pattern_suggest, self.name))
-            raise UserError(f'Nama hanya bisa menggunakan angka, strip, huruf kecil, huruf besar, titik, kurung lengkung, kurung siku, garis miring. Contoh: {suggest}')
+            raise UserError(f'Contoh yang benar adalah {suggest}')
     
     def _get_qty_incoming_bandengan(self):
         for product in self:
@@ -389,8 +405,16 @@ class ProductProduct(models.Model):
 
     def _compute_web_price(self):
         for product in self:
-            product_pricelist_item = self.env['product.pricelist.item'].search(
-                [('pricelist_id', '=', 1), ('product_id', '=', product.id)], limit=1)
+            pricelist_id = self.env.context.get('pricelist')
+
+            domain = [('pricelist_id', '=', pricelist_id or 1), ('product_id', '=', product.id)]
+            product_pricelist_item = self.env['product.pricelist.item'].search(domain, limit=1)
+
+            if product_pricelist_item.base_pricelist_id:
+                base_pricelist_id = product_pricelist_item.base_pricelist_id.id
+                domain = [('pricelist_id', '=', base_pricelist_id), ('product_id', '=', product.id)]
+                product_pricelist_item = self.env['product.pricelist.item'].search(domain, limit=1)
+
             product.web_price = product_pricelist_item.fixed_price
 
     def _compute_stock_vendor(self):
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 3fb61955..8ad25228 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -46,6 +46,11 @@ class PurchaseOrder(models.Model):
     summary_qty_receipt = fields.Float('Summary Qty Receipt', compute='_compute_summary_qty')
     count_line_product = fields.Float('Total Item', compute='compute_count_line_product')
     note_description = fields.Char(string='Note', help='bisa diisi sebagai informasi indent barang tertentu atau apapun')
+    has_active_invoice = fields.Boolean(string='Has Active Invoice', compute='_compute_has_active_invoice')
+
+    def _compute_has_active_invoice(self):
+        for order in self:
+            order.has_active_invoice = any(invoice.state != 'cancel' for invoice in order.invoice_ids)
 
     def add_product_to_pricelist(self):
         for line in self.order_line:
@@ -195,6 +200,7 @@ class PurchaseOrder(models.Model):
                     'product_qty': order_line.product_qty,
                     'qty_available_store': qty_available,
                     'suggest': suggest,
+                    'so_line_id': order_line.id,
                 }
                 self.order_line.create(values)
 
@@ -258,8 +264,6 @@ class PurchaseOrder(models.Model):
                 self.env['po.sync.price'].create([{
                     'order_line_id': line.id,
                 }])
-            
-            
 
     def _send_mail(self):
         output = io.BytesIO()
@@ -325,7 +329,7 @@ class PurchaseOrder(models.Model):
     def re_calculate(self):
         for line in self.order_line:
             sale_order_line = self.env['sale.order.line'].search([
-                ('product_id', '=', line.product_id.id),
+                ('id', '=', line.so_line_id.id),
                 ('order_id', '=', line.order_id.sale_order_id.id)
             ], limit=1, order='price_reduce_taxexcl')
             for so_line in sale_order_line:
@@ -340,9 +344,13 @@ class PurchaseOrder(models.Model):
     def compute_total_margin(self):
         sum_so_margin = sum_sales_price = sum_margin = 0
         for line in self.order_line:
-            sale_order_line = self.env['sale.order.line'].search(
-                [('product_id', '=', line.product_id.id),
-                 ('order_id', '=', line.order_id.sale_order_id.id)], limit=1, order='price_reduce_taxexcl')
+            sale_order_line = line.so_line_id
+            if not sale_order_line:
+                sale_order_line = self.env['sale.order.line'].search([
+                    ('product_id', '=', line.product_id.id),
+                    ('order_id', '=', line.order_id.sale_order_id.id)
+                ], limit=1, order='price_reduce_taxexcl')
+
             sum_so_margin += sale_order_line.item_margin
             sales_price = sale_order_line.price_reduce_taxexcl * sale_order_line.product_uom_qty
             if sale_order_line.order_id.shipping_cost_covered == 'indoteknik':
diff --git a/indoteknik_custom/models/purchase_order_line.py b/indoteknik_custom/models/purchase_order_line.py
index 39aeba0f..95e85122 100755
--- a/indoteknik_custom/models/purchase_order_line.py
+++ b/indoteknik_custom/models/purchase_order_line.py
@@ -29,6 +29,7 @@ class PurchaseOrderLine(models.Model):
     qty_available_store = fields.Float(string='Available')
     suggest = fields.Char(string='Suggest')
     price_vendor = fields.Float(string='Price Vendor', compute='compute_price_vendor')
+    so_line_id = fields.Many2one('sale.order.line', string='ID SO Line')
     
     def compute_price_vendor(self):
         for line in self:
diff --git a/indoteknik_custom/models/quotation_so_multi_update.py b/indoteknik_custom/models/quotation_so_multi_update.py
new file mode 100644
index 00000000..105b7963
--- /dev/null
+++ b/indoteknik_custom/models/quotation_so_multi_update.py
@@ -0,0 +1,22 @@
+from odoo import models, fields
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class QuotationSoMultiUpdate(models.TransientModel):
+    _name = 'quotation.so.multi_update'
+
+    def save_multi_update_quotation(self):
+        quotation_ids = self._context['quotation_ids']
+        sales = self.env['sale.order'].browse(quotation_ids)
+        sales.action_multi_update_state()
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': 'Notification',
+                'message': 'Status berhasil diubah',
+                'next': {'type': 'ir.actions.act_window_close'},
+            }
+        }
\ No newline at end of file
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 376b8e40..71163fa4 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -58,7 +58,7 @@ class SaleOrder(models.Model):
         ('partial_chargeback', 'Partial Chargeback'),
         ('authorize', 'Authorize'),
     ], tracking=True, string='Payment Status', help='Payment Gateway Status / Midtrans / Web, https://docs.midtrans.com/en/after-payment/status-cycle')
-    date_doc_kirim = fields.Datetime(string='Tanggal Kirim di SJ', help="Tanggal Kirim di cetakan SJ yang terakhir, tidak berpengaruh ke Accounting")
+    date_doc_kirim = fields.Datetime(string='Tanggal Kirim di SJ', help="Tanggal Kirim di cetakan SJ yang terakhir, tidak berpengaruh ke Accounting", tracking=True)
     payment_type = fields.Char(string='Payment Type', help='Jenis pembayaran dengan Midtrans')
     gross_amount = fields.Float(string='Gross Amount', help='Jumlah pembayaran yang dilakukan dengan Midtrans')
     notification = fields.Char(string='Notification', help='Dapat membantu error dari approval')
@@ -78,8 +78,41 @@ class SaleOrder(models.Model):
     amount_voucher_disc = fields.Float(string='Voucher Discount')
     source_id = fields.Many2one('utm.source', 'Source', domain="[('id', 'in', [32, 59, 60, 61])]")
     estimated_arrival_days = fields.Integer('Estimated Arrival Days', default=0)
+    email = fields.Char(string='Email')
     picking_iu_id = fields.Many2one('stock.picking', 'Picking IU')
 
+    @api.model
+    def action_multi_update_state(self):
+        for sale in self:
+            sale.update({
+                'state': 'cancel',
+            })
+
+            if sale.state == 'cancel':
+                sale.update({
+                    'approval_status': False,
+                })
+
+    def open_form_multi_update_status(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_sale_orders_multi_update')
+        action['context'] = {
+            'sale_ids': [x.id for x in self]
+        }
+        return action
+    
+    def open_form_multi_update_state(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_quotation_so_multi_update')
+        action['context'] = {
+            'quotation_ids': [x.id for x in self]
+        }
+        return action
+    
+    def action_multi_update_invoice_status(self):
+        for sale in self:
+            sale.update({
+                'invoice_status': 'invoiced',
+            })
+
     def _compute_purchase_total(self):
         for order in self:
             total = 0
@@ -173,6 +206,7 @@ class SaleOrder(models.Model):
         self.npwp = parent_id.npwp
         self.sppkp = parent_id.sppkp
         self.customer_type = parent_id.customer_type
+        self.email = parent_id.email
     
     @api.onchange('partner_id')
     def onchange_partner_id(self):
diff --git a/indoteknik_custom/models/sale_orders_multi_update.py b/indoteknik_custom/models/sale_orders_multi_update.py
new file mode 100644
index 00000000..95cfde21
--- /dev/null
+++ b/indoteknik_custom/models/sale_orders_multi_update.py
@@ -0,0 +1,22 @@
+from odoo import models, fields
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class SaleOrdersMultiUpdate(models.TransientModel):
+    _name = 'sale.orders.multi_update'
+
+    def save_multi_update_so(self):
+        sale_ids = self._context['sale_ids']
+        sales = self.env['sale.order'].browse(sale_ids)
+        sales.action_multi_update_invoice_status()
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': 'Notification',
+                'message': 'Invoice Status berhasil diubah',
+                'next': {'type': 'ir.actions.act_window_close'},
+            }
+        }
\ No newline at end of file
diff --git a/indoteknik_custom/models/solr/__init__.py b/indoteknik_custom/models/solr/__init__.py
index 16da73af..f2d13116 100644
--- a/indoteknik_custom/models/solr/__init__.py
+++ b/indoteknik_custom/models/solr/__init__.py
@@ -7,4 +7,5 @@ from . import product_template
 from . import website_categories_homepage
 from . import x_manufactures
 from . import x_banner_banner
-from . import product_public_category
\ No newline at end of file
+from . import product_public_category
+from . import x_banner_category
\ No newline at end of file
diff --git a/indoteknik_custom/models/solr/apache_solr.py b/indoteknik_custom/models/solr/apache_solr.py
index eb02cb57..5acfded8 100644
--- a/indoteknik_custom/models/solr/apache_solr.py
+++ b/indoteknik_custom/models/solr/apache_solr.py
@@ -213,6 +213,8 @@ class ApacheSolr(models.Model):
         end_time = time.time()
         _logger.info("[SYNC_PRODUCT_TO_SOLR] Finish task add to solr. Time taken: {:.6f} seconds".format(end_time - start_time))
 
+        return True
+
     def _test_product_price(self, product_id=228178):
         product = self.env['product.product'].search([('id', '=', product_id)], limit=1)
         _logger.info('price incl tax: %s' % product._get_website_price_include_tax())
@@ -287,3 +289,5 @@ class ApacheSolr(models.Model):
         _variants_solr.add(documents)
         end_time = time.time()
         _logger.info("[SYNC_VARIANTS_TO_SOLR] Finish task add to solr. Time taken: {:.6f} seconds".format(end_time - start_time))
+
+        return False
diff --git a/indoteknik_custom/models/solr/product_product.py b/indoteknik_custom/models/solr/product_product.py
index 93e26793..41af2d0e 100644
--- a/indoteknik_custom/models/solr/product_product.py
+++ b/indoteknik_custom/models/solr/product_product.py
@@ -31,8 +31,6 @@ class ProductProduct(models.Model):
         solr_model = self.env['apache.solr']
 
         for variant in self:
-            if not variant.product_tmpl_id.active and variant.product_tmpl_id.type != 'product':
-                continue
 
             category_id = 0
             category_name = ''
@@ -64,7 +62,8 @@ class ProductProduct(models.Model):
                 'search_rank_i': variant.product_tmpl_id.search_rank,
                 'search_rank_weekly_i': variant.product_tmpl_id.search_rank_weekly,
                 'attributes': [x.name for x in variant.product_template_attribute_value_ids],
-                'has_product_info_b': True
+                'has_product_info_b': True,
+                'publish_b': variant.product_tmpl_id.publish,
             })
 
             self.solr().add(docs=[document], softCommit=True)
@@ -78,18 +77,18 @@ class ProductProduct(models.Model):
 
         for variant in self:
             price_excl_after_disc = price_excl = discount = tax = 0
-            flashsale_data = tier1 = tier2 = tier3 = {}
+            flashsale_data = {}
 
             if price_excl_after_disc == 0 or variant._get_website_price_after_disc_and_tax() < price_excl_after_disc:
                 price_excl = variant._get_website_price_exclude_tax()
                 price_excl_after_disc = variant._get_website_price_after_disc_and_tax()
-                discount = variant._get_website_disc(0)
                 tax = variant._get_website_tax()
+                discount = variant._get_website_disc(0)
                 flashsale_data = variant._get_flashsale_price()
-                # add price tiering for base price, discount, and price after discount (tier 1 - 3)
-                tier1 = variant._get_pricelist_tier1()
-                tier2 = variant._get_pricelist_tier2()
-                tier3 = variant._get_pricelist_tier3()
+
+                price_excl_v2 = variant._v2_get_website_price_exclude_tax()
+                price_excl_after_disc_v2 = variant._v2_get_website_price_after_disc_and_tax()
+                tax_v2 = variant._v2_get_website_tax()
 
             document = solr_model.get_doc('variants', variant.id)
             document.update({
@@ -106,14 +105,23 @@ class ProductProduct(models.Model):
                 "discount_f": discount,
                 "price_discount_f": price_excl_after_disc,
                 "tax_f": tax,
-                "discount_tier1_f": tier1.get('discount_tier1', 0),
-                "price_tier1_f": tier1.get('price_tier1', 0),
-                "discount_tier2_f": tier2.get('discount_tier2', 0),
-                "price_tier2_f": tier2.get('price_tier2', 0),
-                "discount_tier3_f": tier3.get('discount_tier3', 0),
-                "price_tier3_f": tier3.get('price_tier3', 0),
-                "has_price_info_b": True
+                "price_v2_f": price_excl_v2,
+                "price_discount_v2_f": price_excl_after_disc_v2,
+                "tax_v2_f": tax_v2,
             })
+
+            for tier_number in [1, 2, 3, '1_v2', '2_v2', '3_v2', '4_v2', '5_v2']:
+                tier = variant._get_pricelist_tier(tier_number)
+                document.update({
+                    f"discount_tier{tier_number}_f": tier.get(f'discount_tier{tier_number}', 0),
+                    f"price_tier{tier_number}_f": tier.get(f'price_tier{tier_number}', 0),
+                })
+
+            # for tier_number in [1, 2, 3, '1_v2', '2_v2', '3_v2', '4_v2', '5_v2']:
+            #     tier = tier_data[tier_number]
+
+            document.update({"has_price_info_b": True})
+
             self.solr().add(docs=[document], softCommit=True)
             variant.change_solr_data('Ada perubahan pada harga product')
 
diff --git a/indoteknik_custom/models/solr/product_template.py b/indoteknik_custom/models/solr/product_template.py
index ea976359..b4782d1c 100644
--- a/indoteknik_custom/models/solr/product_template.py
+++ b/indoteknik_custom/models/solr/product_template.py
@@ -23,9 +23,21 @@ class ProductTemplate(models.Model):
                 'function_name': function_name
             }) 
 
-    @api.constrains('active')
-    def _create_solr_queue_sync_active(self):
-        self._create_solr_queue('_sync_active_template_solr')
+    @api.constrains('active', 'type')
+    def constrains_active(self):
+        for template in self:
+            template.publish = template.active and template.type == 'product'
+        self._create_solr_queue('_sync_product_template_to_solr')
+
+    @api.constrains('publish')
+    def constrains_publish(self):
+        for template in self:
+            if template.active and template.type == 'product':
+                continue
+            template.product_variant_ids.publish = template.publish
+        self._create_solr_queue('_sync_product_template_to_solr')
+
+    constrains_active._priority = 1
 
     @api.constrains('name', 'default_code', 'weight', 'x_manufacture', 'public_categ_ids', 'search_rank', 'search_rank_weekly', 'image_1920')
     def _create_solr_queue_sync_product_template(self):
@@ -42,25 +54,10 @@ class ProductTemplate(models.Model):
             product._create_solr_queue('_sync_price_to_solr')
             product.solr_flag = 1
 
-    def _sync_active_template_solr(self):
-        for template in self:
-            if not template.active or template.type != 'product':
-                template._sync_delete_solr()
-            else:
-                template._sync_product_template_to_solr()
-                template._sync_price_to_solr()
-
-                products = self.env['product.product'].search(
-                    [('product_tmpl_id', '=', template.id), ('active', 'in', [True, False])])
-                products._sync_variants_to_solr()
-
     def _sync_product_template_to_solr(self):
         solr_model = self.env['apache.solr']
 
         for template in self:
-            if not template.active or template.type != 'product':
-                continue
-
             variant_names = ', '.join([x.display_name or '' for x in template.product_variant_ids])
             variant_codes = ', '.join([x.default_code or '' for x in template.product_variant_ids])
 
@@ -96,10 +93,15 @@ class ProductTemplate(models.Model):
                 "category_name": category_name,
                 "description_t": template.website_description or '',
                 'has_product_info_b': True,
+                'publish_b': template.publish   
             })
 
             self.solr().add(docs=[document], softCommit=True)
-            template.product_variant_ids._sync_variants_to_solr()
+            products = self.env['product.product'].search([
+                ('product_tmpl_id', '=', template.id),
+                ('active', 'in', [True, False])
+            ])
+            products._sync_variants_to_solr()
             self.change_solr_data('Perubahan pada data product')
 
             if not document.get('has_price_info_b'):
@@ -110,6 +112,8 @@ class ProductTemplate(models.Model):
 
         for template in self:
             flashsale_data = {}
+            price_excl = price_excl_after_disc = discount = tax = 0
+            tier_data = {}
 
             for variant in template.product_variant_ids:
                 variant_flashsale = variant._get_flashsale_price()
@@ -123,9 +127,10 @@ class ProductTemplate(models.Model):
                 price_excl_after_disc = variant._get_website_price_after_disc_and_tax()
                 discount = variant._get_website_disc(0)
                 tax = variant._get_website_tax()
-                tier1 = variant._get_pricelist_tier1()
-                tier2 = variant._get_pricelist_tier2()
-                tier3 = variant._get_pricelist_tier3()
+
+                price_excl_v2 = variant._v2_get_website_price_exclude_tax()
+                price_excl_after_disc_v2 = variant._v2_get_website_price_after_disc_and_tax()
+                tax_v2 = variant._v2_get_website_tax()
 
             document = solr_model.get_doc('product', template.id)
             document.update({
@@ -142,28 +147,27 @@ class ProductTemplate(models.Model):
                 "discount_f": discount,
                 "price_discount_f": price_excl_after_disc,
                 "tax_f": tax,
-                "discount_tier1_f": tier1.get('discount_tier1', 0),
-                "price_tier1_f": tier1.get('price_tier1', 0),
-                "discount_tier2_f": tier2.get('discount_tier2', 0),
-                "price_tier2_f": tier2.get('price_tier2', 0),
-                "discount_tier3_f": tier3.get('discount_tier3', 0),
-                "price_tier3_f": tier3.get('price_tier3', 0),
-                "has_price_info_b": True
+                "price_v2_f": price_excl_v2,
+                "price_discount_v2_f": price_excl_after_disc_v2,
+                "tax_v2_f": tax_v2,
             })
 
+            for tier_number in [1, 2, 3, '1_v2', '2_v2', '3_v2', '4_v2', '5_v2']:
+                tier = variant._get_pricelist_tier(tier_number)
+                document.update({
+                    f"discount_tier{tier_number}_f": tier.get(f'discount_tier{tier_number}', 0),
+                    f"price_tier{tier_number}_f": tier.get(f'price_tier{tier_number}', 0),
+                })
+
+            document.update({"has_price_info_b": True})
+
             self.solr().add(docs=[document], softCommit=True)
             template.product_variant_ids._sync_price_to_solr()
             template.change_solr_data('Ada perubahan pada harga product')
 
             if not document.get('has_product_info_b'):
                 template._sync_product_template_to_solr()
-
-    def _sync_delete_solr(self):
-        for rec in self:
-            self.solr().delete(rec.id)
-            for variant in rec.product_variant_ids:
-                variant._sync_delete_solr()
-
+   
     def solr_results(self, detail=False):
         solr_model = self.env['apache.solr']
         pricelist = self.env.user_pricelist
diff --git a/indoteknik_custom/models/solr/x_banner_banner.py b/indoteknik_custom/models/solr/x_banner_banner.py
index 5608a3d7..67739d47 100644
--- a/indoteknik_custom/models/solr/x_banner_banner.py
+++ b/indoteknik_custom/models/solr/x_banner_banner.py
@@ -46,8 +46,8 @@ class XBannerBanner(models.Model):
                 'background_color_s': banners.background_color or '',
                 'image_s': self.env['ir.attachment'].api_image('x_banner.banner', 'x_banner_image', banners.id),
                 'status_s': banners.x_status_banner or '',
-                'categories': banners.x_banner_category.id or '',
-                'manufactures': banners.x_relasi_manufacture.id or '',
+                'category_id_i': banners.x_banner_category.id or '',
+                'manufacture_id_i': banners.x_relasi_manufacture.id or '',
                 'group_by_week': banners.group_by_week or '',
             })
             self.solr().add([document])
diff --git a/indoteknik_custom/models/solr/x_banner_category.py b/indoteknik_custom/models/solr/x_banner_category.py
new file mode 100644
index 00000000..c73f6722
--- /dev/null
+++ b/indoteknik_custom/models/solr/x_banner_category.py
@@ -0,0 +1,54 @@
+from odoo import fields, models, api
+from datetime import datetime
+
+class XBannerCategory(models.Model):
+    _inherit = "x_banner.category"
+
+    last_update_solr = fields.Datetime(string='Last Update Solr')
+
+    def update_last_update_solr(self):
+        self.last_update_solr = datetime.utcnow()
+
+    def solr(self):
+        return self.env['apache.solr'].connect('banner_categories')
+
+    def _create_solr_queue(self, function_name):
+        for rec in self:
+            self.env['apache.solr.queue'].create_unique({
+                'res_model': self._name,
+                'res_id': rec.id,
+                'function_name': function_name
+            }) 
+
+    @api.constrains('x_name', 'x_banner_subtitle', 'x_studio_field_KKVl4', 'banner_ids')
+    def _create_solr_queue_sync_banner_categories(self):
+        self._create_solr_queue('_sync_banner_categories_to_solr')
+
+    def action_sync_to_solr(self):
+        banner_ids = self.env.context.get('active_ids', [])
+        banners = self.search([('id', 'in', banner_ids)])
+        banners._create_solr_queue('_sync_banner_categories_to_solr')
+
+    def _sync_banner_categories_to_solr(self):
+        for banners in self:
+            document = {}
+            document.update({
+                'id': banners.id,
+                'display_name_s': banners.display_name,
+                'name_s': banners.x_name,
+                'banner_subtitle_s': banners.x_banner_subtitle or '',
+                'x_studio_field_KKVl4_s': banners.x_studio_field_KKVl4 or '',
+                'banners': [x.id for x in banners.banner_ids],
+            })
+            self.solr().add([document])
+            banners.update_last_update_solr()
+
+        self.solr().commit()
+
+    def unlink(self):
+        res = super(XBannerCategory, self).unlink()
+        for rec in self:
+            self.solr().delete(rec.id)
+        self.solr().optimize()
+        self.solr().commit()
+        return res
\ No newline at end of file
diff --git a/indoteknik_custom/models/solr/x_manufactures.py b/indoteknik_custom/models/solr/x_manufactures.py
index c0c321e4..375b7708 100644
--- a/indoteknik_custom/models/solr/x_manufactures.py
+++ b/indoteknik_custom/models/solr/x_manufactures.py
@@ -44,10 +44,11 @@ class XManufactures(models.Model):
                 'sequence_i': brands.sequence or '',
                 'negara_asal_s': brands.x_negara_asal or '',
                 'short_desc_s': brands.x_short_desc or '',
+                'level_s': brands.x_manufacture_level or '',
                 'image_s': self.env['ir.attachment'].api_image('x_manufactures', 'x_logo_manufacture', brands.id),
                 'produk_aksesoris_sparepart_s': brands.x_produk_aksesoris_sparepart or '',
-                'categories': [x.id for x in brands.category_ids],
-                'banners': [x.id for x in brands.x_manufactures_banners],
+                'category_ids': [x.id for x in brands.category_ids],
+                'banner_ids': [x.id for x in brands.x_manufactures_banners],
             })
             self.solr().add([document])
             brands.update_last_update_solr()
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index e1564ca9..181f2a59 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -64,7 +64,7 @@ class StockPicking(models.Model):
         ('pengajuan1', 'Approval Finance'),
         ('approved', 'Approved'),
     ], string='Approval Return Status', readonly=True, copy=False, index=True, tracking=3, help="Approval Status untuk Return")
-    date_doc_kirim = fields.Datetime(string='Tanggal Kirim di SJ', help="Tanggal Kirim di cetakan SJ, tidak berpengaruh ke Accounting")
+    date_doc_kirim = fields.Datetime(string='Tanggal Kirim di SJ', help="Tanggal Kirim di cetakan SJ, tidak berpengaruh ke Accounting", tracking=True)
     note_logistic = fields.Selection([
         ('hold', 'Hold by Sales'),
         ('not_paid', 'Customer belum bayar'),
diff --git a/indoteknik_custom/models/users.py b/indoteknik_custom/models/users.py
index 14fcae98..b90c0097 100644
--- a/indoteknik_custom/models/users.py
+++ b/indoteknik_custom/models/users.py
@@ -10,6 +10,7 @@ class Users(models.Model):
     is_leader = fields.Boolean(string='Leader', help='Berhak Approval SO Margin < 15 dan Approval PO')
     is_accounting = fields.Boolean(string='Accounting', help='Berhak Approval Internal Use')
     is_logistic_approver = fields.Boolean(string='Logistic Approver', help='Berhak Approval Penerimaan Barang')
+    is_editor_product = fields.Boolean(string='Editor Product', help='Berhak Mengedit Data Product')
 
     def notify_internal_users(self, message, title):
         users = self.search([('share', '=', False)])
diff --git a/indoteknik_custom/models/voucher.py b/indoteknik_custom/models/voucher.py
index 4865db2f..8486fca0 100644
--- a/indoteknik_custom/models/voucher.py
+++ b/indoteknik_custom/models/voucher.py
@@ -218,6 +218,7 @@ class Voucher(models.Model):
         tnc.append('<ol>')
         tnc.append('<li>Voucher hanya berlaku apabila pembelian Pengguna sudah memenuhi syarat dan ketentuan yang tertera pada voucher</li>')
         tnc.append(f'<li>Voucher berlaku {self._res_remaining_time()} lagi</li>')
+        tnc.append(f'<li>Voucher tidak bisa digunakan apabila terdapat produk flash sale</li>')
         if len(self.voucher_line) > 0:
             brand_names = ', '.join([x.manufacture_id.x_name for x in self.voucher_line])
             tnc.append(f'<li>Voucher berlaku untuk produk dari brand {brand_names}</li>')