mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-14 18:51:21 +00:00
Merge pull request #51770 from frappe/mergify/bp/version-14-hotfix/pr-51768
fix: Show non-SLE vouchers with GL entries in Stock vs Account Value … (backport #51768)
This commit is contained in:
@@ -41,9 +41,37 @@ def get_data(report_filters):
|
|||||||
gl_data = voucher_wise_gl_data.get(key) or {}
|
gl_data = voucher_wise_gl_data.get(key) or {}
|
||||||
d.account_value = gl_data.get("account_value", 0)
|
d.account_value = gl_data.get("account_value", 0)
|
||||||
d.difference_value = d.stock_value - d.account_value
|
d.difference_value = d.stock_value - d.account_value
|
||||||
|
d.ledger_type = "Stock Ledger Entry"
|
||||||
if abs(d.difference_value) > 0.1:
|
if abs(d.difference_value) > 0.1:
|
||||||
data.append(d)
|
data.append(d)
|
||||||
|
|
||||||
|
if key in voucher_wise_gl_data:
|
||||||
|
del voucher_wise_gl_data[key]
|
||||||
|
|
||||||
|
if voucher_wise_gl_data:
|
||||||
|
data += get_gl_ledgers_with_no_stock_ledger_entries(voucher_wise_gl_data)
|
||||||
|
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
def get_gl_ledgers_with_no_stock_ledger_entries(voucher_wise_gl_data):
|
||||||
|
data = []
|
||||||
|
|
||||||
|
for key in voucher_wise_gl_data:
|
||||||
|
gl_data = voucher_wise_gl_data.get(key) or {}
|
||||||
|
data.append(
|
||||||
|
{
|
||||||
|
"name": gl_data.get("name"),
|
||||||
|
"ledger_type": "GL Entry",
|
||||||
|
"voucher_type": gl_data.get("voucher_type"),
|
||||||
|
"voucher_no": gl_data.get("voucher_no"),
|
||||||
|
"posting_date": gl_data.get("posting_date"),
|
||||||
|
"stock_value": 0,
|
||||||
|
"account_value": gl_data.get("account_value", 0),
|
||||||
|
"difference_value": gl_data.get("account_value", 0) * -1,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
@@ -88,6 +116,7 @@ def get_gl_data(report_filters, filters):
|
|||||||
"voucher_type",
|
"voucher_type",
|
||||||
"voucher_no",
|
"voucher_no",
|
||||||
"sum(debit_in_account_currency) - sum(credit_in_account_currency) as account_value",
|
"sum(debit_in_account_currency) - sum(credit_in_account_currency) as account_value",
|
||||||
|
"posting_date",
|
||||||
],
|
],
|
||||||
group_by="voucher_type, voucher_no",
|
group_by="voucher_type, voucher_no",
|
||||||
)
|
)
|
||||||
@@ -105,10 +134,15 @@ def get_columns(filters):
|
|||||||
{
|
{
|
||||||
"label": _("Stock Ledger ID"),
|
"label": _("Stock Ledger ID"),
|
||||||
"fieldname": "name",
|
"fieldname": "name",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Dynamic Link",
|
||||||
"options": "Stock Ledger Entry",
|
"options": "ledger_type",
|
||||||
"width": "80",
|
"width": "80",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"label": _("Ledger Type"),
|
||||||
|
"fieldname": "ledger_type",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
},
|
||||||
{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date"},
|
{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date"},
|
||||||
{"label": _("Posting Time"), "fieldname": "posting_time", "fieldtype": "Time"},
|
{"label": _("Posting Time"), "fieldname": "posting_time", "fieldtype": "Time"},
|
||||||
{"label": _("Voucher Type"), "fieldname": "voucher_type", "width": "110"},
|
{"label": _("Voucher Type"), "fieldname": "voucher_type", "width": "110"},
|
||||||
|
|||||||
Reference in New Issue
Block a user