nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use json directly instead of using frappe.json (#41609)

Browse Source 
(cherry picked from commit 3f06f1905f)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
Akhil Narang
2024-05-23 19:30:42 +05:30
committed by akhilnarang
parent dcffb3886b
commit 5b2c13dacf
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
View File

@@ -441,7 +441,7 @@ def create_merge_logs(invoice_by_customer, closing_entry=None):
if closing_entry: if closing_entry:
closing_entry.set_status(update=True, status="Failed") closing_entry.set_status(update=True, status="Failed")
if isinstance(error_message, list): if isinstance(error_message, list):
error_message = frappe.json.dumps(error_message) error_message = json.dumps(error_message)
closing_entry.db_set("error_message", error_message) closing_entry.db_set("error_message", error_message)
raise raise

4
erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
View File

@@ -1,6 +1,8 @@
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt # For license information, please see license.txt
import json
import frappe import frappe
from frappe import _, qb from frappe import _, qb
from frappe.model.document import Document from frappe.model.document import Document
@@ -479,7 +481,7 @@ def is_any_doc_running(for_filter: str | dict | None = None) -> str | None:
running_doc = None running_doc = None
if for_filter: if for_filter:
if isinstance(for_filter, str): if isinstance(for_filter, str):
for_filter = frappe.json.loads(for_filter) for_filter = json.loads(for_filter)
running_doc = frappe.db.get_value( running_doc = frappe.db.get_value(
"Process Payment Reconciliation", "Process Payment Reconciliation",

5
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@@ -2,6 +2,7 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
import copy import copy
import json
import frappe import frappe
from frappe.model.dynamic_links import get_dynamic_link_map from frappe.model.dynamic_links import get_dynamic_link_map
@@ -3479,9 +3480,9 @@ class TestSalesInvoice(FrappeTestCase):
map_docs( map_docs(
method="erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice", method="erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
source_names=frappe.json.dumps([dn1.name, dn2.name]), source_names=json.dumps([dn1.name, dn2.name]),
target_doc=si, target_doc=si,
args=frappe.json.dumps({"customer": dn1.customer, "merge_taxes": 1, "filtered_children": []}), args=json.dumps({"customer": dn1.customer, "merge_taxes": 1, "filtered_children": []}),
) )
si.save().submit() si.save().submit()

4
erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py
View File

@@ -1,6 +1,8 @@
# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt # For license information, please see license.txt
import json
import frappe import frappe
from frappe import _, qb from frappe import _, qb
from frappe.model.document import Document from frappe.model.document import Document
@@ -142,7 +144,7 @@ def get_linked_payments_for_doc(
@frappe.whitelist() @frappe.whitelist()
def create_unreconcile_doc_for_selection(selections=None): def create_unreconcile_doc_for_selection(selections=None):
if selections: if selections:
selections = frappe.json.loads(selections) selections = json.loads(selections)
# assuming each row is a unique voucher # assuming each row is a unique voucher
for row in selections: for row in selections:
unrecon = frappe.new_doc("Unreconcile Payment") unrecon = frappe.new_doc("Unreconcile Payment")

2
erpnext/accounts/utils.py
View File

@@ -56,7 +56,7 @@ def get_fiscal_year(
date=None, fiscal_year=None, label="Date", verbose=1, company=None, as_dict=False, boolean=False date=None, fiscal_year=None, label="Date", verbose=1, company=None, as_dict=False, boolean=False
): ):
if isinstance(boolean, str): if isinstance(boolean, str):
boolean = frappe.json.loads(boolean) boolean = loads(boolean)
fiscal_years = get_fiscal_years( fiscal_years = get_fiscal_years(
date, fiscal_year, label, verbose, company, as_dict=as_dict, boolean=boolean date, fiscal_year, label, verbose, company, as_dict=as_dict, boolean=boolean

4
erpnext/selling/doctype/customer/test_customer.py
View File

@@ -2,6 +2,8 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
import json
import frappe import frappe
from frappe.custom.doctype.property_setter.property_setter import make_property_setter from frappe.custom.doctype.property_setter.property_setter import make_property_setter
from frappe.test_runner import make_test_records from frappe.test_runner import make_test_records
@@ -322,7 +324,7 @@ class TestCustomer(FrappeTestCase):
frappe.ValidationError, frappe.ValidationError,
update_child_qty_rate, update_child_qty_rate,
so.doctype, so.doctype,
frappe.json.dumps([modified_item]), json.dumps([modified_item]),
so.name, so.name,
) )