Merge branch 'odoo-production' into dev/wms

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/stock_immediate_transfer.py
#	indoteknik_custom/models/stock_picking.py

1 files changed, 28 insertions, 3 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 777e8ed2..d90c4a8a 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -86,6 +86,7 @@ class PurchaseOrder(models.Model):
     total_cost_service = fields.Float(string='Total Cost Service')
     total_delivery_amt = fields.Float(string='Total Delivery Amt')
     store_name = fields.Char(string='Nama Toko')
+    purchase_order_count = fields.Integer('Purchase Order Count', related='partner_id.purchase_order_count')
 
     @api.onchange('total_cost_service')
     def _onchange_total_cost_service(self):
@@ -154,6 +155,7 @@ class PurchaseOrder(models.Model):
             'invoice_date': current_date,
             'date': current_date,
             'invoice_origin': self.name,
+            'purchase_order_id': self.id,
             'move_type': 'in_invoice'
         }
 
@@ -178,7 +180,7 @@ class PurchaseOrder(models.Model):
             'move_id': bills.id,
             'product_id': product_dp.id,  # product down payment
             'name': '[IT.121456] Down Payment',  # product down payment
-            'account_id': 401,  # Uang Muka persediaan barang dagang
+            'account_id': 669,  # Uang Muka persediaan barang dagang
             # 'price_unit': move_line.price_unit,
             'quantity': -1,
             'product_uom_id': 1,
@@ -230,6 +232,7 @@ class PurchaseOrder(models.Model):
             'invoice_date': current_date,
             'date': current_date,
             'invoice_origin': self.name,
+            'purchase_order_id': self.id,
             'move_type': 'in_invoice'
         }
 
@@ -240,7 +243,7 @@ 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
+            'account_id': 669,  # Uang Muka persediaan barang dagang
             'quantity': 1,
             'product_uom_id': 1,
             'tax_ids': [line[0].taxes_id.id for line in self.order_line],
@@ -306,6 +309,7 @@ class PurchaseOrder(models.Model):
         invoice_vals = {
             'ref': self.partner_ref or '',
             'move_type': move_type,
+            'purchase_order_id': self.id,
             'narration': self.notes,
             'currency_id': self.currency_id.id,
             'invoice_user_id': self.user_id and self.user_id.id or self.env.user.id,
@@ -387,6 +391,13 @@ class PurchaseOrder(models.Model):
         }
         return action
 
+    def open_form_multi_ask_approval_po(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_purchase_order_multi_ask_approval')
+        action['context'] = {
+            'po_ids': [x.id for x in self]
+        }
+        return action
+    
     def open_form_multi_create_uang_muka(self):
         action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_purchase_order_multi_uangmuka')
         action['context'] = {
@@ -414,6 +425,13 @@ class PurchaseOrder(models.Model):
             
             purchase.button_confirm()
 
+    def action_multi_ask_approval_po(self):
+        for purchase in self:
+            if purchase.state != 'draft':
+                continue
+            
+            purchase.po_approve()
+
     def open_form_multi_update_paid_status(self):
         action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_purchase_order_multi_update')
         action['context'] = {
@@ -965,7 +983,14 @@ class PurchaseOrder(models.Model):
                     sales_price -= (sale_order_line.fee_third_party_line / sale_order_line.product_uom_qty) * line.qty_po
                 sum_sales_price += sales_price
 
-                purchase_price = po_line.price_subtotal / po_line.product_qty * line.qty_po
+                
+                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: