mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-04 04:39:11 +00:00
Merge branch 'develop' into sales-report-total-row
This commit is contained in:
@@ -11,8 +11,8 @@ from erpnext.accounts.doctype.monthly_distribution.monthly_distribution import g
|
||||
|
||||
def get_data_column(filters, partner_doctype):
|
||||
data = []
|
||||
period_list = get_period_list(filters.fiscal_year, filters.fiscal_year,
|
||||
filters.period, company=filters.company)
|
||||
period_list = get_period_list(filters.fiscal_year, filters.fiscal_year, '', '',
|
||||
'Fiscal Year', filters.period, company=filters.company)
|
||||
|
||||
rows = get_data(filters, period_list, partner_doctype)
|
||||
columns = get_columns(filters, period_list, partner_doctype)
|
||||
|
||||
Reference in New Issue
Block a user