summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzka Nathan <darizkyfaz@gmail.com>2024-11-16 09:15:42 +0700
committerAzka Nathan <darizkyfaz@gmail.com>2024-11-16 09:15:42 +0700
commit528a737f696b371faa4ede6e5044c84ad3e4785e (patch)
tree379adea74fc8a7ce1d09523e62d56f34cf9d181d
parentafc8a108c9b1c52656bb3bbac9111dfa6e590bcb (diff)
ppn 12%
-rw-r--r--indoteknik_custom/models/logbook_bill.py2
-rwxr-xr-xindoteknik_custom/models/purchase_pricelist.py4
-rwxr-xr-xindoteknik_custom/models/sale_order.py10
-rw-r--r--indoteknik_custom/models/sale_order_line.py6
-rw-r--r--indoteknik_custom/models/stock_move.py2
-rw-r--r--indoteknik_custom/models/website_user_cart.py6
6 files changed, 15 insertions, 15 deletions
diff --git a/indoteknik_custom/models/logbook_bill.py b/indoteknik_custom/models/logbook_bill.py
index bb956092..3c33aeb7 100644
--- a/indoteknik_custom/models/logbook_bill.py
+++ b/indoteknik_custom/models/logbook_bill.py
@@ -22,7 +22,7 @@ class LogbookBill(models.TransientModel):
('product_id', '=', line.product_id.id),
], order='id desc', limit=1)
total += line.quantity_done * po.price_unit
- total_with_tax = total * 1.11
+ total_with_tax = total * 1.12
return total_with_tax
diff --git a/indoteknik_custom/models/purchase_pricelist.py b/indoteknik_custom/models/purchase_pricelist.py
index e5b35d7f..c543070a 100755
--- a/indoteknik_custom/models/purchase_pricelist.py
+++ b/indoteknik_custom/models/purchase_pricelist.py
@@ -48,9 +48,9 @@ class PurchasePricelist(models.Model):
def _constrains_include_price(self):
price, taxes = self._get_valid_price()
- # When have tax is excluded or empty tax, then multiply by 1.11
+ # When have tax is excluded or empty tax, then multiply by 1.12
if (taxes and not taxes.price_include) or not taxes:
- price *= 1.11
+ price *= 1.12
self.include_price = price
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 80e111a8..756c69cf 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1170,7 +1170,7 @@ class SaleOrder(models.Model):
line_voucher = used_discount * line_contribution
line_voucher_item = line_voucher / line.product_uom_qty
- line_price_unit = line.price_unit / 1.11 if any(tax.id == 23 for tax in line.tax_id) else line.price_unit
+ line_price_unit = line.price_unit / 1.12 if any(tax.id == 23 for tax in line.tax_id) else line.price_unit
line_discount_item = line_price_unit * line.discount / 100 + line_voucher_item
line_voucher_item = line_discount_item / line_price_unit * 100
@@ -1283,13 +1283,13 @@ class SaleOrder(models.Model):
if last_so and rec_purchase_price != last_so.purchase_price:
rec_taxes = self.env['account.tax'].search([('id', '=', rec_taxes_id)], limit=1)
if rec_taxes.price_include:
- selling_price = (rec_purchase_price / 1.11) / (1 - (last_so.item_percent_margin_without_deduction / 100))
+ selling_price = (rec_purchase_price / 1.12) / (1 - (last_so.item_percent_margin_without_deduction / 100))
else:
selling_price = rec_purchase_price / (1 - (last_so.item_percent_margin_without_deduction / 100))
tax_id = last_so.tax_id
for tax in tax_id:
if tax.price_include:
- selling_price = selling_price + (selling_price*11/100)
+ selling_price = selling_price + (selling_price*12/100)
else:
selling_price = selling_price
discount = 0
@@ -1305,13 +1305,13 @@ class SaleOrder(models.Model):
elif last_so and rec_vendor_id == order_line.vendor_id.id and rec_purchase_price != last_so.purchase_price:
rec_taxes = self.env['account.tax'].search([('id', '=', rec_taxes_id)], limit=1)
if rec_taxes.price_include:
- selling_price = (rec_purchase_price / 1.11) / (1 - (last_so.item_percent_margin_without_deduction / 100))
+ selling_price = (rec_purchase_price / 1.12) / (1 - (last_so.item_percent_margin_without_deduction / 100))
else:
selling_price = rec_purchase_price / (1 - (last_so.item_percent_margin_without_deduction / 100))
tax_id = last_so.tax_id
for tax in tax_id:
if tax.price_include:
- selling_price = selling_price + (selling_price*11/100)
+ selling_price = selling_price + (selling_price*12/100)
else:
selling_price = selling_price
discount = 0
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 04fafa69..c5fd9222 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -96,7 +96,7 @@ 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.12
purchase_price = purchase_price * line.product_uom_qty
margin_per_item = sales_price - purchase_price
@@ -124,7 +124,7 @@ 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.12
purchase_price = purchase_price * line.product_uom_qty
margin_per_item = sales_price - purchase_price
@@ -175,7 +175,7 @@ class SaleOrderLine(models.Model):
# # tax_id = last_so.tax_id
# if rec_vendor_id == self.vendor_id and rec_purchase_price != last_so.purchase_price:
# if rec_taxes.price_include:
- # selling_price = (rec_purchase_price/1.11) / (1-(last_so.line_item_margin / 100))
+ # selling_price = (rec_purchase_price/1.12) / (1-(last_so.line_item_margin / 100))
# else:
# selling_price = rec_purchase_price / (1-(last_so.line_item_margin / 100))
# tax_id = last_so.tax_id
diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index ac2e3cc0..0b7734fb 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -91,7 +91,7 @@ class StockMove(models.Model):
# 440 is static id for "PPN Keluaran" on account.account model
debit_account_id = self.picking_id.account_id.id if self.picking_id.account_id.id else 538
- tax = cost * (11 / 100)
+ tax = cost * (12 / 100)
move_lines = self._prepare_account_move_line(qty, cost, credit_account_id, debit_account_id, description)
move_lines += self._prepare_account_move_line(qty, tax, 440, debit_account_id, description)
diff --git a/indoteknik_custom/models/website_user_cart.py b/indoteknik_custom/models/website_user_cart.py
index 494f32f3..a0c3e393 100644
--- a/indoteknik_custom/models/website_user_cart.py
+++ b/indoteknik_custom/models/website_user_cart.py
@@ -163,7 +163,7 @@ class WebsiteUserCart(models.Model):
voucher_shipping_info = voucher_shipping.apply(order_line)
discount_voucher_shipping = voucher_shipping_info['discount']['all']
- tax = round(subtotal * 0.11)
+ tax = round(subtotal * 0.12)
grand_total = subtotal + tax
total_weight = sum(x['weight'] * x['quantity'] for x in products)
total_weight = round(total_weight, 2)
@@ -240,7 +240,7 @@ class WebsiteUserCart(models.Model):
total_voucher += voucher_product
if total_discount > 0:
- ppn = total_discount * 0.11
+ ppn = total_discount * 0.12
return {
'total_discount': self.format_currency(total_discount),
'total_voucher': self.format_currency(total_voucher),
@@ -352,7 +352,7 @@ class WebsiteUserCart(models.Model):
discounted_price = fixed_price - (fixed_price * discount / 100)
- final_price = discounted_price / 1.11
+ final_price = discounted_price / 1.12
return {
'price': final_price,