mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 10:49:09 +00:00
fix: remove hrms dependent func which are moved to hrms module
(cherry picked from commit 038536e1cd)
This commit is contained in:
@@ -196,9 +196,6 @@ class PaymentEntry(AccountsController):
|
|||||||
def before_save(self):
|
def before_save(self):
|
||||||
self.set_matched_unset_payment_requests_to_response()
|
self.set_matched_unset_payment_requests_to_response()
|
||||||
|
|
||||||
def before_submit(self):
|
|
||||||
self.set_exchange_rate_in_advance()
|
|
||||||
|
|
||||||
def on_submit(self):
|
def on_submit(self):
|
||||||
if self.difference_amount:
|
if self.difference_amount:
|
||||||
frappe.throw(_("Difference Amount must be zero"))
|
frappe.throw(_("Difference Amount must be zero"))
|
||||||
@@ -925,18 +922,6 @@ class PaymentEntry(AccountsController):
|
|||||||
|
|
||||||
self.db_set("status", self.status, update_modified=True)
|
self.db_set("status", self.status, update_modified=True)
|
||||||
|
|
||||||
def set_exchange_rate_in_advance(self):
|
|
||||||
if self.references:
|
|
||||||
for reference_doc in self.references:
|
|
||||||
if reference_doc.reference_doctype == "Employee Advance" and self.target_exchange_rate:
|
|
||||||
frappe.db.set_value(
|
|
||||||
"Employee Advance",
|
|
||||||
reference_doc.reference_name,
|
|
||||||
"exchange_rate",
|
|
||||||
self.target_exchange_rate,
|
|
||||||
update_modified=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
def set_total_in_words(self):
|
def set_total_in_words(self):
|
||||||
from frappe.utils import money_in_words
|
from frappe.utils import money_in_words
|
||||||
|
|
||||||
|
|||||||
@@ -35,20 +35,6 @@ frappe.ui.form.on("Employee", {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
if (frm.doc.salary_currency) {
|
|
||||||
frm.set_query("employee_advance_account", function () {
|
|
||||||
return {
|
|
||||||
filters: {
|
|
||||||
root_type: "Asset",
|
|
||||||
is_group: 0,
|
|
||||||
company: frm.doc.company,
|
|
||||||
account_currency: frm.doc.salary_currency,
|
|
||||||
account_type: "Receivable",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
refresh: function (frm) {
|
refresh: function (frm) {
|
||||||
|
|||||||
Reference in New Issue
Block a user