mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-16 05:15:10 +00:00
feat: add show_amount_in_company_currency in gl report
(cherry picked from commit 468e5e9b2e)
# Conflicts:
# erpnext/accounts/report/general_ledger/general_ledger.js
This commit is contained in:
@@ -197,6 +197,11 @@ frappe.query_reports["General Ledger"] = {
|
|||||||
label: __("Show Net Values in Party Account"),
|
label: __("Show Net Values in Party Account"),
|
||||||
fieldtype: "Check",
|
fieldtype: "Check",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
fieldname: "show_amount_in_company_currency",
|
||||||
|
label: __("Show Credit / Debit in Company Currency"),
|
||||||
|
fieldtype: "Check",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
fieldname: "show_remarks",
|
fieldname: "show_remarks",
|
||||||
label: __("Show Remarks"),
|
label: __("Show Remarks"),
|
||||||
|
|||||||
@@ -580,6 +580,19 @@ def get_columns(filters):
|
|||||||
company = filters.get("company") or get_default_company()
|
company = filters.get("company") or get_default_company()
|
||||||
filters["presentation_currency"] = currency = get_company_currency(company)
|
filters["presentation_currency"] = currency = get_company_currency(company)
|
||||||
|
|
||||||
|
company_currency = get_company_currency(filters.get("company") or get_default_company())
|
||||||
|
|
||||||
|
if (
|
||||||
|
filters.get("show_amount_in_company_currency")
|
||||||
|
and filters["presentation_currency"] != company_currency
|
||||||
|
):
|
||||||
|
frappe.throw(
|
||||||
|
_("Presentation Currency cannot be {0} , When {1} is enabled.").format(
|
||||||
|
frappe.bold(filters["presentation_currency"]),
|
||||||
|
frappe.bold("Show Credit / Debit in Company Currency"),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
columns = [
|
columns = [
|
||||||
{
|
{
|
||||||
"label": _("GL Entry"),
|
"label": _("GL Entry"),
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ def convert_to_presentation_currency(gl_entries, currency_info, filters=None):
|
|||||||
len(account_currencies) == 1
|
len(account_currencies) == 1
|
||||||
and account_currency == presentation_currency
|
and account_currency == presentation_currency
|
||||||
and not exchange_gain_or_loss
|
and not exchange_gain_or_loss
|
||||||
):
|
) and not filters.get("show_amount_in_company_currency"):
|
||||||
entry["debit"] = debit_in_account_currency
|
entry["debit"] = debit_in_account_currency
|
||||||
entry["credit"] = credit_in_account_currency
|
entry["credit"] = credit_in_account_currency
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user