Merge pull request #37414 from s-aga-r/FIX-4347
fix: consider received qty while creating SO -> MR
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index aa3d1b3..e365d60 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -5,7 +5,7 @@
import unittest
import frappe
-from frappe.tests.utils import change_settings
+from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import add_days, cint, flt, getdate, nowdate, today
import erpnext
@@ -38,7 +38,7 @@
test_ignore = ["Serial No"]
-class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
+class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
@classmethod
def setUpClass(self):
unlink_payment_on_cancel_of_invoice()
@@ -48,6 +48,9 @@
def tearDownClass(self):
unlink_payment_on_cancel_of_invoice(0)
+ def tearDown(self):
+ frappe.db.rollback()
+
def test_purchase_invoice_received_qty(self):
"""
1. Test if received qty is validated against accepted + rejected
@@ -422,6 +425,7 @@
self.assertEqual(tax.tax_amount, expected_values[i][1])
self.assertEqual(tax.total, expected_values[i][2])
+ @change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
def test_purchase_invoice_with_advance(self):
from erpnext.accounts.doctype.journal_entry.test_journal_entry import (
test_records as jv_test_records,
@@ -476,6 +480,7 @@
)
)
+ @change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
def test_invoice_with_advance_and_multi_payment_terms(self):
from erpnext.accounts.doctype.journal_entry.test_journal_entry import (
test_records as jv_test_records,
@@ -1220,6 +1225,7 @@
acc_settings.submit_journal_entriessubmit_journal_entries = 0
acc_settings.save()
+ @change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
def test_gain_loss_with_advance_entry(self):
unlink_enabled = frappe.db.get_value(
"Accounts Settings", "Accounts Settings", "unlink_payment_on_cancel_of_invoice"
@@ -1420,6 +1426,7 @@
)
frappe.db.set_value("Company", "_Test Company", "exchange_gain_loss_account", original_account)
+ @change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
def test_purchase_invoice_advance_taxes(self):
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 8aa1f4c..c1adffd 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -6,7 +6,7 @@
import frappe
from frappe.model.dynamic_links import get_dynamic_link_map
-from frappe.tests.utils import change_settings
+from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import add_days, flt, getdate, nowdate, today
import erpnext
@@ -45,13 +45,17 @@
from erpnext.stock.utils import get_incoming_rate, get_stock_balance
-class TestSalesInvoice(unittest.TestCase):
+class TestSalesInvoice(FrappeTestCase):
def setUp(self):
from erpnext.stock.doctype.stock_ledger_entry.test_stock_ledger_entry import create_items
create_items(["_Test Internal Transfer Item"], uoms=[{"uom": "Box", "conversion_factor": 10}])
create_internal_parties()
setup_accounts()
+ frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
+
+ def tearDown(self):
+ frappe.db.rollback()
def make(self):
w = frappe.copy_doc(test_records[0])
@@ -179,6 +183,7 @@
self.assertRaises(frappe.LinkExistsError, si.cancel)
unlink_payment_on_cancel_of_invoice()
+ @change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
def test_payment_entry_unlink_against_standalone_credit_note(self):
from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
@@ -1300,6 +1305,7 @@
dn.submit()
return dn
+ @change_settings("Accounts Settings", {"unlink_payment_on_cancellation_of_invoice": 1})
def test_sales_invoice_with_advance(self):
from erpnext.accounts.doctype.journal_entry.test_journal_entry import (
test_records as jv_test_records,
@@ -2775,6 +2781,13 @@
company="_Test Company",
)
+ tds_payable_account = create_account(
+ account_name="TDS Payable",
+ account_type="Tax",
+ parent_account="Duties and Taxes - _TC",
+ company="_Test Company",
+ )
+
si = create_sales_invoice(parent_cost_center="Main - _TC", do_not_save=1)
si.apply_discount_on = "Grand Total"
si.additional_discount_account = additional_discount_account
@@ -3073,8 +3086,8 @@
si.commission_rate = commission_rate
self.assertRaises(frappe.ValidationError, si.save)
+ @change_settings("Accounts Settings", {"acc_frozen_upto": add_days(getdate(), 1)})
def test_sales_invoice_submission_post_account_freezing_date(self):
- frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", add_days(getdate(), 1))
si = create_sales_invoice(do_not_save=True)
si.posting_date = add_days(getdate(), 1)
si.save()
@@ -3083,8 +3096,6 @@
si.posting_date = getdate()
si.submit()
- frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
-
def test_over_billing_case_against_delivery_note(self):
"""
Test a case where duplicating the item with qty = 1 in the invoice
@@ -3113,6 +3124,13 @@
frappe.db.set_single_value("Accounts Settings", "over_billing_allowance", over_billing_allowance)
+ @change_settings(
+ "Accounts Settings",
+ {
+ "book_deferred_entries_via_journal_entry": 1,
+ "submit_journal_entries": 1,
+ },
+ )
def test_multi_currency_deferred_revenue_via_journal_entry(self):
deferred_account = create_account(
account_name="Deferred Revenue",
@@ -3120,11 +3138,6 @@
company="_Test Company",
)
- acc_settings = frappe.get_single("Accounts Settings")
- acc_settings.book_deferred_entries_via_journal_entry = 1
- acc_settings.submit_journal_entries = 1
- acc_settings.save()
-
item = create_item("_Test Item for Deferred Accounting")
item.enable_deferred_expense = 1
item.item_defaults[0].deferred_revenue_account = deferred_account
@@ -3190,13 +3203,6 @@
self.assertEqual(expected_gle[i][2], gle.debit)
self.assertEqual(getdate(expected_gle[i][3]), gle.posting_date)
- acc_settings = frappe.get_single("Accounts Settings")
- acc_settings.book_deferred_entries_via_journal_entry = 0
- acc_settings.submit_journal_entries = 0
- acc_settings.save()
-
- frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
-
def test_standalone_serial_no_return(self):
si = create_sales_invoice(
item_code="_Test Serialized Item With Series", update_stock=True, is_return=True, qty=-1
diff --git a/erpnext/accounts/doctype/subscription/test_subscription.py b/erpnext/accounts/doctype/subscription/test_subscription.py
index 803e879..785fd04 100644
--- a/erpnext/accounts/doctype/subscription/test_subscription.py
+++ b/erpnext/accounts/doctype/subscription/test_subscription.py
@@ -4,6 +4,7 @@
import unittest
import frappe
+from frappe.tests.utils import FrappeTestCase
from frappe.utils.data import (
add_days,
add_months,
@@ -21,11 +22,15 @@
test_dependencies = ("UOM", "Item Group", "Item")
-class TestSubscription(unittest.TestCase):
+class TestSubscription(FrappeTestCase):
def setUp(self):
make_plans()
create_parties()
reset_settings()
+ frappe.db.set_single_value("Accounts Settings", "acc_frozen_upto", None)
+
+ def tearDown(self):
+ frappe.db.rollback()
def test_create_subscription_with_trial_with_correct_period(self):
subscription = create_subscription(
diff --git a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
index 91ad3d6..f2ec31c 100644
--- a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
+++ b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
@@ -68,7 +68,11 @@
tax_amount += entry.credit - entry.debit
if net_total_map.get(name):
- total_amount, grand_total, base_total = net_total_map.get(name)
+ if voucher_type == "Journal Entry":
+ # back calcalute total amount from rate and tax_amount
+ total_amount = grand_total = base_total = tax_amount / (rate / 100)
+ else:
+ total_amount, grand_total, base_total = net_total_map.get(name)
else:
total_amount += entry.credit
diff --git a/erpnext/regional/united_arab_emirates/utils.py b/erpnext/regional/united_arab_emirates/utils.py
index a910af6..efeaeed 100644
--- a/erpnext/regional/united_arab_emirates/utils.py
+++ b/erpnext/regional/united_arab_emirates/utils.py
@@ -7,32 +7,32 @@
def update_itemised_tax_data(doc):
+ # maybe this should be a standard function rather than a regional one
if not doc.taxes:
return
+ if not doc.items:
+ return
+
+ meta = frappe.get_meta(doc.items[0].doctype)
+ if not meta.has_field("tax_rate"):
+ return
+
itemised_tax = get_itemised_tax(doc.taxes)
for row in doc.items:
- tax_rate = 0.0
- item_tax_rate = 0.0
+ tax_rate, tax_amount = 0.0, 0.0
+ # dont even bother checking in item tax template as it contains both input and output accounts - double the tax rate
+ item_code = row.item_code or row.item_name
+ if itemised_tax.get(item_code):
+ for tax in itemised_tax.get(row.item_code).values():
+ _tax_rate = flt(tax.get("tax_rate", 0), row.precision("tax_rate"))
+ tax_amount += flt((row.net_amount * _tax_rate) / 100, row.precision("tax_amount"))
+ tax_rate += _tax_rate
- if row.item_tax_rate:
- item_tax_rate = frappe.parse_json(row.item_tax_rate)
-
- # First check if tax rate is present
- # If not then look up in item_wise_tax_detail
- if item_tax_rate:
- for account, rate in item_tax_rate.items():
- tax_rate += rate
- elif row.item_code and itemised_tax.get(row.item_code):
- tax_rate = sum([tax.get("tax_rate", 0) for d, tax in itemised_tax.get(row.item_code).items()])
-
- meta = frappe.get_meta(row.doctype)
-
- if meta.has_field("tax_rate"):
- row.tax_rate = flt(tax_rate, row.precision("tax_rate"))
- row.tax_amount = flt((row.net_amount * tax_rate) / 100, row.precision("net_amount"))
- row.total_amount = flt((row.net_amount + row.tax_amount), row.precision("total_amount"))
+ row.tax_rate = flt(tax_rate, row.precision("tax_rate"))
+ row.tax_amount = flt(tax_amount, row.precision("tax_amount"))
+ row.total_amount = flt((row.net_amount + row.tax_amount), row.precision("total_amount"))
def get_account_currency(account):