diff --git a/erpnext/change_log/current/desktop.md b/erpnext/change_log/current/desktop.md deleted file mode 100644 index 9b4667b8198..00000000000 --- a/erpnext/change_log/current/desktop.md +++ /dev/null @@ -1,2 +0,0 @@ -- **Desktop Reorganization:** To Do, Calendar, Messages, Notes, Activty have been moved into module **Tools** -- Integrations and Installer has been moved into **Setup** diff --git a/erpnext/change_log/current/drop-ship.md b/erpnext/change_log/current/drop-ship.md deleted file mode 100644 index daa06c2c392..00000000000 --- a/erpnext/change_log/current/drop-ship.md +++ /dev/null @@ -1,2 +0,0 @@ -- **Drop Ship** - - Make Sales Order with mrked item as **_Delivered By Supplier_** and submit SO and then make a Purchase Order. \ No newline at end of file diff --git a/erpnext/change_log/v6/v6_7_0.md b/erpnext/change_log/v6/v6_7_0.md new file mode 100644 index 00000000000..7aefba541ad --- /dev/null +++ b/erpnext/change_log/v6/v6_7_0.md @@ -0,0 +1,7 @@ +- **Desktop Reorganization:** To Do, Calendar, Messages, Notes, Activty have been moved into module **Tools** +- Integrations and Installer has been moved into **Setup** +- Make Purchase Order from Sales Order if Supplier is mentioned. +- **Drop Ship Integration:** Make Sales Order with item marked as **Supplier delivers to Customer** and then make a Purchase Order from the Sales Order with Supplier details. +- Customer details in Purchase Order for Drop Ship. +- Set Sales Order, Purchase Order, Delivery Note and Purchase Receipt as **Closed** to clear notifications. +- Allocate leaves in **Leave Allocation** by specific dates and not Fiscal Year. Sponsored by [Believer's Church](https://www.believerschurch.com) diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js index c8bd753a18c..835170a1544 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.js +++ b/erpnext/hr/doctype/leave_application/leave_application.js @@ -28,21 +28,6 @@ frappe.ui.form.on("Leave Application", { frm.set_value("status", "Open"); frm.trigger("calculate_total_days"); } - - frm.set_intro(""); - if (frm.is_new() && !in_list(user_roles, "HR User")) { - frm.set_intro(__("Fill the form and save it")); - } else { - if(frm.doc.docstatus==0 && frm.doc.status=="Open") { - if(user==frm.doc.leave_approver) { - frm.set_intro(__("You are the Leave Approver for this record. Please Update the 'Status' and Save")); - frm.toggle_enable("status", true); - } else { - frm.set_intro(__("This Leave Application is pending approval. Only the Leave Approver can update status.")) - frm.toggle_enable("status", false); - } - } - } }, leave_approver: function(frm) { diff --git a/sponsors.md b/sponsors.md index c7c7b0f9520..bfa9e51ae6f 100644 --- a/sponsors.md +++ b/sponsors.md @@ -9,7 +9,7 @@ McLean Images