Merge branch 'odoo-production' into feature/integrasi_biteship

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 40 insertions, 8 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 9388ae4c..799c4db0 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -74,6 +74,29 @@ class PurchaseOrder(models.Model):
     approve_by = fields.Many2one('res.users', string='Approve By')
     exclude_incoming = fields.Boolean(string='Exclude Incoming', default=False,
                                       help='Centang jika tidak mau masuk perhitungan Incoming Qty')
+    not_update_purchasepricelist = fields.Boolean(string='Not Update Purchase Pricelist?')
+    # total_cost_service = fields.Float(string='Total Cost Service')
+    # total_delivery_amt = fields.Float(string='Total Delivery Amt')
+
+    # @api.onchange('total_cost_service')
+    # def _onchange_total_cost_service(self):
+    #     for order in self:
+    #         lines = order.order_line
+    #         if lines:
+    #             # Hitung nilai rata-rata cost_service
+    #             per_line_cost_service = order.total_cost_service / len(lines)
+    #             for line in lines:
+    #                 line.cost_service = per_line_cost_service
+
+    # @api.onchange('total_delivery_amt')
+    # def _onchange_total_delivery_amt(self):
+    #     for order in self:
+    #         lines = order.order_line
+    #         if lines:
+    #             # Hitung nilai rata-rata delivery_amt
+    #             per_line_delivery_amt = order.total_delivery_amt / len(lines)
+    #             for line in lines:
+    #                 line.delivery_amt = per_line_delivery_amt
 
     def _compute_total_margin_match(self):
         for purchase in self:
@@ -114,6 +137,7 @@ class PurchaseOrder(models.Model):
             'ref': self.name,
             'invoice_date': current_date,
             'date': current_date,
+            'invoice_origin': self.name,
             'move_type': 'in_invoice'
         }
 
@@ -164,6 +188,11 @@ class PurchaseOrder(models.Model):
 
         self.bills_pelunasan_id = bills.id
 
+        lognote_message = (
+            f"Vendor bill created from: {self.name} ({self.partner_ref})"
+        )
+        bills.message_post(body=lognote_message)
+
         return {
             'name': _('Account Move'),
             'view_mode': 'tree,form',
@@ -173,12 +202,10 @@ class PurchaseOrder(models.Model):
             'domain': [('id', '=', bills.id)]
         }
 
-
-    
     def create_bill_dp(self):
         if not self.env.user.is_accounting:
             raise UserError('Hanya Accounting yang bisa bikin bill dp')
-        
+
         current_date = datetime.utcnow()
         data_bills = {
             'partner_id': self.partner_id.id,
@@ -186,8 +213,8 @@ class PurchaseOrder(models.Model):
             'ref': self.name,
             'invoice_date': current_date,
             'date': current_date,
+            'invoice_origin': self.name,
             'move_type': 'in_invoice'
-
         }
 
         bills = self.env['account.move'].create([data_bills])
@@ -196,14 +223,13 @@ class PurchaseOrder(models.Model):
 
         data_line_bills = {
             'move_id': bills.id,
-            'product_id': product_dp.id, #product down payment
-            'account_id': 401, #Uang Muka persediaan barang dagang
+            'product_id': product_dp.id,  # product down payment
+            'account_id': 401,  # Uang Muka persediaan barang dagang
             'quantity': 1,
             'product_uom_id': 1,
             'tax_ids': [line[0].taxes_id.id for line in self.order_line],
         }
 
-
         bills_line = self.env['account.move.line'].create([data_line_bills])
 
         self.bills_dp_id = bills.id
@@ -212,6 +238,11 @@ class PurchaseOrder(models.Model):
         move_line.name = '[IT.121456] Down Payment'
         move_line.partner_id = self.partner_id.id
 
+        lognote_message = (
+            f"Vendor bill created from: {self.name} ({self.partner_ref})"
+        )
+        bills.message_post(body=lognote_message)
+
         return {
             'name': _('Account Move'),
             'view_mode': 'tree,form',
@@ -620,7 +651,8 @@ class PurchaseOrder(models.Model):
                 raise UserError("Tidak ada link dengan SO, harus approval Merchandise")
             
         send_email = False
-        self.add_product_to_pricelist()
+        if not self.not_update_purchasepricelist:
+            self.add_product_to_pricelist()
         for line in self.order_line:
             if not line.product_id.purchase_ok:
                 raise UserError("Terdapat barang yang tidak bisa diproses")