Merge branch 'odoo-backup' of bitbucket.org:altafixco/indoteknik-addons into gudang-service

merge

10 files changed, 125 insertions, 43 deletions

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index 4b0ce325..0b2f7d1b 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -499,7 +499,8 @@ class AutomaticPurchase(models.Model):
             # _logger.info('test %s' % point.product_id.name)
             if point.product_id.qty_available_bandengan > point.product_min_qty:
                 continue
-            qty_purchase = point.product_max_qty - point.product_id.qty_incoming_bandengan - point.product_id.qty_available_bandengan
+            # qty_purchase = point.product_max_qty - point.product_id.qty_incoming_bandengan - point.product_id.qty_available_bandengan
+            qty_purchase = point.product_max_qty - point.product_id.qty_available_bandengan
             po_line = self.env['purchase.order.line'].search([('product_id', '=', point.product_id.id), ('order_id.state', '=', 'done')], order='id desc', limit=1)
             
             if self.vendor_id:
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 35fa79a8..e16c8d61 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1086,17 +1086,6 @@ class PurchaseOrder(models.Model):
                     if self.order_sales_match_line:
                         if self.total_percent_margin <= 15.0:
                             raise UserError("Approval Pimpinan diperlukan jika terdapat perubahan Unit Price pada PO Line dan Memiliki Margin <= 15%")
-                else:
-                    low_margin_match_so = self.order_sales_match_line.filtered(
-                        lambda match: match.so_header_margin <= 15.0
-                    )
-                    if low_margin_match_so:
-                        raise UserError("Approval Pimpinan diperlukan jika pada PO Line yang Matches SO item memiliki header margin SO <= 15%")
-            # else:
-            #     is_po_manual = '/A/' not in self.name and '/MO/' not in self.name
-            #     if is_po_manual:
-            #         if not self.order_sales_match_line:
-            #             raise UserError("Tidak ada matches SO, Approval Pimpinan diperlukan.")
 
         self._check_assets_note() 
         # self._check_payment_term() # check payment term 
diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 722a125e..82f5e1fd 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -62,7 +62,8 @@ class RefundSaleOrder(models.Model):
         ('uang', 'Refund Lebih Bayar'),
         ('retur_half', 'Refund Retur Sebagian'),
         ('retur', 'Refund Retur Full'),
-        ('salah_transfer', 'Salah Transfer')
+        ('salah_transfer', 'Salah Transfer'),
+        ('berita_acara', 'Kebutuhan Berita Acara')
     ], string='Refund Type', required=True)
 
     tukar_guling_ids = fields.One2many(
@@ -242,7 +243,7 @@ class RefundSaleOrder(models.Model):
                                 )
 
                 invoices = sale_orders.mapped('invoice_ids').filtered(
-                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state != 'cancel'
+                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.payment_state == 'paid'
                 )
                 if invoices:
                     vals['invoice_ids'] = [(6, 0, invoices.ids)]
@@ -251,7 +252,7 @@ class RefundSaleOrder(models.Model):
         invoice_ids_data = vals.get('invoice_ids', [])
         invoice_ids = invoice_ids_data[0][2] if invoice_ids_data and invoice_ids_data[0][0] == 6 else []
         invoices = self.env['account.move'].browse(invoice_ids)
-        if invoice_ids and refund_type and refund_type not in ['uang', 'barang_kosong_sebagian', 'barang_kosong', 'retur_half']:
+        if invoice_ids and refund_type and refund_type not in ['uang', 'barang_kosong_sebagian', 'barang_kosong', 'retur_half', 'berita_acara']:
             raise UserError("Refund type Hanya Bisa Lebih Bayar, Barang Kosong Sebagian, atau Retur jika ada invoice")
         
         if not invoice_ids and refund_type and refund_type in ['uang', 'barang_kosong_sebagian', 'retur_half']:
@@ -296,6 +297,7 @@ class RefundSaleOrder(models.Model):
             ])
             piutangbca = self.env['account.move']
             piutangmdr = self.env['account.move']
+            cabinvoice = self.env['account.move']
 
             for inv_name in invoices.mapped('name'):
                 piutangbca |= self.env['account.move'].search([
@@ -308,6 +310,11 @@ class RefundSaleOrder(models.Model):
                     ('journal_id', '=', 7),
                     ('state', '=', 'posted'),
                 ])
+                cabinvoice |= self.env['account.move'].search([
+                    ('ref', 'ilike', inv_name),
+                    ('journal_id', '=', 11),
+                    ('state', '=', 'posted'),
+                ])
             
             misc = self.env['account.move']
             if invoices:
@@ -378,6 +385,7 @@ class RefundSaleOrder(models.Model):
             has_moves3 = bool(moves3)
             has_piutangmdr = bool(piutangmdr)
             has_piutangbca = bool(piutangbca)
+            has_cabinvoice = bool(cabinvoice)
             has_misc = bool(misc)
             has_ongkir = bool(moves_ongkir)
             ssos = self.env['sale.order'].browse(so_ids)
@@ -385,7 +393,7 @@ class RefundSaleOrder(models.Model):
     
             sisa_uang_masuk = 0.0
 
-            has_journal = has_moves or has_moves2 or has_moves3 or has_piutangbca or has_piutangmdr or has_misc
+            has_journal = has_moves or has_moves2 or has_moves3 or has_piutangbca or has_piutangmdr or has_misc or has_cabinvoice
 
             if has_moves:
                 sisa_uang_masuk += sum(moves.mapped('amount_total_signed'))
@@ -397,6 +405,8 @@ class RefundSaleOrder(models.Model):
                 sisa_uang_masuk += sum(moves3.mapped('amount_total_signed'))
             if has_piutangbca:
                 sisa_uang_masuk += sum(piutangbca.mapped('amount_total_signed'))
+            if has_cabinvoice:
+                sisa_uang_masuk += sum(cabinvoice.mapped('amount_total_signed'))
             if has_piutangmdr:
                 sisa_uang_masuk += sum(piutangmdr.mapped('amount_total_signed'))
             if has_misc:
@@ -425,13 +435,17 @@ class RefundSaleOrder(models.Model):
         total_invoice = sum(self.env['account.move'].browse(invoice_ids).mapped('amount_total_signed')) if invoice_ids else 0.0
         vals['total_invoice'] = total_invoice
         amount_refund = vals.get('amount_refund', 0.0)
-        can_refund = sisa_uang_masuk - total_invoice
-
-        if amount_refund > can_refund or can_refund == 0.0:
-            raise ValidationError(
-                _("Maksimal refund yang bisa dilakukan adalah sebesar %s. "
-                "Silakan sesuaikan jumlah refund.") % (can_refund)
-            )
+        can_refund = 0.0
+        if refund_type == 'berita_acara':
+            can_refund = sisa_uang_masuk
+        else:
+            can_refund = sisa_uang_masuk - total_invoice
+        if refund_type != 'berita_acara':
+            if amount_refund > can_refund or can_refund == 0.0:
+                raise ValidationError(
+                    _("Maksimal refund yang bisa dilakukan adalah sebesar %s. "
+                    "Silakan sesuaikan jumlah refund.") % (can_refund)
+                )
 
         if amount_refund <= 0.00:
             raise ValidationError('Total Refund harus lebih dari 0 jika ingin mengajukan refund')
@@ -483,7 +497,7 @@ class RefundSaleOrder(models.Model):
 
 
                 valid_invoices = sale_orders.mapped('invoice_ids').filtered(
-                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state != 'cancel'
+                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.payment_state == 'paid'
                 )
                 vals['invoice_ids'] = [(6, 0, valid_invoices.ids)]
                 vals['ongkir'] = sum(so.delivery_amt or 0.0 for so in sale_orders)
@@ -539,10 +553,28 @@ class RefundSaleOrder(models.Model):
             if any(field in vals for field in ['uang_masuk', 'invoice_ids', 'ongkir', 'sale_order_ids', 'amount_refund']):
                 total_invoice = sum(self.env['account.move'].browse(invoice_ids).mapped('amount_total_signed'))
                 vals['total_invoice'] = total_invoice
-                uang_masuk = rec.uang_masuk
-                can_refund = uang_masuk - total_invoice
-
+                uang_masuk = vals.get('uang_masuk', rec.uang_masuk)
                 amount_refund = vals.get('amount_refund', rec.amount_refund)
+                can_refund = 0.0
+                total_refunded = 0.0
+
+                if refund_type == 'berita_acara':
+                    can_refund = uang_masuk
+                    remaining = uang_masuk - amount_refund
+                else:
+                    can_refund = uang_masuk - total_invoice
+
+                    existing_refunds = self.search([
+                        ('sale_order_ids', 'in', so_ids),
+                        ('id', '!=', rec.id)
+                    ])
+                    total_refunded = sum(existing_refunds.mapped('amount_refund'))
+
+                    if existing_refunds:
+                        remaining = uang_masuk - total_refunded
+                    else:
+                        remaining = uang_masuk - amount_refund
+
 
                 if amount_refund > can_refund:
                     raise ValidationError(
@@ -592,9 +624,7 @@ class RefundSaleOrder(models.Model):
         for rec in self:
             move_links = []
 
-            invoice_ids = rec.sale_order_ids.mapped('invoice_ids').filtered(
-                lambda inv: inv.state == 'posted'
-            )
+            invoice_ids = rec.sale_order_ids.mapped('invoice_ids')
 
             moves = self.env['account.move'].search([
                 ('sale_id', 'in', rec.sale_order_ids.ids),
@@ -604,6 +634,7 @@ class RefundSaleOrder(models.Model):
 
             piutangbca = self.env['account.move']
             piutangmdr = self.env['account.move']
+            cabinvoice = self.env['account.move']
 
             for inv_name in invoice_ids.mapped('name'):
                 piutangbca |= self.env['account.move'].search([
@@ -616,6 +647,11 @@ class RefundSaleOrder(models.Model):
                     ('journal_id', '=', 7),
                     ('state', '=', 'posted'),
                 ])
+                cabinvoice |= self.env['account.move'].search([
+                    ('ref', 'ilike', inv_name),
+                    ('journal_id', '=', 11),
+                    ('state', '=', 'posted'),
+                ])
 
             moves2 = self.env['account.move']
             if rec.sale_order_ids:
@@ -661,15 +697,13 @@ class RefundSaleOrder(models.Model):
                         ('line_ids.account_id', '=', 450),
                         ('line_ids.account_id', '=', 668),
                 ]
-
-            if so_names:
                 domain += ['|'] * (len(so_names) - 1)
                 for name in so_names:
                     domain.append(('ref', 'ilike', name))
 
-            moves_ongkir = self.env['account.move'].search(domain)
+                moves_ongkir = self.env['account.move'].search(domain)
 
-            all_moves = moves | piutangbca | piutangmdr | misc | moves2 | moves_ongkir
+            all_moves = moves | piutangbca | piutangmdr | misc | moves2 | moves_ongkir | cabinvoice
 
             for move in all_moves:
                 url = f"/web#id={move.id}&model=account.move&view_type=form"
@@ -697,7 +731,7 @@ class RefundSaleOrder(models.Model):
         for so in self.sale_order_ids:
             self.ongkir += so.delivery_amt or 0.0
             valid_invoices = so.invoice_ids.filtered(
-                lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state != 'cancel'
+                lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.payment_state == 'paid'
             )
             all_invoices |= valid_invoices
             total_invoice += sum(valid_invoices.mapped('amount_total_signed'))
@@ -715,6 +749,7 @@ class RefundSaleOrder(models.Model):
 
         piutangbca = self.env['account.move']
         piutangmdr = self.env['account.move']
+        cabinvoice = self.env['account.move']
 
         for inv_name in all_invoices.mapped('name'):
             piutangbca |= self.env['account.move'].search([
@@ -727,6 +762,11 @@ class RefundSaleOrder(models.Model):
                 ('journal_id', '=', 7),
                 ('state', '=', 'posted'),
             ])
+            cabinvoice |= self.env['account.move'].search([
+                ('ref', 'ilike', inv_name),
+                ('journal_id', '=', 11),
+                ('state', '=', 'posted'),
+            ])
 
         misc = self.env['account.move']
         if all_invoices:
@@ -801,6 +841,7 @@ class RefundSaleOrder(models.Model):
         has_moves3 = bool(moves3)
         has_piutangmdr = bool(piutangmdr)
         has_piutangbca = bool(piutangbca)
+        has_cabinvoice = bool(cabinvoice)
         has_misc = bool(misc)
         has_ongkir = bool(moves_ongkir)
         ssos = self.env['sale.order'].browse(so_ids)
@@ -814,6 +855,8 @@ class RefundSaleOrder(models.Model):
            sisa_uang_masuk += sum(moves.mapped('amount_total_signed'))
         if has_moves2:
            sisa_uang_masuk += sum(moves2.mapped('amount_total_signed'))
+        if has_cabinvoice:
+           sisa_uang_masuk += sum(cabinvoice.mapped('amount_total_signed'))
         if has_moves3:
            sisa_uang_masuk += sum(moves3.mapped('amount_total_signed'))
         if has_piutangbca:
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 9eed236f..469509d4 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -3438,7 +3438,7 @@ class SaleOrder(models.Model):
     def button_refund(self):
         self.ensure_one()
         
-        invoice_ids = self.invoice_ids.filtered(lambda inv: inv.state != 'cancel')
+        invoice_ids = self.invoice_ids.filtered(lambda inv: inv.payment_state == 'paid')
 
         moves = self.env['account.move'].search([
             ('sale_id', '=', self.id),
@@ -3447,6 +3447,7 @@ class SaleOrder(models.Model):
         ])
         piutangbca = self.env['account.move']
         piutangmdr = self.env['account.move']
+        cabinvoice = self.env['account.move']
 
         for inv_name in invoice_ids.mapped('name'):
             piutangbca |= self.env['account.move'].search([
@@ -3459,6 +3460,11 @@ class SaleOrder(models.Model):
                 ('journal_id', '=', 7),
                 ('state', '=', 'posted'),
             ])
+            cabinvoice |= self.env['account.move'].search([
+                ('ref', 'ilike', inv_name),
+                ('journal_id', '=', 11),
+                ('state', '=', 'posted'),
+            ])
 
         moves2 = self.env['account.move'].search([
             ('ref', 'ilike', self.name),
@@ -3473,6 +3479,7 @@ class SaleOrder(models.Model):
         has_moves2 = bool(moves2)
         has_piutangmdr = bool(piutangmdr)
         has_piutangbca = bool(piutangbca)
+        has_cabinvoice = bool(cabinvoice)
         has_settlement = self.payment_status == 'settlement'
 
         if has_moves and has_settlement:
@@ -3483,6 +3490,8 @@ class SaleOrder(models.Model):
             total_uang_muka = sum(moves2.mapped('amount_total_signed'))
         elif has_settlement:
             total_uang_muka = self.gross_amount
+        elif has_cabinvoice:
+            total_uang_muka = sum(cabinvoice.mapped('amount_total_signed'))
         elif has_piutangbca:
             total_uang_muka = sum(piutangbca.mapped('amount_total_signed'))
         elif has_piutangmdr:
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 1df1a058..270fc842 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -17,6 +17,7 @@ class SaleOrderLine(models.Model):
                                        help="Total % Margin in Sales Order Header")
     item_percent_margin_before = fields.Float('%Margin Before', compute='_compute_item_percent_margin_before',
                                        help="Total % Margin excluding third party in Sales Order Header")
+    amount_cashback = fields.Float('Cashback Brand', compute='_compute_cashback_brand', help='Cashback from product who has cashback percent in manufacture')
     initial_discount = fields.Float('Initial Discount')
     vendor_id = fields.Many2one(
         'res.partner', string='Vendor', readonly=True,
@@ -164,7 +165,10 @@ class SaleOrderLine(models.Model):
 
             purchase_price = line.purchase_price
             if line.purchase_tax_id.price_include:
-                purchase_price = line.purchase_price / 1.11
+                purchase_price = line.purchase_price / (1 + (line.purchase_tax_id.amount / 100))
+
+            if line.amount_cashback > 0:
+                purchase_price = purchase_price - line.amount_cashback
 
             purchase_price = purchase_price * line.product_uom_qty
             margin_per_item = sales_price - purchase_price
@@ -186,7 +190,10 @@ class SaleOrderLine(models.Model):
 
             purchase_price = line.purchase_price
             if line.purchase_tax_id and line.purchase_tax_id.price_include:
-                purchase_price = line.purchase_price / 1.11
+                purchase_price = line.purchase_price / (1 + (line.purchase_tax_id.amount / 100))
+
+            if line.amount_cashback > 0:
+                purchase_price = purchase_price - line.amount_cashback
 
             purchase_price = purchase_price * line.product_uom_qty
 
@@ -215,7 +222,10 @@ class SaleOrderLine(models.Model):
 
             purchase_price = line.purchase_price
             if line.purchase_tax_id.price_include:
-                purchase_price = line.purchase_price / 1.11
+                purchase_price = line.purchase_price / (1 + (line.purchase_tax_id.amount / 100))
+                
+            if line.amount_cashback > 0:
+                purchase_price = purchase_price - line.amount_cashback
 
             purchase_price = purchase_price * line.product_uom_qty
             margin_per_item = sales_price - purchase_price
@@ -241,12 +251,39 @@ class SaleOrderLine(models.Model):
 
             purchase_price = line.purchase_price
             if line.purchase_tax_id.price_include:
-                purchase_price = line.purchase_price / 1.11
+                purchase_price = line.purchase_price / (1 + (line.purchase_tax_id.amount / 100))
+
+            if line.amount_cashback > 0:
+                purchase_price = purchase_price - line.amount_cashback
 
             purchase_price = purchase_price * line.product_uom_qty
             margin_per_item = sales_price - purchase_price
             line.item_before_margin = margin_per_item
 
+    def _compute_cashback_brand(self):
+        for line in self:
+            line.amount_cashback = 0
+
+            if not line.product_id:
+                continue
+
+            cashback_percent = line.product_id.x_manufacture.cashback_percent or 0
+            if cashback_percent <= 0:
+                continue
+
+            price, taxes, vendor = self._get_purchase_price(line.product_id)
+
+            price_tax_excl = price
+
+            if taxes:
+                tax = self.env['account.tax'].browse(taxes)
+                if tax.price_include:
+                    price_tax_excl = price / (1 + (tax.amount / 100))
+                else:
+                    price_tax_excl = price
+
+            line.amount_cashback = price_tax_excl * cashback_percent
+
     # @api.onchange('vendor_id')
     # def onchange_vendor_id(self):
     #     # TODO : need to change this logic @stephan
diff --git a/indoteknik_custom/models/x_manufactures.py b/indoteknik_custom/models/x_manufactures.py
index b4b61296..0c3bfa3b 100755
--- a/indoteknik_custom/models/x_manufactures.py
+++ b/indoteknik_custom/models/x_manufactures.py
@@ -50,6 +50,7 @@ class XManufactures(models.Model):
     # user_id = fields.Many2one('res.users', string='Responsible', domain="['|'('id', '=', 19), ('id', '=', 6)]", help="Siapa yang bertanggung jawab")
     user_id = fields.Many2one('res.users', string='Responsible', help="Siapa yang bertanggung jawab")
     override_vendor_id = fields.Many2one('res.partner', string='Override Vendor')
+    cashback_percent = fields.Float(string='Cashback Percent', default=0)
 
     def _compute_vendor_ids(self):
         for manufacture in self:
diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index a6804ca4..81129dde 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -67,7 +67,7 @@
                                 ADM. JAKARTA UTARA, DKI JAKARTA
                             </t>
                             <t t-else="">
-                                Jl. Bandengan Utara Komp A 8 B RT.<br/>
+                                Jl. Bandengan Utara Komp A &amp; B RT.<br/>
                                 Penjaringan, Kec. Penjaringan, Jakarta<br/>
                                 (BELAKANG INDOMARET)
                             </t>
diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index d303e5ea..8e1eb3b6 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -16,7 +16,7 @@
                 <field name="outgoing"/>
                 <field name="status_apo" invisible="1"/>
                 <field name="action"/>
-                <field name="note"/>
+                <field name="note" optional="hide"/>
                 <field name="note_detail"/>
                 <field name="date_po" optional="hide"/>
                 <field name="so_number"/>
@@ -59,7 +59,7 @@
                             <field name="outgoing"/>
                             <field name="purchase_representative_id"/>
                             <field name="vendor_id"/>
-                            <field name="note"/>
+                            <!-- <field name="note"/> -->
                             <field name="note_detail"/>
                         </group>
                     </group>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 23fbe155..c3df92ec 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -302,6 +302,7 @@
                             ]
                         }
                     "/>
+                    <field name="amount_cashback"/>
                     <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id"
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index 02061251..b52fe795 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -82,6 +82,7 @@
                                 <field name="x_negara_asal"/>
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>
+                                <field name="cashback_percent" widget="percentage"/>
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
                                 <field name="parent_id"/>