resolve merge

7 files changed, 104 insertions, 62 deletions

diff --git a/indoteknik_custom/controllers/website.py b/indoteknik_custom/controllers/website.py
index 2e3df519..120dddad 100644
--- a/indoteknik_custom/controllers/website.py
+++ b/indoteknik_custom/controllers/website.py
@@ -1,7 +1,12 @@
-from odoo.http import request, Controller
+from odoo.http import request, Controller, route
 from odoo import http, _
 
 class Website(Controller):
+    
+    @route(['/shop', '/shop/cart'], auth='public', website=True)
+    def shop(self, **kw):
+        return request.redirect('https://indoteknik.com/shop/promo', code=302)
+    
     @http.route('/content', auth='public')
     def content(self, **kw):
         url = kw.get('url', '')
diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index 6d832b85..2f3789eb 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -13,8 +13,10 @@ class CustomerRebate(models.Model):
     _inherit = ['mail.thread']
 
     partner_id = fields.Many2one('res.partner', string='Customer', required=True)
-    date_from = fields.Date(string='Date From', required=True, help="Pastikan tanggal 1 januari, jika tidak, code akan break")
-    date_to = fields.Date(string='Date To', required=True, help="Pastikan tanggal 31 desember, jika tidak, code akan break")
+    date_from = fields.Date(string='Date From', required=True,
+                            help="Pastikan tanggal 1 januari, jika tidak, code akan break")
+    date_to = fields.Date(string='Date To', required=True,
+                          help="Pastikan tanggal 31 desember, jika tidak, code akan break")
     description = fields.Char(string='Description')
     target_1st = fields.Float(string='Target/Quarter 1st')
     target_2nd = fields.Float(string='Target/Quarter 2nd')
@@ -36,7 +38,7 @@ class CustomerRebate(models.Model):
             line.dpp_q2 = line._get_current_dpp_q2(line)
             line.dpp_q3 = line._get_current_dpp_q3(line)
             line.dpp_q4 = line._get_current_dpp_q4(line)
-            
+
     def _compute_achievement(self):
         for line in self:
             line.status_q1 = line._check_achievement(line.target_1st, line.target_2nd, line.dpp_q1)
@@ -53,18 +55,18 @@ class CustomerRebate(models.Model):
         else:
             status = 'not achieve'
         return status
-    
+
     def _get_current_dpp_q1(self, line):
         sum_dpp = 0
         brand = [10, 89, 122]
         where = [
-                ('move_id.move_type', '=', 'out_invoice'),
-                ('move_id.state', '=', 'posted'),
-                ('move_id.is_customer_commision', '=', False),
-                ('move_id.partner_id.id', '=', line.partner_id.id),
-                ('move_id.invoice_date', '>=', line.date_from),
-                ('move_id.invoice_date', '<=', '2023-03-31'),
-                ('product_id.x_manufacture', 'in', brand),
+            ('move_id.move_type', '=', 'out_invoice'),
+            ('move_id.state', '=', 'posted'),
+            ('move_id.is_customer_commision', '=', False),
+            ('move_id.partner_id.id', '=', line.partner_id.id),
+            ('move_id.invoice_date', '>=', line.date_from),
+            ('move_id.invoice_date', '<=', '2023-03-31'),
+            ('product_id.x_manufacture', 'in', brand),
         ]
         invoice_lines = self.env['account.move.line'].search(where, order='id')
         for invoice_line in invoice_lines:
@@ -75,13 +77,13 @@ class CustomerRebate(models.Model):
         sum_dpp = 0
         brand = [10, 89, 122]
         where = [
-                ('move_id.move_type', '=', 'out_invoice'),
-                ('move_id.state', '=', 'posted'),
-                ('move_id.is_customer_commision', '=', False),
-                ('move_id.partner_id.id', '=', line.partner_id.id),
-                ('move_id.invoice_date', '>=', '2023-04-01'),
-                ('move_id.invoice_date', '<=', '2023-06-30'),
-                ('product_id.x_manufacture', 'in', brand),
+            ('move_id.move_type', '=', 'out_invoice'),
+            ('move_id.state', '=', 'posted'),
+            ('move_id.is_customer_commision', '=', False),
+            ('move_id.partner_id.id', '=', line.partner_id.id),
+            ('move_id.invoice_date', '>=', '2023-04-01'),
+            ('move_id.invoice_date', '<=', '2023-06-30'),
+            ('product_id.x_manufacture', 'in', brand),
         ]
         invoices = self.env['account.move.line'].search(where, order='id')
         for invoice in invoices:
@@ -92,13 +94,13 @@ class CustomerRebate(models.Model):
         sum_dpp = 0
         brand = [10, 89, 122]
         where = [
-                ('move_id.move_type', '=', 'out_invoice'),
-                ('move_id.state', '=', 'posted'),
-                ('move_id.is_customer_commision', '=', False),
-                ('move_id.partner_id.id', '=', line.partner_id.id),
-                ('move_id.invoice_date', '>=', '2023-07-01'),
-                ('move_id.invoice_date', '<=', '2023-09-30'),
-                ('product_id.x_manufacture', 'in', brand),
+            ('move_id.move_type', '=', 'out_invoice'),
+            ('move_id.state', '=', 'posted'),
+            ('move_id.is_customer_commision', '=', False),
+            ('move_id.partner_id.id', '=', line.partner_id.id),
+            ('move_id.invoice_date', '>=', '2023-07-01'),
+            ('move_id.invoice_date', '<=', '2023-09-30'),
+            ('product_id.x_manufacture', 'in', brand),
         ]
         invoices = self.env['account.move.line'].search(where, order='id')
         for invoice in invoices:
@@ -109,19 +111,20 @@ class CustomerRebate(models.Model):
         sum_dpp = 0
         brand = [10, 89, 122]
         where = [
-                ('move_id.move_type', '=', 'out_invoice'),
-                ('move_id.state', '=', 'posted'),
-                ('move_id.is_customer_commision', '=', False),
-                ('move_id.partner_id.id', '=', line.partner_id.id),
-                ('move_id.invoice_date', '>=', '2023-10-01'),
-                ('move_id.invoice_date', '<=', line.date_to),
-                ('product_id.x_manufacture', 'in', brand),
+            ('move_id.move_type', '=', 'out_invoice'),
+            ('move_id.state', '=', 'posted'),
+            ('move_id.is_customer_commision', '=', False),
+            ('move_id.partner_id.id', '=', line.partner_id.id),
+            ('move_id.invoice_date', '>=', '2023-10-01'),
+            ('move_id.invoice_date', '<=', line.date_to),
+            ('product_id.x_manufacture', 'in', brand),
         ]
         invoices = self.env['account.move.line'].search(where, order='id')
         for invoice in invoices:
             sum_dpp += invoice.price_subtotal
         return sum_dpp
 
+
 class RejectReasonCommision(models.TransientModel):
     _name = 'reject.reason.commision'
     _description = 'Wizard for Reject Reason Customer Commision'
@@ -150,16 +153,19 @@ class CustomerCommision(models.Model):
     partner_ids = fields.Many2many('res.partner', String='Customer', required=True)
     description = fields.Char(string='Description')
     notification = fields.Char(string='Notification')
-    commision_lines = fields.One2many('customer.commision.line', 'customer_commision_id', string='Lines', auto_join=True)
+    commision_lines = fields.One2many('customer.commision.line', 'customer_commision_id', string='Lines',
+                                      auto_join=True)
     status = fields.Selection([
+        ('draft', 'Draft'),
         ('pengajuan1', 'Menunggu Approval Manager Sales'),
         ('pengajuan2', 'Menunggu Approval Marketing'),
         ('pengajuan3', 'Menunggu Approval Pimpinan'),
         ('pengajuan4', 'Menunggu Approval Accounting'),
         ('approved', 'Approved'),
         ('reject', 'Rejected'),
-    ], string='Status', copy=False, readonly=True, tracking=3, index=True, track_visibility='onchange',default='draft')
+    ], string='Status', copy=False, readonly=True, tracking=3, index=True, track_visibility='onchange', default='draft')
     last_status = fields.Selection([
+        ('draft', 'Draft'),
         ('pengajuan1', 'Menunggu Approval Manager Sales'),
         ('pengajuan2', 'Menunggu Approval Marketing'),
         ('pengajuan3', 'Menunggu Approval Pimpinan'),
@@ -209,7 +215,7 @@ class CustomerCommision(models.Model):
 
         for record in self:
             res = ''
-            
+
             try:
                 if record.commision_amt > 0:
                     tb.parse(int(record.commision_amt))
@@ -222,15 +228,16 @@ class CustomerCommision(models.Model):
         for rec in self:
             so_numbers = set()
             invoice_numbers = set()
-            
+
             for line in rec.commision_lines:
-                if line.invoice_id: 
+                if line.invoice_id:
                     if line.invoice_id.sale_id:
                         so_numbers.add(line.invoice_id.sale_id.name)
                     invoice_numbers.add(line.invoice_id.name)
-            
+
             rec.grouped_so_number = ', '.join(sorted(so_numbers))
             rec.grouped_invoice_number = ', '.join(sorted(invoice_numbers))
+
     # add status for type of commision, fee, rebate / cashback
     # include child or not?
 
@@ -255,22 +262,22 @@ class CustomerCommision(models.Model):
                     self.commision_percent = achieve_2nd
                 else:
                     self.commision_percent = 0
-                
+
                 self._onchange_commision_amt()
 
     @api.constrains('commision_percent')
     def _onchange_commision_percent(self):
         if not self.env.context.get('_onchange_commision_percent', True):
             return
-        
+
         if self.commision_amt == 0:
             self.commision_amt = self.commision_percent * self.total_dpp // 100
-    
+
     @api.constrains('commision_amt')
     def _onchange_commision_amt(self):
         if not self.env.context.get('_onchange_commision_amt', True):
             return
-        
+
         if self.total_dpp > 0 and self.commision_percent == 0:
             self.commision_percent = (self.commision_amt / self.total_dpp) * 100
 
@@ -322,7 +329,7 @@ class CustomerCommision(models.Model):
             raise UserError('Harus di approved oleh yang bersangkutan')
         return
 
-    def action_reject(self):#add 2 step approval
+    def action_reject(self):  # add 2 step approval
         return {
             'type': 'ir.actions.act_window',
             'name': _('Reject Reason'),
@@ -353,7 +360,7 @@ class CustomerCommision(models.Model):
     def generate_customer_commision(self):
         if self.commision_lines:
             raise UserError('Line sudah ada, tidak bisa di generate ulang')
-        
+
         if self.commision_type == 'fee':
             self._generate_customer_commision_fee()
         else:
@@ -428,11 +435,13 @@ class CustomerCommision(models.Model):
                 }])
         return
 
+
 class CustomerCommisionLine(models.Model):
     _name = 'customer.commision.line'
     _order = 'id'
 
-    customer_commision_id = fields.Many2one('customer.commision', string='Ref', required=True, ondelete='cascade', copy=False)
+    customer_commision_id = fields.Many2one('customer.commision', string='Ref', required=True, ondelete='cascade',
+                                            copy=False)
     invoice_id = fields.Many2one('account.move', string='Invoice')
     partner_id = fields.Many2one('res.partner', string='Customer')
     state = fields.Char(string='InvStatus')
@@ -440,10 +449,12 @@ class CustomerCommisionLine(models.Model):
     tax = fields.Float(string='TaxAmt')
     total = fields.Float(string='Total')
     total_percent_margin = fields.Float('Total Margin', related='invoice_id.sale_id.total_percent_margin')
-    total_margin_excl_third_party = fields.Float('Before Margin', related='invoice_id.sale_id.total_margin_excl_third_party')
+    total_margin_excl_third_party = fields.Float('Before Margin',
+                                                 related='invoice_id.sale_id.total_margin_excl_third_party')
     product_id = fields.Many2one('product.product', string='Product')
     sale_order_id = fields.Many2one('sale.order', string='Sale Order', related='invoice_id.sale_id')
 
+
 class AccountMove(models.Model):
     _inherit = 'account.move'
     is_customer_commision = fields.Boolean(string='Customer Commision Used')
diff --git a/indoteknik_custom/models/mrp_production.py b/indoteknik_custom/models/mrp_production.py
index 87d75faf..8179fe56 100644
--- a/indoteknik_custom/models/mrp_production.py
+++ b/indoteknik_custom/models/mrp_production.py
@@ -13,6 +13,14 @@ class MrpProduction(models.Model):
     sale_order =  fields.Many2one('sale.order', string='Sale Order', copy=False)
     production_purchase_match = fields.One2many('production.purchase.match', 'production_id', string='Purchase Matches', auto_join=True)
     is_po = fields.Boolean(string='Is PO')
+    state_reserve = fields.Selection([
+        ('waiting', 'Waiting For Fullfilment'),
+        ('ready', 'Ready to Ship'),
+        ('done', 'Done'),
+        ('cancel', 'Cancelled'),
+    ], string='Status Reserve', tracking=True, copy=False, help="The current state of the stock picking.")
+    date_reserved = fields.Datetime(string="Date Reserved", help='Tanggal ter-reserved semua barang nya', copy=False)
+
 
     @api.constrains('check_bom_product_lines')
     def constrains_check_bom_product_lines(self):
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 02d61387..b0e17a3a 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -248,6 +248,16 @@ class SaleOrder(models.Model):
     nomor_so_pengganti = fields.Char(string='Nomor SO Pengganti', copy=False, tracking=3)
     shipping_option_id = fields.Many2one("shipping.option", string="Selected Shipping Option", domain="['|', ('sale_order_id', '=', False), ('sale_order_id', '=', id)]")
 
+    def _validate_uniform_taxes(self):
+        for order in self:
+            tax_sets = set()
+            for line in order.order_line:
+                tax_ids = tuple(sorted(line.tax_id.ids))
+                if tax_ids:
+                    tax_sets.add(tax_ids)
+            if len(tax_sets) > 1:
+                raise ValidationError("Semua produk dalam Sales Order harus memiliki kombinasi pajak yang sama.")
+                
     @api.constrains('fee_third_party', 'delivery_amt', 'biaya_lain_lain')
     def _check_total_margin_excl_third_party(self):
         for rec in self:
@@ -1036,6 +1046,7 @@ class SaleOrder(models.Model):
 
         self._validate_order()
         for order in self:
+            order._validate_uniform_taxes()
             order.order_line.validate_line()
 
             term_days = 0
@@ -1088,6 +1099,7 @@ class SaleOrder(models.Model):
 
         self._validate_order()
         for order in self:
+            order._validate_uniform_taxes()
             order.order_line.validate_line()
             order.check_data_real_delivery_address()
             order._validate_order()
@@ -1319,6 +1331,7 @@ class SaleOrder(models.Model):
         
     def action_confirm(self):
         for order in self:
+            order._validate_uniform_taxes()
             order.check_duplicate_product()
             order.check_product_bom()
             order.check_credit_limit()
@@ -1452,10 +1465,11 @@ class SaleOrder(models.Model):
                     return False
             
     def _requires_approval_margin_leader(self):
-        return self.total_percent_margin < 15 and not self.env.user.is_leader
+        return self.total_percent_margin <= 15 and not self.env.user.is_leader
             
     def _requires_approval_margin_manager(self):
-        return self.total_percent_margin >= 15 and not self.env.user.is_leader and not self.env.user.is_sales_manager
+        return 15 < self.total_percent_margin <= 24 and not self.env.user.is_sales_manager and not self.env.user.is_leader
+        # return self.total_percent_margin >= 15 and not self.env.user.is_leader and not self.env.user.is_sales_manager
     
     def _create_approval_notification(self, approval_role):
         title = 'Warning'
diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index e75c75f0..3c765244 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -15,20 +15,20 @@ class StockMove(models.Model):
     barcode = fields.Char(string='Barcode', related='product_id.barcode')
     vendor_id = fields.Many2one('res.partner' ,string='Vendor')
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        moves = super(StockMove, self).create(vals_list)
+    # @api.model_create_multi
+    # def create(self, vals_list):
+    #     moves = super(StockMove, self).create(vals_list)
         
-        for move in moves:
-            if move.product_id and move.location_id.id == 58 and move.location_dest_id.id == 57 and move.picking_type_id.id == 75:
-                po_line = self.env['purchase.order.line'].search([
-                    ('product_id', '=', move.product_id.id),
-                    ('order_id.name', '=', move.origin)
-                ], limit=1)
-                if po_line:
-                    move.write({'purchase_line_id': po_line.id})
+    #     for move in moves:
+    #         if move.product_id and move.location_id.id == 58 and move.location_dest_id.id == 57 and move.picking_type_id.id == 75:
+    #             po_line = self.env['purchase.order.line'].search([
+    #                 ('product_id', '=', move.product_id.id),
+    #                 ('order_id.name', '=', move.origin)
+    #             ], limit=1)
+    #             if po_line:
+    #                 move.write({'purchase_line_id': po_line.id})
         
-        return moves
+        # return moves
 
     @api.constrains('product_id')
     def constrains_product_to_fill_vendor(self):
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index e178ad1c..a017a090 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -158,13 +158,13 @@ class StockPicking(models.Model):
     linked_manual_bu_out = fields.Many2one('stock.picking', string='BU Out', copy=False)
 
     area_name = fields.Char(string="Area", compute="_compute_area_name")
-
     @api.depends('real_shipping_id.kecamatan_id', 'real_shipping_id.kota_id')
     def _compute_area_name(self):
         for record in self:
             district = record.real_shipping_id.kecamatan_id or ''
             city = record.real_shipping_id.kota_id or ''
             record.area_name = f"{district}, {city}".strip(', ')
+            
 
     # def write(self, vals):
     #     if 'linked_manual_bu_out' in vals:
diff --git a/indoteknik_custom/views/mrp_production.xml b/indoteknik_custom/views/mrp_production.xml
index 419737f9..3de52a08 100644
--- a/indoteknik_custom/views/mrp_production.xml
+++ b/indoteknik_custom/views/mrp_production.xml
@@ -49,6 +49,10 @@
                 <field name="desc"/>
                 <field name="sale_order"/>
             </field>
+            <field name="state" position="after">
+                <field name="state_reserve" optional="hide"/>
+                <field name="date_reserved" optional="hide"/>
+            </field>
         </field>
     </record>