fix: get_period_list API change fixes
This commit is contained in:
parent
cb8ea6643e
commit
9d5fabd7ac
@ -12,7 +12,8 @@ def execute(filters=None):
|
|||||||
columns, data, chart = [], [], []
|
columns, data, chart = [], [], []
|
||||||
if filters.get('fiscal_year'):
|
if filters.get('fiscal_year'):
|
||||||
company = erpnext.get_default_company()
|
company = erpnext.get_default_company()
|
||||||
period_list = get_period_list(filters.get('fiscal_year'), filters.get('fiscal_year'),"Monthly", company)
|
period_list = get_period_list(filters.get('fiscal_year'), filters.get('fiscal_year'),
|
||||||
|
'', '', 'Fiscal Year', 'Monthly', company=company)
|
||||||
columns=get_columns()
|
columns=get_columns()
|
||||||
data=get_log_data(filters)
|
data=get_log_data(filters)
|
||||||
chart=get_chart_data(data,period_list)
|
chart=get_chart_data(data,period_list)
|
||||||
|
@ -11,9 +11,10 @@ from erpnext.accounts.doctype.monthly_distribution.monthly_distribution import g
|
|||||||
|
|
||||||
def get_data_column(filters, partner_doctype):
|
def get_data_column(filters, partner_doctype):
|
||||||
data = []
|
data = []
|
||||||
period_list = get_period_list(filters.fiscal_year, filters.fiscal_year,
|
period_list = get_period_list(filters.fiscal_year, filters.fiscal_year, '', '',
|
||||||
filters.period, company=filters.company)
|
'Fiscal Year', filters.period, company=filters.company)
|
||||||
|
|
||||||
|
print(period_list)
|
||||||
rows = get_data(filters, period_list, partner_doctype)
|
rows = get_data(filters, period_list, partner_doctype)
|
||||||
columns = get_columns(filters, period_list, partner_doctype)
|
columns = get_columns(filters, period_list, partner_doctype)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user