From 4e0908d0557e2dcacf358df0f2ada84d9bf18d9a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 6 Jan 2016 18:23:00 +0530 Subject: [PATCH] [change-log] --- erpnext/change_log/current/billing_status_in_dn_and_pr.md | 4 ---- erpnext/change_log/v6/v6.16.3.md | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 erpnext/change_log/current/billing_status_in_dn_and_pr.md create mode 100644 erpnext/change_log/v6/v6.16.3.md diff --git a/erpnext/change_log/current/billing_status_in_dn_and_pr.md b/erpnext/change_log/current/billing_status_in_dn_and_pr.md deleted file mode 100644 index b504020ad4..0000000000 --- a/erpnext/change_log/current/billing_status_in_dn_and_pr.md +++ /dev/null @@ -1,4 +0,0 @@ -- Billing Status in Delivery Note (DN) and Purchase Receipt (PR) - - If Invoice made directly against DN/PR, calculate based on actual billed amount - - If Invoice made via Sales Order/Purchase Order, allocate billed amount in DN/PR based on FIFO - - Billing status updated in existing DN/PR \ No newline at end of file diff --git a/erpnext/change_log/v6/v6.16.3.md b/erpnext/change_log/v6/v6.16.3.md new file mode 100644 index 0000000000..ee0279b342 --- /dev/null +++ b/erpnext/change_log/v6/v6.16.3.md @@ -0,0 +1,5 @@ +- Track billed status of a Delivery Note (DN) or Purchase Receipt (PR) + - The system looks for Invoices directly created from Delivery Note / Purchase Receipt *(Workflow: Order -> DN/PR -> Invoice)* and allocates these amounts directly to the DN/PR + - Next, it looks for Invoices not created from Delivery Note / Purchase Receipt, but from an Order *(Workflow: Order -> Invoice, Order -> DN/PR)* and the DN/PR is selected based on FIFO for allocating the billed amount +- In Stock Entry, re-calculate Additional Costs and Amount on changing Quantity or Rate +- Chart of Accounts for Singapore