Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into reminder-tempo-v2

4 files changed, 14 insertions, 7 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index 26b5df37..9f7df464 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -215,9 +215,8 @@ class CustomerCommision(models.Model):
     grouped_so_number = fields.Char(string='Group SO Number', compute='_compute_grouped_numbers')
     grouped_invoice_number = fields.Char(string='Group Invoice Number', compute='_compute_grouped_numbers')
 
-    sales_id = fields.Many2one('res.users', string="Sales", tracking=True, default=lambda self: self.env.user,
-                               domain=lambda self: [
-                                   ('groups_id', 'in', self.env.ref('sales_team.group_sale_salesman').id)])
+    sales_id = fields.Many2one('res.users', string="Sales", tracking=True, required=True,
+                                domain=[('groups_id', 'in', [94]),('id', '!=', 15710)])
 
     date_approved_sales = fields.Datetime(string="Date Approved Sales", tracking=True)
     date_approved_marketing = fields.Datetime(string="Date Approved Marketing", tracking=True)
diff --git a/indoteknik_custom/models/mrp_production.py b/indoteknik_custom/models/mrp_production.py
index 7977bdf7..91da0597 100644
--- a/indoteknik_custom/models/mrp_production.py
+++ b/indoteknik_custom/models/mrp_production.py
@@ -156,7 +156,7 @@ class MrpProduction(models.Model):
                             'order_id': new_po.id
                         }])
             
-            new_po.button_confirm()
+            # new_po.button_confirm()
             
         self.is_po = True
 
@@ -247,7 +247,7 @@ class CheckBomProduct(models.Model):
     @api.constrains('production_id', 'product_id')
     def _check_product_bom_validation(self):
         for record in self:
-            if record.production_id.sale_order.state not in ['sale', 'done']:
+            if record.production_id.sale_order and record.production_id.sale_order.state not in ['sale', 'done']:
                 raise UserError((
                 "SO harus diconfirm terlebih dahulu."
             ))
@@ -273,13 +273,13 @@ class CheckBomProduct(models.Model):
             if existing_lines:
                 total_quantity = sum(existing_lines.mapped('quantity'))
 
-                if total_quantity < total_qty_in_moves:
+                if total_quantity > total_qty_in_moves:
                     raise UserError((
                         "Quantity Product '%s' kurang dari quantity demand."
                     ) % (record.product_id.display_name))
             else:
                 # Check if the quantity exceeds the allowed total
-                if record.quantity < total_qty_in_moves:
+                if record.quantity > total_qty_in_moves:
                     raise UserError((
                         "Quantity Product '%s' kurang dari quantity demand."
                     ) % (record.product_id.display_name))
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 5e9fc362..64b9f9bc 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -1,6 +1,10 @@
 from odoo import fields, models, api, _
 from odoo.exceptions import UserError
 from datetime import datetime, timedelta
+import logging
+from odoo.tools.float_utils import float_compare
+
+_logger = logging.getLogger(__name__)
 
 
 class SaleOrderLine(models.Model):
@@ -49,6 +53,9 @@ class SaleOrderLine(models.Model):
     qty_free_bu = fields.Float(string='Free BU', compute='_get_qty_free_bandengan')
     desc_updatable = fields.Boolean(string='desc boolean', default=True, compute='_get_desc_updatable')
 
+    is_has_disc = fields.Boolean('Flash Sale', default=False)
+
+
     def _get_outgoing_incoming_moves(self):
         outgoing_moves = self.env['stock.move']
         incoming_moves = self.env['stock.move']
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index c1f1fe61..d75120b7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -290,6 +290,7 @@
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
                     <field name="weight" optional="hide"/>
+                    <field name="is_has_disc" string="Flash Sale Item?" readonly="1" optional="hide"/>
                     <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
                     <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/>
                 </xpath>