Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[change-log]

Browse Source
This commit is contained in:
Rushabh Mehta 2015-11-04 17:00:02 +05:30
parent a20a419cb8
commit b9e7cb02f4
5 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/change_log/current/desktop.md
View File

@ -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**

2
erpnext/change_log/current/drop-ship.md
View File

@ -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.

7
erpnext/change_log/v6/v6_7_0.md Normal file
View File

@ -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)

15
erpnext/hr/doctype/leave_application/leave_application.js
View File

@ -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) {

18
sponsors.md
View File

@ -9,7 +9,7 @@
<a href="http://www.mcleans.net.au">McLean Images</a>
</td>
<td>
For credit period setting options
Credit period setting options
for Customer <a href="https://github.com/frappe/erpnext/issues/3451">#3451</a>
</td>
</tr>
@ -18,7 +18,7 @@
<a href="http://www.strellagroup.com">Strella Consulting Sdn Bhd</a>
</td>
<td>
For Sales / Purchase Return Enhancement <a href="https://github.com/frappe/erpnext/issues/3582">#3582</a>
Sales / Purchase Return Enhancement <a href="https://github.com/frappe/erpnext/issues/3582">#3582</a>
</td>
</tr>
<tr>
@ -26,7 +26,7 @@
PT. Ridho Sribumi Sejahtera
</td>
<td>
For Additional Costs in Stock Entry <a href="https://github.com/frappe/erpnext/issues/3613">#3613</a>
Additional Costs in Stock Entry <a href="https://github.com/frappe/erpnext/issues/3613">#3613</a>
</td>
</tr>
<tr>
@ -34,7 +34,7 @@
<a href="http://www.rigpl.com">Rohit Industries</a>
</td>
<td>
For Mandrill Integration <a href="https://github.com/frappe/erpnext/issues/3546">#3546</a>
Mandrill Integration <a href="https://github.com/frappe/erpnext/issues/3546">#3546</a>
</td>
</tr>
<tr>
@ -42,7 +42,15 @@
<a href="http://www.gps.gt">Startrack</a>
</td>
<td>
For Delivery to Target Warehouse <a href="https://github.com/frappe/erpnext/issues/3970">#3546</a>
Delivery to Target Warehouse <a href="https://github.com/frappe/erpnext/issues/3970">#3546</a>
</td>
</tr>
<tr>
<td style="width: 30%">
<a href="https://www.believerschurch.com/">Believer's Church</a>
</td>
<td>
Leave Allocation based on Arbitrary Dates <a href="https://github.com/frappe/erpnext/issues/1938">#1938</a>
</td>
</tr>
</tbody>