Merge branch 'odoo-production' into CR/renca-voucher

12 files changed, 133 insertions, 55 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 8b95ade8..5b7b59bd 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -426,7 +426,7 @@ class SaleOrder(controller.Controller):
             'npwp': sales_partner.npwp or '0',  # Get NPWP from partner
             'sppkp': sales_partner.sppkp,  # Get SPPKP from partner
             'email': sales_partner.email,  # Get Email from partner
-            'user_id': 3222  # User ID: Nadia Rauhadatul Firdaus
+            'user_id': 11314  # User ID: Boy Revandi
         }
         
         sales_partner = request.env['res.partner'].browse(parameters['partner_id'])
diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index 1d26d356..c0974367 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -98,7 +98,7 @@ class User(controller.Controller):
             user.partner_id.npwp = '00.000.000.0-000.000'
             user.partner_id.sppkp = '-'
             user.partner_id.nama_wajib_pajak = user.name
-            user.partner_id.user_id = 3222
+            user.partner_id.user_id = 11314
             user.partner_id.property_account_receivable_id = 395
             user.partner_id.property_account_payable_id = 438
         data = {
@@ -208,7 +208,7 @@ class User(controller.Controller):
                     'email': email_partner,
                     'street': alamat_bisnis,
                     'company_type': 'company',
-                    'user_id': 3222,
+                    'user_id': 11314,
                     'property_account_receivable_id': 395,
                     'property_account_payable_id': 438,
                     'active': False,
@@ -253,7 +253,7 @@ class User(controller.Controller):
             user.partner_id.npwp = '00.000.000.0-000.000'
             user.partner_id.sppkp = '-'
             user.partner_id.nama_wajib_pajak = name
-            user.partner_id.user_id = 3222
+            user.partner_id.user_id = 11314
             user.partner_id.property_account_receivable_id= 395
             user.partner_id.property_account_payable_id = 438
 
@@ -605,7 +605,7 @@ class User(controller.Controller):
                         'email': email_partner,
                         'street': alamat_bisnis,
                         'company_type': 'company',
-                        'user_id': 3222,
+                        'user_id': 11314,
                         'property_account_receivable_id': 395,
                         'property_account_payable_id': 438,
                         'active': False,
diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index e74efb95..ac887547 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -161,6 +161,7 @@
         'report/report_picking.xml',
         'report/report_sale_order.xml',
         'views/coretax_faktur.xml',
+        'views/stock_inventory.xml',
     ],
     'demo': [],
     'css': [],
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index dea3eeea..f33a7411 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -143,3 +143,4 @@ from . import coretax_fatur
 from  . import ir_actions_report
 from . import barcoding_product
 from . import account_payment_register
+from . import stock_inventory
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 54d771ba..f2401dec 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -943,63 +943,42 @@ class PurchaseOrder(models.Model):
 
     def compute_total_margin_from_apo(self):
         sum_so_margin = sum_sales_price = sum_margin = 0
-        for line in self.order_sales_match_line:
-            po_line = self.env['purchase.order.line'].search([
+        for line in self.order_line:
+            sales_order_line = self.env['purchase.order.sales.match'].search([
                 ('product_id', '=', line.product_id.id),
-                ('order_id', '=', line.purchase_order_id.id)
-            ], limit=1)
-            sale_order_line = line.sale_line_id
-            if not sale_order_line:
-                sale_order_line = self.env['sale.order.line'].search([
-                    ('product_id', '=', line.product_id.id),
-                    ('order_id', '=', line.sale_id.id)
-                ], limit=1, order='price_reduce_taxexcl')
-
-            if sale_order_line and po_line:
-                so_margin = (line.qty_po / line.qty_so) * sale_order_line.item_margin
-                sum_so_margin += so_margin
-
-                sales_price = sale_order_line.price_reduce_taxexcl * line.qty_po
+                ('purchase_order_id', '=', line.order_id.id)
+            ])
+            
+            for so_line in sales_order_line:
+                sale_order_line = so_line.sale_line_id
+                sum_so_margin += sale_order_line.item_margin
+                sales_price = sale_order_line.price_reduce_taxexcl * sale_order_line.product_uom_qty
                 if sale_order_line.order_id.shipping_cost_covered == 'indoteknik':
-                    sales_price -= (sale_order_line.delivery_amt_line / sale_order_line.product_uom_qty) * line.qty_po
+                    sales_price -= sale_order_line.delivery_amt_line
                 if sale_order_line.order_id.fee_third_party > 0:
-                    sales_price -= (sale_order_line.fee_third_party_line / sale_order_line.product_uom_qty) * line.qty_po
+                    sales_price -= sale_order_line.fee_third_party_line
                 sum_sales_price += sales_price
 
-                
-                purchase_price = po_line.price_subtotal
-                if po_line.ending_price > 0:
-                    if po_line.taxes_id.id == 22:
-                        ending_price = po_line.ending_price / 1.11
-                        purchase_price = ending_price
-                    else:
-                        purchase_price = po_line.ending_price
-                if line.purchase_order_id.delivery_amount > 0:
-                    purchase_price += (po_line.delivery_amt_line / po_line.product_qty) * line.qty_po
-                if line.purchase_order_id.delivery_amt > 0:
-                    purchase_price += line.purchase_order_id.delivery_amt
-                real_item_margin = sales_price - purchase_price
-                sum_margin += real_item_margin
-
-        if sum_so_margin != 0 and sum_sales_price != 0 and sum_margin != 0:
-            self.total_so_margin = sum_so_margin
-            self.total_so_percent_margin = round((sum_so_margin / sum_sales_price), 2) * 100
-            self.total_margin = sum_margin
-            self.total_percent_margin = round((sum_margin / sum_sales_price), 2) * 100
-
-        else:
-            self.total_margin = 0
-            self.total_percent_margin = 0
-            self.total_so_margin = 0
-            self.total_so_percent_margin = 0
-                
+            purchase_price = line.price_subtotal
+            if line.order_id.total_delivery_amt > 0 and line.order_id.total_cost_service > 0:
+                if line.taxes_id.id == 22:
+                    ending_price = line.ending_price / 1.11
+                    purchase_price = ending_price
+                else:
+                    purchase_price = line.ending_price
+            # purchase_price = line.price_subtotal  
+            if line.order_id.delivery_amount > 0:
+                purchase_price += line.delivery_amt_line
+            if line.order_id.delivery_amt > 0:
+                purchase_price += line.order_id.delivery_amt
+            real_item_margin = sales_price - purchase_price
+            sum_margin += real_item_margin
 
         if sum_so_margin != 0 and sum_sales_price != 0 and sum_margin != 0:
             self.total_so_margin = sum_so_margin
             self.total_so_percent_margin = round((sum_so_margin / sum_sales_price), 2) * 100
             self.total_margin = sum_margin
             self.total_percent_margin = round((sum_margin / sum_sales_price), 2) * 100
-
         else:
             self.total_margin = 0
             self.total_percent_margin = 0
diff --git a/indoteknik_custom/models/purchase_order_sales_match.py b/indoteknik_custom/models/purchase_order_sales_match.py
index d1d929d3..4ebe959b 100644
--- a/indoteknik_custom/models/purchase_order_sales_match.py
+++ b/indoteknik_custom/models/purchase_order_sales_match.py
@@ -24,6 +24,13 @@ class PurchaseOrderSalesMatch(models.Model):
     margin_item = fields.Float(string='Margin')
     delivery_amt = fields.Float(string='Delivery Amount', compute='_compute_delivery_amt')
     margin_deduct = fields.Float(string='After Deduct', compute='_compute_delivery_amt')
+    purchase_price_so = fields.Float(string='Purchase Price Sale Order', related='sale_line_id.purchase_price')
+    purchase_price_po = fields.Float('Purchase Price PO', compute='_compute_purchase_price_po')
+
+    def _compute_purchase_price_po(self):
+        for line in self:
+            purchase_price = self.env['purchase.order.line'].search([('order_id', '=', line.purchase_order_id.id), ('product_id', '=', line.product_id.id)])
+            line.purchase_price_po = purchase_price.price_unit
 
     def _compute_delivery_amt(self):
         for line in self:
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 430b4526..e23f39bc 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1122,7 +1122,7 @@ class SaleOrder(models.Model):
         return self.total_percent_margin < 15 and not self.env.user.is_leader
             
     def _requires_approval_margin_manager(self):
-        return self.total_percent_margin <= 20 and not self.env.user.is_leader and not self.env.user.is_sales_manager
+        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_inventory.py b/indoteknik_custom/models/stock_inventory.py
new file mode 100644
index 00000000..12a891de
--- /dev/null
+++ b/indoteknik_custom/models/stock_inventory.py
@@ -0,0 +1,59 @@
+from odoo import models, api, fields
+from odoo.exceptions import UserError
+from datetime import datetime
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class StockInventory(models.Model):
+    _inherit = ['stock.inventory']
+    _order = 'id desc'
+    _rec_name = 'number'
+
+    number = fields.Char(string='Document No', index=True, copy=False, readonly=True)
+    adjusment_type = fields.Selection([
+        ('in', 'Adjusment In'),
+        ('out', 'Adjusment Out'),
+    ], string='Adjusments Type', required=True)
+
+    def _generate_number_stock_inventory(self):
+        """Men-generate nomor untuk semua stock inventory yang belum memiliki number."""
+        stock_records = self.env['stock.inventory'].search([('number', '=', False)], order='id asc')
+        for record in stock_records:
+            self._assign_number(record)
+
+        _logger.info('Generate Number Done')
+
+    def _assign_number(self, record):
+        """Menentukan nomor berdasarkan kategori Adjust-In atau Adjust-Out."""
+        name_upper = record.name.upper() if record.name else ""
+
+        if self.adjusment_type == 'out' or "ADJUST OUT" in name_upper or "ADJUST-OUT" in name_upper or "OUT" in name_upper:
+            last_number = self._get_last_sequence("ADJUST/OUT/")
+            record.number = f"ADJUST/OUT/{last_number}"
+        elif self.adjusment_type == 'in' or "ADJUST IN" in name_upper or "ADJUST-IN" in name_upper or "IN" in name_upper:
+            last_number = self._get_last_sequence("ADJUST/IN/")
+            record.number = f"ADJUST/IN/{last_number}"
+        else:
+            record.number = "UNKNOWN"  # Jika tidak termasuk kategori
+
+    def _get_last_sequence(self, prefix):
+        """Mengambil nomor terakhir berdasarkan prefix (ADJUST/OUT/ atau ADJUST/IN/) dengan format 00001, 00002, dst."""
+        last_record = self.env['stock.inventory'].search(
+            [("number", "like", f"{prefix}%")], order="number desc", limit=1
+        )
+
+        if last_record and last_record.number:
+            try:
+                last_number = int(last_record.number.split("/")[-1])  # Ambil angka terakhir
+                return str(last_number + 1).zfill(5)  # Format jadi 00001, 00002, dst.
+            except ValueError:
+                return "00001"  # Jika format tidak valid, mulai dari 00001
+        return "00001"  # Jika belum ada data, mulai dari 00001
+
+    @api.model
+    def create(self, vals):
+        order = super(StockInventory, self).create(vals)
+        self._assign_number(order)
+        return order
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 49e66786..36d9f63d 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -94,7 +94,7 @@ class StockPicking(models.Model):
     purchase_representative_id = fields.Many2one('res.users', related='move_lines.purchase_line_id.order_id.user_id', string="Purchase Representative")
     carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method')
     shipping_status = fields.Char(string='Shipping Status', compute="_compute_shipping_status")
-    date_reserved = fields.Datetime(string="Date Reserved", help='Tanggal ter-reserved semua barang nya')
+    date_reserved = fields.Datetime(string="Date Reserved", help='Tanggal ter-reserved semua barang nya', copy=False)
     status_printed = fields.Selection([
         ('not_printed', 'Belum Print'),
         ('printed', 'Printed')
@@ -120,7 +120,7 @@ class StockPicking(models.Model):
         ('ready', 'Ready to Ship'),
         ('done', 'Done'),
         ('cancel', 'Cancelled'),
-    ], string='Status Reserve', readonly=True, tracking=True, help="The current state of the stock picking.")
+    ], string='Status Reserve', tracking=True, copy=False, help="The current state of the stock picking.")
     notee = fields.Text(string="Note")
 
     @api.model
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index de29468d..13ce5f98 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -162,4 +162,5 @@ access_confirm_approval_wizard,confirm.approval.wizard,model_confirm_approval_wi
 access_barcode_product,access.barcode.product,model_barcode_product,,1,1,1,1
 access_barcoding_product,access.barcoding.product,model_barcoding_product,,1,1,1,1
 access_barcoding_product_line,access.barcoding.product.line,model_barcoding_product_line,,1,1,1,1
-access_account_payment_register,access.account.payment.register,model_account_payment_register,,1,1,1,1
\ No newline at end of file
+access_account_payment_register,access.account.payment.register,model_account_payment_register,,1,1,1,1
+access_stock_inventory,access.stock.inventory,model_stock_inventory,,1,1,1,1
\ No newline at end of file
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 3e4dd89c..0d3d5cc2 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -296,6 +296,8 @@
                     <field name="partner_invoice_id"/>
                     <field name="salesperson_id"/>
                     <field name="product_id"/>
+                    <field name="purchase_price_so"/>
+                    <field name="purchase_price_po"/>
                     <field name="qty_so"/>
                     <field name="qty_po"/>
                     <field name="margin_item" optional="hide"/>
diff --git a/indoteknik_custom/views/stock_inventory.xml b/indoteknik_custom/views/stock_inventory.xml
new file mode 100644
index 00000000..db85f05c
--- /dev/null
+++ b/indoteknik_custom/views/stock_inventory.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <!-- Form View: Tambahkan field 'number' setelah lokasi -->
+    <record id="view_stock_inventory_form_inherit" model="ir.ui.view">
+        <field name="name">stock.inventory.form.inherit</field>
+        <field name="model">stock.inventory</field>
+        <field name="inherit_id" ref="stock.view_inventory_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='location_ids']" position="after">
+                <field name="number" readonly="1"/>
+                <field name="adjusment_type" />
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Tree View: Tambahkan field 'number' setelah tanggal -->
+    <record id="view_stock_inventory_tree_inherit" model="ir.ui.view">
+        <field name="name">stock.inventory.tree.inherit</field>
+        <field name="model">stock.inventory</field>
+        <field name="inherit_id" ref="stock.view_inventory_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='date']" position="after">
+                <field name="number"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>