From fd8f34018dd71af87c68bd72f6155ca1094c5e18 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 29 Jul 2015 16:28:29 +0530 Subject: [PATCH 1/2] Change log added --- erpnext/change_log/current/item_cleanup.md | 2 -- erpnext/change_log/current/packing_list.md | 2 -- erpnext/change_log/current/spnsorship.md | 2 -- erpnext/change_log/v5/v5_4_0.md | 9 +++++++++ 4 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 erpnext/change_log/current/item_cleanup.md delete mode 100644 erpnext/change_log/current/packing_list.md delete mode 100644 erpnext/change_log/current/spnsorship.md create mode 100644 erpnext/change_log/v5/v5_4_0.md diff --git a/erpnext/change_log/current/item_cleanup.md b/erpnext/change_log/current/item_cleanup.md deleted file mode 100644 index c2f1e911e7..0000000000 --- a/erpnext/change_log/current/item_cleanup.md +++ /dev/null @@ -1,2 +0,0 @@ -- **Item** form cleanups: "Yes" / "No" type fields changed to checkboxes.
- **Warning**: This could break your 3rd party integrations with Item, if any. diff --git a/erpnext/change_log/current/packing_list.md b/erpnext/change_log/current/packing_list.md deleted file mode 100644 index d4793be1ea..0000000000 --- a/erpnext/change_log/current/packing_list.md +++ /dev/null @@ -1,2 +0,0 @@ -- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice -- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered \ No newline at end of file diff --git a/erpnext/change_log/current/spnsorship.md b/erpnext/change_log/current/spnsorship.md deleted file mode 100644 index 62720acc54..0000000000 --- a/erpnext/change_log/current/spnsorship.md +++ /dev/null @@ -1,2 +0,0 @@ -- Sales / Purchase Return Enahancement - **[Sponsored by Strella Consulting Sdn Bhd](http://www.strellagroup.com)** - * Now you can make Delivery Note, Purchase Receipt or Sales / Purchase Invoice with negative quantity \ No newline at end of file diff --git a/erpnext/change_log/v5/v5_4_0.md b/erpnext/change_log/v5/v5_4_0.md new file mode 100644 index 0000000000..0a9f29f7d7 --- /dev/null +++ b/erpnext/change_log/v5/v5_4_0.md @@ -0,0 +1,9 @@ +- Sales / Purchase Return Enahancement - **[Sponsored by Strella Consulting Sdn Bhd](http://www.strellagroup.com)** + * Now you can make Delivery Note, Purchase Receipt or Sales / Purchase Invoice with negative quantity +- **Item** form cleanups: "Yes" / "No" type fields changed to checkboxes.
+ **Warning**: This could break your 3rd party integrations with Item, if any +- Leave Application: Consideration of **holidays** in calculation of 'Number of Days' is now optional. You can set it in Leave Type record. +- Customer / Supplier can be **freezed** now +- Fix: Reserved qty calculation while delivering Product Bundle via Sales Invoice +- Fix: Deleted stock ledger entries on cancellation of Sales Invoice while Product Bundle delivered +- Fix: Fetch default expense account and cost center from item based on selected company \ No newline at end of file From 7364ebaff64146777b7f74d07cb6311130b25cd7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 29 Jul 2015 16:41:23 +0530 Subject: [PATCH 2/2] minor fix --- erpnext/change_log/v5/v5_4_0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/change_log/v5/v5_4_0.md b/erpnext/change_log/v5/v5_4_0.md index 0a9f29f7d7..6c9b72ec5e 100644 --- a/erpnext/change_log/v5/v5_4_0.md +++ b/erpnext/change_log/v5/v5_4_0.md @@ -1,5 +1,5 @@ -- Sales / Purchase Return Enahancement - **[Sponsored by Strella Consulting Sdn Bhd](http://www.strellagroup.com)** - * Now you can make Delivery Note, Purchase Receipt or Sales / Purchase Invoice with negative quantity +- Sales / Purchase Return Enahancement - **Sponsored by [Strella Consulting Sdn Bhd](http://www.strellagroup.com)** + * Now you can make Return entry by creating Delivery Note, Purchase Receipt or Sales / Purchase Invoice with negative quantity - **Item** form cleanups: "Yes" / "No" type fields changed to checkboxes.
**Warning**: This could break your 3rd party integrations with Item, if any - Leave Application: Consideration of **holidays** in calculation of 'Number of Days' is now optional. You can set it in Leave Type record.