nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up get_currency first pass

Browse Source
This commit is contained in:
tundebabzy
2018-01-22 17:59:03 +01:00
parent 45ebdc4884
commit 063c5a3f05
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -129,21 +129,18 @@ def get_currency(filters):
:return: str - Currency :return: str - Currency
""" """
currency_map = {} # Get the company
company = None
presentation_currency = None
company_currency = None
if filters.get('company'): if filters.get('company'):
company = filters['company'] company = filters['company']
else: else:
company = get_default_company() company = get_default_company()
# Get the currency
company_currency = get_company_currency(company) company_currency = get_company_currency(company)
presentation_currency = filters['presentation_currency'] if filters.get('presentation_currency') else company_currency presentation_currency = filters['presentation_currency'] if filters.get('presentation_currency') else company_currency
currency_map = dict(
company=company, company_currency=company_currency, presentation_currency=presentation_currency currency_map = dict(company=company, company_currency=company_currency, presentation_currency=presentation_currency)
)
return currency_map return currency_map
@@ -185,10 +182,10 @@ def convert_to_presentation_currency(gl_entries, currency_info):
def get_gl_entries(filters): def get_gl_entries(filters):
currency = get_currency(filters) currency_map = get_currency(filters)
select_fields = """, sum(debit_in_account_currency) as debit_in_account_currency, select_fields = """, sum(debit_in_account_currency) as debit_in_account_currency,
sum(credit_in_account_currency) as credit_in_account_currency""" \ sum(credit_in_account_currency) as credit_in_account_currency""" \
if filters.get("show_in_account_currency") else ""
group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \ group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \
if filters.get("group_by_voucher") else "group by name" if filters.get("group_by_voucher") else "group by name"
@@ -198,7 +195,7 @@ def get_gl_entries(filters):
posting_date, account, party_type, party, posting_date, account, party_type, party,
sum(debit) as debit, sum(credit) as credit, sum(debit) as debit, sum(credit) as credit,
voucher_type, voucher_no, cost_center, project, voucher_type, voucher_no, cost_center, project,
against_voucher_type, against_voucher, account_currency against_voucher_type, against_voucher, account_currency,
remarks, against, is_opening {select_fields} remarks, against, is_opening {select_fields}
from `tabGL Entry` from `tabGL Entry`
where company=%(company)s {conditions} where company=%(company)s {conditions}
@@ -207,9 +204,10 @@ def get_gl_entries(filters):
.format(select_fields=select_fields, conditions=get_conditions(filters), .format(select_fields=select_fields, conditions=get_conditions(filters),
group_by_condition=group_by_condition), filters, as_dict=1) group_by_condition=group_by_condition), filters, as_dict=1)
print('GL entries:', gl_entries) if filters.get('presentation_currency'):
return convert_to_presentation_currency(gl_entries, currency_map)
return gl_entries else:
return gl_entries
def get_conditions(filters): def get_conditions(filters):