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

chore: fix logic for purchase invoice and some typos

Browse Source
This commit is contained in:
ruthra kumar 2023-06-16 14:07:44 +05:30
parent 13febcac81
commit 34b5e849a2
2 changed files with 7 additions and 4 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

@ -811,8 +811,8 @@ class PaymentEntry(AccountsController):
else: else:
# Use source/target exchange rate, so no difference amount is calculated. # Use source/target exchange rate, so no difference amount is calculated.
# then update exchange gain/loss amount in refernece table # then update exchange gain/loss amount in reference table
# if there is an amount, submit a JE for that # if there is an exchange gain/loss amount in reference table, submit a JE for that
exchange_rate = 1 exchange_rate = 1
if self.payment_type == "Receive": if self.payment_type == "Receive":

7
erpnext/controllers/accounts_controller.py
View File

@ -972,7 +972,7 @@ class AccountsController(TransactionBase):
""" """
Make Exchange Gain/Loss journal for Invoices and Payments Make Exchange Gain/Loss journal for Invoices and Payments
""" """
# Cancelling is existing exchange gain/loss journals is handled in on_cancel event # Cancelling existing exchange gain/loss journals is handled in on_cancel event in accounts/utils.py
if self.docstatus == 1: if self.docstatus == 1:
if self.get("doctype") == "Payment Entry": if self.get("doctype") == "Payment Entry":
gain_loss_to_book = [x for x in self.references if x.exchange_gain_loss != 0] gain_loss_to_book = [x for x in self.references if x.exchange_gain_loss != 0]
@ -1027,6 +1027,10 @@ class AccountsController(TransactionBase):
"Account", party_account, "account_currency" "Account", party_account, "account_currency"
) )
dr_or_cr = "debit" if d.exchange_gain_loss > 0 else "credit" dr_or_cr = "debit" if d.exchange_gain_loss > 0 else "credit"
if d.reference_doctype == "Purchase Invoice":
dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
reverse_dr_or_cr = "debit" if dr_or_cr == "credit" else "credit" reverse_dr_or_cr = "debit" if dr_or_cr == "credit" else "credit"
gain_loss_account = frappe.get_cached_value( gain_loss_account = frappe.get_cached_value(
@ -1080,7 +1084,6 @@ class AccountsController(TransactionBase):
journal_entry.save() journal_entry.save()
journal_entry.submit() journal_entry.submit()
# frappe.throw("stopping...")
def update_against_document_in_jv(self): def update_against_document_in_jv(self):
""" """