Merge branch 'develop' into sales-report-total-row

This commit is contained in:
Deepesh Garg
2020-05-06 10:48:21 +05:30
committed by GitHub
292 changed files with 517085 additions and 509738 deletions

View File

@@ -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)