Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16807 from rohitwaghchaure/remove_validation_for_group_by_voucher_consolidate

Browse Source 
fix: when General Ledger is opened from Purchase Receipt or Delivery note, user get Opening and Closing printed twice
This commit is contained in:
rohitwaghchaure 2019-03-01 14:25:00 +05:30 committed by GitHub
commit 5e71a56c7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ def validate_filters(filters, account_details):
frappe.throw(_("Can not filter based on Account, if grouped by Account")) frappe.throw(_("Can not filter based on Account, if grouped by Account"))
if (filters.get("voucher_no") if (filters.get("voucher_no")
and filters.get("group_by") in [_('Group by Voucher'), _('Group by Voucher (Consolidated)')]): and filters.get("group_by") in [_('Group by Voucher')]):
frappe.throw(_("Can not filter based on Voucher No, if grouped by Voucher")) frappe.throw(_("Can not filter based on Voucher No, if grouped by Voucher"))
if filters.from_date > filters.to_date: if filters.from_date > filters.to_date:

2
erpnext/public/js/controllers/stock_controller.js
View File

@ -73,7 +73,7 @@ erpnext.stock.StockController = frappe.ui.form.Controller.extend({
from_date: me.frm.doc.posting_date, from_date: me.frm.doc.posting_date,
to_date: me.frm.doc.posting_date, to_date: me.frm.doc.posting_date,
company: me.frm.doc.company, company: me.frm.doc.company,
group_by: "" group_by: "Group by Voucher (Consolidated)"
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");
}, __("View")); }, __("View"));