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

[Minor] Report related fixes (#14620)

Browse Source 
* fix in query incase list is empty

* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated

* unset currency filter to apply default currency or so

* python 2 - 3 fix
This commit is contained in:
Zarrar 2018-06-21 10:53:12 +05:30 committed by Nabin Hait
parent 51e4d641c8
commit e25dcd2737
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/accounts/report/cash_flow/custom_cash_flow.py
View File

@ -25,15 +25,14 @@ def get_mappers_from_db():
def get_accounts_in_mappers(mapping_names): def get_accounts_in_mappers(mapping_names):
return frappe.db.sql( return frappe.db.sql('''
'select cfma.name, cfm.label, cfm.is_working_capital, cfm.is_income_tax_liability, ' select cfma.name, cfm.label, cfm.is_working_capital, cfm.is_income_tax_liability,
'cfm.is_income_tax_expense, cfm.is_finance_cost, cfm.is_finance_cost_adjustment ' cfm.is_income_tax_expense, cfm.is_finance_cost, cfm.is_finance_cost_adjustment
'from `tabCash Flow Mapping Accounts` cfma ' from `tabCash Flow Mapping Accounts` cfma
'join `tabCash Flow Mapping` cfm on cfma.parent=cfm.name ' join `tabCash Flow Mapping` cfm on cfma.parent=cfm.name
'where cfma.parent in %s ' where cfma.parent in (%s)
'order by cfm.is_working_capital', order by cfm.is_working_capital
(mapping_names,) ''', (', '.join(['"%s"' % d for d in mapping_names])))
)
def setup_mappers(mappers): def setup_mappers(mappers):
@ -334,6 +333,7 @@ def compute_data(filters, company_currency, profit_data, period_list, light_mapp
def execute(filters=None): def execute(filters=None):
if not filters.periodicity: filters.periodicity = "Monthly"
period_list = get_period_list( period_list = get_period_list(
filters.from_fiscal_year, filters.to_fiscal_year, filters.periodicity, filters.from_fiscal_year, filters.to_fiscal_year, filters.periodicity,
filters.accumulated_values, filters.company filters.accumulated_values, filters.company
@ -376,6 +376,7 @@ def _get_account_type_based_data(filters, account_names, period_list, accumulate
total = 0 total = 0
for period in period_list: for period in period_list:
start_date = get_start_date(period, accumulated_values, company) start_date = get_start_date(period, accumulated_values, company)
accounts = ', '.join(['"%s"' % d for d in account_names])
if opening_balances: if opening_balances:
date_info = dict(date=start_date) date_info = dict(date=start_date)
@ -397,19 +398,19 @@ def _get_account_type_based_data(filters, account_names, period_list, accumulate
from `tabGL Entry` from `tabGL Entry`
where company=%s and posting_date >= %s and posting_date <= %s where company=%s and posting_date >= %s and posting_date <= %s
and voucher_type != 'Period Closing Voucher' and voucher_type != 'Period Closing Voucher'
and account in ( SELECT name FROM tabAccount WHERE name IN %s and account in ( SELECT name FROM tabAccount WHERE name IN (%s)
OR parent_account IN %s) OR parent_account IN (%s))
""", (company, start, end, account_names, account_names)) """, (company, start, end, accounts, accounts))
else: else:
gl_sum = frappe.db.sql_list(""" gl_sum = frappe.db.sql_list("""
select sum(credit) - sum(debit) select sum(credit) - sum(debit)
from `tabGL Entry` from `tabGL Entry`
where company=%s and posting_date >= %s and posting_date <= %s where company=%s and posting_date >= %s and posting_date <= %s
and voucher_type != 'Period Closing Voucher' and voucher_type != 'Period Closing Voucher'
and account in ( SELECT name FROM tabAccount WHERE name IN %s and account in ( SELECT name FROM tabAccount WHERE name IN (%s)
OR parent_account IN %s) OR parent_account IN (%s))
""", (company, start_date if accumulated_values else period['from_date'], """, (company, start_date if accumulated_values else period['from_date'],
period['to_date'], account_names, account_names)) period['to_date'], accounts, accounts))
if gl_sum and gl_sum[0]: if gl_sum and gl_sum[0]:
amount = gl_sum[0] amount = gl_sum[0]

3
erpnext/public/js/utils.js
View File

@ -15,7 +15,8 @@ $.extend(erpnext, {
get_presentation_currency_list: () => { get_presentation_currency_list: () => {
const docs = frappe.boot.docs; const docs = frappe.boot.docs;
const currency_list = docs.filter(d => d.doctype === ":Currency").map(d => d.name); let currency_list = docs.filter(d => d.doctype === ":Currency").map(d => d.name);
currency_list.unshift("");
return currency_list; return currency_list;
}, },

4
erpnext/selling/report/address_and_contacts/address_and_contacts.py
View File

@ -77,8 +77,8 @@ def get_party_addresses_and_contact(party_type, party, party_group):
result.extend(add_blank_columns_for("Address")) result.extend(add_blank_columns_for("Address"))
data.append(result) data.append(result)
else: else:
addresses = map(list, addresses) addresses = list(map(list, addresses))
contacts = map(list, contacts) contacts = list(map(list, contacts))
max_length = max(len(addresses), len(contacts)) max_length = max(len(addresses), len(contacts))
for idx in range(0, max_length): for idx in range(0, max_length):