+
+###Manual Allocation of leaves
+
+> Human Resources > Leaves and Holiday > Leave Allocation > New Leave Allocation
+
+To manually allocate leaves for an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period.
+
+
diff --git a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.md b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-application.md
similarity index 98%
rename from foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.md
rename to foundation/www/docs/user/manual/en/human-resources/leave-management/leave-application.md
index c26db8aa..e6ec75e9 100755
--- a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.md
+++ b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-application.md
@@ -21,7 +21,7 @@ _Basic Workflow:_
-###Setting Leave Approver
+### Setting Leave Approver
* A leave approver is a user who can approve an leave application for an employee. Leave Approvers for each department can be configured in the [Department](/docs/user/manual/en/human-resources/setup/department.html) master.
diff --git a/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-block-list.md b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-block-list.md
new file mode 100644
index 00000000..e8655f42
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-block-list.md
@@ -0,0 +1,8 @@
+# Leave Block List
+
+> Human Resources > Leaves and Holiday > Leave Block List > New Leave Block List
+
+Leave Block List is a list of dates in a year, on which employees can not apply for leave. You can define a list of users who can approve Leave Application on blocked days, in case of urgency. You can also define whether the list will applied on entire company or any specific departments.
+
+
diff --git a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-encashment.md b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-encashment.md
similarity index 100%
rename from foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave-encashment.md
rename to foundation/www/docs/user/manual/en/human-resources/leave-management/leave-encashment.md
diff --git a/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-period.md b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-period.md
new file mode 100644
index 00000000..6dd04d7f
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-period.md
@@ -0,0 +1,12 @@
+# Leave Period
+
+Most companies manage leaves based on a Leave Period. ERPNext allows you to create a Leave period by going to
+
+> Human Resources > Leaves and Holiday > Leave Period > New Leave Period
+
+
+
+### Granting Leaves to Employees
+
+Leave Management in ERPNext is based on Leave Allocations created for each employee. This means, Employees can only avail as many leaves (of each Leave Type) allocated to them. There are multiple ways by which you can create Leave Allocations for Employees.
diff --git a/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-policy.md b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-policy.md
new file mode 100644
index 00000000..c0596a66
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-policy.md
@@ -0,0 +1,24 @@
+# Leave Policy
+
+> Human Resources > Leaves and Holiday > Leave Policy > New Leave Policy
+
+It is a practice for many enterprises to enforce a general Leave Policy to effectively track and manage Employee leaves. ERPNext allows you to create and manage multiple Leave Policies and allocate leaves to Employees as defined by the policy.
+
+
+
+### Enforcing the Leave Policy
+
+To enforce the Leave Policy, you can either:
+
+* Apply the Leave Policy in Employee Grade
+
+
+
+This will ensure all leave allocations for all employees of this grade will be as per the Leave Policy
+
+* Update Employee record with appropriate Leave Policy. In case you need to selectively update the Leave Policy for a particular Employee, you can do so by updating the Employee record.
+
+
diff --git a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave.md b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-type.md
old mode 100755
new mode 100644
similarity index 50%
rename from foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave.md
rename to foundation/www/docs/user/manual/en/human-resources/leave-management/leave-type.md
index 4d58572a..c5aa0e37
--- a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/leave.md
+++ b/foundation/www/docs/user/manual/en/human-resources/leave-management/leave-type.md
@@ -1,11 +1,5 @@
-
-#Leaves Setup
-This section will help you understand how ERPNext enables you to efficiently manage the leave schedule of your organization. It also explains the way employees can apply for leaves.
+# Leave Type
-Employees create leave requests, which their respective managers (leave approver) can approve or reject. An Employee can select from a number of leave types such as sick leave, casual leave, privilege leave and so on. The number and type of leaves an Employee can apply is controlled by Leave Allocations. You can create Leave Allocations for a Leave Period based on the company's Leave Policy. You can also allocate additional leaves to your employees and generate reports to track leaves taken by Employees.
-
----
-##Leave Type
> Human Resources > Leaves and Holiday > Leave Type > New Leave Type
Leave Type refers to types of leave allotted to an employee by a company. An employee can select a particular Leave Type while requesting for a leave. You can create any number of Leave Types based on your company’s
@@ -46,7 +40,7 @@ requirement.
-###Default Leave Types
+### Default Leave Types
There are some pre-loaded Leave Types in the system, as below:
- Leave Without Pay: You can avail these leaves for different purposes, such as, extended medical issues, educational purpose or unavoidable personal reason. Employee does not get paid for such leaves.
@@ -55,74 +49,3 @@ There are some pre-loaded Leave Types in the system, as below:
- Compensatory off: These are compensatory leave allotted to employees for overtime work.
- Casual leave: You can avail this leave to take care of urgent and unseen matters.
----
-##Leave Policy
-> Human Resources > Leaves and Holiday > Leave Policy > New Leave Policy
-
-It is a practice for many enterprises to enforce a general Leave Policy to effectively track and manage Employee leaves. ERPNext allows you to create and manage multiple Leave Policies and allocate leaves to Employees as defined by the policy.
-
-
-
-### Enforcing the Leave Policy
-To enforce the Leave Policy, you can either:
-* Apply the Leave Policy in Employee Grade
-
-
-This will ensure all leave allocations for all employees of this grade will be as per the Leave Policy
-
-* Update Employee record with appropriate Leave Policy. In case you need to selectively update the Leave Policy for a particular Employee, you can do so by updating the Employee record.
-
-
-
----
-##Leave Period
-Most companies manage leaves based on a Leave Period. ERPNext allows you to create a Leave period by going to
-> Human Resources > Leaves and Holiday > Leave Period > New Leave Period
-
-
-
-###Granting Leaves to Employees
-Leave Management in ERPNext is based on Leave Allocations created for each employee. This means, Employees can only avail as many leaves (of each Leave Type) allocated to them. There are multiple ways by which you can create Leave Allocations for Employees.
-
-##Leave Allocation
-Leave Allocation enables you to allot a specific number of leaves to a particular employee. You can allocate a number of leaves to different types of leave.
-
-###Allocating leaves for a Leave Period
-> Human Resources > Leaves and Holiday > Leave Period
-
-Leave Period helps you manage leaves for a period and also doubles up as a tool to help you grant leaves for a category of employees. The _Grant_ button will generate Leave Allocations based on the Leave Policy applicable to each Employee. You can allocate leaves based on Employee Grade, Department or Designation. Also, note that _Carry Forward Leaves_ check will enable you to carry forward any unused leaves (for Leave Types with Is Carry Forward turned on) from previous allocations to new ones.
-
-
-
-###Manual Allocation of leaves
-> Human Resources > Leaves and Holiday > Leave Allocation > New Leave Allocation
-
-To manually allocate leaves for an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period.
-
-
-
----
-##Leave Block List
-
-> Human Resources > Leaves and Holiday > Leave Block List > New Leave Block List
-
-Leave Block List is a list of dates in a year, on which employees can not apply for leave. You can define a list of users who can approve Leave Application on blocked days, in case of urgency. You can also define whether the list will applied on entire company or any specific departments.
-
-
-
----
-#Applying for Leaves
-
-##Leave Application
-> Human Resources > Leaves and Holiday > Leave Application > New Leave Application
-
-[Leave Application](/docs/user/manual/en/human-resources/leaves_and_holiday/leave-application.html) section enables an employee to apply for leaves. Employee can select the type of leave and the Leave Approver who will authorize the Leave Application. Leave Approvers for each department can be configured in the [Department](/docs/user/manual/en/human-resources/setup/department.html) master. Based on selected dates and applicable Holiday List, total leave days is calculated automatically.
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.md b/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.md
deleted file mode 100755
index 4e0b58db..00000000
--- a/foundation/www/docs/user/manual/en/human-resources/leaves_and_holiday/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Leaves and Holiday
-Managing leaves of employees is a very important function every HR. ERPNext allows you to allocate leaves to employees, track leaves of employees and the approval workflows associated with the process. This sections explains this in detail.
-
-### Topics
-
-{index}
diff --git a/foundation/www/docs/user/manual/en/human-resources/shift-management.md b/foundation/www/docs/user/manual/en/human-resources/shift-management.md
index 6854058c..0fd0ab96 100755
--- a/foundation/www/docs/user/manual/en/human-resources/shift-management.md
+++ b/foundation/www/docs/user/manual/en/human-resources/shift-management.md
@@ -19,7 +19,7 @@ Human Resources > Shift Management > Shift Type
* Enter Shift Type, Start Time and End Time for quick entry.
- 
+
### Shift Request
@@ -41,5 +41,5 @@ Human Resources > Shift Management > Shift Request
* You can also view Calendar view of Shift Assignments.
- 
\ No newline at end of file
diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md b/foundation/www/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
index 7be3bf94..d76df1fd 100755
--- a/foundation/www/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
+++ b/foundation/www/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
@@ -1,5 +1,5 @@
-# Using Custom Domain On Erpnext
+# Using Custom Domain On ERPNext
diff --git a/foundation/www/docs/user/manual/en/setting-up/company-setup.md b/foundation/www/docs/user/manual/en/setting-up/company-setup.md
index dc8ffb49..eba85fe8 100755
--- a/foundation/www/docs/user/manual/en/setting-up/company-setup.md
+++ b/foundation/www/docs/user/manual/en/setting-up/company-setup.md
@@ -2,7 +2,7 @@
A company is a legal entity made up of an association of people for carrying on a commercial or industrial enterprise.
-In ERPNext, first Company is created on completion of account creation. For each Company, you can set a domain as manufacturing, retail, or services depending on the nature of your business activity.
+In ERPNext, first Company is created on completion of account creation. For each Company, you can set a domain as manufacturing, retail, or services depending on the nature of your business activity.
If you have more than one company, you can add them from:
@@ -10,22 +10,26 @@ If you have more than one company, you can add them from:
### Company Tree Structure
+> New in Version 11
+
The company is a tree-structured master. It allows you to define a federated and group company structure.
-
+
+
+Once you build a company tree, ERPNext will validate that the accounts of the child companies will match the accounts in the parent company, so that you can consolidate all the accounts in a consolidated chart of accounts statement.
### Chart of Accounts
On each Company, the master for Chart of Account is maintained separately. This allows you to maintain separate accounting for each company as per the legal requirements.
-
+
ERPNext has localized Chart of Accounts readily available for some countries. When creating new Company, you can choose to setup Chart of Account for it from one of the following options.
* Standard Chart of Accounts
* Based on Existing Company's Chart of Account
-
+
### Default Values
diff --git a/foundation/www/docs/user/manual/en/using-erpnext/index.md b/foundation/www/docs/user/manual/en/using-erpnext/index.md
index 933aecc7..136b27ec 100755
--- a/foundation/www/docs/user/manual/en/using-erpnext/index.md
+++ b/foundation/www/docs/user/manual/en/using-erpnext/index.md
@@ -1,5 +1,5 @@
-# Using Erpnext
+# Using ERPNext
We live in an era when people are very comfortable communicating, discussing,
asking, assigning work and getting feedback electronically. The Internet acts
diff --git a/foundation/www/docs/user/manual/es/introduction/getting-started-with-erpnext.md b/foundation/www/docs/user/manual/es/introduction/getting-started-with-erpnext.md
index 3c1fc0b2..4c1604a0 100755
--- a/foundation/www/docs/user/manual/es/introduction/getting-started-with-erpnext.md
+++ b/foundation/www/docs/user/manual/es/introduction/getting-started-with-erpnext.md
@@ -1,5 +1,5 @@
-# Getting Started With Erpnext
+# Getting Started With ERPNext
Hay muchas manera de comenzar a utilizar ERPNext.
diff --git a/foundation/www/releases/__init__.py b/foundation/www/releases/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/releases/version-11/__init__.py b/foundation/www/releases/version-11/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/releases/version-11/features/__init__.py b/foundation/www/releases/version-11/features/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/foundation/www/releases/version-11/features/_sidebar.json b/foundation/www/releases/version-11/features/_sidebar.json
new file mode 100644
index 00000000..e75409f2
--- /dev/null
+++ b/foundation/www/releases/version-11/features/_sidebar.json
@@ -0,0 +1,30 @@
+[
+ {
+ "route": "/releases/version-11",
+ "title": "Version 11 Home"
+ },
+ {
+ "route": "/releases/version-11/features/accounting",
+ "title": "Accounting"
+ },
+ {
+ "route": "/releases/version-11/features/human-resources",
+ "title": "Human Resources"
+ },
+ {
+ "route": "/releases/version-11/features/asset-management",
+ "title": "Asset Management"
+ },
+ {
+ "route": "/releases/version-11/features/other",
+ "title": "New Features"
+ },
+ {
+ "route": "/releases/version-11/features/marketplace",
+ "title": "Marketplace"
+ },
+ {
+ "route": "/releases/version-11/features/framework",
+ "title": "Framework"
+ }
+]
diff --git a/foundation/www/releases/version-11/features/accounting.md b/foundation/www/releases/version-11/features/accounting.md
new file mode 100644
index 00000000..09fc1753
--- /dev/null
+++ b/foundation/www/releases/version-11/features/accounting.md
@@ -0,0 +1,59 @@
+# Finance + Accounting Enhancements
+
+ERPNext in Version 11 accounting has a lot of enhancements that make it an Enterprise-Ready ERP system. Here is a summary of the highlights
+
+### Company Tree
+
+ERPNext already supports multi-company, in Version 11, the company is now a tree structure so you can create holding companies and consolidate financial reports within a group of companies. ERPNext also ensures that the chart of accounts of the child company is mapped to the parent Company
+
+
+
+### Multiple Finance Books
+
+With the new concept of **Finance Book**, you can now make journal entries that are only posted to specific Financial Books. This is useful if you have to report depreciation and other values in different ways based on regulatory requirements. You can also use this to post alternate balance sheets for your internal reporting.
+
+### Bank Statement Upload
+
+Bank Statement Import allows you to define the standard format of your Bank's statement export and then allows you to import the your bank statement. The tool will also help you reconcile payments, make new payments and match them with invoices.
+
+### Tax Witholding
+
+ERPNext will now automatically calculate tax to be witheld from suppliers based on rules, so now operators don't have to manually look up rules and calculate tax to be witheld before making payments.
+
+### Subscriptions and Deferred Revenue
+
+If you are servicing subscriptions or contracts that go across financial periods, it makes sense to book revenue in the correct period so you can defer the tax liability to the actual period where you deliver the service. ERPNext will now let you setup subscriptions and automatically book revenue monthly or quarterly based on your settings.
+
+[Learn about Deferred Revenue](https://erpnext.org/docs/user/manual/en/accounts/deferred-revenue)
+
+
+
+### Inter Company Transactions
+
+Inter-company transactions allow you to post validated back-to-back transactions across companies. These include Journal Entries, Sales and Purchase Invoices. In the company master you have to specify which companies are allowed to transact with each other and then you can make inter company transactions on those companies.
+
+[Learn more about Inter Company Journal Entry](https://erpnext.org/docs/user/manual/en/accounts/inter-company-journal-entry) and [Inter Company Invoice](https://erpnext.org/docs/user/manual/en/accounts/inter-company-invoices)
+
+### Standalone Credit / Debit Note
+
+Debit and Credit notes can now be made as stand alone documents. In Version 10 and earlier, these could be made only against an existing Sales or Purchase.
+
+
+
+### Reverse Journal Entry
+
+You can now automatically pass a reverse Journal Entry to that will swap the debits and credits in order to reverse a particular transaction.
+
+### Enhanced Bank Guarantee
+
+You can now track Bank Guarantees in given to customers and track its expiry via Email Alert
+
+[Learn more about Bank Guarantee](https://erpnext.org/docs/user/manual/en/accounts/bank-guarantee)
+
+### Cost Center Numbering
+
+Account Numbering System has now been extended to Cost Centers.
+
+
+
diff --git a/foundation/www/releases/version-11/features/asset-management.md b/foundation/www/releases/version-11/features/asset-management.md
new file mode 100644
index 00000000..57ca0d0b
--- /dev/null
+++ b/foundation/www/releases/version-11/features/asset-management.md
@@ -0,0 +1,27 @@
+# Asset Management Enhancements
+
+Large Enterprises have a large number of assets and they form a large part of their balance sheets. Helping effective management of assets is one of the core features of an Enterprise Grade ERP system.
+
+### Serialised Assets
+
+Assets in ERPNext are not integrated with Serial Numbers so that you can directly create Serialised Assets from Purchase Invoices. This is ideal if you are buying large number of assets like laptops or furniture and want to track each asset separately with a Serial Number.
+
+### Capital-Work-in-Progress (CWIP) Accounting
+
+With CWIP, you can track assets appear in your books but are not yet deployed. When assets are purchased, the can be held in a placeholder account (CWIP) and the depreciation cycle starts automatically on the day you designate it to come to use.
+
+
+
+### Multiple depreciation schedule based on finance book
+
+With multiple Finance Books, you can maintain different depreciation schedules for each finance book and ERPNext will automatically book the depreciation expense in the respective date based on its schedule.
+
+### Asset Value Adjustment
+
+You can change the value of an asset incase of damage or theft or sale (or partial sale) with a one time entry called Asset Value Adjustment
+
+
+
+### Improved Asset Movement between location or employee
+
+You can now issue, return and move an Asset along with its Serial Number between locations and employees. This will help you keep track of assets like laptops etc that are issues to employees and at various locations.
\ No newline at end of file
diff --git a/foundation/www/releases/version-11/features/framework.md b/foundation/www/releases/version-11/features/framework.md
new file mode 100644
index 00000000..a56524dd
--- /dev/null
+++ b/foundation/www/releases/version-11/features/framework.md
@@ -0,0 +1,43 @@
+# Framework Enhancements
+
+Frappe Framework sits at the foundation of ERPNext and is the core technology that drives this application. There have been huge improvements on the Framework side as we make ERPNext even more ready for the next generation.
+
+### Python 3!
+
+Frappe Framework and ERPNext are now both compliant with Python 3, the latest and greatest from the Python community. As of Version 11, both Python 2 and 3 are supported and we recommend all users to gradually move to Python 3 as we might drop support for Python 2 in the upcoming versions.
+
+### User Permissions
+
+User Permissions has been redesigned for simplicty and control. In Version 10, setting user permissions depended on 3 settings: User Permissions, Role Permissions, Document Type. This was extremely hard to configure and understand and based on user feedback, we have unlinked Role Permissions from this.
+
+This is the design that actually kicked off a breaking change, and hence Version 11!
+
+[Follow the discussion that led to change in User Permissions](https://discuss.erpnext.com/t/proposal-user-permissions-simplifcation/25641)
+
+
+
+### Auto Repeat
+
+Automatically schedule creation of duplicates of certain documents at fixed intervals. This feature which was restricted to a few document types has now been made generic.
+
+### Workflows
+
+Workflows have been so far a much used but under developed features of Frappe/ERPNext. In Version 11, Workflows are given a much required upgrade. You can now set rules on workflow and track Pending Workflow Action for all users. Users will also get an email notification for their workflow events and they can approve or reject directly via Email!
+
+[Learn More about Workflows](https://erpnext.org/docs/user/manual/en/setting-up/workflows)
+
+### Bulk Actions and Edit
+
+A small tweak that will greatly improve your productivity is Bulk Actions. You can now select and edit a bunch documents from the List View and also Submit and Cancel them. Once you use this feature, you will wonder how did you ever live without it.
+
+
+
+### Dynamic Charts
+
+You can now configure charts on the fly by selecting your axes, powered by the beautiful Frappe Charts library.
+
+### Chat
+
+The in-app chat has been completely revamped and now works real time in an overlay widget. Now start communicating in-app with your colleagues via Frappe Chat
+
+
diff --git a/foundation/www/releases/version-11/features/human-resources.md b/foundation/www/releases/version-11/features/human-resources.md
new file mode 100644
index 00000000..0be136b1
--- /dev/null
+++ b/foundation/www/releases/version-11/features/human-resources.md
@@ -0,0 +1,123 @@
+# Human Resource Management Enhancements
+
+So far the Human Resource Management module in ERPNext was very basic. From our interactions we realized that most larger companies that implemented ERPNext had their own HR implementations. This has changed with Version 11. ERPNext has now a much deeper Human Resource management module and this is by far the biggest improvement in this version.
+
+### Department Hierarchy
+
+With the Department now a tree, you can map your company's organization structure as a tree.
+
+
+
+[Learn more about Departments](https://erpnext.org/docs/user/manual/en/human-resources/setup/department)
+
+---
+
+## Leave Management
+
+[Learn more about how Leave Management works](https://erpnext.org/docs/user/manual/en/human-resources/leave-management)
+
+### Leave Period
+
+There is now a Leave Period against which leaves will be granted (allocated). The process of allocation will be done in basis of Leave Policy and these can be directly attached to Employees or their Grades.
+
+
+
+### New Leave Types
+
+Several new leave types have been introduced:
+
+- Optional Leave: Pick leaves from a set of optional holidays (for example religious holidays).
+- Earned Leave: Automatically allocate leave based on time served.
+- Parental Leave: Long term paternity or maternity leaves.
+
+### Leave Encashment
+
+Employees can now apply for encashment of unused leaves based on the company policy for each leave type and maximum number of encashable leaves.
+
+### Compensatory Leave
+
+If an Employee has worked on a holiday, she can apply for a Compensatory Leave that will allow her to take off on another day.
+
+### Attendance Request
+
+Request for Attendance in case the Employee has worked from home or has been out of office on field duty.
+
+
+---
+
+## Enhanced Payroll
+
+Along with Leave Management, Payroll has been greately enhanced with tons of new features.
+
+[Learn how Payroll works in EPRNext](https://erpnext.org/docs/user/manual/en/human-resources/payroll)
+
+### New Salary Structure
+
+Salary Structure Assignment is now moved out of Salary Structure so that you can assign a single structure to a large number of Employees
+
+### Additional Salary
+
+Declare Ad-hoc salary components that can be used in case of Incentives or one time bonus or deductions.
+
+### Payroll Period
+
+Salary processing now happens in pre-defined periods (years) where the dates for each month's payroll and freezing of other documents is defined.
+
+### Employee Benefits
+
+Employees can now apply for flexible benefits (like medical, dental, internet etc) offered by the company that form and also submit claims against those benefits.
+
+### Employee Tax Exemptions
+
+Employees can apply for Tax Exemptions based on the categories defined by the government and the system will automatically adjust the tax deducted based on the exemptions applied and the proof submitted.
+
+### Auto Calculation of Tax Deduction
+
+You can define various rates of tax deducation based on thresholds that will be automatically calculated and deducted from the month's salary.
+
+### Enhanced Salary Processing
+
+Payroll run has been enhanced to process a large number of Employees in a go by pushing processing to background jobs via queues.
+
+---
+
+## Employee Lifecycle
+
+In Version 11, you can easily track the lifecycle of Employees right from the time they join the company to the time they leave. There are numberous processes in onboarding, transfer and separation. ERPNext helps you manage these processes by integrating with the Projects module.
+
+[Learn more about Employee Lifecycle](https://erpnext.org/docs/user/manual/en/human-resources/employee_lifecycle)
+
+
+
+### Employee Onboarding
+
+Prepare a template for Employee onboarding like signing of the contract, NDA, issuing ID card, email id etc and make separate tasks that can be assigned to individuals or Roles.
+
+### Employee Separation
+
+Just like Onboarding, separation helps you prepare a checklist of all the tasks that need to be completed when an Employee leaves the organisation
+
+### Employee Transfer and Promotion
+
+Keep a track of transfers of employees withing departments or group companies and also their promotions.
+
+---
+
+### Shift Planning
+
+ERPNext Version 11 also helps you manage multiple shifts by planning shifts and assigning employees to shifts and also managing requests by employees for various shifts.
+
+ - Shift Type: Manage list of Shifts and their timings and start and end dates and number of openings.
+ - Shift Assignment: Assign Employees to Shift Types to track how many Employees are assigned.
+ - Shift Request: Manage the process by which Employees can apply for Shifts
+
+[Learn more about Shift Management](https://erpnext.org/docs/user/manual/en/human-resources/shift-management)
+
+---
+
+### Staffing Plan
+
+You can create Staffing Plans and limit the number of openings for each position for each period. When a staffing plan is created, ERPNext will ensure that the number of Job Openings does not cross the budget number of positions.
+
+[Learn more about Staffing Plan](https://erpnext.org/docs/user/manual/en/human-resources/setup/staffing-plan.html)
diff --git a/foundation/www/releases/version-11/features/marketplace.md b/foundation/www/releases/version-11/features/marketplace.md
new file mode 100644
index 00000000..71b2d9e4
--- /dev/null
+++ b/foundation/www/releases/version-11/features/marketplace.md
@@ -0,0 +1,32 @@
+# Marketplace
+
+Our announcement in the 2017 Conference, that we are planning to launch an in-app listing of products by ERPNext users, is finally coming to life. ERPNext Version 11 will have a free marketplace where any ERPNext user can list their products and be discovered by thousands of other companies using ERPNext.
+
+The markplace itself will be hosted independantly by the ERPNext Foundation, a registered not-for-profit that works towards the improvement of ERPNext.
+
+With the marketplace ERPNext goes beyond a tool to help manage a business, to a tool that also helps you grow your business.
+
+### Marketplace Design
+
+The marketplace will be available as an in-app module within ERPNext
+
+
+
+### Item View
+
+Ability to review, save and contact seller from the Item View
+
+
+
+### Company View
+
+A homepage for every company, with an introduction and showing what items are there in the view.
+
+
+
+### Communicate with Sellers and Buyers
+
+Communicate directly with Sellers and Buyers from within ERPNext
+
+
+
diff --git a/foundation/www/releases/version-11/features/other.md b/foundation/www/releases/version-11/features/other.md
new file mode 100644
index 00000000..794c24b7
--- /dev/null
+++ b/foundation/www/releases/version-11/features/other.md
@@ -0,0 +1,58 @@
+# Other New Features
+
+ERPNext Version 11 brings tons of new features in almost every module. Here are some of the highlights:
+
+### Loyalty Management
+
+You can manage multiple Loyalty Programs right within EPRNext. Set multiple tiers, define different rules for earning and redemption of points. Keep a track of points earned by each customer against each transaction.
+
+[Learn more about the Loyalty Program](https://erpnext.org/docs/user/manual/en/accounts/loyalty-program)
+
+
+
+### Subscriptions
+
+ERPNext Version 11 has a first class Subscription management. You can define differrent Subscription Plans and Subscriptions. ERPNext will automatically create invoices based on the billing frequency and period.
+
+### Shareholder Management
+
+Keep a track of all Shareholders and Shareholder transactions right within ERPNext. Track Share Transfers between Shareholders and automatically calculate dividend based on the Shareholding pattern.
+
+[Learn more about the Shareholder Module](https://discuss.erpnext.com/t/shareholder-module-money-with-wings-moneybag-money-mouth-face/33380)
+
+
+
+### Production Plan and Job Card
+
+Split Work Orders into individual Job Cards that can be issued per Workstation. Transfer material from one workstation to other based on the Product Routing and keep track of inventory at the workstation level.
+
+[Job Cards is planned to be merged soon into Version 11](https://github.com/frappe/erpnext/pull/15244)
+
+### Updated Timesheets
+
+Timesheets have now been updated with a timer, so you can simply hit the "Start" and "Stop" buttons to track time.
+
+[Learn more about updated timesheets](https://erpnext.org/docs/user/manual/en/projects/timesheet)
+
+
+
+### Integrations
+
+ERPNext Version 11 has a host of new integrations that work out-of-the-box including:
+
+1. Stripe Payment Gateway Integration
+1. Braintree Payment Gateway Integration
+1. Woocommerce Order Sync
+1. Amazon MWS Order Sync
+1. Updated Shoify Order Sync
+
+### Localizations
+
+ERPNext Version 11 also brings enhancements to various localizations including:
+
+1. Additional reports for GST for India.
+1. Immutable Ledger posting for France.
+
+### Update Qty After Submit
+
+You will now be able to update the Sales or Purchase Order quantity after submitted an order, if the item has not been delivered or billed. No need to cancel downstream transactions and re-submit them.
\ No newline at end of file
diff --git a/foundation/www/releases/version-11/index.html b/foundation/www/releases/version-11/index.html
new file mode 100644
index 00000000..08e71783
--- /dev/null
+++ b/foundation/www/releases/version-11/index.html
@@ -0,0 +1,65 @@
+{% extends "templates/base.html" %}
+{% block title %}ERPNext Version 11{% endblock %}
+
+
+{% macro card(title, body, link) %}
+Expanding ERPNext to Serve Large Enterprises
+ Explore
+Version 11 is the first ERPNext Version that is truly community contributed. Learn how it was executed with a quick chat with core developers.
+ +