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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-05-23 15:05:58 +05:30
parent a6bf7c1ebd
commit 5230d411bf
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@@ -1395,17 +1395,9 @@ frappe.ui.form.on('Payment Entry Reference', {
args: { args: {
reference_doctype: row.reference_doctype, reference_doctype: row.reference_doctype,
reference_name: row.reference_name, reference_name: row.reference_name,
<<<<<<< HEAD party_account_currency: frm.doc.payment_type == "Receive" ? frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency,
party_account_currency: frm.doc.payment_type=="Receive" ?
frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency
=======
party_account_currency:
frm.doc.payment_type == "Receive"
? frm.doc.paid_from_account_currency
: frm.doc.paid_to_account_currency,
party_type: frm.doc.party_type, party_type: frm.doc.party_type,
party: frm.doc.party, party: frm.doc.party,
>>>>>>> f331f9b15c (fix: Fetch outstanding and total amount for reference journal entry)
}, },
callback: function(r, rt) { callback: function(r, rt) {
if(r.message) { if(r.message) {

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

@@ -1919,15 +1919,10 @@ def get_outstanding_on_journal_entry(voucher_no, party_type, party):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def get_reference_details(reference_doctype, reference_name, party_account_currency):
total_amount = outstanding_amount = exchange_rate = None
=======
def get_reference_details( def get_reference_details(
reference_doctype, reference_name, party_account_currency, party_type=None, party=None reference_doctype, reference_name, party_account_currency, party_type=None, party=None
): ):
total_amount = outstanding_amount = exchange_rate = account = None total_amount = outstanding_amount = exchange_rate = None
>>>>>>> f331f9b15c (fix: Fetch outstanding and total amount for reference journal entry)
ref_doc = frappe.get_doc(reference_doctype, reference_name) ref_doc = frappe.get_doc(reference_doctype, reference_name)
company_currency = ref_doc.get("company_currency") or erpnext.get_company_currency(ref_doc.company) company_currency = ref_doc.get("company_currency") or erpnext.get_company_currency(ref_doc.company)