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

fix: conversion rate as 1 if no conversion rate

Browse Source
This commit is contained in:
Anurag Mishra 2020-07-14 18:58:02 +05:30
parent 25b6c5d55a
commit c1636f8fab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -1029,14 +1029,14 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
if bank_amount: if bank_amount:
received_amount = bank_amount received_amount = bank_amount
else: else:
received_amount = paid_amount * doc.conversion_rate received_amount = paid_amount * (doc.get('conversion_rate') or 1)
else: else:
received_amount = abs(outstanding_amount) received_amount = abs(outstanding_amount)
if bank_amount: if bank_amount:
paid_amount = bank_amount paid_amount = bank_amount
else: else:
# if party account currency and bank currency is different then populate paid amount as well # if party account currency and bank currency is different then populate paid amount as well
paid_amount = received_amount * doc.conversion_rate paid_amount = received_amount * (doc.get('conversion_rate') or 1)
pe = frappe.new_doc("Payment Entry") pe = frappe.new_doc("Payment Entry")
pe.payment_type = payment_type pe.payment_type = payment_type