[Minor] Employee Separation Fix (#14867)
* delete associated task & project forcefully
in Employee Seapration cancel trigger
* remove leftover print statement
* remove console statements
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index f2b9ba2..5f04f8b 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -16,9 +16,7 @@
},
onload: function() {
var me = this;
- this._super();
- console.log("class erpnext.accounts.SalesInvoiceController, onload this->", this);
-
+ this._super();
if(!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) {
// show debit_to in print format
diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py
index f6682e0..acb94fe 100644
--- a/erpnext/hr/utils.py
+++ b/erpnext/hr/utils.py
@@ -71,8 +71,8 @@
def on_cancel(self):
# delete task project
for task in frappe.get_all("Task", filters={"project": self.project}):
- frappe.delete_doc("Task", task.name)
- frappe.delete_doc("Project", self.project)
+ frappe.delete_doc("Task", task.name, force=1)
+ frappe.delete_doc("Project", self.project, force=1)
self.db_set('project', '')
for activity in self.activities:
activity.db_set("task", "")
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 303d21f..9279021 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -613,7 +613,6 @@
this.frm.doc.paid_amount : this.frm.doc.base_paid_amount;
this.frm.doc.outstanding_amount = flt(total_amount_to_pay - flt(paid_amount) +
flt(this.frm.doc.change_amount * this.frm.doc.conversion_rate), precision("outstanding_amount"));
- console.log("set the outstanding amount");
}
},
@@ -653,7 +652,6 @@
this.frm.doc.paid_amount = flt(paid_amount, precision("paid_amount"));
this.frm.doc.base_paid_amount = flt(base_paid_amount, precision("base_paid_amount"));
- console.log("paid amount set as -> ", paid_amount, base_paid_amount);
},
calculate_change_amount: function(){
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index cd02e30..3683695 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -570,7 +570,6 @@
self.assertEqual(dn.name, dt.delivery_stops[0].delivery_note)
def create_delivery_note(**args):
- print (frappe.session.user)
dn = frappe.new_doc("Delivery Note")
args = frappe._dict(args)
dn.posting_date = args.posting_date or nowdate()