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

fix final failing test

Browse Source
This commit is contained in:
tunde 2017-09-21 13:43:38 +01:00
parent 82de375ba0
commit d7d306bfdb
2 changed files with 3 additions and 3 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

@ -290,7 +290,7 @@ class PaymentEntry(AccountsController):
def set_difference_amount(self): def set_difference_amount(self):
base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate) base_unallocated_amount = flt(self.unallocated_amount) * (flt(self.source_exchange_rate)
if self.payment_type=="Receive" else flt(self.target_exchange_rate)) if self.payment_type == "Receive" else flt(self.target_exchange_rate))
base_party_amount = flt(self.base_total_allocated_amount) + flt(base_unallocated_amount) base_party_amount = flt(self.base_total_allocated_amount) + flt(base_unallocated_amount)
@ -777,7 +777,7 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
'due_date': reference.due_date, 'due_date': reference.due_date,
'total_amount': reference.invoice_amount, 'total_amount': reference.invoice_amount,
'outstanding_amount': reference.outstanding_amount, 'outstanding_amount': reference.outstanding_amount,
'allocated_amount': reference.outstanding_amount 'allocated_amount': allocated_amount
}) })
if paid_amount: if paid_amount:
paid_amount -= allocated_amount paid_amount -= allocated_amount

2
erpnext/accounts/doctype/payment_entry/test_payment_entry.py
View File

@ -108,7 +108,7 @@ class TestPaymentEntry(unittest.TestCase):
self.assertEqual(outstanding_amount, 0) self.assertEqual(outstanding_amount, 0)
def test_payment_entry_against_si_usd_to_inr(self): def test_payment_entry_against_si_usd_to_inr(self):
si = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC", si = create_sales_invoice(customer="_Test Customer USD", debit_to="_Test Receivable USD - _TC",
currency="USD", conversion_rate=50) currency="USD", conversion_rate=50)
pe = get_payment_entry("Sales Invoice", si.name, party_amount=20, pe = get_payment_entry("Sales Invoice", si.name, party_amount=20,
bank_account="_Test Bank - _TC", bank_amount=900) bank_account="_Test Bank - _TC", bank_amount=900)