schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Against voucher filter in General Ledger (#39102)

Browse Source
This commit is contained in:
Deepesh Garg
2024-01-03 10:51:34 +05:30
committed by GitHub
parent 56d510b878
commit 458064f8a1
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/general_ledger/general_ledger.js
View File

@@ -52,6 +52,11 @@ frappe.query_reports["General Ledger"] = {
frappe.query_report.set_filter_value('group_by', "Group by Voucher (Consolidated)"); frappe.query_report.set_filter_value('group_by', "Group by Voucher (Consolidated)");
} }
}, },
{
"fieldname":"against_voucher_no",
"label": __("Against Voucher No"),
"fieldtype": "Data",
},
{ {
"fieldtype": "Break", "fieldtype": "Break",
}, },

3
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -238,6 +238,9 @@ def get_conditions(filters):
if filters.get("voucher_no"): if filters.get("voucher_no"):
conditions.append("voucher_no=%(voucher_no)s") conditions.append("voucher_no=%(voucher_no)s")
if filters.get("against_voucher_no"):
conditions.append("against_voucher=%(against_voucher_no)s")
if filters.get("voucher_no_not_in"): if filters.get("voucher_no_not_in"):
conditions.append("voucher_no not in %(voucher_no_not_in)s") conditions.append("voucher_no not in %(voucher_no_not_in)s")

6
erpnext/controllers/accounts_controller.py
View File

@@ -933,6 +933,12 @@ class AccountsController(TransactionBase):
} }
) )
if not args.get("against_voucher_type") and self.get("against_voucher_type"):
gl_dict.update({"against_voucher_type": self.get("against_voucher_type")})
if not args.get("against_voucher") and self.get("against_voucher"):
gl_dict.update({"against_voucher": self.get("against_voucher")})
return gl_dict return gl_dict
def get_voucher_subtype(self): def get_voucher_subtype(self):