From 321eb7701fa2172ae3d1f633774702e4a8f8a380 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 10 Nov 2023 11:44:12 +0700
Subject: can delete commision line

---
 indoteknik_custom/views/customer_commision.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index e299d37e..008c79f8 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -20,7 +20,7 @@
         <field name="name">customer.commision.line.tree</field>
         <field name="model">customer.commision.line</field>
         <field name="arch" type="xml">
-            <tree editable="top" create="false" delete="false">
+            <tree editable="top" create="false">
                 <field name="partner_id" readonly="1"/>
                 <field name="invoice_id" readonly="1"/>
                 <field name="state" readonly="1"/>
-- 
cgit v1.2.3


From b4e74170aeaf00937f78e5af9047218ddb17516c Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Fri, 10 Nov 2023 13:37:46 +0700
Subject: Add parameter on delete weekly solr

---
 indoteknik_custom/models/solr/apache_solr_queue.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/solr/apache_solr_queue.py b/indoteknik_custom/models/solr/apache_solr_queue.py
index 8dd7c273..07274295 100644
--- a/indoteknik_custom/models/solr/apache_solr_queue.py
+++ b/indoteknik_custom/models/solr/apache_solr_queue.py
@@ -72,11 +72,12 @@ class ApacheSolrQueue(models.Model):
         if count == 0:
             self.create(payload)
 
-    def delete_weekly_solr(self, limit=500):
+    def delete_weekly_solr(self, limit=500, days_after=30):
         solr = self.search([
             ('execute_status', '=', 'success'),
-            ('execute_date', '>=', (datetime.utcnow() - timedelta(days=7))),
+            ('execute_date', '>=', (datetime.utcnow() - timedelta(days=days_after))),
         ], limit=limit)
+        
         for rec in solr:
             rec.unlink()
 
-- 
cgit v1.2.3


From 9a6918c3ee15cbed74af9fcf838a667dac166b32 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 10 Nov 2023 13:52:18 +0700
Subject: add other info in commision and add name in dunning run

---
 indoteknik_custom/models/commision.py          | 4 ++++
 indoteknik_custom/models/dunning_run.py        | 1 +
 indoteknik_custom/views/customer_commision.xml | 8 ++++++++
 3 files changed, 13 insertions(+)

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index d4942a0d..a11d85c7 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -148,6 +148,10 @@ class CustomerCommision(models.Model):
         ('cashback', 'Cashback'),
         ('rebate', 'Rebate'),
     ], string='Commision Type', required=True)
+    bank_name = fields.Char(string='Bank', tracking=3)
+    account_name = fields.Char(string='Account Name', tracking=3)
+    bank_account = fields.Char(string='Account No', tracking=3)
+    note_transfer = fields.Char(string='Keterangan')
 
     # add status for type of commision, fee, rebate / cashback
     # include child or not?
diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 8e5b2c19..abfd68be 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -10,6 +10,7 @@ class DunningRun(models.Model):
     _name = 'dunning.run'
     _description = 'Dunning Run'
     _order = 'dunning_date desc, id desc'
+    _rec_name = 'number'
 
     number = fields.Char(string='Document No', index=True, copy=False, readonly=True)
     dunning_date = fields.Date(string='Dunning Date', required=True)
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 008c79f8..993521ca 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -72,6 +72,14 @@
                             <page string="Lines">
                                 <field name="commision_lines"/>
                             </page>
+                            <page string="Other Info" name="customer_commision_info">
+                                <group>
+                                    <field name="bank_name"/>
+                                    <field name="account_name"/>
+                                    <field name="bank_account"/>
+                                    <field name="note_transfer"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-- 
cgit v1.2.3


From e7dc713b08b356100960e93d552b3a3a2a31727c Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Fri, 10 Nov 2023 16:28:06 +0700
Subject: Fix bug voucher

---
 indoteknik_custom/models/voucher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/voucher.py b/indoteknik_custom/models/voucher.py
index 66c50c24..2eedc861 100644
--- a/indoteknik_custom/models/voucher.py
+++ b/indoteknik_custom/models/voucher.py
@@ -219,7 +219,7 @@ class Voucher(models.Model):
         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])
+            brand_names = ', '.join([x.manufacture_id.x_name or '' for x in self.voucher_line])
             tnc.append(f'<li>Voucher berlaku untuk produk dari brand {brand_names}</li>')
         tnc.append(self.generate_detail_tnc())
         tnc.append('</ol>')
-- 
cgit v1.2.3


From 49846bc78d282516092c6c63db63d4ea01d42949 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Mon, 13 Nov 2023 15:31:43 +0700
Subject: remove divide tax while flashsale

---
 indoteknik_api/models/product_product.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py
index aa9e0ad7..1db58d8e 100644
--- a/indoteknik_api/models/product_product.py
+++ b/indoteknik_api/models/product_product.py
@@ -273,7 +273,8 @@ class ProductProduct(models.Model):
 
         base_price = 0
         if base_pricelist:
-            base_price = base_pricelist.computed_price / 1.11
+            base_price = base_pricelist.computed_price
+            # base_price = base_pricelist.computed_price / 1.11
 
         discount = 0
         price_flashsale = 0
-- 
cgit v1.2.3