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

Merge pull request #21513 from deepeshgarg007/get_period_api_v13

Browse Source 
fix: get_period_list API change fixes
This commit is contained in:
Deepesh Garg 2020-04-29 22:23:15 +05:30 committed by GitHub
commit b134abd3bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
View File

@ -12,7 +12,8 @@ def execute(filters=None):
columns, data, chart = [], [], []
if filters.get('fiscal_year'):
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()
data=get_log_data(filters)
chart=get_chart_data(data,period_list)

4
erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
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)