Revert "fix: split expected jv entries for scrap asset"
This reverts commit 291a4991246b5a53491066eb46efda0de2a8002f.
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index b48a8e6..1dfcac8 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -357,7 +357,7 @@
process_debit_credit_difference(gl_map)
if gl_map:
- check_freezing_date(gl_map[0]["posting_date"], adv_adj)
+ # check_freezing_date(gl_map[0]["posting_date"], adv_adj)
is_opening = any(d.get("is_opening") == "Yes" for d in gl_map)
if gl_map[0]["voucher_type"] != "Period Closing Voucher":
validate_against_pcv(is_opening, gl_map[0]["posting_date"], gl_map[0]["company"])
@@ -594,7 +594,7 @@
partial_cancel=partial_cancel,
)
validate_accounting_period(gl_entries)
- check_freezing_date(gl_entries[0]["posting_date"], adv_adj)
+ # check_freezing_date(gl_entries[0]["posting_date"], adv_adj)
is_opening = any(d.get("is_opening") == "Yes" for d in gl_entries)
validate_against_pcv(is_opening, gl_entries[0]["posting_date"], gl_entries[0]["company"])
diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py
index 0773698..dc80aa5 100644
--- a/erpnext/assets/doctype/asset/test_asset.py
+++ b/erpnext/assets/doctype/asset/test_asset.py
@@ -251,16 +251,7 @@
flt(18000.0 + pro_rata_amount, asset.precision("gross_purchase_amount")),
0.0,
),
- (
- "_Test Fixed Asset - _TC",
- 0.0,
- flt(18000.0 + pro_rata_amount, asset.precision("gross_purchase_amount")),
- ),
- (
- "_Test Fixed Asset - _TC",
- 0.0,
- flt(82000.0 - pro_rata_amount, asset.precision("gross_purchase_amount")),
- ),
+ ("_Test Fixed Asset - _TC", 0.0, 100000.0),
(
"_Test Gain/Loss on Asset Disposal - _TC",
flt(82000.0 - pro_rata_amount, asset.precision("gross_purchase_amount")),