|
@@ -13,67 +12,70 @@ frappe.ui.form.on('Accounting Dimension Filter', { |
${__("No Matching Bank Transactions Found")}
`
+ let no_bank_transactions_text = `${__(
+ "No Matching Bank Transactions Found"
+ )}
`;
set_field_options("no_bank_transactions", no_bank_transactions_text);
},
onload: function (frm) {
// Set default filter dates
- let today = frappe.datetime.get_today()
+ let today = frappe.datetime.get_today();
frm.doc.bank_statement_from_date = frappe.datetime.add_months(today, -1);
frm.doc.bank_statement_to_date = today;
- frm.trigger('bank_account');
+ frm.trigger("bank_account");
},
filter_by_reference_date: function (frm) {
@@ -37,34 +38,27 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
refresh: function (frm) {
frm.disable_save();
- frappe.require("bank-reconciliation-tool.bundle.js", () =>
- frm.trigger("make_reconciliation_tool")
- );
+ frappe.require("bank-reconciliation-tool.bundle.js", () => frm.trigger("make_reconciliation_tool"));
frm.add_custom_button(__("Upload Bank Statement"), () =>
- frappe.call({
- method:
- "erpnext.accounts.doctype.bank_statement_import.bank_statement_import.upload_bank_statement",
- args: {
- dt: frm.doc.doctype,
- dn: frm.doc.name,
- company: frm.doc.company,
- bank_account: frm.doc.bank_account,
- },
- callback: function (r) {
- if (!r.exc) {
- var doc = frappe.model.sync(r.message);
- frappe.set_route(
- "Form",
- doc[0].doctype,
- doc[0].name
- );
- }
- },
- })
+ frappe.call({
+ method: "erpnext.accounts.doctype.bank_statement_import.bank_statement_import.upload_bank_statement",
+ args: {
+ dt: frm.doc.doctype,
+ dn: frm.doc.name,
+ company: frm.doc.company,
+ bank_account: frm.doc.bank_account,
+ },
+ callback: function (r) {
+ if (!r.exc) {
+ var doc = frappe.model.sync(r.message);
+ frappe.set_route("Form", doc[0].doctype, doc[0].name);
+ }
+ },
+ })
);
- frm.add_custom_button(__('Auto Reconcile'), function() {
+ frm.add_custom_button(__("Auto Reconcile"), function () {
frappe.call({
method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers",
args: {
@@ -75,33 +69,22 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
from_reference_date: frm.doc.from_reference_date,
to_reference_date: frm.doc.to_reference_date,
},
- })
+ });
});
- frm.add_custom_button(__('Get Unreconciled Entries'), function() {
+ frm.add_custom_button(__("Get Unreconciled Entries"), function () {
frm.trigger("make_reconciliation_tool");
});
- frm.change_custom_button_type('Get Unreconciled Entries', null, 'primary');
-
+ frm.change_custom_button_type("Get Unreconciled Entries", null, "primary");
},
bank_account: function (frm) {
- frappe.db.get_value(
- "Bank Account",
- frm.doc.bank_account,
- "account",
- (r) => {
- frappe.db.get_value(
- "Account",
- r.account,
- "account_currency",
- (r) => {
- frm.doc.account_currency = r.account_currency;
- frm.trigger("render_chart");
- }
- );
- }
- );
+ frappe.db.get_value("Bank Account", frm.doc.bank_account, "account", (r) => {
+ frappe.db.get_value("Account", r.account, "account_currency", (r) => {
+ frm.doc.account_currency = r.account_currency;
+ frm.trigger("render_chart");
+ });
+ });
frm.trigger("get_account_opening_balance");
},
@@ -120,11 +103,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
) {
frm.trigger("render_chart");
frm.trigger("render");
- frappe.utils.scroll_to(
- frm.get_field("reconciliation_tool_cards").$wrapper,
- true,
- 30
- );
+ frappe.utils.scroll_to(frm.get_field("reconciliation_tool_cards").$wrapper, true, 30);
}
});
}
@@ -133,11 +112,10 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
get_account_opening_balance(frm) {
if (frm.doc.bank_account && frm.doc.bank_statement_from_date) {
frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
args: {
bank_account: frm.doc.bank_account,
- till_date: frm.doc.bank_statement_from_date,
+ till_date: frappe.datetime.add_days(frm.doc.bank_statement_from_date, -1),
},
callback: (response) => {
frm.set_value("account_opening_balance", response.message);
@@ -149,8 +127,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
get_cleared_balance(frm) {
if (frm.doc.bank_account && frm.doc.bank_statement_to_date) {
return frappe.call({
- method:
- "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
+ method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
args: {
bank_account: frm.doc.bank_account,
till_date: frm.doc.bank_statement_to_date,
@@ -163,41 +140,30 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
},
render_chart(frm) {
- frm.cards_manager = new erpnext.accounts.bank_reconciliation.NumberCardManager(
- {
- $reconciliation_tool_cards: frm.get_field(
- "reconciliation_tool_cards"
- ).$wrapper,
- bank_statement_closing_balance:
- frm.doc.bank_statement_closing_balance,
- cleared_balance: frm.cleared_balance,
- currency: frm.doc.account_currency,
- }
- );
+ frm.cards_manager = new erpnext.accounts.bank_reconciliation.NumberCardManager({
+ $reconciliation_tool_cards: frm.get_field("reconciliation_tool_cards").$wrapper,
+ bank_statement_closing_balance: frm.doc.bank_statement_closing_balance,
+ cleared_balance: frm.cleared_balance,
+ currency: frm.doc.account_currency,
+ });
},
render(frm) {
if (frm.doc.bank_account) {
- frm.bank_reconciliation_data_table_manager = new erpnext.accounts.bank_reconciliation.DataTableManager(
- {
+ frm.bank_reconciliation_data_table_manager =
+ new erpnext.accounts.bank_reconciliation.DataTableManager({
company: frm.doc.company,
bank_account: frm.doc.bank_account,
- $reconciliation_tool_dt: frm.get_field(
- "reconciliation_tool_dt"
- ).$wrapper,
- $no_bank_transactions: frm.get_field(
- "no_bank_transactions"
- ).$wrapper,
+ $reconciliation_tool_dt: frm.get_field("reconciliation_tool_dt").$wrapper,
+ $no_bank_transactions: frm.get_field("no_bank_transactions").$wrapper,
bank_statement_from_date: frm.doc.bank_statement_from_date,
bank_statement_to_date: frm.doc.bank_statement_to_date,
filter_by_reference_date: frm.doc.filter_by_reference_date,
from_reference_date: frm.doc.from_reference_date,
to_reference_date: frm.doc.to_reference_date,
- bank_statement_closing_balance:
- frm.doc.bank_statement_closing_balance,
+ bank_statement_closing_balance: frm.doc.bank_statement_closing_balance,
cards_manager: frm.cards_manager,
- }
- );
+ });
}
},
});
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
index 6017c5a491d..2987bac677c 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
@@ -61,9 +61,7 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
def get_account_balance(bank_account, till_date):
# returns account balance till the specified date
account = frappe.db.get_value("Bank Account", bank_account, "account")
- filters = frappe._dict(
- {"account": account, "report_date": till_date, "include_pos_transactions": 1}
- )
+ filters = frappe._dict({"account": account, "report_date": till_date, "include_pos_transactions": 1})
data = get_entries(filters)
balance_as_per_system = get_balance_on(filters["account"], filters["report_date"])
@@ -76,10 +74,7 @@ def get_account_balance(bank_account, till_date):
amounts_not_reflected_in_system = get_amounts_not_reflected_in_system(filters)
bank_bal = (
- flt(balance_as_per_system)
- - flt(total_debit)
- + flt(total_credit)
- + amounts_not_reflected_in_system
+ flt(balance_as_per_system) - flt(total_debit) + flt(total_credit) + amounts_not_reflected_in_system
)
return bank_bal
@@ -377,12 +372,13 @@ def auto_reconcile_vouchers(
)
transaction = frappe.get_doc("Bank Transaction", transaction.name)
account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
- matched_trans = 0
for voucher in vouchers:
gl_entry = frappe.db.get_value(
"GL Entry",
dict(
- account=account, voucher_type=voucher["payment_doctype"], voucher_no=voucher["payment_name"]
+ account=account,
+ voucher_type=voucher["payment_doctype"],
+ voucher_no=voucher["payment_name"],
),
["credit", "debit"],
as_dict=1,
@@ -731,7 +727,7 @@ def get_lr_matching_query(bank_account, exact_match, filters):
)
if frappe.db.has_column("Loan Repayment", "repay_from_salary"):
- query = query.where((loan_repayment.repay_from_salary == 0))
+ query = query.where(loan_repayment.repay_from_salary == 0)
if exact_match:
query.where(loan_repayment.amount_paid == filters.get("amount"))
@@ -764,7 +760,7 @@ def get_pe_matching_query(
if cint(filter_by_reference_date):
filter_by_date = f"AND reference_date between '{from_reference_date}' and '{to_reference_date}'"
order_by = " reference_date"
- if frappe.flags.auto_reconcile_vouchers == True:
+ if frappe.flags.auto_reconcile_vouchers is True:
filter_by_reference_no = f"AND reference_no = '{transaction.reference_number}'"
return f"""
SELECT
@@ -815,7 +811,7 @@ def get_je_matching_query(
if cint(filter_by_reference_date):
filter_by_date = f"AND je.cheque_date between '{from_reference_date}' and '{to_reference_date}'"
order_by = " je.cheque_date"
- if frappe.flags.auto_reconcile_vouchers == True:
+ if frappe.flags.auto_reconcile_vouchers is True:
filter_by_reference_no = f"AND je.cheque_no = '{transaction.reference_number}'"
return f"""
SELECT
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
index db68dfad79e..c4b442070d2 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
@@ -17,11 +17,9 @@ frappe.ui.form.on("Bank Statement Import", {
frm.import_in_progress = false;
if (data_import !== frm.doc.name) return;
frappe.model.clear_doc("Bank Statement Import", frm.doc.name);
- frappe.model
- .with_doc("Bank Statement Import", frm.doc.name)
- .then(() => {
- frm.refresh();
- });
+ frappe.model.with_doc("Bank Statement Import", frm.doc.name).then(() => {
+ frm.refresh();
+ });
});
frappe.realtime.on("data_import_progress", (data) => {
frm.import_in_progress = true;
@@ -48,20 +46,9 @@ frappe.ui.form.on("Bank Statement Import", {
: __("Updating {0} of {1}, {2}", message_args);
}
if (data.skipping) {
- message = __(
- "Skipping {0} of {1}, {2}",
- [
- data.current,
- data.total,
- eta_message,
- ]
- );
+ message = __("Skipping {0} of {1}, {2}", [data.current, data.total, eta_message]);
}
- frm.dashboard.show_progress(
- __("Import Progress"),
- percent,
- message
- );
+ frm.dashboard.show_progress(__("Import Progress"), percent, message);
frm.page.set_indicator(__("In Progress"), "orange");
// hide progress when complete
@@ -103,15 +90,12 @@ frappe.ui.form.on("Bank Statement Import", {
frm.trigger("show_report_error_button");
if (frm.doc.status === "Partial Success") {
- frm.add_custom_button(__("Export Errored Rows"), () =>
- frm.trigger("export_errored_rows")
- );
+ frm.add_custom_button(__("Export Errored Rows"), () => frm.trigger("export_errored_rows"));
}
if (frm.doc.status.includes("Success")) {
- frm.add_custom_button(
- __("Go to {0} List", [__(frm.doc.reference_doctype)]),
- () => frappe.set_route("List", frm.doc.reference_doctype)
+ frm.add_custom_button(__("Go to {0} List", [__(frm.doc.reference_doctype)]), () =>
+ frappe.set_route("List", frm.doc.reference_doctype)
);
}
},
@@ -128,13 +112,8 @@ frappe.ui.form.on("Bank Statement Import", {
frm.disable_save();
if (frm.doc.status !== "Success") {
if (!frm.is_new() && frm.has_import_file()) {
- let label =
- frm.doc.status === "Pending"
- ? __("Start Import")
- : __("Retry");
- frm.page.set_primary_action(label, () =>
- frm.events.start_import(frm)
- );
+ let label = frm.doc.status === "Pending" ? __("Start Import") : __("Retry");
+ frm.page.set_primary_action(label, () => frm.events.start_import(frm));
} else {
frm.page.set_primary_action(__("Save"), () => frm.save());
}
@@ -176,24 +155,24 @@ frappe.ui.form.on("Bank Statement Import", {
message =
successful_records.length > 1
? __(
- "Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again.",
- message_args
- )
+ "Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again.",
+ message_args
+ )
: __(
- "Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again.",
- message_args
- );
+ "Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again.",
+ message_args
+ );
} else {
message =
successful_records.length > 1
? __(
- "Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again.",
- message_args
- )
+ "Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again.",
+ message_args
+ )
: __(
- "Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again.",
- message_args
- );
+ "Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again.",
+ message_args
+ );
}
}
frm.dashboard.set_headline(message);
@@ -236,8 +215,7 @@ frappe.ui.form.on("Bank Statement Import", {
},
download_template() {
- let method =
- "/api/method/frappe.core.doctype.data_import.data_import.download_template";
+ let method = "/api/method/frappe.core.doctype.data_import.data_import.download_template";
open_url_post(method, {
doctype: "Bank Transaction",
@@ -250,7 +228,7 @@ frappe.ui.form.on("Bank Statement Import", {
"description",
"reference_number",
"bank_account",
- "currency"
+ "currency",
],
},
});
@@ -321,10 +299,7 @@ frappe.ui.form.on("Bank Statement Import", {
show_import_preview(frm, preview_data) {
let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
- if (
- frm.import_preview &&
- frm.import_preview.doctype === frm.doc.reference_doctype
- ) {
+ if (frm.import_preview && frm.import_preview.doctype === frm.doc.reference_doctype) {
frm.import_preview.preview_data = preview_data;
frm.import_preview.import_log = import_log;
frm.import_preview.refresh();
@@ -340,19 +315,10 @@ frappe.ui.form.on("Bank Statement Import", {
frm,
events: {
remap_column(changed_map) {
- let template_options = JSON.parse(
- frm.doc.template_options || "{}"
- );
- template_options.column_to_field_map =
- template_options.column_to_field_map || {};
- Object.assign(
- template_options.column_to_field_map,
- changed_map
- );
- frm.set_value(
- "template_options",
- JSON.stringify(template_options)
- );
+ let template_options = JSON.parse(frm.doc.template_options || "{}");
+ template_options.column_to_field_map = template_options.column_to_field_map || {};
+ Object.assign(template_options.column_to_field_map, changed_map);
+ frm.set_value("template_options", JSON.stringify(template_options));
frm.save().then(() => frm.trigger("import_file"));
},
},
@@ -386,8 +352,7 @@ frappe.ui.form.on("Bank Statement Import", {
let other_warnings = [];
for (let warning of warnings) {
if (warning.row) {
- warnings_by_row[warning.row] =
- warnings_by_row[warning.row] || [];
+ warnings_by_row[warning.row] = warnings_by_row[warning.row] || [];
warnings_by_row[warning.row].push(warning);
} else {
other_warnings.push(warning);
@@ -402,9 +367,7 @@ frappe.ui.form.on("Bank Statement Import", {
if (w.field) {
let label =
w.field.label +
- (w.field.parent !== frm.doc.reference_doctype
- ? ` (${w.field.parent})`
- : "");
+ (w.field.parent !== frm.doc.reference_doctype ? ` (${w.field.parent})` : "");
return `${m.message}
`
- : "";
+ let title = m.title ? `${m.title}` : "";
+ let message = m.message ? `${m.message}
` : "";
return title + message;
})
.join("");
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
index 3f5c064f4b9..78a27c3b96d 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
@@ -21,7 +21,7 @@ INVALID_VALUES = ("", None)
class BankStatementImport(DataImport):
def __init__(self, *args, **kwargs):
- super(BankStatementImport, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
def validate(self):
doc_before_save = self.get_doc_before_save()
@@ -30,7 +30,6 @@ class BankStatementImport(DataImport):
or (doc_before_save and doc_before_save.import_file != self.import_file)
or (doc_before_save and doc_before_save.google_sheets_url != self.google_sheets_url)
):
-
template_options_dict = {}
column_to_field_map = {}
bank = frappe.get_doc("Bank", self.bank)
@@ -45,7 +44,6 @@ class BankStatementImport(DataImport):
self.validate_google_sheets_url()
def start_import(self):
-
preview = frappe.get_doc("Bank Statement Import", self.name).get_preview_from_template(
self.import_file, self.google_sheets_url
)
@@ -102,7 +100,7 @@ def download_errored_template(data_import_name):
def parse_data_from_template(raw_data):
data = []
- for i, row in enumerate(raw_data):
+ for _i, row in enumerate(raw_data):
if all(v in INVALID_VALUES for v in row):
# empty row
continue
@@ -112,9 +110,7 @@ def parse_data_from_template(raw_data):
return data
-def start_import(
- data_import, bank_account, import_file_path, google_sheets_url, bank, template_options
-):
+def start_import(data_import, bank_account, import_file_path, google_sheets_url, bank, template_options):
"""This method runs in background job"""
update_mapping_db(bank, template_options)
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import_list.js b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import_list.js
index 6c754022e68..4ab65ff73aa 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import_list.js
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import_list.js
@@ -1,36 +1,34 @@
let imports_in_progress = [];
-frappe.listview_settings['Bank Statement Import'] = {
+frappe.listview_settings["Bank Statement Import"] = {
onload(listview) {
- frappe.realtime.on('data_import_progress', data => {
+ frappe.realtime.on("data_import_progress", (data) => {
if (!imports_in_progress.includes(data.data_import)) {
imports_in_progress.push(data.data_import);
}
});
- frappe.realtime.on('data_import_refresh', data => {
- imports_in_progress = imports_in_progress.filter(
- d => d !== data.data_import
- );
+ frappe.realtime.on("data_import_refresh", (data) => {
+ imports_in_progress = imports_in_progress.filter((d) => d !== data.data_import);
listview.refresh();
});
},
- get_indicator: function(doc) {
+ get_indicator: function (doc) {
var colors = {
- 'Pending': 'orange',
- 'Not Started': 'orange',
- 'Partial Success': 'orange',
- 'Success': 'green',
- 'In Progress': 'orange',
- 'Error': 'red'
+ Pending: "orange",
+ "Not Started": "orange",
+ "Partial Success": "orange",
+ Success: "green",
+ "In Progress": "orange",
+ Error: "red",
};
let status = doc.status;
if (imports_in_progress.includes(doc.name)) {
- status = 'In Progress';
+ status = "In Progress";
}
- if (status == 'Pending') {
- status = 'Not Started';
+ if (status == "Pending") {
+ status = "Not Started";
}
- return [__(status), colors[status], 'status,=,' + doc.status];
+ return [__(status), colors[status], "status,=," + doc.status];
},
- hide_name_column: true
+ hide_name_column: true,
};
diff --git a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
index 04dab4c28a0..230407ba5a4 100644
--- a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
+++ b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
@@ -1,5 +1,3 @@
-from typing import Tuple, Union
-
import frappe
from frappe.utils import flt
from rapidfuzz import fuzz, process
@@ -19,7 +17,7 @@ class AutoMatchParty:
def get(self, key):
return self.__dict__.get(key, None)
- def match(self) -> Union[Tuple, None]:
+ def match(self) -> tuple | None:
result = None
result = AutoMatchbyAccountIBAN(
bank_party_account_number=self.bank_party_account_number,
@@ -50,7 +48,7 @@ class AutoMatchbyAccountIBAN:
result = self.match_account_in_party()
return result
- def match_account_in_party(self) -> Union[Tuple, None]:
+ def match_account_in_party(self) -> tuple | None:
"""Check if there is a IBAN/Account No. match in Customer/Supplier/Employee"""
result = None
parties = get_parties_in_order(self.deposit)
@@ -97,7 +95,7 @@ class AutoMatchbyPartyNameDescription:
def get(self, key):
return self.__dict__.get(key, None)
- def match(self) -> Union[Tuple, None]:
+ def match(self) -> tuple | None:
# fuzzy search by customer/supplier & employee
if not (self.bank_party_name or self.description):
return None
@@ -105,7 +103,7 @@ class AutoMatchbyPartyNameDescription:
result = self.match_party_name_desc_in_party()
return result
- def match_party_name_desc_in_party(self) -> Union[Tuple, None]:
+ def match_party_name_desc_in_party(self) -> tuple | None:
"""Fuzzy search party name and/or description against parties in the system"""
result = None
parties = get_parties_in_order(self.deposit)
@@ -130,7 +128,7 @@ class AutoMatchbyPartyNameDescription:
return result
- def fuzzy_search_and_return_result(self, party, names, field) -> Union[Tuple, None]:
+ def fuzzy_search_and_return_result(self, party, names, field) -> tuple | None:
skip = False
result = process.extract(
query=self.get(field),
@@ -147,7 +145,7 @@ class AutoMatchbyPartyNameDescription:
party_name,
), skip
- def process_fuzzy_result(self, result: Union[list, None]):
+ def process_fuzzy_result(self, result: list | None):
"""
If there are multiple valid close matches return None as result may be faulty.
Return the result only if one accurate match stands out.
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js
index b3cc1cbb1be..d899d429178 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js
@@ -3,7 +3,7 @@
frappe.ui.form.on("Bank Transaction", {
onload(frm) {
- frm.set_query("payment_document", "payment_entries", function() {
+ frm.set_query("payment_document", "payment_entries", function () {
const payment_doctypes = frm.events.get_payment_doctypes(frm);
return {
filters: {
@@ -23,7 +23,7 @@ frappe.ui.form.on("Bank Transaction", {
set_bank_statement_filter(frm);
},
- setup: function(frm) {
+ setup: function (frm) {
frm.set_query("party_type", function () {
return {
filters: {
@@ -33,16 +33,10 @@ frappe.ui.form.on("Bank Transaction", {
});
},
- get_payment_doctypes: function() {
+ get_payment_doctypes: function () {
// get payment doctypes from all the apps
- return [
- "Payment Entry",
- "Journal Entry",
- "Sales Invoice",
- "Purchase Invoice",
- "Bank Transaction",
- ];
- }
+ return ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Bank Transaction"];
+ },
});
frappe.ui.form.on("Bank Transaction Payments", {
@@ -54,10 +48,11 @@ frappe.ui.form.on("Bank Transaction Payments", {
const update_clearance_date = (frm, cdt, cdn) => {
if (frm.doc.docstatus === 1) {
frappe
- .xcall(
- "erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment",
- { doctype: cdt, docname: cdn, bt_name: frm.doc.name }
- )
+ .xcall("erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment", {
+ doctype: cdt,
+ docname: cdn,
+ bt_name: frm.doc.name,
+ })
.then((e) => {
if (e == "success") {
frappe.show_alert({
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
index 256bde5c719..49c5a9fe4ee 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
@@ -2,6 +2,7 @@
# For license information, please see license.txt
import frappe
+from frappe.model.docstatus import DocStatus
from frappe.utils import flt
from erpnext.controllers.status_updater import StatusUpdater
@@ -40,9 +41,10 @@ class BankTransaction(StatusUpdater):
else:
allocated_amount = 0.0
- amount = abs(flt(self.withdrawal) - flt(self.deposit))
- self.db_set("allocated_amount", flt(allocated_amount))
- self.db_set("unallocated_amount", amount - flt(allocated_amount))
+ unallocated_amount = abs(flt(self.withdrawal) - flt(self.deposit)) - allocated_amount
+
+ self.db_set("allocated_amount", flt(allocated_amount, self.precision("allocated_amount")))
+ self.db_set("unallocated_amount", flt(unallocated_amount, self.precision("unallocated_amount")))
self.reload()
self.set_status(update=True)
@@ -68,7 +70,7 @@ class BankTransaction(StatusUpdater):
"payment_entry": voucher["payment_name"],
"allocated_amount": 0.0, # Temporary
}
- child = self.append("payment_entries", pe)
+ self.append("payment_entries", pe)
added = True
# runs on_update_after_submit
@@ -184,9 +186,7 @@ def get_clearance_details(transaction, payment_entry):
"""
gl_bank_account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
gles = get_related_bank_gl_entries(payment_entry.payment_document, payment_entry.payment_entry)
- bt_allocations = get_total_allocated_amount(
- payment_entry.payment_document, payment_entry.payment_entry
- )
+ bt_allocations = get_total_allocated_amount(payment_entry.payment_document, payment_entry.payment_entry)
unallocated_amount = min(
transaction.unallocated_amount,
@@ -284,7 +284,6 @@ def get_total_allocated_amount(doctype, docname):
def get_paid_amount(payment_entry, currency, gl_bank_account):
if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]:
-
paid_amount_field = "paid_amount"
if payment_entry.payment_document == "Payment Entry":
doc = frappe.get_doc("Payment Entry", payment_entry.payment_entry)
@@ -323,9 +322,7 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
)
elif payment_entry.payment_document == "Loan Repayment":
- return frappe.db.get_value(
- payment_entry.payment_document, payment_entry.payment_entry, "amount_paid"
- )
+ return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "amount_paid")
elif payment_entry.payment_document == "Bank Transaction":
dep, wth = frappe.db.get_value(
@@ -335,9 +332,7 @@ def get_paid_amount(payment_entry, currency, gl_bank_account):
else:
frappe.throw(
- "Please reconcile {0}: {1} manually".format(
- payment_entry.payment_document, payment_entry.payment_entry
- )
+ f"Please reconcile {payment_entry.payment_document}: {payment_entry.payment_entry} manually"
)
@@ -393,3 +388,21 @@ def unclear_reference_payment(doctype, docname, bt_name):
bt = frappe.get_doc("Bank Transaction", bt_name)
set_voucher_clearance(doctype, docname, None, bt)
return docname
+
+
+def remove_from_bank_transaction(doctype, docname):
+ """Remove a (cancelled) voucher from all Bank Transactions."""
+ for bt_name in get_reconciled_bank_transactions(doctype, docname):
+ bt = frappe.get_doc("Bank Transaction", bt_name)
+ if bt.docstatus == DocStatus.cancelled():
+ continue
+
+ modified = False
+
+ for pe in bt.payment_entries:
+ if pe.payment_document == doctype and pe.payment_entry == docname:
+ bt.remove(pe)
+ modified = True
+
+ if modified:
+ bt.save()
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js
index 2585ee9c923..9942c09bf47 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js
@@ -1,15 +1,15 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.listview_settings['Bank Transaction'] = {
+frappe.listview_settings["Bank Transaction"] = {
add_fields: ["unallocated_amount"],
- get_indicator: function(doc) {
- if(doc.docstatus == 2) {
+ get_indicator: function (doc) {
+ if (doc.docstatus == 2) {
return [__("Cancelled"), "red", "docstatus,=,2"];
- } else if(flt(doc.unallocated_amount)<=0) {
+ } else if (flt(doc.unallocated_amount) <= 0) {
return [__("Reconciled"), "green", "unallocated_amount,=,0"];
- } else if(flt(doc.unallocated_amount)>0) {
+ } else if (flt(doc.unallocated_amount) > 0) {
return [__("Unreconciled"), "orange", "unallocated_amount,>,0"];
}
- }
+ },
};
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
index 372c53d4992..2fec01ad397 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
@@ -18,12 +18,12 @@ def upload_bank_statement():
fcontent = frappe.local.uploaded_file
fname = frappe.local.uploaded_filename
- if frappe.safe_encode(fname).lower().endswith("csv".encode("utf-8")):
+ if frappe.safe_encode(fname).lower().endswith(b"csv"):
from frappe.utils.csvutils import read_csv_content
rows = read_csv_content(fcontent, False)
- elif frappe.safe_encode(fname).lower().endswith("xlsx".encode("utf-8")):
+ elif frappe.safe_encode(fname).lower().endswith(b"xlsx"):
from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file
rows = read_xlsx_file_from_attached_file(fcontent=fcontent)
diff --git a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
index f900e0775ce..71b901327d7 100644
--- a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
@@ -2,10 +2,10 @@
# See license.txt
import json
-import unittest
import frappe
from frappe import utils
+from frappe.model.docstatus import DocStatus
from frappe.tests.utils import FrappeTestCase
from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
@@ -32,8 +32,16 @@ class TestBankTransaction(FrappeTestCase):
frappe.db.delete(dt)
make_pos_profile()
- add_transactions()
- add_vouchers()
+
+ # generate and use a uniq hash identifier for 'Bank Account' and it's linked GL 'Account' to avoid validation error
+ uniq_identifier = frappe.generate_hash(length=10)
+ gl_account = create_gl_account("_Test Bank " + uniq_identifier)
+ bank_account = create_bank_account(
+ gl_account=gl_account, bank_account_name="Checking Account " + uniq_identifier
+ )
+
+ add_transactions(bank_account=bank_account)
+ add_vouchers(gl_account=gl_account)
# This test checks if ERPNext is able to provide a linked payment for a bank transaction based on the amount of the bank transaction.
def test_linked_payments(self):
@@ -81,6 +89,29 @@ class TestBankTransaction(FrappeTestCase):
clearance_date = frappe.db.get_value("Payment Entry", payment.name, "clearance_date")
self.assertFalse(clearance_date)
+ def test_cancel_voucher(self):
+ bank_transaction = frappe.get_doc(
+ "Bank Transaction",
+ dict(description="1512567 BG/000003025 OPSKATTUZWXXX AT776000000098709849 Herr G"),
+ )
+ payment = frappe.get_doc("Payment Entry", dict(party="Mr G", paid_amount=1700))
+ vouchers = json.dumps(
+ [
+ {
+ "payment_doctype": "Payment Entry",
+ "payment_name": payment.name,
+ "amount": bank_transaction.unallocated_amount,
+ }
+ ]
+ )
+ reconcile_vouchers(bank_transaction.name, vouchers)
+ payment.reload()
+ payment.cancel()
+ bank_transaction.reload()
+ self.assertEqual(bank_transaction.docstatus, DocStatus.submitted())
+ self.assertEqual(bank_transaction.unallocated_amount, 1700)
+ self.assertEqual(bank_transaction.payment_entries, [])
+
# Check if ERPNext can correctly filter a linked payments based on the debit/credit amount
def test_debit_credit_output(self):
bank_transaction = frappe.get_doc(
@@ -190,7 +221,9 @@ class TestBankTransaction(FrappeTestCase):
self.assertEqual(linked_payments[0][2], repayment_entry.name)
-def create_bank_account(bank_name="Citi Bank", account_name="_Test Bank - _TC"):
+def create_bank_account(
+ bank_name="Citi Bank", gl_account="_Test Bank - _TC", bank_account_name="Checking Account"
+):
try:
frappe.get_doc(
{
@@ -202,21 +235,35 @@ def create_bank_account(bank_name="Citi Bank", account_name="_Test Bank - _TC"):
pass
try:
- frappe.get_doc(
+ bank_account = frappe.get_doc(
{
"doctype": "Bank Account",
- "account_name": "Checking Account",
+ "account_name": bank_account_name,
"bank": bank_name,
- "account": account_name,
+ "account": gl_account,
}
).insert(ignore_if_duplicate=True)
except frappe.DuplicateEntryError:
pass
+ return bank_account.name
-def add_transactions():
- create_bank_account()
+def create_gl_account(gl_account_name="_Test Bank - _TC"):
+ gl_account = frappe.get_doc(
+ {
+ "doctype": "Account",
+ "company": "_Test Company",
+ "parent_account": "Current Assets - _TC",
+ "account_type": "Bank",
+ "is_group": 0,
+ "account_name": gl_account_name,
+ }
+ ).insert()
+ return gl_account.name
+
+
+def add_transactions(bank_account="_Test Bank - _TC"):
doc = frappe.get_doc(
{
"doctype": "Bank Transaction",
@@ -224,7 +271,7 @@ def add_transactions():
"date": "2018-10-23",
"deposit": 1200,
"currency": "INR",
- "bank_account": "Checking Account - Citi Bank",
+ "bank_account": bank_account,
}
).insert()
doc.submit()
@@ -236,7 +283,7 @@ def add_transactions():
"date": "2018-10-23",
"deposit": 1700,
"currency": "INR",
- "bank_account": "Checking Account - Citi Bank",
+ "bank_account": bank_account,
}
).insert()
doc.submit()
@@ -248,7 +295,7 @@ def add_transactions():
"date": "2018-10-26",
"withdrawal": 690,
"currency": "INR",
- "bank_account": "Checking Account - Citi Bank",
+ "bank_account": bank_account,
}
).insert()
doc.submit()
@@ -260,7 +307,7 @@ def add_transactions():
"date": "2018-10-27",
"deposit": 3900,
"currency": "INR",
- "bank_account": "Checking Account - Citi Bank",
+ "bank_account": bank_account,
}
).insert()
doc.submit()
@@ -272,13 +319,13 @@ def add_transactions():
"date": "2018-10-27",
"withdrawal": 109080,
"currency": "INR",
- "bank_account": "Checking Account - Citi Bank",
+ "bank_account": bank_account,
}
).insert()
doc.submit()
-def add_vouchers():
+def add_vouchers(gl_account="_Test Bank - _TC"):
try:
frappe.get_doc(
{
@@ -294,7 +341,7 @@ def add_vouchers():
pi = make_purchase_invoice(supplier="Conrad Electronic", qty=1, rate=690)
- pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+ pe = get_payment_entry("Purchase Invoice", pi.name, bank_account=gl_account)
pe.reference_no = "Conrad Oct 18"
pe.reference_date = "2018-10-24"
pe.insert()
@@ -313,14 +360,14 @@ def add_vouchers():
pass
pi = make_purchase_invoice(supplier="Mr G", qty=1, rate=1200)
- pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+ pe = get_payment_entry("Purchase Invoice", pi.name, bank_account=gl_account)
pe.reference_no = "Herr G Oct 18"
pe.reference_date = "2018-10-24"
pe.insert()
pe.submit()
pi = make_purchase_invoice(supplier="Mr G", qty=1, rate=1700)
- pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+ pe = get_payment_entry("Purchase Invoice", pi.name, bank_account=gl_account)
pe.reference_no = "Herr G Nov 18"
pe.reference_date = "2018-11-01"
pe.insert()
@@ -351,10 +398,10 @@ def add_vouchers():
pass
pi = make_purchase_invoice(supplier="Poore Simon's", qty=1, rate=3900, is_paid=1, do_not_save=1)
- pi.cash_bank_account = "_Test Bank - _TC"
+ pi.cash_bank_account = gl_account
pi.insert()
pi.submit()
- pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+ pe = get_payment_entry("Purchase Invoice", pi.name, bank_account=gl_account)
pe.reference_no = "Poore Simon's Oct 18"
pe.reference_date = "2018-10-28"
pe.paid_amount = 690
@@ -363,7 +410,7 @@ def add_vouchers():
pe.submit()
si = create_sales_invoice(customer="Poore Simon's", qty=1, rate=3900)
- pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank - _TC")
+ pe = get_payment_entry("Sales Invoice", si.name, bank_account=gl_account)
pe.reference_no = "Poore Simon's Oct 18"
pe.reference_date = "2018-10-28"
pe.insert()
@@ -383,19 +430,13 @@ def add_vouchers():
mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Cash"})
- if not frappe.db.get_value(
- "Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}
- ):
- mode_of_payment.append(
- "accounts", {"company": "_Test Company", "default_account": "_Test Bank - _TC"}
- )
+ if not frappe.db.get_value("Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}):
+ mode_of_payment.append("accounts", {"company": "_Test Company", "default_account": gl_account})
mode_of_payment.save()
si = create_sales_invoice(customer="Fayva", qty=1, rate=109080, do_not_save=1)
si.is_pos = 1
- si.append(
- "payments", {"mode_of_payment": "Cash", "account": "_Test Bank - _TC", "amount": 109080}
- )
+ si.append("payments", {"mode_of_payment": "Cash", "account": gl_account, "amount": 109080})
si.insert()
si.submit()
diff --git a/erpnext/accounts/doctype/bisect_accounting_statements/__init__.py b/erpnext/accounts/doctype/bisect_accounting_statements/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js
new file mode 100644
index 00000000000..f3532e5be61
--- /dev/null
+++ b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js
@@ -0,0 +1,100 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("Bisect Accounting Statements", {
+ onload(frm) {
+ frm.trigger("render_heatmap");
+ },
+ refresh(frm) {
+ frm.add_custom_button(__("Bisect Left"), () => {
+ frm.trigger("bisect_left");
+ });
+
+ frm.add_custom_button(__("Bisect Right"), () => {
+ frm.trigger("bisect_right");
+ });
+
+ frm.add_custom_button(__("Up"), () => {
+ frm.trigger("move_up");
+ });
+ frm.add_custom_button(__("Build Tree"), () => {
+ frm.trigger("build_tree");
+ });
+ },
+ render_heatmap(frm) {
+ let bisect_heatmap = frm.get_field("bisect_heatmap").$wrapper;
+ bisect_heatmap.addClass("bisect_heatmap_location");
+
+ // milliseconds in a day
+ let msiad = 24 * 60 * 60 * 1000;
+ let datapoints = {};
+ let fr_dt = new Date(frm.doc.from_date).getTime();
+ let to_dt = new Date(frm.doc.to_date).getTime();
+ let bisect_start = new Date(frm.doc.current_from_date).getTime();
+ let bisect_end = new Date(frm.doc.current_to_date).getTime();
+
+ for (let x = fr_dt; x <= to_dt; x += msiad) {
+ let epoch_in_seconds = x / 1000;
+ if (bisect_start <= x && x <= bisect_end) {
+ datapoints[epoch_in_seconds] = 1.0;
+ } else {
+ datapoints[epoch_in_seconds] = 0.0;
+ }
+ }
+
+ new frappe.Chart(".bisect_heatmap_location", {
+ type: "heatmap",
+ data: {
+ dataPoints: datapoints,
+ start: new Date(frm.doc.from_date),
+ end: new Date(frm.doc.to_date),
+ },
+ countLabel: "Bisecting",
+ discreteDomains: 1,
+ });
+ },
+ bisect_left(frm) {
+ frm.call({
+ doc: frm.doc,
+ method: "bisect_left",
+ freeze: true,
+ freeze_message: __("Bisecting Left ..."),
+ callback: (r) => {
+ frm.trigger("render_heatmap");
+ },
+ });
+ },
+ bisect_right(frm) {
+ frm.call({
+ doc: frm.doc,
+ freeze: true,
+ freeze_message: __("Bisecting Right ..."),
+ method: "bisect_right",
+ callback: (r) => {
+ frm.trigger("render_heatmap");
+ },
+ });
+ },
+ move_up(frm) {
+ frm.call({
+ doc: frm.doc,
+ freeze: true,
+ freeze_message: __("Moving up in tree ..."),
+ method: "move_up",
+ callback: (r) => {
+ frm.trigger("render_heatmap");
+ },
+ });
+ },
+ build_tree(frm) {
+ frm.call({
+ doc: frm.doc,
+ freeze: true,
+ freeze_message: __("Rebuilding BTree for period ..."),
+ method: "build_tree",
+ callback: (r) => {
+ frm.trigger("render_heatmap");
+ },
+ });
+ },
+});
diff --git a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json
new file mode 100644
index 00000000000..e129fa60c2c
--- /dev/null
+++ b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json
@@ -0,0 +1,194 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2023-09-15 21:28:28.054773",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "section_break_cvfg",
+ "company",
+ "column_break_hcam",
+ "from_date",
+ "column_break_qxbi",
+ "to_date",
+ "column_break_iwny",
+ "algorithm",
+ "section_break_8ph9",
+ "current_node",
+ "section_break_ngid",
+ "bisect_heatmap",
+ "section_break_hmsy",
+ "bisecting_from",
+ "current_from_date",
+ "column_break_uqyd",
+ "bisecting_to",
+ "current_to_date",
+ "section_break_hbyo",
+ "heading_cppb",
+ "p_l_summary",
+ "column_break_aivo",
+ "balance_sheet_summary",
+ "b_s_summary",
+ "column_break_gvwx",
+ "difference_heading",
+ "difference"
+ ],
+ "fields": [
+ {
+ "fieldname": "column_break_qxbi",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "from_date",
+ "fieldtype": "Datetime",
+ "label": "From Date"
+ },
+ {
+ "fieldname": "to_date",
+ "fieldtype": "Datetime",
+ "label": "To Date"
+ },
+ {
+ "default": "BFS",
+ "fieldname": "algorithm",
+ "fieldtype": "Select",
+ "label": "Algorithm",
+ "options": "BFS\nDFS"
+ },
+ {
+ "fieldname": "column_break_iwny",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "current_node",
+ "fieldtype": "Link",
+ "label": "Current Node",
+ "options": "Bisect Nodes"
+ },
+ {
+ "fieldname": "section_break_hmsy",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "current_from_date",
+ "fieldtype": "Datetime",
+ "read_only": 1
+ },
+ {
+ "fieldname": "current_to_date",
+ "fieldtype": "Datetime",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_uqyd",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_hbyo",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "p_l_summary",
+ "fieldtype": "Float",
+ "read_only": 1
+ },
+ {
+ "fieldname": "b_s_summary",
+ "fieldtype": "Float",
+ "read_only": 1
+ },
+ {
+ "fieldname": "difference",
+ "fieldtype": "Float",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_aivo",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_gvwx",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "label": "Company",
+ "options": "Company"
+ },
+ {
+ "fieldname": "column_break_hcam",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_ngid",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "section_break_8ph9",
+ "fieldtype": "Section Break",
+ "hidden": 1
+ },
+ {
+ "fieldname": "bisect_heatmap",
+ "fieldtype": "HTML",
+ "label": "Heatmap"
+ },
+ {
+ "fieldname": "heading_cppb",
+ "fieldtype": "Heading",
+ "label": "Profit and Loss Summary"
+ },
+ {
+ "fieldname": "balance_sheet_summary",
+ "fieldtype": "Heading",
+ "label": "Balance Sheet Summary"
+ },
+ {
+ "fieldname": "difference_heading",
+ "fieldtype": "Heading",
+ "label": "Difference"
+ },
+ {
+ "fieldname": "bisecting_from",
+ "fieldtype": "Heading",
+ "label": "Bisecting From"
+ },
+ {
+ "fieldname": "bisecting_to",
+ "fieldtype": "Heading",
+ "label": "Bisecting To"
+ },
+ {
+ "fieldname": "section_break_cvfg",
+ "fieldtype": "Section Break"
+ }
+ ],
+ "hide_toolbar": 1,
+ "index_web_pages_for_search": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2023-12-01 16:49:54.073890",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bisect Accounting Statements",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "Administrator",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py
new file mode 100644
index 00000000000..f2ed299592b
--- /dev/null
+++ b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py
@@ -0,0 +1,206 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import datetime
+from collections import deque
+from math import floor
+
+import frappe
+from dateutil.relativedelta import relativedelta
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import getdate
+from frappe.utils.data import guess_date_format
+
+
+class BisectAccountingStatements(Document):
+ def validate(self):
+ self.validate_dates()
+
+ def validate_dates(self):
+ if getdate(self.from_date) > getdate(self.to_date):
+ frappe.throw(
+ _("From Date: {0} cannot be greater than To date: {1}").format(
+ frappe.bold(self.from_date), frappe.bold(self.to_date)
+ )
+ )
+
+ def bfs(self, from_date: datetime, to_date: datetime):
+ # Make Root node
+ node = frappe.new_doc("Bisect Nodes")
+ node.root = None
+ node.period_from_date = from_date
+ node.period_to_date = to_date
+ node.insert()
+
+ period_queue = deque([node])
+ while period_queue:
+ cur_node = period_queue.popleft()
+ delta = cur_node.period_to_date - cur_node.period_from_date
+ if delta.days == 0:
+ continue
+ else:
+ cur_floor = floor(delta.days / 2)
+ next_to_date = cur_node.period_from_date + relativedelta(days=+cur_floor)
+ left_node = frappe.new_doc("Bisect Nodes")
+ left_node.period_from_date = cur_node.period_from_date
+ left_node.period_to_date = next_to_date
+ left_node.root = cur_node.name
+ left_node.generated = False
+ left_node.insert()
+ cur_node.left_child = left_node.name
+ period_queue.append(left_node)
+
+ next_from_date = cur_node.period_from_date + relativedelta(days=+(cur_floor + 1))
+ right_node = frappe.new_doc("Bisect Nodes")
+ right_node.period_from_date = next_from_date
+ right_node.period_to_date = cur_node.period_to_date
+ right_node.root = cur_node.name
+ right_node.generated = False
+ right_node.insert()
+ cur_node.right_child = right_node.name
+ period_queue.append(right_node)
+
+ cur_node.save()
+
+ def dfs(self, from_date: datetime, to_date: datetime):
+ # Make Root node
+ node = frappe.new_doc("Bisect Nodes")
+ node.root = None
+ node.period_from_date = from_date
+ node.period_to_date = to_date
+ node.insert()
+
+ period_stack = [node]
+ while period_stack:
+ cur_node = period_stack.pop()
+ delta = cur_node.period_to_date - cur_node.period_from_date
+ if delta.days == 0:
+ continue
+ else:
+ cur_floor = floor(delta.days / 2)
+ next_to_date = cur_node.period_from_date + relativedelta(days=+cur_floor)
+ left_node = frappe.new_doc("Bisect Nodes")
+ left_node.period_from_date = cur_node.period_from_date
+ left_node.period_to_date = next_to_date
+ left_node.root = cur_node.name
+ left_node.generated = False
+ left_node.insert()
+ cur_node.left_child = left_node.name
+ period_stack.append(left_node)
+
+ next_from_date = cur_node.period_from_date + relativedelta(days=+(cur_floor + 1))
+ right_node = frappe.new_doc("Bisect Nodes")
+ right_node.period_from_date = next_from_date
+ right_node.period_to_date = cur_node.period_to_date
+ right_node.root = cur_node.name
+ right_node.generated = False
+ right_node.insert()
+ cur_node.right_child = right_node.name
+ period_stack.append(right_node)
+
+ cur_node.save()
+
+ @frappe.whitelist()
+ def build_tree(self):
+ frappe.db.delete("Bisect Nodes")
+
+ # Convert str to datetime format
+ dt_format = guess_date_format(self.from_date)
+ from_date = datetime.datetime.strptime(self.from_date, dt_format)
+ to_date = datetime.datetime.strptime(self.to_date, dt_format)
+
+ if self.algorithm == "BFS":
+ self.bfs(from_date, to_date)
+
+ if self.algorithm == "DFS":
+ self.dfs(from_date, to_date)
+
+ # set root as current node
+ root = frappe.db.get_all("Bisect Nodes", filters={"root": ["is", "not set"]})[0]
+ self.get_report_summary()
+ self.current_node = root.name
+ self.current_from_date = self.from_date
+ self.current_to_date = self.to_date
+ self.save()
+
+ def get_report_summary(self):
+ filters = {
+ "company": self.company,
+ "filter_based_on": "Date Range",
+ "period_start_date": self.current_from_date,
+ "period_end_date": self.current_to_date,
+ "periodicity": "Yearly",
+ }
+ pl_summary = frappe.get_doc("Report", "Profit and Loss Statement")
+ self.p_l_summary = pl_summary.execute_script_report(filters=filters)[5]
+ bs_summary = frappe.get_doc("Report", "Balance Sheet")
+ self.b_s_summary = bs_summary.execute_script_report(filters=filters)[5]
+ self.difference = abs(self.p_l_summary - self.b_s_summary)
+
+ def update_node(self):
+ current_node = frappe.get_doc("Bisect Nodes", self.current_node)
+ current_node.balance_sheet_summary = self.b_s_summary
+ current_node.profit_loss_summary = self.p_l_summary
+ current_node.difference = self.difference
+ current_node.generated = True
+ current_node.save()
+
+ def current_node_has_summary_info(self):
+ "Assertion method"
+ return frappe.db.get_value("Bisect Nodes", self.current_node, "generated")
+
+ def fetch_summary_info_from_current_node(self):
+ current_node = frappe.get_doc("Bisect Nodes", self.current_node)
+ self.p_l_summary = current_node.balance_sheet_summary
+ self.b_s_summary = current_node.profit_loss_summary
+ self.difference = abs(self.p_l_summary - self.b_s_summary)
+
+ def fetch_or_calculate(self):
+ if self.current_node_has_summary_info():
+ self.fetch_summary_info_from_current_node()
+ else:
+ self.get_report_summary()
+ self.update_node()
+
+ @frappe.whitelist()
+ def bisect_left(self):
+ if self.current_node is not None:
+ cur_node = frappe.get_doc("Bisect Nodes", self.current_node)
+ if cur_node.left_child is not None:
+ lft_node = frappe.get_doc("Bisect Nodes", cur_node.left_child)
+ self.current_node = cur_node.left_child
+ self.current_from_date = lft_node.period_from_date
+ self.current_to_date = lft_node.period_to_date
+ self.fetch_or_calculate()
+ self.save()
+ else:
+ frappe.msgprint(_("No more children on Left"))
+
+ @frappe.whitelist()
+ def bisect_right(self):
+ if self.current_node is not None:
+ cur_node = frappe.get_doc("Bisect Nodes", self.current_node)
+ if cur_node.right_child is not None:
+ rgt_node = frappe.get_doc("Bisect Nodes", cur_node.right_child)
+ self.current_node = cur_node.right_child
+ self.current_from_date = rgt_node.period_from_date
+ self.current_to_date = rgt_node.period_to_date
+ self.fetch_or_calculate()
+ self.save()
+ else:
+ frappe.msgprint(_("No more children on Right"))
+
+ @frappe.whitelist()
+ def move_up(self):
+ if self.current_node is not None:
+ cur_node = frappe.get_doc("Bisect Nodes", self.current_node)
+ if cur_node.root is not None:
+ root = frappe.get_doc("Bisect Nodes", cur_node.root)
+ self.current_node = cur_node.root
+ self.current_from_date = root.period_from_date
+ self.current_to_date = root.period_to_date
+ self.fetch_or_calculate()
+ self.save()
+ else:
+ frappe.msgprint(_("Reached Root"))
diff --git a/erpnext/accounts/doctype/bisect_accounting_statements/test_bisect_accounting_statements.py b/erpnext/accounts/doctype/bisect_accounting_statements/test_bisect_accounting_statements.py
new file mode 100644
index 00000000000..56ecc94a18e
--- /dev/null
+++ b/erpnext/accounts/doctype/bisect_accounting_statements/test_bisect_accounting_statements.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestBisectAccountingStatements(FrappeTestCase):
+ pass
diff --git a/erpnext/accounts/doctype/bisect_nodes/__init__.py b/erpnext/accounts/doctype/bisect_nodes/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.js b/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.js
new file mode 100644
index 00000000000..6dea25fc924
--- /dev/null
+++ b/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Bisect Nodes", {
+// refresh(frm) {
+
+// },
+// });
diff --git a/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json b/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json
new file mode 100644
index 00000000000..03fad261c3c
--- /dev/null
+++ b/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json
@@ -0,0 +1,97 @@
+{
+ "actions": [],
+ "autoname": "autoincrement",
+ "creation": "2023-09-27 14:56:38.112462",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "root",
+ "left_child",
+ "right_child",
+ "period_from_date",
+ "period_to_date",
+ "difference",
+ "balance_sheet_summary",
+ "profit_loss_summary",
+ "generated"
+ ],
+ "fields": [
+ {
+ "fieldname": "root",
+ "fieldtype": "Link",
+ "label": "Root",
+ "options": "Bisect Nodes"
+ },
+ {
+ "fieldname": "left_child",
+ "fieldtype": "Link",
+ "label": "Left Child",
+ "options": "Bisect Nodes"
+ },
+ {
+ "fieldname": "right_child",
+ "fieldtype": "Link",
+ "label": "Right Child",
+ "options": "Bisect Nodes"
+ },
+ {
+ "fieldname": "period_from_date",
+ "fieldtype": "Datetime",
+ "label": "Period_from_date"
+ },
+ {
+ "fieldname": "period_to_date",
+ "fieldtype": "Datetime",
+ "label": "Period To Date"
+ },
+ {
+ "fieldname": "difference",
+ "fieldtype": "Float",
+ "label": "Difference"
+ },
+ {
+ "fieldname": "balance_sheet_summary",
+ "fieldtype": "Float",
+ "label": "Balance Sheet Summary"
+ },
+ {
+ "fieldname": "profit_loss_summary",
+ "fieldtype": "Float",
+ "label": "Profit and Loss Summary"
+ },
+ {
+ "default": "0",
+ "fieldname": "generated",
+ "fieldtype": "Check",
+ "label": "Generated"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2023-12-01 17:46:12.437996",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bisect Nodes",
+ "naming_rule": "Autoincrement",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Administrator",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.py b/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.py
new file mode 100644
index 00000000000..f50776641d0
--- /dev/null
+++ b/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class BisectNodes(Document):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ balance_sheet_summary: DF.Float
+ difference: DF.Float
+ generated: DF.Check
+ left_child: DF.Link | None
+ name: DF.Int | None
+ period_from_date: DF.Datetime | None
+ period_to_date: DF.Datetime | None
+ profit_loss_summary: DF.Float
+ right_child: DF.Link | None
+ root: DF.Link | None
+ # end: auto-generated types
+
+ pass
diff --git a/erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.py b/erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.py
new file mode 100644
index 00000000000..5399df139f1
--- /dev/null
+++ b/erpnext/accounts/doctype/bisect_nodes/test_bisect_nodes.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestBisectNodes(FrappeTestCase):
+ pass
diff --git a/erpnext/accounts/doctype/budget/budget.js b/erpnext/accounts/doctype/budget/budget.js
index e162e3222d3..6e874f7c08c 100644
--- a/erpnext/accounts/doctype/budget/budget.js
+++ b/erpnext/accounts/doctype/budget/budget.js
@@ -2,48 +2,48 @@
// For license information, please see license.txt
frappe.provide("erpnext.accounts.dimensions");
-frappe.ui.form.on('Budget', {
- onload: function(frm) {
- frm.set_query("account", "accounts", function() {
+frappe.ui.form.on("Budget", {
+ onload: function (frm) {
+ frm.set_query("account", "accounts", function () {
return {
filters: {
company: frm.doc.company,
report_type: "Profit and Loss",
- is_group: 0
- }
+ is_group: 0,
+ },
};
});
- frm.set_query("monthly_distribution", function() {
+ frm.set_query("monthly_distribution", function () {
return {
filters: {
- fiscal_year: frm.doc.fiscal_year
- }
+ fiscal_year: frm.doc.fiscal_year,
+ },
};
});
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
},
- refresh: function(frm) {
- frm.trigger("toggle_reqd_fields")
+ refresh: function (frm) {
+ frm.trigger("toggle_reqd_fields");
},
- budget_against: function(frm) {
- frm.trigger("set_null_value")
- frm.trigger("toggle_reqd_fields")
+ budget_against: function (frm) {
+ frm.trigger("set_null_value");
+ frm.trigger("toggle_reqd_fields");
},
- set_null_value: function(frm) {
- if(frm.doc.budget_against == 'Cost Center') {
- frm.set_value('project', null)
+ set_null_value: function (frm) {
+ if (frm.doc.budget_against == "Cost Center") {
+ frm.set_value("project", null);
} else {
- frm.set_value('cost_center', null)
+ frm.set_value("cost_center", null);
}
},
- toggle_reqd_fields: function(frm) {
- frm.toggle_reqd("cost_center", frm.doc.budget_against=="Cost Center");
- frm.toggle_reqd("project", frm.doc.budget_against=="Project");
- }
+ toggle_reqd_fields: function (frm) {
+ frm.toggle_reqd("cost_center", frm.doc.budget_against == "Cost Center");
+ frm.toggle_reqd("project", frm.doc.budget_against == "Project");
+ },
});
diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py
index 6cfd15d3ec8..22b8d64971c 100644
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -40,10 +40,11 @@ class Budget(Document):
select
b.name, ba.account from `tabBudget` b, `tabBudget Account` ba
where
- ba.parent = b.name and b.docstatus < 2 and b.company = %s and %s=%s and
- b.fiscal_year=%s and b.name != %s and ba.account in (%s) """
- % ("%s", budget_against_field, "%s", "%s", "%s", ",".join(["%s"] * len(accounts))),
- (self.company, budget_against, self.fiscal_year, self.name) + tuple(accounts),
+ ba.parent = b.name and b.docstatus < 2 and b.company = {} and {}={} and
+ b.fiscal_year={} and b.name != {} and ba.account in ({}) """.format(
+ "%s", budget_against_field, "%s", "%s", "%s", ",".join(["%s"] * len(accounts))
+ ),
+ (self.company, budget_against, self.fiscal_year, self.name, *tuple(accounts)),
as_dict=1,
)
@@ -66,12 +67,14 @@ class Budget(Document):
if account_details.is_group:
frappe.throw(_("Budget cannot be assigned against Group Account {0}").format(d.account))
elif account_details.company != self.company:
- frappe.throw(_("Account {0} does not belongs to company {1}").format(d.account, self.company))
+ frappe.throw(
+ _("Account {0} does not belongs to company {1}").format(d.account, self.company)
+ )
elif account_details.report_type != "Profit and Loss":
frappe.throw(
- _("Budget cannot be assigned against {0}, as it's not an Income or Expense account").format(
- d.account
- )
+ _(
+ "Budget cannot be assigned against {0}, as it's not an Income or Expense account"
+ ).format(d.account)
)
if d.account in account_list:
@@ -109,6 +112,8 @@ class Budget(Document):
def validate_expense_against_budget(args, expense_amount=0):
args = frappe._dict(args)
+ if not frappe.get_all("Budget", limit=1):
+ return
if args.get("company") and not args.fiscal_year:
args.fiscal_year = get_fiscal_year(args.get("posting_date"), company=args.get("company"))[0]
@@ -116,6 +121,9 @@ def validate_expense_against_budget(args, expense_amount=0):
"Company", args.get("company"), "exception_budget_approver_role"
)
+ if not frappe.get_cached_value("Budget", {"fiscal_year": args.fiscal_year, "company": args.company}): # nosec
+ return
+
if not args.account:
args.account = args.get("expense_account")
@@ -142,32 +150,26 @@ def validate_expense_against_budget(args, expense_amount=0):
if (
args.get(budget_against)
and args.account
- and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"})
+ and (frappe.get_cached_value("Account", args.account, "root_type") == "Expense")
):
-
doctype = dimension.get("document_type")
if frappe.get_cached_value("DocType", doctype, "is_tree"):
- lft, rgt = frappe.db.get_value(doctype, args.get(budget_against), ["lft", "rgt"])
- condition = """and exists(select name from `tab%s`
- where lft<=%s and rgt>=%s and name=b.%s)""" % (
- doctype,
- lft,
- rgt,
- budget_against,
- ) # nosec
+ lft, rgt = frappe.get_cached_value(doctype, args.get(budget_against), ["lft", "rgt"])
+ condition = f"""and exists(select name from `tab{doctype}`
+ where lft<={lft} and rgt>={rgt} and name=b.{budget_against})""" # nosec
args.is_tree = True
else:
- condition = "and b.%s=%s" % (budget_against, frappe.db.escape(args.get(budget_against)))
+ condition = f"and b.{budget_against}={frappe.db.escape(args.get(budget_against))}"
args.is_tree = False
args.budget_against_field = budget_against
args.budget_against_doctype = doctype
budget_records = frappe.db.sql(
- """
+ f"""
select
- b.{budget_against_field} as budget_against, ba.budget_amount, b.monthly_distribution,
+ b.{budget_against} as budget_against, ba.budget_amount, b.monthly_distribution,
ifnull(b.applicable_on_material_request, 0) as for_material_request,
ifnull(applicable_on_purchase_order, 0) as for_purchase_order,
ifnull(applicable_on_booking_actual_expenses,0) as for_actual_expenses,
@@ -180,9 +182,7 @@ def validate_expense_against_budget(args, expense_amount=0):
b.name=ba.parent and b.fiscal_year=%s
and ba.account=%s and b.docstatus=1
{condition}
- """.format(
- condition=condition, budget_against_field=budget_against
- ),
+ """,
(args.fiscal_year, args.account),
as_dict=True,
) # nosec
@@ -194,12 +194,18 @@ def validate_expense_against_budget(args, expense_amount=0):
def validate_budget_records(args, budget_records, expense_amount):
for budget in budget_records:
if flt(budget.budget_amount):
- amount = expense_amount or get_amount(args, budget)
yearly_action, monthly_action = get_actions(args, budget)
+ args["for_material_request"] = budget.for_material_request
+ args["for_purchase_order"] = budget.for_purchase_order
if yearly_action in ("Stop", "Warn"):
compare_expense_with_budget(
- args, flt(budget.budget_amount), _("Annual"), yearly_action, budget.budget_against, amount
+ args,
+ flt(budget.budget_amount),
+ _("Annual"),
+ yearly_action,
+ budget.budget_against,
+ expense_amount,
)
if monthly_action in ["Stop", "Warn"]:
@@ -210,18 +216,32 @@ def validate_budget_records(args, budget_records, expense_amount):
args["month_end_date"] = get_last_day(args.posting_date)
compare_expense_with_budget(
- args, budget_amount, _("Accumulated Monthly"), monthly_action, budget.budget_against, amount
+ args,
+ budget_amount,
+ _("Accumulated Monthly"),
+ monthly_action,
+ budget.budget_against,
+ expense_amount,
)
def compare_expense_with_budget(args, budget_amount, action_for, action, budget_against, amount=0):
- actual_expense = get_actual_expense(args)
- total_expense = actual_expense + amount
+ args.actual_expense, args.requested_amount, args.ordered_amount = get_actual_expense(args), 0, 0
+ if not amount:
+ args.requested_amount, args.ordered_amount = get_requested_amount(args), get_ordered_amount(args)
+
+ if args.get("doctype") == "Material Request" and args.for_material_request:
+ amount = args.requested_amount + args.ordered_amount
+
+ elif args.get("doctype") == "Purchase Order" and args.for_purchase_order:
+ amount = args.ordered_amount
+
+ total_expense = args.actual_expense + amount
if total_expense > budget_amount:
- if actual_expense > budget_amount:
+ if args.actual_expense > budget_amount:
error_tense = _("is already")
- diff = actual_expense - budget_amount
+ diff = args.actual_expense - budget_amount
else:
error_tense = _("will be")
diff = total_expense - budget_amount
@@ -238,9 +258,10 @@ def compare_expense_with_budget(args, budget_amount, action_for, action, budget_
frappe.bold(fmt_money(diff, currency=currency)),
)
- if (
- frappe.flags.exception_approver_role
- and frappe.flags.exception_approver_role in frappe.get_roles(frappe.session.user)
+ msg += get_expense_breakup(args, currency, budget_against)
+
+ if frappe.flags.exception_approver_role and frappe.flags.exception_approver_role in frappe.get_roles(
+ frappe.session.user
):
action = "Warn"
@@ -250,6 +271,83 @@ def compare_expense_with_budget(args, budget_amount, action_for, action, budget_
frappe.msgprint(msg, indicator="orange", title=_("Budget Exceeded"))
+def get_expense_breakup(args, currency, budget_against):
+ msg = "Total Expenses booked through -
- "
+
+ common_filters = frappe._dict(
+ {
+ args.budget_against_field: budget_against,
+ "account": args.account,
+ "company": args.company,
+ }
+ )
+
+ msg += (
+ "
- " + + frappe.utils.get_link_to_report( + "General Ledger", + label="Actual Expenses", + filters=common_filters.copy().update( + { + "from_date": frappe.get_cached_value("Fiscal Year", args.fiscal_year, "year_start_date"), + "to_date": frappe.get_cached_value("Fiscal Year", args.fiscal_year, "year_end_date"), + "is_cancelled": 0, + } + ), + ) + + " - " + + frappe.bold(fmt_money(args.actual_expense, currency=currency)) + + " " + ) + + msg += ( + "
- " + + frappe.utils.get_link_to_report( + "Material Request", + label="Material Requests", + report_type="Report Builder", + doctype="Material Request", + filters=common_filters.copy().update( + { + "status": [["!=", "Stopped"]], + "docstatus": 1, + "material_request_type": "Purchase", + "schedule_date": [["fiscal year", "2023-2024"]], + "item_code": args.item_code, + "per_ordered": [["<", 100]], + } + ), + ) + + " - " + + frappe.bold(fmt_money(args.requested_amount, currency=currency)) + + " " + ) + + msg += ( + "
- " + + frappe.utils.get_link_to_report( + "Purchase Order", + label="Unbilled Orders", + report_type="Report Builder", + doctype="Purchase Order", + filters=common_filters.copy().update( + { + "status": [["!=", "Closed"]], + "docstatus": 1, + "transaction_date": [["fiscal year", "2023-2024"]], + "item_code": args.item_code, + "per_billed": [["<", 100]], + } + ), + ) + + " - " + + frappe.bold(fmt_money(args.ordered_amount, currency=currency)) + + "
\
+ var template =
+ '
\
- .print-format {
+ .print-format {{
padding: 0px;
- }
- @media screen {
- .print-format {
+ }}
+ @media screen {{
+ .print-format {{
padding: 0in;
- }
- }
+ }}
+ }}
-
+frappe.ui.form.on("Loyalty Program", {
+ setup: function (frm) {
+ var help_content = `
-
""".format(
+ starting_position_from_top_edge=doc.starting_position_from_top_edge
if doc.cheque_size == "A4"
else 0.0,
- "cheque_width": doc.cheque_width,
- "cheque_height": doc.cheque_height,
- "acc_pay_dist_from_top_edge": doc.acc_pay_dist_from_top_edge,
- "acc_pay_dist_from_left_edge": doc.acc_pay_dist_from_left_edge,
- "message_to_show": doc.message_to_show if doc.message_to_show else _("Account Pay Only"),
- "date_dist_from_top_edge": doc.date_dist_from_top_edge,
- "date_dist_from_left_edge": doc.date_dist_from_left_edge,
- "acc_no_dist_from_top_edge": doc.acc_no_dist_from_top_edge,
- "acc_no_dist_from_left_edge": doc.acc_no_dist_from_left_edge,
- "payer_name_from_top_edge": doc.payer_name_from_top_edge,
- "payer_name_from_left_edge": doc.payer_name_from_left_edge,
- "amt_in_words_from_top_edge": doc.amt_in_words_from_top_edge,
- "amt_in_words_from_left_edge": doc.amt_in_words_from_left_edge,
- "amt_in_word_width": doc.amt_in_word_width,
- "amt_in_words_line_spacing": doc.amt_in_words_line_spacing,
- "amt_in_figures_from_top_edge": doc.amt_in_figures_from_top_edge,
- "amt_in_figures_from_left_edge": doc.amt_in_figures_from_left_edge,
- "signatory_from_top_edge": doc.signatory_from_top_edge,
- "signatory_from_left_edge": doc.signatory_from_left_edge,
- }
+ cheque_width=doc.cheque_width,
+ cheque_height=doc.cheque_height,
+ acc_pay_dist_from_top_edge=doc.acc_pay_dist_from_top_edge,
+ acc_pay_dist_from_left_edge=doc.acc_pay_dist_from_left_edge,
+ message_to_show=doc.message_to_show if doc.message_to_show else _("Account Pay Only"),
+ date_dist_from_top_edge=doc.date_dist_from_top_edge,
+ date_dist_from_left_edge=doc.date_dist_from_left_edge,
+ acc_no_dist_from_top_edge=doc.acc_no_dist_from_top_edge,
+ acc_no_dist_from_left_edge=doc.acc_no_dist_from_left_edge,
+ payer_name_from_top_edge=doc.payer_name_from_top_edge,
+ payer_name_from_left_edge=doc.payer_name_from_left_edge,
+ amt_in_words_from_top_edge=doc.amt_in_words_from_top_edge,
+ amt_in_words_from_left_edge=doc.amt_in_words_from_left_edge,
+ amt_in_word_width=doc.amt_in_word_width,
+ amt_in_words_line_spacing=doc.amt_in_words_line_spacing,
+ amt_in_figures_from_top_edge=doc.amt_in_figures_from_top_edge,
+ amt_in_figures_from_left_edge=doc.amt_in_figures_from_left_edge,
+ signatory_from_top_edge=doc.signatory_from_top_edge,
+ signatory_from_left_edge=doc.signatory_from_left_edge,
+ )
cheque_print.save(ignore_permissions=True)
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js
index 632fab0197c..c2e4442a9f8 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center.js
@@ -3,75 +3,80 @@
frappe.provide("erpnext.accounts");
-
-
-frappe.ui.form.on('Cost Center', {
- onload: function(frm) {
- frm.set_query("parent_cost_center", function() {
+frappe.ui.form.on("Cost Center", {
+ onload: function (frm) {
+ frm.set_query("parent_cost_center", function () {
return {
filters: {
company: frm.doc.company,
- is_group: 1
- }
- }
+ is_group: 1,
+ },
+ };
});
},
- refresh: function(frm) {
+ refresh: function (frm) {
if (!frm.is_new()) {
- frm.add_custom_button(__('Update Cost Center Name / Number'), function () {
+ frm.add_custom_button(__("Update Cost Center Name / Number"), function () {
frm.trigger("update_cost_center_number");
});
}
- let intro_txt = '';
+ let intro_txt = "";
let doc = frm.doc;
- frm.toggle_display('cost_center_name', doc.__islocal);
- frm.toggle_enable(['is_group', 'company'], doc.__islocal);
+ frm.toggle_display("cost_center_name", doc.__islocal);
+ frm.toggle_enable(["is_group", "company"], doc.__islocal);
- if(!doc.__islocal && doc.is_group==1) {
- intro_txt += __('Note: This Cost Center is a Group. Cannot make accounting entries against groups.');
+ if (!doc.__islocal && doc.is_group == 1) {
+ intro_txt += __(
+ "Note: This Cost Center is a Group. Cannot make accounting entries against groups."
+ );
}
frm.events.hide_unhide_group_ledger(frm);
- frm.toggle_display('sb1', doc.is_group==0);
+ frm.toggle_display("sb1", doc.is_group == 0);
frm.set_intro(intro_txt);
- if(!frm.doc.__islocal) {
- frm.add_custom_button(__('Chart of Cost Centers'),
- function() { frappe.set_route("Tree", "Cost Center"); });
+ if (!frm.doc.__islocal) {
+ frm.add_custom_button(__("Chart of Cost Centers"), function () {
+ frappe.set_route("Tree", "Cost Center");
+ });
- frm.add_custom_button(__('Budget'),
- function() { frappe.set_route("List", "Budget", {'cost_center': frm.doc.name}); });
+ frm.add_custom_button(__("Budget"), function () {
+ frappe.set_route("List", "Budget", { cost_center: frm.doc.name });
+ });
}
},
- update_cost_center_number: function(frm) {
+ update_cost_center_number: function (frm) {
var d = new frappe.ui.Dialog({
- title: __('Update Cost Center Name / Number'),
+ title: __("Update Cost Center Name / Number"),
fields: [
{
- "label": "Cost Center Name",
- "fieldname": "cost_center_name",
- "fieldtype": "Data",
- "reqd": 1,
- "default": frm.doc.cost_center_name
+ label: "Cost Center Name",
+ fieldname: "cost_center_name",
+ fieldtype: "Data",
+ reqd: 1,
+ default: frm.doc.cost_center_name,
},
{
- "label": "Cost Center Number",
- "fieldname": "cost_center_number",
- "fieldtype": "Data",
- "default": frm.doc.cost_center_number
+ label: "Cost Center Number",
+ fieldname: "cost_center_number",
+ fieldtype: "Data",
+ default: frm.doc.cost_center_number,
},
{
- "label": __("Merge with existing"),
- "fieldname": "merge",
- "fieldtype": "Check",
- "default": 0
- }
+ label: __("Merge with existing"),
+ fieldname: "merge",
+ fieldtype: "Check",
+ default: 0,
+ },
],
- primary_action: function() {
+ primary_action: function () {
var data = d.get_values();
- if(data.cost_center_name === frm.doc.cost_center_name && data.cost_center_number === frm.doc.cost_center_number) {
+ if (
+ data.cost_center_name === frm.doc.cost_center_name &&
+ data.cost_center_number === frm.doc.cost_center_number
+ ) {
d.hide();
return;
}
@@ -83,12 +88,12 @@ frappe.ui.form.on('Cost Center', {
cost_center_name: data.cost_center_name,
cost_center_number: cstr(data.cost_center_number),
company: frm.doc.company,
- merge: data.merge
+ merge: data.merge,
},
- callback: function(r) {
+ callback: function (r) {
frappe.dom.unfreeze();
- if(!r.exc) {
- if(r.message) {
+ if (!r.exc) {
+ if (r.message) {
frappe.set_route("Form", "Cost Center", r.message);
} else {
me.frm.set_value("cost_center_name", data.cost_center_name);
@@ -96,44 +101,42 @@ frappe.ui.form.on('Cost Center', {
}
d.hide();
}
- }
+ },
});
},
- primary_action_label: __('Update')
+ primary_action_label: __("Update"),
});
d.show();
},
parent_cost_center(frm) {
- if(!frm.doc.company) {
- frappe.msgprint(__('Please enter company name first'));
+ if (!frm.doc.company) {
+ frappe.msgprint(__("Please enter company name first"));
}
},
hide_unhide_group_ledger(frm) {
let doc = frm.doc;
if (doc.is_group == 1) {
- frm.add_custom_button(__('Convert to Non-Group'),
- () => frm.events.convert_to_ledger(frm));
+ frm.add_custom_button(__("Convert to Non-Group"), () => frm.events.convert_to_ledger(frm));
} else if (doc.is_group == 0) {
- frm.add_custom_button(__('Convert to Group'),
- () => frm.events.convert_to_group(frm));
+ frm.add_custom_button(__("Convert to Group"), () => frm.events.convert_to_group(frm));
}
},
convert_to_group(frm) {
- frm.call('convert_ledger_to_group').then(r => {
- if(r.message === 1) {
+ frm.call("convert_ledger_to_group").then((r) => {
+ if (r.message === 1) {
frm.refresh();
}
});
},
convert_to_ledger(frm) {
- frm.call('convert_group_to_ledger').then(r => {
- if(r.message === 1) {
+ frm.call("convert_group_to_ledger").then((r) => {
+ if (r.message === 1) {
frm.refresh();
}
});
- }
+ },
});
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 7cbb290947e..135f5fdcb3e 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -125,7 +125,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
- "modified": "2022-01-31 13:22:58.916273",
+ "modified": "2024-04-24 10:55:54.083042",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Cost Center",
@@ -163,6 +163,15 @@
{
"read": 1,
"role": "Purchase User"
+ },
+ {
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "report": 1,
+ "role": "Employee",
+ "select": 1,
+ "share": 1
}
],
"search_fields": "parent_cost_center, is_group",
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.py b/erpnext/accounts/doctype/cost_center/cost_center.py
index e8b34bbf034..ec6c17ad639 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.py
+++ b/erpnext/accounts/doctype/cost_center/cost_center.py
@@ -15,9 +15,7 @@ class CostCenter(NestedSet):
def autoname(self):
from erpnext.accounts.utils import get_autoname_with_number
- self.name = get_autoname_with_number(
- self.cost_center_number, self.cost_center_name, self.company
- )
+ self.name = get_autoname_with_number(self.cost_center_number, self.cost_center_name, self.company)
def validate(self):
self.validate_mandatory()
@@ -90,14 +88,14 @@ class CostCenter(NestedSet):
new_cost_center = get_name_with_abbr(newdn, self.company)
# Validate properties before merging
- super(CostCenter, self).before_rename(olddn, new_cost_center, merge, "is_group")
+ super().before_rename(olddn, new_cost_center, merge, "is_group")
if not merge:
new_cost_center = get_name_with_number(new_cost_center, self.cost_center_number)
return new_cost_center
def after_rename(self, olddn, newdn, merge=False):
- super(CostCenter, self).after_rename(olddn, newdn, merge)
+ super().after_rename(olddn, newdn, merge)
if not merge:
new_cost_center = frappe.db.get_value(
diff --git a/erpnext/accounts/doctype/cost_center/cost_center_tree.js b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
index 1d482c58f1a..3edeb8efb0b 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center_tree.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center_tree.js
@@ -1,54 +1,84 @@
frappe.treeview_settings["Cost Center"] = {
breadcrumb: "Accounts",
get_tree_root: false,
- filters: [{
- fieldname: "company",
- fieldtype:"Select",
- options: erpnext.utils.get_tree_options("company"),
- label: __("Company"),
- default: erpnext.utils.get_tree_default("company")
- }],
- root_label: "Cost Centers",
- get_tree_nodes: 'erpnext.accounts.utils.get_children',
- add_tree_node: 'erpnext.accounts.utils.add_cc',
- menu_items:[
+ filters: [
{
- label: __('New Company'),
- action: function() { frappe.new_doc("Company", true) },
- condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1'
- }
+ fieldname: "company",
+ fieldtype: "Select",
+ options: erpnext.utils.get_tree_options("company"),
+ label: __("Company"),
+ default: erpnext.utils.get_tree_default("company"),
+ },
],
- fields:[
- {fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true},
- {fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
- description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')},
- {fieldtype:'Data', fieldname:'cost_center_number', label:__('Cost Center Number'),
- description: __("Number of new Cost Center, it will be included in the cost center name as a prefix")}
+ root_label: "Cost Centers",
+ get_tree_nodes: "erpnext.accounts.utils.get_children",
+ add_tree_node: "erpnext.accounts.utils.add_cc",
+ menu_items: [
+ {
+ label: __("New Company"),
+ action: function () {
+ frappe.new_doc("Company", true);
+ },
+ condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1',
+ },
],
- ignore_fields:["parent_cost_center"],
- onload: function(treeview) {
+ fields: [
+ { fieldtype: "Data", fieldname: "cost_center_name", label: __("New Cost Center Name"), reqd: true },
+ {
+ fieldtype: "Check",
+ fieldname: "is_group",
+ label: __("Is Group"),
+ description: __(
+ "Further cost centers can be made under Groups but entries can be made against non-Groups"
+ ),
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "cost_center_number",
+ label: __("Cost Center Number"),
+ description: __(
+ "Number of new Cost Center, it will be included in the cost center name as a prefix"
+ ),
+ },
+ ],
+ ignore_fields: ["parent_cost_center"],
+ onload: function (treeview) {
function get_company() {
return treeview.page.fields_dict.company.get_value();
}
// tools
- treeview.page.add_inner_button(__("Chart of Accounts"), function() {
- frappe.set_route('Tree', 'Account', {company: get_company()});
- }, __('View'));
+ treeview.page.add_inner_button(
+ __("Chart of Accounts"),
+ function () {
+ frappe.set_route("Tree", "Account", { company: get_company() });
+ },
+ __("View")
+ );
// make
- treeview.page.add_inner_button(__("Budget List"), function() {
- frappe.set_route('List', 'Budget', {company: get_company()});
- }, __('Budget'));
+ treeview.page.add_inner_button(
+ __("Budget List"),
+ function () {
+ frappe.set_route("List", "Budget", { company: get_company() });
+ },
+ __("Budget")
+ );
- treeview.page.add_inner_button(__("Monthly Distribution"), function() {
- frappe.set_route('List', 'Monthly Distribution', {company: get_company()});
- }, __('Budget'));
+ treeview.page.add_inner_button(
+ __("Monthly Distribution"),
+ function () {
+ frappe.set_route("List", "Monthly Distribution", { company: get_company() });
+ },
+ __("Budget")
+ );
- treeview.page.add_inner_button(__("Budget Variance Report"), function() {
- frappe.set_route('query-report', 'Budget Variance Report', {company: get_company()});
- }, __('Budget'));
-
- }
-
-}
+ treeview.page.add_inner_button(
+ __("Budget Variance Report"),
+ function () {
+ frappe.set_route("query-report", "Budget Variance Report", { company: get_company() });
+ },
+ __("Budget")
+ );
+ },
+};
diff --git a/erpnext/accounts/doctype/cost_center/test_cost_center.py b/erpnext/accounts/doctype/cost_center/test_cost_center.py
index 2ec16092d4d..7d01918fb54 100644
--- a/erpnext/accounts/doctype/cost_center/test_cost_center.py
+++ b/erpnext/accounts/doctype/cost_center/test_cost_center.py
@@ -10,7 +10,6 @@ test_records = frappe.get_test_records("Cost Center")
class TestCostCenter(unittest.TestCase):
def test_cost_center_creation_against_child_node(self):
-
if not frappe.db.get_value("Cost Center", {"name": "_Test Cost Center 2 - _TC"}):
frappe.get_doc(test_records[1]).insert()
diff --git a/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.js b/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.js
index ab0baab24a0..8adc5b21215 100644
--- a/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.js
+++ b/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.js
@@ -1,19 +1,24 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Cost Center Allocation', {
- setup: function(frm) {
- let filters = {"is_group": 0};
- if (frm.doc.company) {
- $.extend(filters, {
- "company": frm.doc.company
- });
- }
-
- frm.set_query('main_cost_center', function() {
+frappe.ui.form.on("Cost Center Allocation", {
+ setup: function (frm) {
+ frm.set_query("main_cost_center", function () {
return {
- filters: filters
+ filters: {
+ company: frm.doc.company,
+ is_group: 0,
+ },
};
});
- }
+
+ frm.set_query("cost_center", "allocation_percentages", function () {
+ return {
+ filters: {
+ company: frm.doc.company,
+ is_group: 0,
+ },
+ };
+ });
+ },
});
diff --git a/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py b/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py
index 54ffe21a152..c6cf232ceb8 100644
--- a/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py
+++ b/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py
@@ -29,7 +29,7 @@ class InvalidDateError(frappe.ValidationError):
class CostCenterAllocation(Document):
def __init__(self, *args, **kwargs):
- super(CostCenterAllocation, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self._skip_from_date_validation = False
def validate(self):
@@ -44,9 +44,7 @@ class CostCenterAllocation(Document):
total_percentage = sum([d.percentage for d in self.get("allocation_percentages", [])])
if total_percentage != 100:
- frappe.throw(
- _("Total percentage against cost centers should be 100"), WrongPercentageAllocation
- )
+ frappe.throw(_("Total percentage against cost centers should be 100"), WrongPercentageAllocation)
def validate_from_date_based_on_existing_gle(self):
# Check if GLE exists against the main cost center
diff --git a/erpnext/accounts/doctype/coupon_code/coupon_code.js b/erpnext/accounts/doctype/coupon_code/coupon_code.js
index da3a9f8132f..f8b5bdc35f5 100644
--- a/erpnext/accounts/doctype/coupon_code/coupon_code.js
+++ b/erpnext/accounts/doctype/coupon_code/coupon_code.js
@@ -1,44 +1,41 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Coupon Code', {
- setup: function(frm) {
- frm.set_query("pricing_rule", function() {
+frappe.ui.form.on("Coupon Code", {
+ setup: function (frm) {
+ frm.set_query("pricing_rule", function () {
return {
- filters: [
- ["Pricing Rule","coupon_code_based", "=", "1"]
- ]
+ filters: [["Pricing Rule", "coupon_code_based", "=", "1"]],
};
});
},
- coupon_name:function(frm){
- if (frm.doc.__islocal===1) {
+ coupon_name: function (frm) {
+ if (frm.doc.__islocal === 1) {
frm.trigger("make_coupon_code");
}
},
- coupon_type:function(frm){
- if (frm.doc.__islocal===1) {
+ coupon_type: function (frm) {
+ if (frm.doc.__islocal === 1) {
frm.trigger("make_coupon_code");
}
},
- make_coupon_code: function(frm) {
- var coupon_name=frm.doc.coupon_name;
+ make_coupon_code: function (frm) {
+ var coupon_name = frm.doc.coupon_name;
var coupon_code;
- if (frm.doc.coupon_type=='Gift Card') {
- coupon_code=Math.random().toString(12).substring(2, 12).toUpperCase();
+ if (frm.doc.coupon_type == "Gift Card") {
+ coupon_code = Math.random().toString(12).substring(2, 12).toUpperCase();
+ } else if (frm.doc.coupon_type == "Promotional") {
+ coupon_name = coupon_name.replace(/\s/g, "");
+ coupon_code = coupon_name.toUpperCase().slice(0, 8);
}
- else if(frm.doc.coupon_type=='Promotional'){
- coupon_name=coupon_name.replace(/\s/g,'');
- coupon_code=coupon_name.toUpperCase().slice(0,8);
- }
- frm.doc.coupon_code=coupon_code;
- frm.refresh_field('coupon_code');
+ frm.doc.coupon_code = coupon_code;
+ frm.refresh_field("coupon_code");
},
- refresh: function(frm) {
+ refresh: function (frm) {
if (frm.doc.pricing_rule) {
- frm.add_custom_button(__("Add/Edit Coupon Conditions"), function(){
+ frm.add_custom_button(__("Add/Edit Coupon Conditions"), function () {
frappe.set_route("Form", "Pricing Rule", frm.doc.pricing_rule);
});
}
- }
+ },
});
diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js
index 6c40f2bec0d..ad68352c2a4 100644
--- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js
+++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js
@@ -1,28 +1,41 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Currency Exchange Settings', {
- service_provider: function(frm) {
- if (frm.doc.service_provider == "exchangerate.host") {
- let result = ['result'];
- let params = {
- date: '{transaction_date}',
- from: '{from_currency}',
- to: '{to_currency}'
- };
- add_param(frm, "https://api.exchangerate.host/convert", params, result);
- } else if (frm.doc.service_provider == "frankfurter.app") {
- let result = ['rates', '{to_currency}'];
- let params = {
- base: '{from_currency}',
- symbols: '{to_currency}'
- };
- add_param(frm, "https://frankfurter.app/{transaction_date}", params, result);
- }
- }
+frappe.ui.form.on("Currency Exchange Settings", {
+ service_provider: function (frm) {
+ frm.call({
+ method: "erpnext.accounts.doctype.currency_exchange_settings.currency_exchange_settings.get_api_endpoint",
+ args: {
+ service_provider: frm.doc.service_provider,
+ use_http: frm.doc.use_http,
+ },
+ callback: function (r) {
+ if (r && r.message) {
+ if (frm.doc.service_provider == "exchangerate.host") {
+ let result = ["result"];
+ let params = {
+ date: "{transaction_date}",
+ from: "{from_currency}",
+ to: "{to_currency}",
+ };
+ add_param(frm, r.message, params, result);
+ } else if (frm.doc.service_provider == "frankfurter.app") {
+ let result = ["rates", "{to_currency}"];
+ let params = {
+ base: "{from_currency}",
+ symbols: "{to_currency}",
+ };
+ add_param(frm, r.message, params, result);
+ }
+ }
+ },
+ });
+ },
+ use_http: function (frm) {
+ frm.trigger("service_provider");
+ },
});
-
function add_param(frm, api, params, result) {
var row;
frm.clear_table("req_params");
@@ -30,13 +43,13 @@ function add_param(frm, api, params, result) {
frm.doc.api_endpoint = api;
- $.each(params, function(key, value) {
+ $.each(params, function (key, value) {
row = frm.add_child("req_params");
row.key = key;
row.value = value;
});
- $.each(result, function(key, value) {
+ $.each(result, function (key, value) {
row = frm.add_child("result_key");
row.key = value;
});
diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
index df232a5848c..bd90b8add80 100644
--- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
+++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
@@ -9,6 +9,7 @@
"disabled",
"service_provider",
"api_endpoint",
+ "use_http",
"access_key",
"url",
"column_break_3",
@@ -91,12 +92,19 @@
"fieldname": "access_key",
"fieldtype": "Data",
"label": "Access Key"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval: doc.service_provider != \"Custom\"",
+ "fieldname": "use_http",
+ "fieldtype": "Check",
+ "label": "Use HTTP Protocol"
}
],
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
- "modified": "2023-10-04 15:30:25.333860",
+ "modified": "2024-03-18 08:32:26.895076",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Currency Exchange Settings",
diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
index 117d5ff21e8..39aff032b3d 100644
--- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
+++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
@@ -18,7 +18,6 @@ class CurrencyExchangeSettings(Document):
def set_parameters_and_result(self):
if self.service_provider == "exchangerate.host":
-
if not self.access_key:
frappe.throw(
_("Access Key is required for Service Provider: {0}").format(
@@ -29,7 +28,7 @@ class CurrencyExchangeSettings(Document):
self.set("result_key", [])
self.set("req_params", [])
- self.api_endpoint = "https://api.exchangerate.host/convert"
+ self.api_endpoint = get_api_endpoint(self.service_provider, self.use_http)
self.append("result_key", {"key": "result"})
self.append("req_params", {"key": "access_key", "value": self.access_key})
self.append("req_params", {"key": "amount", "value": "1"})
@@ -40,7 +39,7 @@ class CurrencyExchangeSettings(Document):
self.set("result_key", [])
self.set("req_params", [])
- self.api_endpoint = "https://frankfurter.app/{transaction_date}"
+ self.api_endpoint = get_api_endpoint(self.service_provider, self.use_http)
self.append("result_key", {"key": "rates"})
self.append("result_key", {"key": "{to_currency}"})
self.append("req_params", {"key": "base", "value": "{from_currency}"})
@@ -53,9 +52,7 @@ class CurrencyExchangeSettings(Document):
transaction_date=nowdate(), to_currency="INR", from_currency="USD"
)
- api_url = self.api_endpoint.format(
- transaction_date=nowdate(), to_currency="INR", from_currency="USD"
- )
+ api_url = self.api_endpoint.format(transaction_date=nowdate(), to_currency="INR", from_currency="USD")
try:
response = requests.get(api_url, params=params)
@@ -75,7 +72,23 @@ class CurrencyExchangeSettings(Document):
]
except Exception:
frappe.throw(_("Invalid result key. Response:") + " " + response.text)
- if not isinstance(value, (int, float)):
+ if not isinstance(value, int | float):
frappe.throw(_("Returned exchange rate is neither integer not float."))
self.url = response.url
+
+
+@frappe.whitelist()
+def get_api_endpoint(service_provider: str | None = None, use_http: bool = False):
+ if service_provider and service_provider in ["exchangerate.host", "frankfurter.app"]:
+ if service_provider == "exchangerate.host":
+ api = "api.exchangerate.host/convert"
+ elif service_provider == "frankfurter.app":
+ api = "frankfurter.app/{transaction_date}"
+
+ protocol = "https://"
+ if use_http:
+ protocol = "http://"
+
+ return protocol + api
+ return None
diff --git a/erpnext/accounts/doctype/dunning/dunning.js b/erpnext/accounts/doctype/dunning/dunning.js
index 9909c6c2ab0..5ddee638dea 100644
--- a/erpnext/accounts/doctype/dunning/dunning.js
+++ b/erpnext/accounts/doctype/dunning/dunning.js
@@ -9,7 +9,7 @@ frappe.ui.form.on("Dunning", {
docstatus: 1,
company: frm.doc.company,
outstanding_amount: [">", 0],
- status: "Overdue"
+ status: "Overdue",
},
};
});
@@ -18,18 +18,14 @@ frappe.ui.form.on("Dunning", {
filters: {
company: frm.doc.company,
root_type: "Income",
- is_group: 0
- }
+ is_group: 0,
+ },
};
});
},
refresh: function (frm) {
frm.set_df_property("company", "read_only", frm.doc.__islocal ? 0 : 1);
- frm.set_df_property(
- "sales_invoice",
- "read_only",
- frm.doc.__islocal ? 0 : 1
- );
+ frm.set_df_property("sales_invoice", "read_only", frm.doc.__islocal ? 0 : 1);
if (frm.doc.docstatus === 1 && frm.doc.status === "Unresolved") {
frm.add_custom_button(__("Resolve"), () => {
frm.set_value("status", "Resolved");
@@ -40,22 +36,27 @@ frappe.ui.form.on("Dunning", {
__("Payment"),
function () {
frm.events.make_payment_entry(frm);
- },__("Create")
+ },
+ __("Create")
);
frm.page.set_inner_btn_group_as_primary(__("Create"));
}
- if(frm.doc.docstatus > 0) {
- frm.add_custom_button(__('Ledger'), function() {
- frappe.route_options = {
- "voucher_no": frm.doc.name,
- "from_date": frm.doc.posting_date,
- "to_date": frm.doc.posting_date,
- "company": frm.doc.company,
- "show_cancelled_entries": frm.doc.docstatus === 2
- };
- frappe.set_route("query-report", "General Ledger");
- }, __('View'));
+ if (frm.doc.docstatus > 0) {
+ frm.add_custom_button(
+ __("Ledger"),
+ function () {
+ frappe.route_options = {
+ voucher_no: frm.doc.name,
+ from_date: frm.doc.posting_date,
+ to_date: frm.doc.posting_date,
+ company: frm.doc.company,
+ show_cancelled_entries: frm.doc.docstatus === 2,
+ };
+ frappe.set_route("query-report", "General Ledger");
+ },
+ __("View")
+ );
}
},
overdue_days: function (frm) {
@@ -86,8 +87,7 @@ frappe.ui.form.on("Dunning", {
get_dunning_letter_text: function (frm) {
if (frm.doc.dunning_type) {
frappe.call({
- method:
- "erpnext.accounts.doctype.dunning.dunning.get_dunning_letter_text",
+ method: "erpnext.accounts.doctype.dunning.dunning.get_dunning_letter_text",
args: {
dunning_type: frm.doc.dunning_type,
language: frm.doc.language,
@@ -129,26 +129,25 @@ frappe.ui.form.on("Dunning", {
},
calculate_overdue_days: function (frm) {
if (frm.doc.posting_date && frm.doc.due_date) {
- const overdue_days = moment(frm.doc.posting_date).diff(
- frm.doc.due_date,
- "days"
- );
+ const overdue_days = moment(frm.doc.posting_date).diff(frm.doc.due_date, "days");
frm.set_value("overdue_days", overdue_days);
}
},
calculate_interest_and_amount: function (frm) {
- const interest_per_year = frm.doc.outstanding_amount * frm.doc.rate_of_interest / 100;
- const interest_amount = flt((interest_per_year * cint(frm.doc.overdue_days)) / 365 || 0, precision('interest_amount'));
- const dunning_amount = flt(interest_amount + frm.doc.dunning_fee, precision('dunning_amount'));
- const grand_total = flt(frm.doc.outstanding_amount + dunning_amount, precision('grand_total'));
+ const interest_per_year = (frm.doc.outstanding_amount * frm.doc.rate_of_interest) / 100;
+ const interest_amount = flt(
+ (interest_per_year * cint(frm.doc.overdue_days)) / 365 || 0,
+ precision("interest_amount")
+ );
+ const dunning_amount = flt(interest_amount + frm.doc.dunning_fee, precision("dunning_amount"));
+ const grand_total = flt(frm.doc.outstanding_amount + dunning_amount, precision("grand_total"));
frm.set_value("interest_amount", interest_amount);
frm.set_value("dunning_amount", dunning_amount);
frm.set_value("grand_total", grand_total);
},
make_payment_entry: function (frm) {
return frappe.call({
- method:
- "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry",
+ method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry",
args: {
dt: frm.doc.doctype,
dn: frm.doc.name,
diff --git a/erpnext/accounts/doctype/dunning_type/dunning_type.js b/erpnext/accounts/doctype/dunning_type/dunning_type.js
index 54156b488dd..5fa4fd411db 100644
--- a/erpnext/accounts/doctype/dunning_type/dunning_type.js
+++ b/erpnext/accounts/doctype/dunning_type/dunning_type.js
@@ -1,8 +1,7 @@
// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Dunning Type', {
+frappe.ui.form.on("Dunning Type", {
// refresh: function(frm) {
-
// }
});
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
index 1ef5c837402..741039acae6 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js
@@ -1,75 +1,79 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Exchange Rate Revaluation', {
- setup: function(frm) {
- frm.set_query("party_type", "accounts", function() {
+frappe.ui.form.on("Exchange Rate Revaluation", {
+ setup: function (frm) {
+ frm.set_query("party_type", "accounts", function () {
return {
- "filters": {
- "name": ["in", Object.keys(frappe.boot.party_account_types)],
- }
+ filters: {
+ name: ["in", Object.keys(frappe.boot.party_account_types)],
+ },
};
});
- frm.set_query("account", "accounts", function(doc) {
+ frm.set_query("account", "accounts", function (doc) {
return {
- "filters": {
- "company": doc.company
- }
+ filters: {
+ company: doc.company,
+ },
};
});
},
- refresh: function(frm) {
- if(frm.doc.docstatus==1) {
+ refresh: function (frm) {
+ if (frm.doc.docstatus == 1) {
frappe.call({
- method: 'check_journal_entry_condition',
+ method: "check_journal_entry_condition",
doc: frm.doc,
- callback: function(r) {
+ callback: function (r) {
if (r.message) {
- frm.add_custom_button(__('Journal Entries'), function() {
- return frm.events.make_jv(frm);
- }, __('Create'));
+ frm.add_custom_button(
+ __("Journal Entries"),
+ function () {
+ return frm.events.make_jv(frm);
+ },
+ __("Create")
+ );
}
- }
+ },
});
}
},
- validate_rounding_loss: function(frm) {
+ validate_rounding_loss: function (frm) {
let allowance = frm.doc.rounding_loss_allowance;
if (!(allowance >= 0 && allowance < 1)) {
frappe.throw(__("Rounding Loss Allowance should be between 0 and 1"));
}
},
- rounding_loss_allowance: function(frm) {
+ rounding_loss_allowance: function (frm) {
frm.events.validate_rounding_loss(frm);
},
- validate: function(frm) {
+ validate: function (frm) {
frm.events.validate_rounding_loss(frm);
},
- get_entries: function(frm, account) {
+ get_entries: function (frm, account) {
frappe.call({
method: "get_accounts_data",
doc: cur_frm.doc,
account: account,
- callback: function(r){
+ callback: function (r) {
frappe.model.clear_table(frm.doc, "accounts");
- if(r.message) {
+ if (r.message) {
r.message.forEach((d) => {
- cur_frm.add_child("accounts",d);
+ cur_frm.add_child("accounts", d);
});
frm.events.get_total_gain_loss(frm);
refresh_field("accounts");
}
- }
+ },
});
},
- get_total_gain_loss: function(frm) {
- if(!(frm.doc.accounts && frm.doc.accounts.length)) return;
+ get_total_gain_loss: function (frm) {
+ if (!(frm.doc.accounts && frm.doc.accounts.length)) return;
let total_gain_loss = 0;
frm.doc.accounts.forEach((d) => {
@@ -80,7 +84,7 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
frm.refresh_fields();
},
- make_jv : function(frm) {
+ make_jv: function (frm) {
let revaluation_journal = null;
let zero_balance_journal = null;
frappe.call({
@@ -88,66 +92,68 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
doc: frm.doc,
freeze: true,
freeze_message: "Making Journal Entries...",
- callback: function(r){
+ callback: function (r) {
if (r.message) {
let response = r.message;
- if(response['revaluation_jv'] || response['zero_balance_jv']) {
+ if (response["revaluation_jv"] || response["zero_balance_jv"]) {
frappe.msgprint(__("Journals have been created"));
}
}
- }
+ },
});
- }
+ },
});
frappe.ui.form.on("Exchange Rate Revaluation Account", {
- new_exchange_rate: function(frm, cdt, cdn) {
+ new_exchange_rate: function (frm, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
- row.new_balance_in_base_currency = flt(row.new_exchange_rate * flt(row.balance_in_account_currency),
- precision("new_balance_in_base_currency", row));
+ row.new_balance_in_base_currency = flt(
+ row.new_exchange_rate * flt(row.balance_in_account_currency),
+ precision("new_balance_in_base_currency", row)
+ );
row.gain_loss = row.new_balance_in_base_currency - flt(row.balance_in_base_currency);
refresh_field("accounts");
frm.events.get_total_gain_loss(frm);
},
- account: function(frm, cdt, cdn) {
+ account: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
if (row.account) {
get_account_details(frm, cdt, cdn);
}
},
- party: function(frm, cdt, cdn) {
+ party: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
if (row.party && row.account) {
get_account_details(frm, cdt, cdn);
}
},
- accounts_remove: function(frm) {
+ accounts_remove: function (frm) {
frm.events.get_total_gain_loss(frm);
- }
+ },
});
-var get_account_details = function(frm, cdt, cdn) {
+var get_account_details = function (frm, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
- if(!frm.doc.company || !frm.doc.posting_date) {
+ if (!frm.doc.company || !frm.doc.posting_date) {
frappe.throw(__("Please select Company and Posting Date to getting entries"));
}
frappe.call({
method: "erpnext.accounts.doctype.exchange_rate_revaluation.exchange_rate_revaluation.get_account_details",
- args:{
+ args: {
account: row.account,
company: frm.doc.company,
posting_date: frm.doc.posting_date,
party_type: row.party_type,
party: row.party,
- rounding_loss_allowance: frm.doc.rounding_loss_allowance
+ rounding_loss_allowance: frm.doc.rounding_loss_allowance,
},
- callback: function(r){
+ callback: function (r) {
$.extend(row, r.message);
refresh_field("accounts");
frm.events.get_total_gain_loss(frm);
- }
+ },
});
};
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
index 977cfe94f8a..24a325b9164 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
@@ -246,7 +246,6 @@ class ExchangeRateRevaluation(Document):
# Handle Accounts with '0' balance in Account/Base Currency
for d in [x for x in account_details if x.zero_balance]:
-
if d.balance != 0:
current_exchange_rate = new_exchange_rate = 0
@@ -259,7 +258,8 @@ class ExchangeRateRevaluation(Document):
new_balance_in_account_currency = 0
current_exchange_rate = (
- calculate_exchange_rate_using_last_gle(company, d.account, d.party_type, d.party) or 0.0
+ calculate_exchange_rate_using_last_gle(company, d.account, d.party_type, d.party)
+ or 0.0
)
gain_loss = new_balance_in_account_currency - (
@@ -313,9 +313,7 @@ class ExchangeRateRevaluation(Document):
revaluation_jv = self.make_jv_for_revaluation()
if revaluation_jv:
- frappe.msgprint(
- f"Revaluation Journal: {get_link_to_form('Journal Entry', revaluation_jv.name)}"
- )
+ frappe.msgprint(f"Revaluation Journal: {get_link_to_form('Journal Entry', revaluation_jv.name)}")
return {
"revaluation_jv": revaluation_jv.name if revaluation_jv else None,
@@ -372,7 +370,8 @@ class ExchangeRateRevaluation(Document):
journal_account.update(
{
dr_or_cr: flt(
- abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")
+ abs(d.get("balance_in_account_currency")),
+ d.precision("balance_in_account_currency"),
),
reverse_dr_or_cr: 0,
"debit": 0,
@@ -498,7 +497,9 @@ class ExchangeRateRevaluation(Document):
abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")
),
"cost_center": erpnext.get_default_cost_center(self.company),
- "exchange_rate": flt(d.get("current_exchange_rate"), d.precision("current_exchange_rate")),
+ "exchange_rate": flt(
+ d.get("current_exchange_rate"), d.precision("current_exchange_rate")
+ ),
"reference_type": "Exchange Rate Revaluation",
"reference_name": self.name,
}
@@ -576,7 +577,7 @@ def calculate_exchange_rate_using_last_gle(company, account, party_type, party):
@frappe.whitelist()
def get_account_details(
- company, posting_date, account, party_type=None, party=None, rounding_loss_allowance: float = None
+ company, posting_date, account, party_type=None, party=None, rounding_loss_allowance: float | None = None
):
if not (company and posting_date):
frappe.throw(_("Company and Posting Date is mandatory"))
@@ -589,7 +590,7 @@ def get_account_details(
frappe.throw(_("Party Type and Party is mandatory for {0} account").format(account_type))
account_details = {}
- company_currency = erpnext.get_company_currency(company)
+ erpnext.get_company_currency(company)
account_details = {
"account_currency": account_currency,
@@ -603,24 +604,22 @@ def get_account_details(
rounding_loss_allowance=rounding_loss_allowance,
)
- if account_balance and (
- account_balance[0].balance or account_balance[0].balance_in_account_currency
- ):
- account_with_new_balance = ExchangeRateRevaluation.calculate_new_account_balance(
+ if account_balance and (account_balance[0].balance or account_balance[0].balance_in_account_currency):
+ if account_with_new_balance := ExchangeRateRevaluation.calculate_new_account_balance(
company, posting_date, account_balance
- )
- row = account_with_new_balance[0]
- account_details.update(
- {
- "balance_in_base_currency": row["balance_in_base_currency"],
- "balance_in_account_currency": row["balance_in_account_currency"],
- "current_exchange_rate": row["current_exchange_rate"],
- "new_exchange_rate": row["new_exchange_rate"],
- "new_balance_in_base_currency": row["new_balance_in_base_currency"],
- "new_balance_in_account_currency": row["new_balance_in_account_currency"],
- "zero_balance": row["zero_balance"],
- "gain_loss": row["gain_loss"],
- }
- )
+ ):
+ row = account_with_new_balance[0]
+ account_details.update(
+ {
+ "balance_in_base_currency": row["balance_in_base_currency"],
+ "balance_in_account_currency": row["balance_in_account_currency"],
+ "current_exchange_rate": row["current_exchange_rate"],
+ "new_exchange_rate": row["new_exchange_rate"],
+ "new_balance_in_base_currency": row["new_balance_in_base_currency"],
+ "new_balance_in_account_currency": row["new_balance_in_account_currency"],
+ "zero_balance": row["zero_balance"],
+ "gain_loss": row["gain_loss"],
+ }
+ )
return account_details
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
index ced04ced3fd..709be43e699 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
@@ -1,21 +1,14 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
-import unittest
import frappe
-from frappe import qb
from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import add_days, flt, today
-from erpnext import get_default_cost_center
from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
-from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.accounts.party import get_party_account
from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
-from erpnext.stock.doctype.item.test_item import create_item
class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
@@ -73,9 +66,7 @@ class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
err.extend("accounts", accounts)
row = err.accounts[0]
row.new_exchange_rate = 85
- row.new_balance_in_base_currency = flt(
- row.new_exchange_rate * flt(row.balance_in_account_currency)
- )
+ row.new_balance_in_base_currency = flt(row.new_exchange_rate * flt(row.balance_in_account_currency))
row.gain_loss = row.new_balance_in_base_currency - flt(row.balance_in_base_currency)
err.set_total_gain_loss()
err = err.save().submit()
@@ -127,9 +118,9 @@ class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
pe.save().submit()
# Cancel the auto created gain/loss JE to simulate balance only in base currency
- je = frappe.db.get_all(
- "Journal Entry Account", filters={"reference_name": si.name}, pluck="parent"
- )[0]
+ je = frappe.db.get_all("Journal Entry Account", filters={"reference_name": si.name}, pluck="parent")[
+ 0
+ ]
frappe.get_doc("Journal Entry", je).cancel()
err = frappe.new_doc("Exchange Rate Revaluation")
@@ -235,9 +226,9 @@ class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
self.assertEqual(flt(acc.debit, precision), 0.0)
self.assertEqual(flt(acc.credit, precision), 0.0)
- row = [x for x in je.accounts if x.account == self.debtors_usd][0]
+ row = next(x for x in je.accounts if x.account == self.debtors_usd)
self.assertEqual(flt(row.credit_in_account_currency, precision), 5.0) # in USD
- row = [x for x in je.accounts if x.account != self.debtors_usd][0]
+ row = next(x for x in je.accounts if x.account != self.debtors_usd)
self.assertEqual(flt(row.debit_in_account_currency, precision), 421.06) # in INR
# total_debit and total_credit will be 0.0, as JV is posting only to account currency fields
@@ -294,5 +285,5 @@ class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
"new_balance_in_account_currency": 100.0,
}
- for key, val in expected_data.items():
+ for key, _val in expected_data.items():
self.assertEqual(expected_data.get(key), account_details.get(key))
diff --git a/erpnext/accounts/doctype/finance_book/finance_book.js b/erpnext/accounts/doctype/finance_book/finance_book.js
index 71191bb0cfa..ebe1d246ef1 100644
--- a/erpnext/accounts/doctype/finance_book/finance_book.js
+++ b/erpnext/accounts/doctype/finance_book/finance_book.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Finance Book', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Finance Book", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
index 508b2eaf2a4..a44b52f08f8 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
@@ -1,17 +1,21 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('Fiscal Year', {
- onload: function(frm) {
- if(frm.doc.__islocal) {
- frm.set_value("year_start_date",
- frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1));
+frappe.ui.form.on("Fiscal Year", {
+ onload: function (frm) {
+ if (frm.doc.__islocal) {
+ frm.set_value(
+ "year_start_date",
+ frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)
+ );
}
},
- year_start_date: function(frm) {
+ year_start_date: function (frm) {
if (!frm.doc.is_short_year) {
- let year_end_date =
- frappe.datetime.add_days(frappe.datetime.add_months(frm.doc.year_start_date, 12), -1);
+ let year_end_date = frappe.datetime.add_days(
+ frappe.datetime.add_months(frm.doc.year_start_date, 12),
+ -1
+ );
frm.set_value("year_end_date", year_end_date);
}
},
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index 5ab91f2506c..ff4ac50850f 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -118,9 +118,17 @@
{
"read": 1,
"role": "Employee"
+ },
+ {
+ "read": 1,
+ "role": "Accounts Manager"
+ },
+ {
+ "read": 1,
+ "role": "Stock Manager"
}
],
"show_name_in_global_search": 1,
"sort_field": "name",
"sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index a945860a711..4acdd9a7e8e 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -98,9 +98,9 @@ class FiscalYear(Document):
if overlap:
frappe.throw(
- _("Year start date or end date is overlapping with {0}. To avoid please set company").format(
- existing.name
- ),
+ _(
+ "Year start date or end date is overlapping with {0}. To avoid please set company"
+ ).format(existing.name),
frappe.NameError,
)
@@ -116,9 +116,9 @@ def check_duplicate_fiscal_year(doc):
not frappe.flags.in_test
):
frappe.throw(
- _("Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0}").format(
- fiscal_year
- )
+ _(
+ "Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0}"
+ ).format(fiscal_year)
)
diff --git a/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py
index 6e946f74660..82147f4f6ab 100644
--- a/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py
@@ -41,7 +41,7 @@ def test_record_generator():
]
start = 2012
- end = now_datetime().year + 5
+ end = now_datetime().year + 25
for year in range(start, end):
test_records.append(
{
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.js b/erpnext/accounts/doctype/gl_entry/gl_entry.js
index 4d2a5135187..7f81a2a4e02 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.js
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.js
@@ -1,8 +1,8 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('GL Entry', {
- refresh: function(frm) {
- frm.page.btn_secondary.hide()
- }
+frappe.ui.form.on("GL Entry", {
+ refresh: function (frm) {
+ frm.page.btn_secondary.hide();
+ },
});
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index e6d97a1fb26..eb99768b05e 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -138,8 +138,7 @@
"label": "Against Voucher Type",
"oldfieldname": "against_voucher_type",
"oldfieldtype": "Data",
- "options": "DocType",
- "search_index": 1
+ "options": "DocType"
},
{
"fieldname": "against_voucher",
@@ -158,8 +157,7 @@
"label": "Voucher Type",
"oldfieldname": "voucher_type",
"oldfieldtype": "Select",
- "options": "DocType",
- "search_index": 1
+ "options": "DocType"
},
{
"fieldname": "voucher_no",
@@ -176,7 +174,8 @@
"fieldname": "voucher_detail_no",
"fieldtype": "Data",
"label": "Voucher Detail No",
- "read_only": 1
+ "read_only": 1,
+ "search_index": 1
},
{
"fieldname": "project",
@@ -258,7 +257,8 @@
"icon": "fa fa-list",
"idx": 1,
"in_create": 1,
- "modified": "2020-04-07 16:22:33.766994",
+ "links": [],
+ "modified": "2024-03-19 18:30:49.613401",
"modified_by": "Administrator",
"module": "Accounts",
"name": "GL Entry",
@@ -290,5 +290,6 @@
"quick_entry": 1,
"search_fields": "voucher_no,account,posting_date,against_voucher",
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index 3a564825b55..6ca5e6377c5 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -13,16 +13,9 @@ import erpnext
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
get_checks_for_pl_and_bs_accounts,
)
-from erpnext.accounts.doctype.accounting_dimension_filter.accounting_dimension_filter import (
- get_dimension_filter_map,
-)
from erpnext.accounts.party import validate_party_frozen_disabled, validate_party_gle_currency
from erpnext.accounts.utils import get_account_currency, get_fiscal_year
-from erpnext.exceptions import (
- InvalidAccountCurrency,
- InvalidAccountDimensionError,
- MandatoryAccountDimensionError,
-)
+from erpnext.exceptions import InvalidAccountCurrency
exclude_from_linked_with = True
@@ -54,7 +47,6 @@ class GLEntry(Document):
if not self.flags.from_repost and self.voucher_type != "Period Closing Voucher":
self.validate_account_details(adv_adj)
self.validate_dimensions_for_pl_and_bs()
- self.validate_allowed_dimensions()
validate_balance_type(self.account, adv_adj)
validate_frozen_account(self.account, adv_adj)
@@ -71,13 +63,18 @@ class GLEntry(Document):
]:
# Update outstanding amt on against voucher
if (
- self.against_voucher_type in ["Journal Entry", "Sales Invoice", "Purchase Invoice", "Fees"]
+ self.against_voucher_type
+ in ["Journal Entry", "Sales Invoice", "Purchase Invoice", "Fees"]
and self.against_voucher
and self.flags.update_outstanding == "Yes"
and not frappe.flags.is_reverse_depr_entry
):
update_outstanding_amt(
- self.account, self.party_type, self.party, self.against_voucher_type, self.against_voucher
+ self.account,
+ self.party_type,
+ self.party,
+ self.against_voucher_type,
+ self.against_voucher,
)
def check_mandatory(self):
@@ -135,7 +132,7 @@ class GLEntry(Document):
frappe.throw(msg, title=_("Missing Cost Center"))
def validate_dimensions_for_pl_and_bs(self):
- account_type = frappe.db.get_value("Account", self.account, "report_type")
+ account_type = frappe.get_cached_value("Account", self.account, "report_type")
for dimension in get_checks_for_pl_and_bs_accounts():
if (
@@ -143,12 +140,13 @@ class GLEntry(Document):
and self.company == dimension.company
and dimension.mandatory_for_pl
and not dimension.disabled
+ and not self.is_cancelled
):
if not self.get(dimension.fieldname):
frappe.throw(
- _("Accounting Dimension {0} is required for 'Profit and Loss' account {1}.").format(
- dimension.label, self.account
- )
+ _(
+ "Accounting Dimension {0} is required for 'Profit and Loss' account {1}."
+ ).format(dimension.label, self.account)
)
if (
@@ -156,54 +154,19 @@ class GLEntry(Document):
and self.company == dimension.company
and dimension.mandatory_for_bs
and not dimension.disabled
+ and not self.is_cancelled
):
if not self.get(dimension.fieldname):
frappe.throw(
- _("Accounting Dimension {0} is required for 'Balance Sheet' account {1}.").format(
- dimension.label, self.account
- )
+ _(
+ "Accounting Dimension {0} is required for 'Balance Sheet' account {1}."
+ ).format(dimension.label, self.account)
)
- def validate_allowed_dimensions(self):
- dimension_filter_map = get_dimension_filter_map()
- for key, value in dimension_filter_map.items():
- dimension = key[0]
- account = key[1]
-
- if self.account == account:
- if value["is_mandatory"] and not self.get(dimension):
- frappe.throw(
- _("{0} is mandatory for account {1}").format(
- frappe.bold(frappe.unscrub(dimension)), frappe.bold(self.account)
- ),
- MandatoryAccountDimensionError,
- )
-
- if value["allow_or_restrict"] == "Allow":
- if self.get(dimension) and self.get(dimension) not in value["allowed_dimensions"]:
- frappe.throw(
- _("Invalid value {0} for {1} against account {2}").format(
- frappe.bold(self.get(dimension)),
- frappe.bold(frappe.unscrub(dimension)),
- frappe.bold(self.account),
- ),
- InvalidAccountDimensionError,
- )
- else:
- if self.get(dimension) and self.get(dimension) in value["allowed_dimensions"]:
- frappe.throw(
- _("Invalid value {0} for {1} against account {2}").format(
- frappe.bold(self.get(dimension)),
- frappe.bold(frappe.unscrub(dimension)),
- frappe.bold(self.account),
- ),
- InvalidAccountDimensionError,
- )
-
def check_pl_account(self):
if (
self.is_opening == "Yes"
- and frappe.db.get_value("Account", self.account, "report_type") == "Profit and Loss"
+ and frappe.get_cached_value("Account", self.account, "report_type") == "Profit and Loss"
and not self.is_cancelled
):
frappe.throw(
@@ -245,9 +208,7 @@ class GLEntry(Document):
if not self.cost_center:
return
- is_group, company = frappe.get_cached_value(
- "Cost Center", self.cost_center, ["is_group", "company"]
- )
+ is_group, company = frappe.get_cached_value("Cost Center", self.cost_center, ["is_group", "company"])
if company != self.company:
frappe.throw(
@@ -296,7 +257,7 @@ class GLEntry(Document):
def validate_balance_type(account, adv_adj=False):
if not adv_adj and account:
- balance_must_be = frappe.db.get_value("Account", account, "balance_must_be")
+ balance_must_be = frappe.get_cached_value("Account", account, "balance_must_be")
if balance_must_be:
balance = frappe.db.sql(
"""select sum(debit) - sum(credit)
@@ -316,31 +277,27 @@ def update_outstanding_amt(
account, party_type, party, against_voucher_type, against_voucher, on_cancel=False
):
if party_type and party:
- party_condition = " and party_type={0} and party={1}".format(
+ party_condition = " and party_type={} and party={}".format(
frappe.db.escape(party_type), frappe.db.escape(party)
)
else:
party_condition = ""
if against_voucher_type == "Sales Invoice":
- party_account = frappe.db.get_value(against_voucher_type, against_voucher, "debit_to")
- account_condition = "and account in ({0}, {1})".format(
- frappe.db.escape(account), frappe.db.escape(party_account)
- )
+ party_account = frappe.get_cached_value(against_voucher_type, against_voucher, "debit_to")
+ account_condition = f"and account in ({frappe.db.escape(account)}, {frappe.db.escape(party_account)})"
else:
- account_condition = " and account = {0}".format(frappe.db.escape(account))
+ account_condition = f" and account = {frappe.db.escape(account)}"
# get final outstanding amt
bal = flt(
frappe.db.sql(
- """
+ f"""
select sum(debit_in_account_currency) - sum(credit_in_account_currency)
from `tabGL Entry`
where against_voucher_type=%s and against_voucher=%s
and voucher_type != 'Invoice Discounting'
- {0} {1}""".format(
- party_condition, account_condition
- ),
+ {party_condition} {account_condition}""",
(against_voucher_type, against_voucher),
)[0][0]
or 0.0
@@ -351,12 +308,10 @@ def update_outstanding_amt(
elif against_voucher_type == "Journal Entry":
against_voucher_amount = flt(
frappe.db.sql(
- """
+ f"""
select sum(debit_in_account_currency) - sum(credit_in_account_currency)
from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s
- and account = %s and (against_voucher is null or against_voucher='') {0}""".format(
- party_condition
- ),
+ and account = %s and (against_voucher is null or against_voucher='') {party_condition}""",
(against_voucher, account),
)[0][0]
)
@@ -375,7 +330,9 @@ def update_outstanding_amt(
# Validation : Outstanding can not be negative for JV
if bal < 0 and not on_cancel:
frappe.throw(
- _("Outstanding for {0} cannot be less than zero ({1})").format(against_voucher, fmt_money(bal))
+ _("Outstanding for {0} cannot be less than zero ({1})").format(
+ against_voucher, fmt_money(bal)
+ )
)
if against_voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"]:
@@ -391,7 +348,7 @@ def update_outstanding_amt(
def validate_frozen_account(account, adv_adj=None):
frozen_account = frappe.get_cached_value("Account", account, "freeze_account")
if frozen_account == "Yes" and not adv_adj:
- frozen_accounts_modifier = frappe.db.get_value(
+ frozen_accounts_modifier = frappe.get_cached_value(
"Accounts Settings", None, "frozen_accounts_modifier"
)
@@ -448,7 +405,7 @@ def rename_temporarily_named_docs(doctype):
set_name_from_naming_options(frappe.get_meta(doctype).autoname, doc)
newname = doc.name
frappe.db.sql(
- "UPDATE `tab{}` SET name = %s, to_rename = 0 where name = %s".format(doctype),
+ f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0 where name = %s",
(newname, oldname),
auto_commit=True,
)
diff --git a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
index b188b09843a..3edfd67b005 100644
--- a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
@@ -14,9 +14,7 @@ from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journ
class TestGLEntry(unittest.TestCase):
def test_round_off_entry(self):
frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC")
- frappe.db.set_value(
- "Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC"
- )
+ frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC")
jv = make_journal_entry(
"_Test Account Cost for Goods Sold - _TC",
@@ -73,7 +71,9 @@ class TestGLEntry(unittest.TestCase):
)
self.assertTrue(all(entry.to_rename == 0 for entry in new_gl_entries))
- self.assertTrue(all(new.name != old.name for new, old in zip(gl_entries, new_gl_entries)))
+ self.assertTrue(
+ all(new.name != old.name for new, old in zip(gl_entries, new_gl_entries, strict=False))
+ )
new_naming_series_current_value = frappe.db.sql(
"SELECT current from tabSeries where name = %s", naming_series
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
index db4f7c423f9..974f037a81d 100644
--- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
@@ -1,47 +1,49 @@
// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Invoice Discounting', {
+frappe.ui.form.on("Invoice Discounting", {
setup: (frm) => {
frm.set_query("sales_invoice", "invoices", (doc) => {
return {
- "filters": {
- "docstatus": 1,
- "company": doc.company,
- "outstanding_amount": [">", 0]
+ filters: {
+ docstatus: 1,
+ company: doc.company,
+ outstanding_amount: [">", 0],
},
};
});
-
frm.events.filter_accounts("bank_account", frm, [["account_type", "=", "Bank"]]);
frm.events.filter_accounts("bank_charges_account", frm, [["root_type", "=", "Expense"]]);
frm.events.filter_accounts("short_term_loan", frm, [["root_type", "=", "Liability"]]);
- frm.events.filter_accounts("accounts_receivable_discounted", frm, [["account_type", "=", "Receivable"]]);
+ frm.events.filter_accounts("accounts_receivable_discounted", frm, [
+ ["account_type", "=", "Receivable"],
+ ]);
frm.events.filter_accounts("accounts_receivable_credit", frm, [["account_type", "=", "Receivable"]]);
frm.events.filter_accounts("accounts_receivable_unpaid", frm, [["account_type", "=", "Receivable"]]);
-
},
filter_accounts: (fieldname, frm, addl_filters) => {
let filters = [
["company", "=", frm.doc.company],
- ["is_group", "=", 0]
+ ["is_group", "=", 0],
];
- if(addl_filters){
- filters = $.merge(filters , addl_filters);
+ if (addl_filters) {
+ filters = $.merge(filters, addl_filters);
}
- frm.set_query(fieldname, () => { return { "filters": filters }; });
+ frm.set_query(fieldname, () => {
+ return { filters: filters };
+ });
},
- refresh_filters: (frm) =>{
- let invoice_accounts = Object.keys(frm.doc.invoices).map(function(key) {
+ refresh_filters: (frm) => {
+ let invoice_accounts = Object.keys(frm.doc.invoices).map(function (key) {
return frm.doc.invoices[key].debit_to;
});
let filters = [
["account_type", "=", "Receivable"],
- ["name", "not in", invoice_accounts]
+ ["name", "not in", invoice_accounts],
];
frm.events.filter_accounts("accounts_receivable_credit", frm, filters);
frm.events.filter_accounts("accounts_receivable_discounted", frm, filters);
@@ -52,19 +54,19 @@ frappe.ui.form.on('Invoice Discounting', {
frm.events.show_general_ledger(frm);
if (frm.doc.docstatus === 0) {
- frm.add_custom_button(__('Get Invoices'), function() {
+ frm.add_custom_button(__("Get Invoices"), function () {
frm.events.get_invoices(frm);
});
}
if (frm.doc.docstatus === 1 && frm.doc.status !== "Settled") {
if (frm.doc.status == "Sanctioned") {
- frm.add_custom_button(__('Disburse Loan'), function() {
+ frm.add_custom_button(__("Disburse Loan"), function () {
frm.events.create_disbursement_entry(frm);
}).addClass("btn-primary");
}
if (frm.doc.status == "Disbursed") {
- frm.add_custom_button(__('Close Loan'), function() {
+ frm.add_custom_button(__("Close Loan"), function () {
frm.events.close_loan(frm);
}).addClass("btn-primary");
}
@@ -92,119 +94,121 @@ frappe.ui.form.on('Invoice Discounting', {
calculate_total_amount: (frm) => {
let total_amount = 0.0;
- for (let row of (frm.doc.invoices || [])) {
+ for (let row of frm.doc.invoices || []) {
total_amount += flt(row.outstanding_amount);
}
frm.set_value("total_amount", total_amount);
},
get_invoices: (frm) => {
var d = new frappe.ui.Dialog({
- title: __('Get Invoices based on Filters'),
+ title: __("Get Invoices based on Filters"),
fields: [
{
- "label": "Customer",
- "fieldname": "customer",
- "fieldtype": "Link",
- "options": "Customer"
+ label: "Customer",
+ fieldname: "customer",
+ fieldtype: "Link",
+ options: "Customer",
},
{
- "label": "From Date",
- "fieldname": "from_date",
- "fieldtype": "Date"
+ label: "From Date",
+ fieldname: "from_date",
+ fieldtype: "Date",
},
{
- "label": "To Date",
- "fieldname": "to_date",
- "fieldtype": "Date"
+ label: "To Date",
+ fieldname: "to_date",
+ fieldtype: "Date",
},
{
- "fieldname": "col_break",
- "fieldtype": "Column Break",
+ fieldname: "col_break",
+ fieldtype: "Column Break",
},
{
- "label": "Min Amount",
- "fieldname": "min_amount",
- "fieldtype": "Currency"
+ label: "Min Amount",
+ fieldname: "min_amount",
+ fieldtype: "Currency",
},
{
- "label": "Max Amount",
- "fieldname": "max_amount",
- "fieldtype": "Currency"
- }
+ label: "Max Amount",
+ fieldname: "max_amount",
+ fieldtype: "Currency",
+ },
],
- primary_action: function() {
+ primary_action: function () {
var data = d.get_values();
frappe.call({
method: "erpnext.accounts.doctype.invoice_discounting.invoice_discounting.get_invoices",
args: {
- filters: data
+ filters: data,
},
- callback: function(r) {
- if(!r.exc) {
+ callback: function (r) {
+ if (!r.exc) {
d.hide();
- $.each(r.message, function(i, v) {
- frm.doc.invoices = frm.doc.invoices.filter(row => row.sales_invoice);
+ $.each(r.message, function (i, v) {
+ frm.doc.invoices = frm.doc.invoices.filter((row) => row.sales_invoice);
let row = frm.add_child("invoices");
$.extend(row, v);
frm.events.refresh_filters(frm);
});
refresh_field("invoices");
}
- }
+ },
});
},
- primary_action_label: __('Get Invocies')
+ primary_action_label: __("Get Invocies"),
});
d.show();
},
create_disbursement_entry: (frm) => {
frappe.call({
- method:"create_disbursement_entry",
+ method: "create_disbursement_entry",
doc: frm.doc,
- callback: function(r) {
- if(!r.exc){
+ callback: function (r) {
+ if (!r.exc) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
}
- }
+ },
});
-
},
close_loan: (frm) => {
frappe.call({
- method:"close_loan",
+ method: "close_loan",
doc: frm.doc,
- callback: function(r) {
- if(!r.exc){
+ callback: function (r) {
+ if (!r.exc) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
}
- }
+ },
});
-
},
show_general_ledger: (frm) => {
- if(frm.doc.docstatus > 0) {
- cur_frm.add_custom_button(__('Accounting Ledger'), function() {
- frappe.route_options = {
- voucher_no: frm.doc.name,
- from_date: frm.doc.posting_date,
- to_date: moment(frm.doc.modified).format('YYYY-MM-DD'),
- company: frm.doc.company,
- group_by: "Group by Voucher (Consolidated)",
- show_cancelled_entries: frm.doc.docstatus === 2
- };
- frappe.set_route("query-report", "General Ledger");
- }, __("View"));
+ if (frm.doc.docstatus > 0) {
+ cur_frm.add_custom_button(
+ __("Accounting Ledger"),
+ function () {
+ frappe.route_options = {
+ voucher_no: frm.doc.name,
+ from_date: frm.doc.posting_date,
+ to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
+ company: frm.doc.company,
+ group_by: "Group by Voucher (Consolidated)",
+ show_cancelled_entries: frm.doc.docstatus === 2,
+ };
+ frappe.set_route("query-report", "General Ledger");
+ },
+ __("View")
+ );
}
- }
+ },
});
-frappe.ui.form.on('Discounted Invoice', {
+frappe.ui.form.on("Discounted Invoice", {
sales_invoice: (frm) => {
frm.events.calculate_total_amount(frm);
frm.events.refresh_filters(frm);
@@ -212,5 +216,5 @@ frappe.ui.form.on('Discounted Invoice', {
invoices_remove: (frm) => {
frm.events.calculate_total_amount(frm);
frm.events.refresh_filters(frm);
- }
+ },
});
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
index 5bd4585a9a8..2322d68c000 100644
--- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
@@ -55,9 +55,7 @@ class InvoiceDiscounting(AccountsController):
frappe.throw(
_(
"Row({0}): Outstanding Amount cannot be greater than actual Outstanding Amount {1} in {2}"
- ).format(
- record.idx, frappe.bold(actual_outstanding), frappe.bold(record.sales_invoice)
- )
+ ).format(record.idx, frappe.bold(actual_outstanding), frappe.bold(record.sales_invoice))
)
def calculate_total_amount(self):
@@ -77,7 +75,9 @@ class InvoiceDiscounting(AccountsController):
self.status = status
self.db_set("status", status)
for d in self.invoices:
- frappe.get_doc("Sales Invoice", d.sales_invoice).set_status(update=True, update_modified=False)
+ frappe.get_doc("Sales Invoice", d.sales_invoice).set_status(
+ update=True, update_modified=False
+ )
else:
self.status = "Draft"
if self.docstatus == 1:
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js
index 4895efcd4cc..0b08e393de2 100644
--- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js
@@ -1,21 +1,16 @@
-frappe.listview_settings['Invoice Discounting'] = {
+frappe.listview_settings["Invoice Discounting"] = {
add_fields: ["status"],
- get_indicator: function(doc)
- {
- if(doc.status == "Draft") {
+ get_indicator: function (doc) {
+ if (doc.status == "Draft") {
return [__("Draft"), "red", "status,=,Draft"];
- }
- else if(doc.status == "Sanctioned") {
+ } else if (doc.status == "Sanctioned") {
return [__("Sanctioned"), "green", "status,=,Sanctioned"];
- }
- else if(doc.status == "Disbursed") {
+ } else if (doc.status == "Disbursed") {
return [__("Disbursed"), "blue", "status,=,Disbursed"];
- }
- else if(doc.status == "Settled") {
+ } else if (doc.status == "Settled") {
return [__("Settled"), "orange", "status,=,Settled"];
- }
- else if(doc.status == "Canceled") {
+ } else if (doc.status == "Canceled") {
return [__("Canceled"), "red", "status,=,Canceled"];
}
- }
+ },
};
diff --git a/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py
index a85fdfcad7f..01050c058e8 100644
--- a/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py
+++ b/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py
@@ -75,8 +75,8 @@ class TestInvoiceDiscounting(unittest.TestCase):
gle = get_gl_entries("Invoice Discounting", inv_disc.name)
expected_gle = {inv.debit_to: [0.0, 200], self.ar_credit: [200, 0.0]}
- for i, gle in enumerate(gle):
- self.assertEqual([gle.debit, gle.credit], expected_gle.get(gle.account))
+ for _i, gle_value in enumerate(gle):
+ self.assertEqual([gle_value.debit, gle_value.credit], expected_gle.get(gle_value.account))
def test_loan_on_submit(self):
inv = create_sales_invoice(rate=300)
@@ -92,9 +92,7 @@ class TestInvoiceDiscounting(unittest.TestCase):
period=60,
)
self.assertEqual(inv_disc.status, "Sanctioned")
- self.assertEqual(
- inv_disc.loan_end_date, add_days(inv_disc.loan_start_date, inv_disc.loan_period)
- )
+ self.assertEqual(inv_disc.loan_end_date, add_days(inv_disc.loan_start_date, inv_disc.loan_period))
def test_on_disbursed(self):
inv = create_sales_invoice(rate=500)
@@ -262,13 +260,9 @@ class TestInvoiceDiscounting(unittest.TestCase):
je_on_payment.submit()
self.assertEqual(je_on_payment.accounts[0].account, self.ar_discounted)
- self.assertEqual(
- je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount)
- )
+ self.assertEqual(je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount))
self.assertEqual(je_on_payment.accounts[1].account, self.bank_account)
- self.assertEqual(
- je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount)
- )
+ self.assertEqual(je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount))
inv.reload()
self.assertEqual(inv.outstanding_amount, 0)
@@ -304,13 +298,9 @@ class TestInvoiceDiscounting(unittest.TestCase):
je_on_payment.submit()
self.assertEqual(je_on_payment.accounts[0].account, self.ar_unpaid)
- self.assertEqual(
- je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount)
- )
+ self.assertEqual(je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount))
self.assertEqual(je_on_payment.accounts[1].account, self.bank_account)
- self.assertEqual(
- je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount)
- )
+ self.assertEqual(je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount))
inv.reload()
self.assertEqual(inv.outstanding_amount, 0)
diff --git a/erpnext/accounts/doctype/item_tax_template/item_tax_template.js b/erpnext/accounts/doctype/item_tax_template/item_tax_template.js
index e921a0d949d..b608ccd3568 100644
--- a/erpnext/accounts/doctype/item_tax_template/item_tax_template.js
+++ b/erpnext/accounts/doctype/item_tax_template/item_tax_template.js
@@ -1,27 +1,49 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Item Tax Template', {
- setup: function(frm) {
- frm.set_query("tax_type", "taxes", function(doc) {
+frappe.ui.form.on("Item Tax Template", {
+ setup: function (frm) {
+ frm.set_query("tax_type", "taxes", function (doc) {
return {
filters: [
- ['Account', 'company', '=', frm.doc.company],
- ['Account', 'is_group', '=', 0],
- ['Account', 'account_type', 'in', ['Tax', 'Chargeable', 'Income Account', 'Expense Account', 'Expenses Included In Valuation']]
- ]
- }
+ ["Account", "company", "=", frm.doc.company],
+ ["Account", "is_group", "=", 0],
+ [
+ "Account",
+ "account_type",
+ "in",
+ [
+ "Tax",
+ "Chargeable",
+ "Income Account",
+ "Expense Account",
+ "Expenses Included In Valuation",
+ ],
+ ],
+ ],
+ };
});
},
company: function (frm) {
- frm.set_query("tax_type", "taxes", function(doc) {
+ frm.set_query("tax_type", "taxes", function (doc) {
return {
filters: [
- ['Account', 'company', '=', frm.doc.company],
- ['Account', 'is_group', '=', 0],
- ['Account', 'account_type', 'in', ['Tax', 'Chargeable', 'Income Account', 'Expense Account', 'Expenses Included In Valuation']]
- ]
- }
+ ["Account", "company", "=", frm.doc.company],
+ ["Account", "is_group", "=", 0],
+ [
+ "Account",
+ "account_type",
+ "in",
+ [
+ "Tax",
+ "Chargeable",
+ "Income Account",
+ "Expense Account",
+ "Expenses Included In Valuation",
+ ],
+ ],
+ ],
+ };
});
- }
+ },
});
diff --git a/erpnext/accounts/doctype/item_tax_template/item_tax_template.py b/erpnext/accounts/doctype/item_tax_template/item_tax_template.py
index 23f36ec6d8d..755ff490885 100644
--- a/erpnext/accounts/doctype/item_tax_template/item_tax_template.py
+++ b/erpnext/accounts/doctype/item_tax_template/item_tax_template.py
@@ -14,7 +14,7 @@ class ItemTaxTemplate(Document):
def autoname(self):
if self.company and self.title:
abbr = frappe.get_cached_value("Company", self.company, "abbr")
- self.name = "{0} - {1}".format(self.title, abbr)
+ self.name = f"{self.title} - {abbr}"
def validate_tax_accounts(self):
"""Check whether Tax Rate is not entered twice for same Tax Type"""
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index c59643280e8..cda0adc7257 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -4,39 +4,57 @@
frappe.provide("erpnext.accounts");
frappe.provide("erpnext.journal_entry");
-
frappe.ui.form.on("Journal Entry", {
- setup: function(frm) {
+ setup: function (frm) {
frm.add_fetch("bank_account", "account", "account");
- frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', "Repost Payment Ledger", 'Asset', 'Asset Movement', "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries"];
+ frm.ignore_doctypes_on_cancel_all = [
+ "Sales Invoice",
+ "Purchase Invoice",
+ "Journal Entry",
+ "Repost Payment Ledger",
+ "Asset",
+ "Asset Movement",
+ "Repost Accounting Ledger",
+ "Unreconcile Payment",
+ "Unreconcile Payment Entries",
+ "Bank Transaction",
+ ];
},
- refresh: function(frm) {
+ refresh: function (frm) {
erpnext.toggle_naming_series();
- if(frm.doc.docstatus > 0) {
- frm.add_custom_button(__('Ledger'), function() {
- frappe.route_options = {
- "voucher_no": frm.doc.name,
- "from_date": frm.doc.posting_date,
- "to_date": moment(frm.doc.modified).format('YYYY-MM-DD'),
- "company": frm.doc.company,
- "finance_book": frm.doc.finance_book,
- "group_by": '',
- "show_cancelled_entries": frm.doc.docstatus === 2
- };
- frappe.set_route("query-report", "General Ledger");
- }, __('View'));
+ if (frm.doc.docstatus > 0) {
+ frm.add_custom_button(
+ __("Ledger"),
+ function () {
+ frappe.route_options = {
+ voucher_no: frm.doc.name,
+ from_date: frm.doc.posting_date,
+ to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
+ company: frm.doc.company,
+ finance_book: frm.doc.finance_book,
+ group_by: "",
+ show_cancelled_entries: frm.doc.docstatus === 2,
+ };
+ frappe.set_route("query-report", "General Ledger");
+ },
+ __("View")
+ );
}
- if(frm.doc.docstatus==1) {
- frm.add_custom_button(__('Reverse Journal Entry'), function() {
- return erpnext.journal_entry.reverse_journal_entry(frm);
- }, __('Actions'));
+ if (frm.doc.docstatus == 1) {
+ frm.add_custom_button(
+ __("Reverse Journal Entry"),
+ function () {
+ return erpnext.journal_entry.reverse_journal_entry(frm);
+ },
+ __("Actions")
+ );
}
if (frm.doc.__islocal) {
- frm.add_custom_button(__('Quick Entry'), function() {
+ frm.add_custom_button(__("Quick Entry"), function () {
return erpnext.journal_entry.quick_entry(frm);
});
}
@@ -44,52 +62,63 @@ frappe.ui.form.on("Journal Entry", {
// hide /unhide fields based on currency
erpnext.journal_entry.toggle_fields_based_on_currency(frm);
- if ((frm.doc.voucher_type == "Inter Company Journal Entry") && (frm.doc.docstatus == 1) && (!frm.doc.inter_company_journal_entry_reference)) {
- frm.add_custom_button(__("Create Inter Company Journal Entry"),
- function() {
+ if (
+ frm.doc.voucher_type == "Inter Company Journal Entry" &&
+ frm.doc.docstatus == 1 &&
+ !frm.doc.inter_company_journal_entry_reference
+ ) {
+ frm.add_custom_button(
+ __("Create Inter Company Journal Entry"),
+ function () {
frm.trigger("make_inter_company_journal_entry");
- }, __('Make'));
+ },
+ __("Make")
+ );
}
erpnext.accounts.unreconcile_payment.add_unreconcile_btn(frm);
},
- before_save: function(frm) {
- if ((frm.doc.docstatus == 0) && (!frm.doc.is_system_generated)) {
- let payment_entry_references = frm.doc.accounts.filter(elem => (elem.reference_type == "Payment Entry"));
+ before_save: function (frm) {
+ if (frm.doc.docstatus == 0 && !frm.doc.is_system_generated) {
+ let payment_entry_references = frm.doc.accounts.filter(
+ (elem) => elem.reference_type == "Payment Entry"
+ );
if (payment_entry_references.length > 0) {
- let rows = payment_entry_references.map(x => "#"+x.idx);
- frappe.throw(__("Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually.", [frappe.utils.comma_and(rows)]));
+ let rows = payment_entry_references.map((x) => "#" + x.idx);
+ frappe.throw(
+ __("Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually.", [
+ frappe.utils.comma_and(rows),
+ ])
+ );
}
}
},
- make_inter_company_journal_entry: function(frm) {
+ make_inter_company_journal_entry: function (frm) {
var d = new frappe.ui.Dialog({
title: __("Select Company"),
fields: [
{
- 'fieldname': 'company',
- 'fieldtype': 'Link',
- 'label': __('Company'),
- 'options': 'Company',
- "get_query": function () {
+ fieldname: "company",
+ fieldtype: "Link",
+ label: __("Company"),
+ options: "Company",
+ get_query: function () {
return {
- filters: [
- ["Company", "name", "!=", frm.doc.company]
- ]
+ filters: [["Company", "name", "!=", frm.doc.company]],
};
},
- 'reqd': 1
- }
+ reqd: 1,
+ },
],
});
- d.set_primary_action(__('Create'), function() {
+ d.set_primary_action(__("Create"), function () {
d.hide();
var args = d.get_values();
frappe.call({
args: {
- "name": frm.doc.name,
- "voucher_type": frm.doc.voucher_type,
- "company": args.company
+ name: frm.doc.name,
+ voucher_type: frm.doc.voucher_type,
+ company: args.company,
},
method: "erpnext.accounts.doctype.journal_entry.journal_entry.make_inter_company_journal_entry",
callback: function (r) {
@@ -97,103 +126,106 @@ frappe.ui.form.on("Journal Entry", {
var doc = frappe.model.sync(r.message)[0];
frappe.set_route("Form", doc.doctype, doc.name);
}
- }
+ },
});
});
d.show();
},
- multi_currency: function(frm) {
+ multi_currency: function (frm) {
erpnext.journal_entry.toggle_fields_based_on_currency(frm);
},
- posting_date: function(frm) {
- if(!frm.doc.multi_currency || !frm.doc.posting_date) return;
+ posting_date: function (frm) {
+ if (!frm.doc.multi_currency || !frm.doc.posting_date) return;
- $.each(frm.doc.accounts || [], function(i, row) {
+ $.each(frm.doc.accounts || [], function (i, row) {
erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name);
- })
+ });
},
- company: function(frm) {
+ company: function (frm) {
frappe.call({
method: "frappe.client.get_value",
args: {
doctype: "Company",
- filters: {"name": frm.doc.company},
- fieldname: "cost_center"
+ filters: { name: frm.doc.company },
+ fieldname: "cost_center",
},
- callback: function(r){
- if(r.message){
- $.each(frm.doc.accounts || [], function(i, jvd) {
+ callback: function (r) {
+ if (r.message) {
+ $.each(frm.doc.accounts || [], function (i, jvd) {
frappe.model.set_value(jvd.doctype, jvd.name, "cost_center", r.message.cost_center);
});
}
- }
+ },
});
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
},
- voucher_type: function(frm){
+ voucher_type: function (frm) {
+ if (!frm.doc.company) return null;
- if(!frm.doc.company) return null;
-
- if((!(frm.doc.accounts || []).length) || ((frm.doc.accounts || []).length === 1 && !frm.doc.accounts[0].account)) {
- if(in_list(["Bank Entry", "Cash Entry"], frm.doc.voucher_type)) {
+ if (
+ !(frm.doc.accounts || []).length ||
+ ((frm.doc.accounts || []).length === 1 && !frm.doc.accounts[0].account)
+ ) {
+ if (in_list(["Bank Entry", "Cash Entry"], frm.doc.voucher_type)) {
return frappe.call({
type: "GET",
method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
args: {
- "account_type": (frm.doc.voucher_type=="Bank Entry" ?
- "Bank" : (frm.doc.voucher_type=="Cash Entry" ? "Cash" : null)),
- "company": frm.doc.company
+ account_type:
+ frm.doc.voucher_type == "Bank Entry"
+ ? "Bank"
+ : frm.doc.voucher_type == "Cash Entry"
+ ? "Cash"
+ : null,
+ company: frm.doc.company,
},
- callback: function(r) {
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
// If default company bank account not set
- if(!$.isEmptyObject(r.message)){
+ if (!$.isEmptyObject(r.message)) {
update_jv_details(frm.doc, [r.message]);
}
}
- }
+ },
});
}
}
},
- from_template: function(frm){
- if (frm.doc.from_template){
- frappe.db.get_doc("Journal Entry Template", frm.doc.from_template)
- .then((doc) => {
- frappe.model.clear_table(frm.doc, "accounts");
- frm.set_value({
- "company": doc.company,
- "voucher_type": doc.voucher_type,
- "naming_series": doc.naming_series,
- "is_opening": doc.is_opening,
- "multi_currency": doc.multi_currency
- })
- update_jv_details(frm.doc, doc.accounts);
+ from_template: function (frm) {
+ if (frm.doc.from_template) {
+ frappe.db.get_doc("Journal Entry Template", frm.doc.from_template).then((doc) => {
+ frappe.model.clear_table(frm.doc, "accounts");
+ frm.set_value({
+ company: doc.company,
+ voucher_type: doc.voucher_type,
+ naming_series: doc.naming_series,
+ is_opening: doc.is_opening,
+ multi_currency: doc.multi_currency,
});
+ update_jv_details(frm.doc, doc.accounts);
+ });
}
- }
+ },
});
-var update_jv_details = function(doc, r) {
- $.each(r, function(i, d) {
+var update_jv_details = function (doc, r) {
+ $.each(r, function (i, d) {
var row = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
- frappe.model.set_value(row.doctype, row.name, "account", d.account)
- frappe.model.set_value(row.doctype, row.name, "balance", d.balance)
+ frappe.model.set_value(row.doctype, row.name, "account", d.account);
});
refresh_field("accounts");
-}
+};
erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Controller {
onload() {
this.load_defaults();
this.setup_queries();
- this.setup_balance_formatter();
erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
}
@@ -203,69 +235,67 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
load_defaults() {
//this.frm.show_print_first = true;
- if(this.frm.doc.__islocal && this.frm.doc.company) {
+ if (this.frm.doc.__islocal && this.frm.doc.company) {
frappe.model.set_default_values(this.frm.doc);
- $.each(this.frm.doc.accounts || [], function(i, jvd) {
+ $.each(this.frm.doc.accounts || [], function (i, jvd) {
frappe.model.set_default_values(jvd);
});
var posting_date = this.frm.doc.posting_date;
- if(!this.frm.doc.amended_from) this.frm.set_value('posting_date', posting_date || frappe.datetime.get_today());
+ if (!this.frm.doc.amended_from)
+ this.frm.set_value("posting_date", posting_date || frappe.datetime.get_today());
}
}
setup_queries() {
var me = this;
- me.frm.set_query("account", "accounts", function(doc, cdt, cdn) {
+ me.frm.set_query("account", "accounts", function (doc, cdt, cdn) {
return erpnext.journal_entry.account_query(me.frm);
});
- me.frm.set_query("party_type", "accounts", function(doc, cdt, cdn) {
+ me.frm.set_query("party_type", "accounts", function (doc, cdt, cdn) {
const row = locals[cdt][cdn];
return {
query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
filters: {
- 'account': row.account
- }
- }
+ account: row.account,
+ },
+ };
});
- me.frm.set_query("reference_name", "accounts", function(doc, cdt, cdn) {
+ me.frm.set_query("reference_name", "accounts", function (doc, cdt, cdn) {
var jvd = frappe.get_doc(cdt, cdn);
// journal entry
- if(jvd.reference_type==="Journal Entry") {
+ if (jvd.reference_type === "Journal Entry") {
frappe.model.validate_missing(jvd, "account");
return {
query: "erpnext.accounts.doctype.journal_entry.journal_entry.get_against_jv",
filters: {
account: jvd.account,
- party: jvd.party
- }
+ party: jvd.party,
+ },
};
}
var out = {
- filters: [
- [jvd.reference_type, "docstatus", "=", 1]
- ]
+ filters: [[jvd.reference_type, "docstatus", "=", 1]],
};
- if(in_list(["Sales Invoice", "Purchase Invoice"], jvd.reference_type)) {
+ if (in_list(["Sales Invoice", "Purchase Invoice"], jvd.reference_type)) {
out.filters.push([jvd.reference_type, "outstanding_amount", "!=", 0]);
// Filter by cost center
- if(jvd.cost_center) {
+ if (jvd.cost_center) {
out.filters.push([jvd.reference_type, "cost_center", "in", ["", jvd.cost_center]]);
}
// account filter
frappe.model.validate_missing(jvd, "account");
- var party_account_field = jvd.reference_type==="Sales Invoice" ? "debit_to": "credit_to";
+ var party_account_field = jvd.reference_type === "Sales Invoice" ? "debit_to" : "credit_to";
out.filters.push([jvd.reference_type, party_account_field, "=", jvd.account]);
-
}
- if(in_list(["Sales Order", "Purchase Order"], jvd.reference_type)) {
+ if (in_list(["Sales Order", "Purchase Order"], jvd.reference_type)) {
// party_type and party mandatory
frappe.model.validate_missing(jvd, "party_type");
frappe.model.validate_missing(jvd, "party");
@@ -273,11 +303,11 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
out.filters.push([jvd.reference_type, "per_billed", "<", 100]);
}
- if(jvd.party_type && jvd.party) {
+ if (jvd.party_type && jvd.party) {
var party_field = "";
- if(jvd.reference_type.indexOf("Sales")===0) {
+ if (jvd.reference_type.indexOf("Sales") === 0) {
var party_field = "customer";
- } else if (jvd.reference_type.indexOf("Purchase")===0) {
+ } else if (jvd.reference_type.indexOf("Purchase") === 0) {
var party_field = "supplier";
}
@@ -288,64 +318,49 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
return out;
});
-
-
- }
-
- setup_balance_formatter() {
- const formatter = function(value, df, options, doc) {
- var currency = frappe.meta.get_field_currency(df, doc);
- var dr_or_cr = value ? ('') : "";
- return "
-
+
""" % {
- "starting_position_from_top_edge": doc.starting_position_from_top_edge
+
+
- %(message_to_show)s
+ {message_to_show}
-
- {{ frappe.utils.formatdate(doc.reference_date) or '' }}
+ {{{{ frappe.utils.formatdate(doc.reference_date) or '' }}}}
-
- {{ doc.account_no or '' }}
+ {{{{ doc.account_no or '' }}}}
-
- {{doc.party_name}}
+ {{{{doc.party_name}}}}
-
- {{frappe.utils.money_in_words(doc.base_paid_amount or doc.base_received_amount)}}
+
+ {{{{frappe.utils.money_in_words(doc.base_paid_amount or doc.base_received_amount)}}}}
-
- {{doc.get_formatted("base_paid_amount") or doc.get_formatted("base_received_amount")}}
+ {{{{doc.get_formatted("base_paid_amount") or doc.get_formatted("base_received_amount")}}}}
-
- {{doc.company}}
+ {{{{doc.company}}}}
-"
- + ((value==null || value==="") ? "" : format_currency(Math.abs(value), currency))
- + " " + dr_or_cr
- + "
";
- };
- this.frm.fields_dict.accounts.grid.update_docfield_property('balance', 'formatter', formatter);
- this.frm.fields_dict.accounts.grid.update_docfield_property('party_balance', 'formatter', formatter);
}
reference_name(doc, cdt, cdn) {
var d = frappe.get_doc(cdt, cdn);
- if(d.reference_name) {
- if (d.reference_type==="Purchase Invoice" && !flt(d.debit)) {
- this.get_outstanding('Purchase Invoice', d.reference_name, doc.company, d);
- } else if (d.reference_type==="Sales Invoice" && !flt(d.credit)) {
- this.get_outstanding('Sales Invoice', d.reference_name, doc.company, d);
- } else if (d.reference_type==="Journal Entry" && !flt(d.credit) && !flt(d.debit)) {
- this.get_outstanding('Journal Entry', d.reference_name, doc.company, d);
+ if (d.reference_name) {
+ if (d.reference_type === "Purchase Invoice" && !flt(d.debit)) {
+ this.get_outstanding("Purchase Invoice", d.reference_name, doc.company, d);
+ } else if (d.reference_type === "Sales Invoice" && !flt(d.credit)) {
+ this.get_outstanding("Sales Invoice", d.reference_name, doc.company, d);
+ } else if (d.reference_type === "Journal Entry" && !flt(d.credit) && !flt(d.debit)) {
+ this.get_outstanding("Journal Entry", d.reference_name, doc.company, d);
}
}
}
get_outstanding(doctype, docname, company, child) {
var args = {
- "doctype": doctype,
- "docname": docname,
- "party": child.party,
- "account": child.account,
- "account_currency": child.account_currency,
- "company": company
- }
+ doctype: doctype,
+ docname: docname,
+ party: child.party,
+ account: child.account,
+ account_currency: child.account_currency,
+ company: company,
+ };
return frappe.call({
method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_outstanding",
- args: { args: args},
- callback: function(r) {
- if(r.message) {
- $.each(r.message, function(field, value) {
+ args: { args: args },
+ callback: function (r) {
+ if (r.message) {
+ $.each(r.message, function (field, value) {
frappe.model.set_value(child.doctype, child.name, field, value);
- })
+ });
}
- }
+ },
});
}
accounts_add(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
- $.each(doc.accounts, function(i, d) {
- if(d.account && d.party && d.party_type) {
+ $.each(doc.accounts, function (i, d) {
+ if (d.account && d.party && d.party_type) {
row.account = d.account;
row.party = d.party;
row.party_type = d.party_type;
@@ -353,8 +368,8 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
});
// set difference
- if(doc.difference) {
- if(doc.difference > 0) {
+ if (doc.difference) {
+ if (doc.difference > 0) {
row.credit_in_account_currency = doc.difference;
row.credit = doc.difference;
} else {
@@ -364,132 +379,144 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
}
cur_frm.cscript.update_totals(doc);
- erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, 'accounts');
+ erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, "accounts");
}
-
};
cur_frm.script_manager.make(erpnext.accounts.JournalEntry);
-cur_frm.cscript.update_totals = function(doc) {
- var td=0.0; var tc =0.0;
+cur_frm.cscript.update_totals = function (doc) {
+ var td = 0.0;
+ var tc = 0.0;
var accounts = doc.accounts || [];
- for(var i in accounts) {
+ for (var i in accounts) {
td += flt(accounts[i].debit, precision("debit", accounts[i]));
tc += flt(accounts[i].credit, precision("credit", accounts[i]));
}
var doc = locals[doc.doctype][doc.name];
doc.total_debit = td;
doc.total_credit = tc;
- doc.difference = flt((td - tc), precision("difference"));
- refresh_many(['total_debit','total_credit','difference']);
-}
+ doc.difference = flt(td - tc, precision("difference"));
+ refresh_many(["total_debit", "total_credit", "difference"]);
+};
-cur_frm.cscript.get_balance = function(doc,dt,dn) {
+cur_frm.cscript.get_balance = function (doc, dt, dn) {
cur_frm.cscript.update_totals(doc);
- cur_frm.call('get_balance', null, () => { cur_frm.refresh(); });
-}
+ cur_frm.call("get_balance", null, () => {
+ cur_frm.refresh();
+ });
+};
-cur_frm.cscript.validate = function(doc,cdt,cdn) {
+cur_frm.cscript.validate = function (doc, cdt, cdn) {
cur_frm.cscript.update_totals(doc);
-}
+};
frappe.ui.form.on("Journal Entry Account", {
- party: function(frm, cdt, cdn) {
+ party: function (frm, cdt, cdn) {
var d = frappe.get_doc(cdt, cdn);
- if(!d.account && d.party_type && d.party) {
- if(!frm.doc.company) frappe.throw(__("Please select Company"));
+ if (!d.account && d.party_type && d.party) {
+ if (!frm.doc.company) frappe.throw(__("Please select Company"));
return frm.call({
- method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_party_account_and_balance",
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_party_account_and_currency",
child: d,
args: {
company: frm.doc.company,
party_type: d.party_type,
party: d.party,
- cost_center: d.cost_center
- }
+ },
});
}
},
- cost_center: function(frm, dt, dn) {
- erpnext.journal_entry.set_account_balance(frm, dt, dn);
+ cost_center: function (frm, dt, dn) {
+ // Don't reset for Gain/Loss type journals, as it will make Debit and Credit values '0'
+ if (frm.doc.voucher_type != "Exchange Gain Or Loss") {
+ erpnext.journal_entry.set_account_details(frm, dt, dn);
+ }
},
- account: function(frm, dt, dn) {
- erpnext.journal_entry.set_account_balance(frm, dt, dn);
+ account: function (frm, dt, dn) {
+ erpnext.journal_entry.set_account_details(frm, dt, dn);
},
- debit_in_account_currency: function(frm, cdt, cdn) {
+ debit_in_account_currency: function (frm, cdt, cdn) {
erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
},
- credit_in_account_currency: function(frm, cdt, cdn) {
+ credit_in_account_currency: function (frm, cdt, cdn) {
erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
},
- debit: function(frm, dt, dn) {
+ debit: function (frm, dt, dn) {
cur_frm.cscript.update_totals(frm.doc);
},
- credit: function(frm, dt, dn) {
+ credit: function (frm, dt, dn) {
cur_frm.cscript.update_totals(frm.doc);
},
- exchange_rate: function(frm, cdt, cdn) {
+ exchange_rate: function (frm, cdt, cdn) {
var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
var row = locals[cdt][cdn];
- if(row.account_currency == company_currency || !frm.doc.multi_currency) {
+ if (row.account_currency == company_currency || !frm.doc.multi_currency) {
frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
}
erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
- }
-})
+ },
+});
-frappe.ui.form.on("Journal Entry Account", "accounts_remove", function(frm) {
+frappe.ui.form.on("Journal Entry Account", "accounts_remove", function (frm) {
cur_frm.cscript.update_totals(frm.doc);
});
$.extend(erpnext.journal_entry, {
- toggle_fields_based_on_currency: function(frm) {
+ toggle_fields_based_on_currency: function (frm) {
var fields = ["currency_section", "account_currency", "exchange_rate", "debit", "credit"];
var grid = frm.get_field("accounts").grid;
- if(grid) grid.set_column_disp(fields, frm.doc.multi_currency);
+ if (grid) grid.set_column_disp(fields, frm.doc.multi_currency);
// dynamic label
var field_label_map = {
- "debit_in_account_currency": "Debit",
- "credit_in_account_currency": "Credit"
+ debit_in_account_currency: "Debit",
+ credit_in_account_currency: "Credit",
};
$.each(field_label_map, function (fieldname, label) {
frm.fields_dict.accounts.grid.update_docfield_property(
fieldname,
- 'label',
- frm.doc.multi_currency ? (label + " in Account Currency") : label
+ "label",
+ frm.doc.multi_currency ? label + " in Account Currency" : label
);
- })
+ });
},
- set_debit_credit_in_company_currency: function(frm, cdt, cdn) {
+ set_debit_credit_in_company_currency: function (frm, cdt, cdn) {
var row = locals[cdt][cdn];
- frappe.model.set_value(cdt, cdn, "debit",
- flt(flt(row.debit_in_account_currency)*row.exchange_rate, precision("debit", row)));
+ frappe.model.set_value(
+ cdt,
+ cdn,
+ "debit",
+ flt(flt(row.debit_in_account_currency) * row.exchange_rate, precision("debit", row))
+ );
- frappe.model.set_value(cdt, cdn, "credit",
- flt(flt(row.credit_in_account_currency)*row.exchange_rate, precision("credit", row)));
+ frappe.model.set_value(
+ cdt,
+ cdn,
+ "credit",
+ flt(flt(row.credit_in_account_currency) * row.exchange_rate, precision("credit", row))
+ );
cur_frm.cscript.update_totals(frm.doc);
},
- set_exchange_rate: function(frm, cdt, cdn) {
+ set_exchange_rate: function (frm, cdt, cdn) {
var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
var row = locals[cdt][cdn];
- if(row.account_currency == company_currency || !frm.doc.multi_currency) {
+ if (row.account_currency == company_currency || !frm.doc.multi_currency) {
row.exchange_rate = 1;
erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
} else if (!row.exchange_rate || row.exchange_rate == 1 || row.account_type == "Bank") {
@@ -504,50 +531,70 @@ $.extend(erpnext.journal_entry, {
reference_name: cstr(row.reference_name),
debit: flt(row.debit_in_account_currency),
credit: flt(row.credit_in_account_currency),
- exchange_rate: row.exchange_rate
+ exchange_rate: row.exchange_rate,
},
- callback: function(r) {
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
row.exchange_rate = r.message;
erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
}
- }
- })
+ },
+ });
} else {
erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
}
refresh_field("exchange_rate", cdn, "accounts");
},
- quick_entry: function(frm) {
+ quick_entry: function (frm) {
var naming_series_options = frm.fields_dict.naming_series.df.options;
- var naming_series_default = frm.fields_dict.naming_series.df.default || naming_series_options.split("\n")[0];
+ var naming_series_default =
+ frm.fields_dict.naming_series.df.default || naming_series_options.split("\n")[0];
var dialog = new frappe.ui.Dialog({
title: __("Quick Journal Entry"),
fields: [
- {fieldtype: "Currency", fieldname: "debit", label: __("Amount"), reqd: 1},
- {fieldtype: "Link", fieldname: "debit_account", label: __("Debit Account"), reqd: 1,
+ { fieldtype: "Currency", fieldname: "debit", label: __("Amount"), reqd: 1 },
+ {
+ fieldtype: "Link",
+ fieldname: "debit_account",
+ label: __("Debit Account"),
+ reqd: 1,
options: "Account",
- get_query: function() {
+ get_query: function () {
return erpnext.journal_entry.account_query(frm);
- }
+ },
},
- {fieldtype: "Link", fieldname: "credit_account", label: __("Credit Account"), reqd: 1,
+ {
+ fieldtype: "Link",
+ fieldname: "credit_account",
+ label: __("Credit Account"),
+ reqd: 1,
options: "Account",
- get_query: function() {
+ get_query: function () {
return erpnext.journal_entry.account_query(frm);
- }
+ },
},
- {fieldtype: "Date", fieldname: "posting_date", label: __("Date"), reqd: 1,
- default: frm.doc.posting_date},
- {fieldtype: "Small Text", fieldname: "user_remark", label: __("User Remark")},
- {fieldtype: "Select", fieldname: "naming_series", label: __("Series"), reqd: 1,
- options: naming_series_options, default: naming_series_default},
- ]
+ {
+ fieldtype: "Date",
+ fieldname: "posting_date",
+ label: __("Date"),
+ reqd: 1,
+ default: frm.doc.posting_date,
+ },
+ { fieldtype: "Small Text", fieldname: "user_remark", label: __("User Remark") },
+ {
+ fieldtype: "Select",
+ fieldname: "naming_series",
+ label: __("Series"),
+ reqd: 1,
+ options: naming_series_options,
+ default: naming_series_default,
+ },
+ ],
});
- dialog.set_primary_action(__("Save"), function() {
+ dialog.set_primary_action(__("Save"), function () {
var btn = this;
var values = dialog.get_values();
@@ -564,11 +611,21 @@ $.extend(erpnext.journal_entry, {
var debit_row = frm.fields_dict.accounts.grid.add_new_row();
frappe.model.set_value(debit_row.doctype, debit_row.name, "account", values.debit_account);
- frappe.model.set_value(debit_row.doctype, debit_row.name, "debit_in_account_currency", values.debit);
+ frappe.model.set_value(
+ debit_row.doctype,
+ debit_row.name,
+ "debit_in_account_currency",
+ values.debit
+ );
var credit_row = frm.fields_dict.accounts.grid.add_new_row();
frappe.model.set_value(credit_row.doctype, credit_row.name, "account", values.credit_account);
- frappe.model.set_value(credit_row.doctype, credit_row.name, "credit_in_account_currency", values.debit);
+ frappe.model.set_value(
+ credit_row.doctype,
+ credit_row.name,
+ "credit_in_account_currency",
+ values.debit
+ );
frm.save();
@@ -578,36 +635,36 @@ $.extend(erpnext.journal_entry, {
dialog.show();
},
- account_query: function(frm) {
+ account_query: function (frm) {
var filters = {
company: frm.doc.company,
- is_group: 0
+ is_group: 0,
};
- if(!frm.doc.multi_currency) {
+ if (!frm.doc.multi_currency) {
$.extend(filters, {
- account_currency: frappe.get_doc(":Company", frm.doc.company).default_currency
+ account_currency: frappe.get_doc(":Company", frm.doc.company).default_currency,
});
}
return { filters: filters };
},
- reverse_journal_entry: function() {
+ reverse_journal_entry: function () {
frappe.model.open_mapped_doc({
method: "erpnext.accounts.doctype.journal_entry.journal_entry.make_reverse_journal_entry",
- frm: cur_frm
- })
+ frm: cur_frm,
+ });
},
});
$.extend(erpnext.journal_entry, {
- set_account_balance: function(frm, dt, dn) {
+ set_account_details: function (frm, dt, dn) {
var d = locals[dt][dn];
- if(d.account) {
- if(!frm.doc.company) frappe.throw(__("Please select Company first"));
- if(!frm.doc.posting_date) frappe.throw(__("Please select Posting Date first"));
+ if (d.account) {
+ if (!frm.doc.company) frappe.throw(__("Please select Company first"));
+ if (!frm.doc.posting_date) frappe.throw(__("Please select Posting Date first"));
return frappe.call({
- method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_account_balance_and_party_type",
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_account_details_and_party_type",
args: {
account: d.account,
date: frm.doc.posting_date,
@@ -615,15 +672,14 @@ $.extend(erpnext.journal_entry, {
debit: flt(d.debit_in_account_currency),
credit: flt(d.credit_in_account_currency),
exchange_rate: d.exchange_rate,
- cost_center: d.cost_center
},
- callback: function(r) {
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
$.extend(d, r.message);
erpnext.journal_entry.set_debit_credit_in_company_currency(frm, dt, dn);
- refresh_field('accounts');
+ refresh_field("accounts");
}
- }
+ },
});
}
},
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 82a9c0f1524..b4fb13e42c3 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -33,7 +33,7 @@ class StockAccountInvalidTransaction(frappe.ValidationError):
class JournalEntry(AccountsController):
def __init__(self, *args, **kwargs):
- super(JournalEntry, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
def get_feed(self):
return self.voucher_type
@@ -68,7 +68,6 @@ class JournalEntry(AccountsController):
self.set_print_format_fields()
self.validate_credit_debit_note()
self.validate_empty_accounts_table()
- self.set_account_and_party_balance()
self.validate_inter_company_accounts()
self.validate_depr_entry_voucher_type()
@@ -78,6 +77,20 @@ class JournalEntry(AccountsController):
if not self.title:
self.title = self.get_title()
+ def submit(self):
+ if len(self.accounts) > 100:
+ msgprint(_("The task has been enqueued as a background job."), alert=True)
+ self.queue_action("submit", timeout=4600)
+ else:
+ return self._submit()
+
+ def cancel(self):
+ if len(self.accounts) > 100:
+ msgprint(_("The task has been enqueued as a background job."), alert=True)
+ self.queue_action("cancel", timeout=4600)
+ else:
+ return self._cancel()
+
def on_submit(self):
self.validate_cheque_info()
self.check_credit_limit()
@@ -89,7 +102,7 @@ class JournalEntry(AccountsController):
def on_cancel(self):
# References for this Journal are removed on the `on_cancel` event in accounts_controller
- super(JournalEntry, self).on_cancel()
+ super().on_cancel()
self.ignore_linked_doctypes = (
"GL Entry",
"Stock Ledger Entry",
@@ -124,10 +137,7 @@ class JournalEntry(AccountsController):
frappe.get_doc(voucher_type, voucher_no).set_total_advance_paid()
def validate_inter_company_accounts(self):
- if (
- self.voucher_type == "Inter Company Journal Entry"
- and self.inter_company_journal_entry_reference
- ):
+ if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
doc = frappe.get_doc("Journal Entry", self.inter_company_journal_entry_reference)
account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
previous_account_currency = frappe.get_cached_value("Company", doc.company, "default_currency")
@@ -273,10 +283,7 @@ class JournalEntry(AccountsController):
asset.set_status()
def update_inter_company_jv(self):
- if (
- self.voucher_type == "Inter Company Journal Entry"
- and self.inter_company_journal_entry_reference
- ):
+ if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
frappe.db.set_value(
"Journal Entry",
self.inter_company_journal_entry_reference,
@@ -304,17 +311,25 @@ class JournalEntry(AccountsController):
if d.account == inv_disc_doc.short_term_loan and d.reference_name == inv_disc:
if self.docstatus == 1:
if d.credit > 0:
- _validate_invoice_discounting_status(inv_disc, inv_disc_doc.status, "Sanctioned", d.idx)
+ _validate_invoice_discounting_status(
+ inv_disc, inv_disc_doc.status, "Sanctioned", d.idx
+ )
status = "Disbursed"
elif d.debit > 0:
- _validate_invoice_discounting_status(inv_disc, inv_disc_doc.status, "Disbursed", d.idx)
+ _validate_invoice_discounting_status(
+ inv_disc, inv_disc_doc.status, "Disbursed", d.idx
+ )
status = "Settled"
else:
if d.credit > 0:
- _validate_invoice_discounting_status(inv_disc, inv_disc_doc.status, "Disbursed", d.idx)
+ _validate_invoice_discounting_status(
+ inv_disc, inv_disc_doc.status, "Disbursed", d.idx
+ )
status = "Sanctioned"
elif d.debit > 0:
- _validate_invoice_discounting_status(inv_disc, inv_disc_doc.status, "Settled", d.idx)
+ _validate_invoice_discounting_status(
+ inv_disc, inv_disc_doc.status, "Settled", d.idx
+ )
status = "Disbursed"
break
if status:
@@ -371,10 +386,7 @@ class JournalEntry(AccountsController):
)
def unlink_inter_company_jv(self):
- if (
- self.voucher_type == "Inter Company Journal Entry"
- and self.inter_company_journal_entry_reference
- ):
+ if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
frappe.db.set_value(
"Journal Entry",
self.inter_company_journal_entry_reference,
@@ -396,9 +408,9 @@ class JournalEntry(AccountsController):
if account_type in ["Receivable", "Payable"]:
if not (d.party_type and d.party):
frappe.throw(
- _("Row {0}: Party Type and Party is required for Receivable / Payable account {1}").format(
- d.idx, d.account
- )
+ _(
+ "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
+ ).format(d.idx, d.account)
)
elif (
d.party_type
@@ -461,17 +473,30 @@ class JournalEntry(AccountsController):
elif d.party_type == "Supplier" and flt(d.credit) > 0:
frappe.throw(_("Row {0}: Advance against Supplier must be debit").format(d.idx))
+ def system_generated_gain_loss(self):
+ return (
+ self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency and self.is_system_generated
+ )
+
def validate_against_jv(self):
for d in self.get("accounts"):
if d.reference_type == "Journal Entry":
- account_root_type = frappe.db.get_value("Account", d.account, "root_type")
- if account_root_type == "Asset" and flt(d.debit) > 0:
+ account_root_type = frappe.get_cached_value("Account", d.account, "root_type")
+ if (
+ account_root_type == "Asset"
+ and flt(d.debit) > 0
+ and not self.system_generated_gain_loss()
+ ):
frappe.throw(
_(
"Row #{0}: For {1}, you can select reference document only if account gets credited"
).format(d.idx, d.account)
)
- elif account_root_type == "Liability" and flt(d.credit) > 0:
+ elif (
+ account_root_type == "Liability"
+ and flt(d.credit) > 0
+ and not self.system_generated_gain_loss()
+ ):
frappe.throw(
_(
"Row #{0}: For {1}, you can select reference document only if account gets debited"
@@ -503,7 +528,7 @@ class JournalEntry(AccountsController):
for jvd in against_entries:
if flt(jvd[dr_or_cr]) > 0:
valid = True
- if not valid:
+ if not valid and not self.system_generated_gain_loss():
frappe.throw(
_("Against Journal Entry {0} does not have any unmatched {1} entry").format(
d.reference_name, dr_or_cr
@@ -543,11 +568,13 @@ class JournalEntry(AccountsController):
if d.reference_type == "Purchase Order" and flt(d.credit) > 0:
frappe.throw(
- _("Row {0}: Credit entry can not be linked with a {1}").format(d.idx, d.reference_type)
+ _("Row {0}: Credit entry can not be linked with a {1}").format(
+ d.idx, d.reference_type
+ )
)
# set totals
- if not d.reference_name in self.reference_totals:
+ if d.reference_name not in self.reference_totals:
self.reference_totals[d.reference_name] = 0.0
if self.voucher_type not in ("Deferred Revenue", "Deferred Expense"):
@@ -565,7 +592,10 @@ class JournalEntry(AccountsController):
# check if party and account match
if d.reference_type in ("Sales Invoice", "Purchase Invoice"):
- if self.voucher_type in ("Deferred Revenue", "Deferred Expense") and d.reference_detail_no:
+ if (
+ self.voucher_type in ("Deferred Revenue", "Deferred Expense")
+ and d.reference_detail_no
+ ):
debit_or_credit = "Debit" if d.debit else "Credit"
party_account = get_deferred_booking_accounts(
d.reference_type, d.reference_detail_no, debit_or_credit
@@ -574,7 +604,8 @@ class JournalEntry(AccountsController):
else:
if d.reference_type == "Sales Invoice":
party_account = (
- get_party_account_based_on_invoice_discounting(d.reference_name) or against_voucher[1]
+ get_party_account_based_on_invoice_discounting(d.reference_name)
+ or against_voucher[1]
)
else:
party_account = against_voucher[1]
@@ -698,7 +729,9 @@ class JournalEntry(AccountsController):
if not (self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency):
if self.difference:
frappe.throw(
- _("Total Debit must be equal to Total Credit. The difference is {0}").format(self.difference)
+ _("Total Debit must be equal to Total Credit. The difference is {0}").format(
+ self.difference
+ )
)
def set_total_debit_credit(self):
@@ -762,7 +795,6 @@ class JournalEntry(AccountsController):
and self.posting_date
)
):
-
ignore_exchange_rate = False
if self.get("flags") and self.flags.get("ignore_exchange_rate"):
ignore_exchange_rate = True
@@ -1008,27 +1040,21 @@ class JournalEntry(AccountsController):
self.validate_total_debit_and_credit()
def get_values(self):
- cond = (
- " and outstanding_amount <= {0}".format(self.write_off_amount)
- if flt(self.write_off_amount) > 0
- else ""
- )
+ cond = f" and outstanding_amount <= {self.write_off_amount}" if flt(self.write_off_amount) > 0 else ""
if self.write_off_based_on == "Accounts Receivable":
return frappe.db.sql(
"""select name, debit_to as account, customer as party, outstanding_amount
- from `tabSales Invoice` where docstatus = 1 and company = %s
- and outstanding_amount > 0 %s"""
- % ("%s", cond),
+ from `tabSales Invoice` where docstatus = 1 and company = {}
+ and outstanding_amount > 0 {}""".format("%s", cond),
self.company,
as_dict=True,
)
elif self.write_off_based_on == "Accounts Payable":
return frappe.db.sql(
"""select name, credit_to as account, supplier as party, outstanding_amount
- from `tabPurchase Invoice` where docstatus = 1 and company = %s
- and outstanding_amount > 0 %s"""
- % ("%s", cond),
+ from `tabPurchase Invoice` where docstatus = 1 and company = {}
+ and outstanding_amount > 0 {}""".format("%s", cond),
self.company,
as_dict=True,
)
@@ -1051,21 +1077,6 @@ class JournalEntry(AccountsController):
if not self.get("accounts"):
frappe.throw(_("Accounts table cannot be blank."))
- def set_account_and_party_balance(self):
- account_balance = {}
- party_balance = {}
- for d in self.get("accounts"):
- if d.account not in account_balance:
- account_balance[d.account] = get_balance_on(account=d.account, date=self.posting_date)
-
- if (d.party_type, d.party) not in party_balance:
- party_balance[(d.party_type, d.party)] = get_balance_on(
- party_type=d.party_type, party=d.party, date=self.posting_date, company=self.company
- )
-
- d.account_balance = account_balance[d.account]
- d.party_balance = party_balance[(d.party_type, d.party)]
-
@frappe.whitelist()
def get_default_bank_cash_account(company, account_type=None, mode_of_payment=None, account=None):
@@ -1152,7 +1163,7 @@ def get_payment_entry_against_order(
"amount_field_bank": amount_field_bank,
"amount": amount,
"debit_in_account_currency": debit_in_account_currency,
- "remarks": "Advance Payment received against {0} {1}".format(dt, dn),
+ "remarks": f"Advance Payment received against {dt} {dn}",
"is_advance": "Yes",
"bank_account": bank_account,
"journal_entry": journal_entry,
@@ -1191,7 +1202,7 @@ def get_payment_entry_against_invoice(
"amount_field_bank": amount_field_bank,
"amount": amount if amount else abs(ref_doc.outstanding_amount),
"debit_in_account_currency": debit_in_account_currency,
- "remarks": "Payment received against {0} {1}. {2}".format(dt, dn, ref_doc.remarks),
+ "remarks": f"Payment received against {dt} {dn}. {ref_doc.remarks}",
"is_advance": "No",
"bank_account": bank_account,
"journal_entry": journal_entry,
@@ -1217,9 +1228,7 @@ def get_payment_entry(ref_doc, args):
)
je = frappe.new_doc("Journal Entry")
- je.update(
- {"voucher_type": "Bank Entry", "company": ref_doc.company, "remark": args.get("remarks")}
- )
+ je.update({"voucher_type": "Bank Entry", "company": ref_doc.company, "remark": args.get("remarks")})
party_row = je.append(
"accounts",
@@ -1231,8 +1240,6 @@ def get_payment_entry(ref_doc, args):
"account_type": frappe.db.get_value("Account", args.get("party_account"), "account_type"),
"account_currency": args.get("party_account_currency")
or get_account_currency(args.get("party_account")),
- "balance": get_balance_on(args.get("party_account")),
- "party_balance": get_balance_on(party=args.get("party"), party_type=args.get("party_type")),
"exchange_rate": exchange_rate,
args.get("amount_field_party"): args.get("amount"),
"is_advance": args.get("is_advance"),
@@ -1244,9 +1251,7 @@ def get_payment_entry(ref_doc, args):
bank_row = je.append("accounts")
# Make it bank_details
- bank_account = get_default_bank_cash_account(
- ref_doc.company, "Bank", account=args.get("bank_account")
- )
+ bank_account = get_default_bank_cash_account(ref_doc.company, "Bank", account=args.get("bank_account"))
if bank_account:
bank_row.update(bank_account)
# Modified to include the posting date for which the exchange rate is required.
@@ -1286,7 +1291,7 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
return []
return frappe.db.sql(
- """
+ f"""
SELECT jv.name, jv.posting_date, jv.user_remark
FROM `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
WHERE jv_detail.parent = jv.name
@@ -1297,16 +1302,14 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
OR jv_detail.reference_type = ''
)
AND jv.docstatus = 1
- AND jv.`{0}` LIKE %(txt)s
+ AND jv.`{searchfield}` LIKE %(txt)s
ORDER BY jv.name DESC
LIMIT %(limit)s offset %(offset)s
- """.format(
- searchfield
- ),
+ """,
dict(
account=filters.get("account"),
party=cstr(filters.get("party")),
- txt="%{0}%".format(txt),
+ txt=f"%{txt}%",
offset=start,
limit=page_len,
),
@@ -1328,19 +1331,15 @@ def get_outstanding(args):
condition = " and party=%(party)s" if args.get("party") else ""
against_jv_amount = frappe.db.sql(
- """
+ f"""
select sum(debit_in_account_currency) - sum(credit_in_account_currency)
- from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {0}
- and (reference_type is null or reference_type = '')""".format(
- condition
- ),
+ from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {condition}
+ and (reference_type is null or reference_type = '')""",
args,
)
against_jv_amount = flt(against_jv_amount[0][0]) if against_jv_amount else 0
- amount_field = (
- "credit_in_account_currency" if against_jv_amount > 0 else "debit_in_account_currency"
- )
+ amount_field = "credit_in_account_currency" if against_jv_amount > 0 else "debit_in_account_currency"
return {amount_field: abs(against_jv_amount)}
elif args.get("doctype") in ("Sales Invoice", "Purchase Invoice"):
party_type = "Customer" if args.get("doctype") == "Sales Invoice" else "Supplier"
@@ -1353,9 +1352,7 @@ def get_outstanding(args):
due_date = invoice.get("due_date")
- exchange_rate = (
- invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1
- )
+ exchange_rate = invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1
if args["doctype"] == "Sales Invoice":
amount_field = (
@@ -1380,37 +1377,26 @@ def get_outstanding(args):
@frappe.whitelist()
-def get_party_account_and_balance(company, party_type, party, cost_center=None):
+def get_party_account_and_currency(company, party_type, party):
if not frappe.has_permission("Account"):
frappe.msgprint(_("No Permission"), raise_exception=1)
account = get_party_account(party_type, party, company)
- account_balance = get_balance_on(account=account, cost_center=cost_center)
- party_balance = get_balance_on(
- party_type=party_type, party=party, company=company, cost_center=cost_center
- )
-
return {
"account": account,
- "balance": account_balance,
- "party_balance": party_balance,
- "account_currency": frappe.db.get_value("Account", account, "account_currency"),
+ "account_currency": frappe.get_cached_value("Account", account, "account_currency"),
}
@frappe.whitelist()
-def get_account_balance_and_party_type(
- account, date, company, debit=None, credit=None, exchange_rate=None, cost_center=None
-):
- """Returns dict of account balance and party type to be set in Journal Entry on selection of account."""
+def get_account_details_and_party_type(account, date, company, debit=None, credit=None, exchange_rate=None):
+ """Returns dict of account details and party type to be set in Journal Entry on selection of account."""
if not frappe.has_permission("Account"):
frappe.msgprint(_("No Permission"), raise_exception=1)
company_currency = erpnext.get_company_currency(company)
- account_details = frappe.db.get_value(
- "Account", account, ["account_type", "account_currency"], as_dict=1
- )
+ account_details = frappe.db.get_value("Account", account, ["account_type", "account_currency"], as_dict=1)
if not account_details:
return
@@ -1423,7 +1409,6 @@ def get_account_balance_and_party_type(
party_type = ""
grid_values = {
- "balance": get_balance_on(account, date, cost_center=cost_center),
"party_type": party_type,
"account_type": account_details.account_type,
"account_currency": account_details.account_currency or company_currency,
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry_list.js b/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
index 48d6115e3df..9d6e87392e5 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry_list.js
@@ -1,12 +1,12 @@
-frappe.listview_settings['Journal Entry'] = {
+frappe.listview_settings["Journal Entry"] = {
add_fields: ["voucher_type", "posting_date", "total_debit", "company", "user_remark"],
- get_indicator: function(doc) {
- if(doc.docstatus==0) {
- return [__("Draft", "red", "docstatus,=,0")]
- } else if(doc.docstatus==2) {
- return [__("Cancelled", "grey", "docstatus,=,2")]
+ get_indicator: function (doc) {
+ if (doc.docstatus == 0) {
+ return [__("Draft", "red", "docstatus,=,0")];
+ } else if (doc.docstatus == 2) {
+ return [__("Cancelled", "grey", "docstatus,=,2")];
} else {
- return [__(doc.voucher_type), "blue", "voucher_type,=," + doc.voucher_type]
+ return [__(doc.voucher_type), "blue", "voucher_type,=," + doc.voucher_type];
}
- }
+ },
};
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index e44ebc6afce..979f964b62a 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -69,10 +69,8 @@ class TestJournalEntry(unittest.TestCase):
self.assertTrue(
frappe.db.sql(
- """select name from `tabJournal Entry Account`
- where reference_type = %s and reference_name = %s and {0}=400""".format(
- dr_or_cr
- ),
+ f"""select name from `tabJournal Entry Account`
+ where reference_type = %s and reference_name = %s and {dr_or_cr}=400""",
(submitted_voucher.doctype, submitted_voucher.name),
)
)
@@ -84,9 +82,8 @@ class TestJournalEntry(unittest.TestCase):
def advance_paid_testcase(self, base_jv, test_voucher, dr_or_cr):
# Test advance paid field
advance_paid = frappe.db.sql(
- """select advance_paid from `tab%s`
- where name=%s"""
- % (test_voucher.doctype, "%s"),
+ """select advance_paid from `tab{}`
+ where name={}""".format(test_voucher.doctype, "%s"),
(test_voucher.name),
)
payment_against_order = base_jv.get("accounts")[0].get(dr_or_cr)
@@ -159,9 +156,7 @@ class TestJournalEntry(unittest.TestCase):
jv.cancel()
def test_multi_currency(self):
- jv = make_journal_entry(
- "_Test Bank USD - _TC", "_Test Bank - _TC", 100, exchange_rate=50, save=False
- )
+ jv = make_journal_entry("_Test Bank USD - _TC", "_Test Bank - _TC", 100, exchange_rate=50, save=False)
jv.get("accounts")[1].credit_in_account_currency = 5000
jv.submit()
@@ -201,7 +196,7 @@ class TestJournalEntry(unittest.TestCase):
"credit",
"credit_in_account_currency",
):
- for i, gle in enumerate(gl_entries):
+ for _i, gle in enumerate(gl_entries):
self.assertEqual(expected_values[gle.account][field], gle[field])
# cancel
@@ -263,7 +258,7 @@ class TestJournalEntry(unittest.TestCase):
"credit",
"credit_in_account_currency",
):
- for i, gle in enumerate(gl_entries):
+ for _i, gle in enumerate(gl_entries):
self.assertEqual(expected_values[gle.account][field], gle[field])
def test_disallow_change_in_account_currency_for_a_party(self):
diff --git a/erpnext/accounts/doctype/journal_entry/test_records.json b/erpnext/accounts/doctype/journal_entry/test_records.json
index 5077305cf22..73777d4008c 100644
--- a/erpnext/accounts/doctype/journal_entry/test_records.json
+++ b/erpnext/accounts/doctype/journal_entry/test_records.json
@@ -81,7 +81,6 @@
},
{
"account": "Sales - _TC",
- "cost_center": "_Test Cost Center - _TC",
"credit_in_account_currency": 400.0,
"debit_in_account_currency": 0.0,
"doctype": "Journal Entry Account",
diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index 3132fe9b12b..94a050a9004 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -9,12 +9,10 @@
"field_order": [
"account",
"account_type",
- "balance",
"col_break1",
"bank_account",
"party_type",
"party",
- "party_balance",
"accounting_dimensions_section",
"cost_center",
"dimension_col_break",
@@ -63,17 +61,6 @@
"label": "Account Type",
"print_hide": 1
},
- {
- "fieldname": "balance",
- "fieldtype": "Currency",
- "label": "Account Balance",
- "no_copy": 1,
- "oldfieldname": "balance",
- "oldfieldtype": "Data",
- "options": "account_currency",
- "print_hide": 1,
- "read_only": 1
- },
{
"default": ":Company",
"description": "If Income or Expense",
@@ -107,14 +94,6 @@
"label": "Party",
"options": "party_type"
},
- {
- "fieldname": "party_balance",
- "fieldtype": "Currency",
- "label": "Party Balance",
- "options": "account_currency",
- "print_hide": 1,
- "read_only": 1
- },
{
"fieldname": "currency_section",
"fieldtype": "Section Break",
diff --git a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
index 5ebdf61db2c..9a526af4eb4 100644
--- a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
+++ b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
@@ -2,78 +2,82 @@
// For license information, please see license.txt
frappe.ui.form.on("Journal Entry Template", {
- onload: function(frm) {
- if(frm.is_new()) {
+ onload: function (frm) {
+ if (frm.is_new()) {
frappe.call({
type: "GET",
method: "erpnext.accounts.doctype.journal_entry_template.journal_entry_template.get_naming_series",
- callback: function(r){
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
frm.set_df_property("naming_series", "options", r.message.split("\n"));
frm.set_value("naming_series", r.message.split("\n")[0]);
frm.refresh_field("naming_series");
}
- }
+ },
});
}
},
- refresh: function(frm) {
+ refresh: function (frm) {
frappe.model.set_default_values(frm.doc);
- frm.set_query("account" ,"accounts", function(){
+ frm.set_query("account", "accounts", function () {
var filters = {
company: frm.doc.company,
- is_group: 0
+ is_group: 0,
};
- if(!frm.doc.multi_currency) {
+ if (!frm.doc.multi_currency) {
$.extend(filters, {
- account_currency: frappe.get_doc(":Company", frm.doc.company).default_currency
+ account_currency: frappe.get_doc(":Company", frm.doc.company).default_currency,
});
}
return { filters: filters };
});
},
- voucher_type: function(frm) {
- var add_accounts = function(doc, r) {
- $.each(r, function(i, d) {
+ voucher_type: function (frm) {
+ var add_accounts = function (doc, r) {
+ $.each(r, function (i, d) {
var row = frappe.model.add_child(doc, "Journal Entry Template Account", "accounts");
row.account = d.account;
});
refresh_field("accounts");
};
- if(!frm.doc.company) return;
+ if (!frm.doc.company) return;
frm.trigger("clear_child");
- switch(frm.doc.voucher_type){
+ switch (frm.doc.voucher_type) {
case "Bank Entry":
case "Cash Entry":
frappe.call({
type: "GET",
method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
args: {
- "account_type": (frm.doc.voucher_type=="Bank Entry" ?
- "Bank" : (frm.doc.voucher_type=="Cash Entry" ? "Cash" : null)),
- "company": frm.doc.company
+ account_type:
+ frm.doc.voucher_type == "Bank Entry"
+ ? "Bank"
+ : frm.doc.voucher_type == "Cash Entry"
+ ? "Cash"
+ : null,
+ company: frm.doc.company,
},
- callback: function(r) {
- if(r.message) {
+ callback: function (r) {
+ if (r.message) {
// If default company bank account not set
- if(!$.isEmptyObject(r.message)){
+ if (!$.isEmptyObject(r.message)) {
add_accounts(frm.doc, [r.message]);
}
}
- }
+ },
});
break;
default:
frm.trigger("clear_child");
}
},
- clear_child: function(frm){
+ clear_child: function (frm) {
frappe.model.clear_table(frm.doc, "accounts");
frm.refresh_field("accounts");
- }
+ },
});
diff --git a/erpnext/accounts/doctype/ledger_health/__init__.py b/erpnext/accounts/doctype/ledger_health/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/doctype/ledger_health/ledger_health.js b/erpnext/accounts/doctype/ledger_health/ledger_health.js
new file mode 100644
index 00000000000..e207daef511
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health/ledger_health.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Ledger Health", {
+// refresh(frm) {
+
+// },
+// });
diff --git a/erpnext/accounts/doctype/ledger_health/ledger_health.json b/erpnext/accounts/doctype/ledger_health/ledger_health.json
new file mode 100644
index 00000000000..fb2da3d2564
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health/ledger_health.json
@@ -0,0 +1,70 @@
+{
+ "actions": [],
+ "autoname": "autoincrement",
+ "creation": "2024-03-26 17:01:47.443986",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+ "voucher_type",
+ "voucher_no",
+ "checked_on",
+ "debit_credit_mismatch",
+ "general_and_payment_ledger_mismatch"
+ ],
+ "fields": [
+ {
+ "fieldname": "voucher_type",
+ "fieldtype": "Data",
+ "label": "Voucher Type"
+ },
+ {
+ "fieldname": "voucher_no",
+ "fieldtype": "Data",
+ "label": "Voucher No"
+ },
+ {
+ "default": "0",
+ "fieldname": "debit_credit_mismatch",
+ "fieldtype": "Check",
+ "label": "Debit-Credit mismatch"
+ },
+ {
+ "fieldname": "checked_on",
+ "fieldtype": "Datetime",
+ "label": "Checked On"
+ },
+ {
+ "default": "0",
+ "fieldname": "general_and_payment_ledger_mismatch",
+ "fieldtype": "Check",
+ "label": "General and Payment Ledger mismatch"
+ }
+ ],
+ "in_create": 1,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-04-09 11:16:07.044484",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Ledger Health",
+ "naming_rule": "Autoincrement",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/ledger_health/ledger_health.py b/erpnext/accounts/doctype/ledger_health/ledger_health.py
new file mode 100644
index 00000000000..590ff80cc11
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health/ledger_health.py
@@ -0,0 +1,25 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class LedgerHealth(Document):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ checked_on: DF.Datetime | None
+ debit_credit_mismatch: DF.Check
+ general_and_payment_ledger_mismatch: DF.Check
+ name: DF.Int | None
+ voucher_no: DF.Data | None
+ voucher_type: DF.Data | None
+ # end: auto-generated types
+
+ pass
diff --git a/erpnext/accounts/doctype/ledger_health/test_ledger_health.py b/erpnext/accounts/doctype/ledger_health/test_ledger_health.py
new file mode 100644
index 00000000000..d35b39d9ea1
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health/test_ledger_health.py
@@ -0,0 +1,109 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+import frappe
+from frappe import qb
+from frappe.tests.utils import FrappeTestCase
+from frappe.utils import nowdate
+
+from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
+from erpnext.accounts.utils import run_ledger_health_checks
+
+
+class TestLedgerHealth(AccountsTestMixin, FrappeTestCase):
+ def setUp(self):
+ self.create_company()
+ self.create_customer()
+ self.configure_monitoring_tool()
+ self.clear_old_entries()
+
+ def tearDown(self):
+ frappe.db.rollback()
+
+ def configure_monitoring_tool(self):
+ monitor_settings = frappe.get_doc("Ledger Health Monitor")
+ monitor_settings.enable_health_monitor = True
+ monitor_settings.enable_for_last_x_days = 60
+ monitor_settings.debit_credit_mismatch = True
+ monitor_settings.general_and_payment_ledger_mismatch = True
+ exists = [x for x in monitor_settings.companies if x.company == self.company]
+ if not exists:
+ monitor_settings.append("companies", {"company": self.company})
+ monitor_settings.save()
+
+ def clear_old_entries(self):
+ super().clear_old_entries()
+ lh = qb.DocType("Ledger Health")
+ qb.from_(lh).delete().run()
+
+ def create_journal(self):
+ je = frappe.new_doc("Journal Entry")
+ je.company = self.company
+ je.voucher_type = "Journal Entry"
+ je.posting_date = nowdate()
+ je.append(
+ "accounts",
+ {
+ "account": self.debit_to,
+ "party_type": "Customer",
+ "party": self.customer,
+ "debit_in_account_currency": 10000,
+ },
+ )
+ je.append("accounts", {"account": self.income_account, "credit_in_account_currency": 10000})
+ je.save().submit()
+ self.je = je
+
+ def test_debit_credit_mismatch(self):
+ self.create_journal()
+
+ # manually cause debit-credit mismatch
+ gle = frappe.db.get_all(
+ "GL Entry", filters={"voucher_no": self.je.name, "account": self.income_account}
+ )[0]
+ frappe.db.set_value("GL Entry", gle.name, "credit", 8000)
+
+ run_ledger_health_checks()
+ expected = {
+ "voucher_type": self.je.doctype,
+ "voucher_no": self.je.name,
+ "debit_credit_mismatch": True,
+ "general_and_payment_ledger_mismatch": False,
+ }
+ actual = frappe.db.get_all(
+ "Ledger Health",
+ fields=[
+ "voucher_type",
+ "voucher_no",
+ "debit_credit_mismatch",
+ "general_and_payment_ledger_mismatch",
+ ],
+ )
+ self.assertEqual(len(actual), 1)
+ self.assertEqual(expected, actual[0])
+
+ def test_gl_and_pl_mismatch(self):
+ self.create_journal()
+
+ # manually cause GL and PL discrepancy
+ ple = frappe.db.get_all("Payment Ledger Entry", filters={"voucher_no": self.je.name})[0]
+ frappe.db.set_value("Payment Ledger Entry", ple.name, "amount", 11000)
+
+ run_ledger_health_checks()
+ expected = {
+ "voucher_type": self.je.doctype,
+ "voucher_no": self.je.name,
+ "debit_credit_mismatch": False,
+ "general_and_payment_ledger_mismatch": True,
+ }
+ actual = frappe.db.get_all(
+ "Ledger Health",
+ fields=[
+ "voucher_type",
+ "voucher_no",
+ "debit_credit_mismatch",
+ "general_and_payment_ledger_mismatch",
+ ],
+ )
+ self.assertEqual(len(actual), 1)
+ self.assertEqual(expected, actual[0])
diff --git a/erpnext/accounts/doctype/ledger_health_monitor/__init__.py b/erpnext/accounts/doctype/ledger_health_monitor/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.js b/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.js
new file mode 100644
index 00000000000..cf112760f8c
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Ledger Health Monitor", {
+// refresh(frm) {
+
+// },
+// });
diff --git a/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.json b/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.json
new file mode 100644
index 00000000000..6e688333e3f
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.json
@@ -0,0 +1,104 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-03-27 09:38:07.427997",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+ "enable_health_monitor",
+ "monitor_section",
+ "monitor_for_last_x_days",
+ "debit_credit_mismatch",
+ "general_and_payment_ledger_mismatch",
+ "section_break_xdsp",
+ "companies"
+ ],
+ "fields": [
+ {
+ "default": "0",
+ "fieldname": "enable_health_monitor",
+ "fieldtype": "Check",
+ "label": "Enable Health Monitor"
+ },
+ {
+ "fieldname": "monitor_section",
+ "fieldtype": "Section Break",
+ "label": "Configuration"
+ },
+ {
+ "default": "0",
+ "fieldname": "debit_credit_mismatch",
+ "fieldtype": "Check",
+ "label": "Debit-Credit Mismatch"
+ },
+ {
+ "default": "0",
+ "fieldname": "general_and_payment_ledger_mismatch",
+ "fieldtype": "Check",
+ "label": "Discrepancy between General and Payment Ledger"
+ },
+ {
+ "default": "60",
+ "fieldname": "monitor_for_last_x_days",
+ "fieldtype": "Int",
+ "in_list_view": 1,
+ "label": "Monitor for Last 'X' days",
+ "reqd": 1
+ },
+ {
+ "fieldname": "section_break_xdsp",
+ "fieldtype": "Section Break",
+ "label": "Companies"
+ },
+ {
+ "fieldname": "companies",
+ "fieldtype": "Table",
+ "options": "Ledger Health Monitor Company"
+ }
+ ],
+ "hide_toolbar": 1,
+ "index_web_pages_for_search": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-03-27 10:14:16.511681",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Ledger Health Monitor",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "Accounts Manager",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "Accounts User",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.py b/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.py
new file mode 100644
index 00000000000..9f7c569d6d1
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.py
@@ -0,0 +1,28 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class LedgerHealthMonitor(Document):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ from erpnext.accounts.doctype.ledger_health_monitor_company.ledger_health_monitor_company import (
+ LedgerHealthMonitorCompany,
+ )
+
+ companies: DF.Table[LedgerHealthMonitorCompany]
+ debit_credit_mismatch: DF.Check
+ enable_health_monitor: DF.Check
+ general_and_payment_ledger_mismatch: DF.Check
+ monitor_for_last_x_days: DF.Int
+ # end: auto-generated types
+
+ pass
diff --git a/erpnext/accounts/doctype/ledger_health_monitor/test_ledger_health_monitor.py b/erpnext/accounts/doctype/ledger_health_monitor/test_ledger_health_monitor.py
new file mode 100644
index 00000000000..e0ba4435b82
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health_monitor/test_ledger_health_monitor.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestLedgerHealthMonitor(FrappeTestCase):
+ pass
diff --git a/erpnext/accounts/doctype/ledger_health_monitor_company/__init__.py b/erpnext/accounts/doctype/ledger_health_monitor_company/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json b/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json
new file mode 100644
index 00000000000..87fa3e32801
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json
@@ -0,0 +1,32 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-03-27 10:04:45.727054",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "company"
+ ],
+ "fields": [
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "options": "Company"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 10:06:22.806155",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Ledger Health Monitor Company",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.py b/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.py
new file mode 100644
index 00000000000..5890410090d
--- /dev/null
+++ b/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.py
@@ -0,0 +1,23 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class LedgerHealthMonitorCompany(Document):
+ # begin: auto-generated types
+ # This code is auto-generated. Do not modify anything in this block.
+
+ from typing import TYPE_CHECKING
+
+ if TYPE_CHECKING:
+ from frappe.types import DF
+
+ company: DF.Link | None
+ parent: DF.Data
+ parentfield: DF.Data
+ parenttype: DF.Data
+ # end: auto-generated types
+
+ pass
diff --git a/erpnext/accounts/doctype/ledger_merge/ledger_merge.js b/erpnext/accounts/doctype/ledger_merge/ledger_merge.js
index b2db98dbd03..6faae84447b 100644
--- a/erpnext/accounts/doctype/ledger_merge/ledger_merge.js
+++ b/erpnext/accounts/doctype/ledger_merge/ledger_merge.js
@@ -1,9 +1,9 @@
// Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Ledger Merge', {
- setup: function(frm) {
- frappe.realtime.on('ledger_merge_refresh', ({ ledger_merge }) => {
+frappe.ui.form.on("Ledger Merge", {
+ setup: function (frm) {
+ frappe.realtime.on("ledger_merge_refresh", ({ ledger_merge }) => {
if (ledger_merge !== frm.doc.name) return;
frappe.model.clear_doc(frm.doc.doctype, frm.doc.name);
frappe.model.with_doc(frm.doc.doctype, frm.doc.name).then(() => {
@@ -11,29 +11,29 @@ frappe.ui.form.on('Ledger Merge', {
});
});
- frappe.realtime.on('ledger_merge_progress', data => {
+ frappe.realtime.on("ledger_merge_progress", (data) => {
if (data.ledger_merge !== frm.doc.name) return;
- let message = __('Merging {0} of {1}', [data.current, data.total]);
+ let message = __("Merging {0} of {1}", [data.current, data.total]);
let percent = Math.floor((data.current * 100) / data.total);
- frm.dashboard.show_progress(__('Merge Progress'), percent, message);
- frm.page.set_indicator(__('In Progress'), 'orange');
+ frm.dashboard.show_progress(__("Merge Progress"), percent, message);
+ frm.page.set_indicator(__("In Progress"), "orange");
});
- frm.set_query("account", function(doc) {
- if (!doc.company) frappe.throw(__('Please set Company'));
- if (!doc.root_type) frappe.throw(__('Please set Root Type'));
+ frm.set_query("account", function (doc) {
+ if (!doc.company) frappe.throw(__("Please set Company"));
+ if (!doc.root_type) frappe.throw(__("Please set Root Type"));
return {
filters: {
root_type: doc.root_type,
- company: doc.company
- }
+ company: doc.company,
+ },
};
});
- frm.set_query('account', 'merge_accounts', function(doc) {
- if (!doc.company) frappe.throw(__('Please set Company'));
- if (!doc.root_type) frappe.throw(__('Please set Root Type'));
- if (!doc.account) frappe.throw(__('Please set Account'));
+ frm.set_query("account", "merge_accounts", function (doc) {
+ if (!doc.company) frappe.throw(__("Please set Company"));
+ if (!doc.root_type) frappe.throw(__("Please set Root Type"));
+ if (!doc.account) frappe.throw(__("Please set Account"));
let acc = [doc.account];
frm.doc.merge_accounts.forEach((row) => {
acc.push(row.account);
@@ -43,86 +43,86 @@ frappe.ui.form.on('Ledger Merge', {
is_group: doc.is_group,
root_type: doc.root_type,
name: ["not in", acc],
- company: doc.company
- }
+ company: doc.company,
+ },
};
});
},
- refresh: function(frm) {
+ refresh: function (frm) {
frm.page.hide_icon_group();
- frm.trigger('set_merge_status');
- frm.trigger('update_primary_action');
+ frm.trigger("set_merge_status");
+ frm.trigger("update_primary_action");
},
- after_save: function(frm) {
+ after_save: function (frm) {
setTimeout(() => {
- frm.trigger('update_primary_action');
+ frm.trigger("update_primary_action");
}, 500);
},
- update_primary_action: function(frm) {
+ update_primary_action: function (frm) {
if (frm.is_dirty()) {
frm.enable_save();
return;
}
frm.disable_save();
- if (frm.doc.status !== 'Success') {
+ if (frm.doc.status !== "Success") {
if (!frm.is_new()) {
- let label = frm.doc.status === 'Pending' ? __('Start Merge') : __('Retry');
+ let label = frm.doc.status === "Pending" ? __("Start Merge") : __("Retry");
frm.page.set_primary_action(label, () => frm.events.start_merge(frm));
} else {
- frm.page.set_primary_action(__('Save'), () => frm.save());
+ frm.page.set_primary_action(__("Save"), () => frm.save());
}
}
},
- start_merge: function(frm) {
+ start_merge: function (frm) {
frm.call({
- method: 'form_start_merge',
+ method: "form_start_merge",
args: { docname: frm.doc.name },
- btn: frm.page.btn_primary
- }).then(r => {
+ btn: frm.page.btn_primary,
+ }).then((r) => {
if (r.message === true) {
frm.disable_save();
}
});
},
- set_merge_status: function(frm) {
+ set_merge_status: function (frm) {
if (frm.doc.status == "Pending") return;
let successful_records = 0;
frm.doc.merge_accounts.forEach((row) => {
if (row.merged) successful_records += 1;
});
let message_args = [successful_records, frm.doc.merge_accounts.length];
- frm.dashboard.set_headline(__('Successfully merged {0} out of {1}.', message_args));
+ frm.dashboard.set_headline(__("Successfully merged {0} out of {1}.", message_args));
},
- root_type: function(frm) {
- frm.set_value('account', '');
- frm.set_value('merge_accounts', []);
+ root_type: function (frm) {
+ frm.set_value("account", "");
+ frm.set_value("merge_accounts", []);
},
- company: function(frm) {
- frm.set_value('account', '');
- frm.set_value('merge_accounts', []);
- }
+ company: function (frm) {
+ frm.set_value("account", "");
+ frm.set_value("merge_accounts", []);
+ },
});
-frappe.ui.form.on('Ledger Merge Accounts', {
- merge_accounts_add: function(frm) {
- frm.trigger('update_primary_action');
+frappe.ui.form.on("Ledger Merge Accounts", {
+ merge_accounts_add: function (frm) {
+ frm.trigger("update_primary_action");
},
- merge_accounts_remove: function(frm) {
- frm.trigger('update_primary_action');
+ merge_accounts_remove: function (frm) {
+ frm.trigger("update_primary_action");
},
- account: function(frm, cdt, cdn) {
+ account: function (frm, cdt, cdn) {
let row = frappe.get_doc(cdt, cdn);
row.account_name = row.account;
- frm.refresh_field('merge_accounts');
- frm.trigger('update_primary_action');
- }
+ frm.refresh_field("merge_accounts");
+ frm.trigger("update_primary_action");
+ },
});
diff --git a/erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py b/erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py
index 992ce9ede5d..dccd73c62a9 100644
--- a/erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py
+++ b/erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py
@@ -83,7 +83,10 @@ class TestLedgerMerge(unittest.TestCase):
"account": "Indirect Income - _TC",
"merge_accounts": [
{"account": "Indirect Test Income - _TC", "account_name": "Indirect Test Income"},
- {"account": "Administrative Test Income - _TC", "account_name": "Administrative Test Income"},
+ {
+ "account": "Administrative Test Income - _TC",
+ "account_name": "Administrative Test Income",
+ },
],
}
).insert(ignore_permissions=True)
diff --git a/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.js b/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.js
index d7dc7f3f3c7..d522f6d8af1 100644
--- a/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.js
+++ b/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.js
@@ -1,8 +1,6 @@
// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Loyalty Point Entry', {
- refresh: function(frm) {
-
- }
+frappe.ui.form.on("Loyalty Point Entry", {
+ refresh: function (frm) {},
});
diff --git a/erpnext/accounts/doctype/loyalty_program/loyalty_program.js b/erpnext/accounts/doctype/loyalty_program/loyalty_program.js
index 6951b2a2b32..4c29be3b556 100644
--- a/erpnext/accounts/doctype/loyalty_program/loyalty_program.js
+++ b/erpnext/accounts/doctype/loyalty_program/loyalty_program.js
@@ -3,30 +3,37 @@
frappe.provide("erpnext.accounts.dimensions");
-frappe.ui.form.on('Loyalty Program', {
- setup: function(frm) {
- var help_content =
- `
- ${__('Notes')} + ${__("Notes")}
|
