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

add new function convert_to_presentation_currency

Browse Source
This commit is contained in:
tundebabzy
2018-01-22 17:42:09 +01:00
parent 9c36baaac4
commit 45ebdc4884
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe
from erpnext import get_company_currency, get_default_company
from erpnext.setup.utils import get_exchange_rate
from frappe.utils import getdate, cstr, flt
from frappe.utils import getdate, cstr, flt, cint
from frappe import _, _dict
from erpnext.accounts.utils import get_account_currency
@@ -153,6 +153,37 @@ def convert(value, from_, to, date):
return converted_value
def convert_to_presentation_currency(gl_entries, currency_info):
converted_gl_list = []
for entry in gl_entries:
if currency_info['company_currency'] != currency_info['presentation_currency'] and \
entry['account_currency'] != currency_info['presentation_currency']:
value = cint(entry['debit'] or cint(entry['credit']))
date = entry['posting_date']
presentation_currency = currency_info['presentation_currency']
company_currency = currency_info['company_currency']
converted_value = convert(value, presentation_currency, company_currency, date)
if entry.get('debit'):
print entry['debit_in_account_currency']
entry['debit'] = converted_value
else:
print entry['credit']
entry['credit'] = converted_value
elif currency_info['company_currency'] != currency_info['presentation_currency']:
if entry.get('debit'):
entry['debit'] = entry['debit_in_account_currency']
else:
entry['credit'] = entry['credit_in_account_currency']
converted_gl_list.append(entry)
return converted_gl_list
def get_gl_entries(filters):
currency = get_currency(filters)
select_fields = """, sum(debit_in_account_currency) as debit_in_account_currency,