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

chore:conflicts

Browse Source
This commit is contained in:
Ankush Menat
2022-05-13 13:14:08 +05:30
committed by GitHub
parent 8ef649f65d
commit 0ec5adeed8
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/public/js/controllers/transaction.js
View File

@@ -1034,19 +1034,10 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
erpnext.utils.get_contact_details(this.frm); erpnext.utils.get_contact_details(this.frm);
}, },
<<<<<<< HEAD
currency: function() { currency: function() {
/* manqala 19/09/2016: let the translation date be whichever of the transaction_date or posting_date is available */
var transaction_date = this.frm.doc.transaction_date || this.frm.doc.posting_date;
/* end manqala */
var me = this;
=======
currency() {
// The transaction date be either transaction_date (from orders) or posting_date (from invoices)
let transaction_date = this.frm.doc.transaction_date || this.frm.doc.posting_date; let transaction_date = this.frm.doc.transaction_date || this.frm.doc.posting_date;
let me = this; let me = this;
>>>>>>> 54d6cf18fc (fix: Item rate reset on changing posting date (#30990))
this.set_dynamic_labels(); this.set_dynamic_labels();
let company_currency = this.get_company_currency(); let company_currency = this.get_company_currency();
// Added `ignore_price_list` to determine if document is loading after mapping from another doc // Added `ignore_price_list` to determine if document is loading after mapping from another doc