Merge branch 'production' into cr/outgoing_incoming_bu_v2

5 files changed, 33 insertions, 7 deletions

diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py
index fe459ee3..4d186568 100755
--- a/indoteknik_custom/models/product_template.py
+++ b/indoteknik_custom/models/product_template.py
@@ -61,6 +61,7 @@ class ProductTemplate(models.Model):
     sni = fields.Boolean(string='SNI')
     tkdn = fields.Boolean(string='TKDN')
     short_spesification = fields.Char(string='Short Spesification')
+    merchandise_ok = fields.Boolean(string='Product Promotion')
     
     @api.constrains('name', 'internal_reference', 'x_manufacture')
     def required_public_categ_ids(self):
@@ -377,6 +378,7 @@ class ProductProduct(models.Model):
     max_qty_reorder = fields.Float(string='Max Qty Reorder', compute='_get_max_qty_reordering_rule')
     qty_rpo = fields.Float(string='Qty RPO', compute='_get_qty_rpo')
     plafon_qty = fields.Float(string='Max Plafon', compute='_get_plafon_qty_product')
+    merchandise_ok = fields.Boolean(string='Product Promotion')
 
     def _get_clean_website_description(self):
         for rec in self:
diff --git a/indoteknik_custom/models/promotion/sale_order.py b/indoteknik_custom/models/promotion/sale_order.py
index be820c6f..1c31d060 100644
--- a/indoteknik_custom/models/promotion/sale_order.py
+++ b/indoteknik_custom/models/promotion/sale_order.py
@@ -10,11 +10,12 @@ class SaleOrder(models.Model):
         for promotion in promotions:
             program_line = self.env['promotion.program.line'].browse(promotion['program_line_id'])
             for free_product in program_line.free_product_ids:
-                self.env['sale.order.line'].create({
-                    'order_id': self.id,
-                    'name': "Free Product " + free_product.product_id.display_name,
-                    'display_type': 'line_note'
-                })
+                if free_product.product_id.merchandise_ok:
+                    self.env['sale.order.line'].create({
+                        'order_id': self.id,
+                        'name': f"Free Product {free_product.product_id.display_name} Quantity ({free_product.qty})",
+                        'display_type': 'line_note'
+                    })
 
     def apply_promotion_program(self):
         userdata = {
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 4297012c..da4a6cb6 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -1,7 +1,7 @@
 from odoo import models, fields, api
 from odoo.exceptions import UserError, ValidationError
 from datetime import datetime
-
+from odoo.http import request
 class GroupPartner(models.Model):
     _name = 'group.partner'
 
@@ -244,6 +244,14 @@ class ResPartner(models.Model):
     def _onchange_customer_type(self):
         if self.customer_type == 'nonpkp':
             self.npwp = '00.000.000.0-000.000'
-        
 
+    def get_check_tempo_partner(self):
+        self.ensure_one()
+
+        partner = self.parent_id or self
+
+        if not partner.property_payment_term_id or 'Tempo' not in partner.property_payment_term_id.name:
+            return False
+        else:
+            return True
 
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 315a338a..7fc6d96a 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -99,6 +99,7 @@ class SaleOrder(models.Model):
     helper_by_id = fields.Many2one('res.users', 'Helper By')
     eta_date = fields.Datetime(string='ETA Date', copy=False, compute='_compute_eta_date')
     flash_sale = fields.Boolean(string='Flash Sale', help='Data dari web')
+    is_continue_transaction = fields.Boolean(string='Button Transaction', help='Data dari web')
     web_approval = fields.Selection([
         ('company', 'Company'),
         ('cust_manager', 'Customer Manager'),
@@ -144,6 +145,14 @@ class SaleOrder(models.Model):
         ('NP', 'Non Pareto')
     ])
 
+    @api.onchange('payment_status')
+    def _is_continue_transaction(self):
+        if not self.is_continue_transaction:
+            if self.payment_status == 'settlement':
+                self.is_continue_transaction = True
+            else:
+                self.is_continue_transaction = False
+
     def _compute_total_weight(self):
         total_weight = 0
         missing_weight_products = []
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 5a509ebd..b6599137 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -24,6 +24,12 @@
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="required">0</attribute>
                 </field>
+                <div name="options" position="inside">
+                    <div>
+                        <field name="merchandise_ok"/>
+                        <label for="merchandise_ok"/>
+                    </div>
+                </div>
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </field>