From dc8e6bbafd7b7679202cd516b550f5ab2e3461d9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 3 Sep 2018 13:07:34 +0530 Subject: [PATCH] v11 start --- .../assets/img/setup/data-import /__init__.py | 0 .../en/human-resources/tools/__init__.py | 0 .../manual/en/setting-up/company-setup.md | 12 ++-- foundation/www/releases/__init__.py | 0 .../www/releases/version-11/__init__.py | 0 .../releases/version-11/features/__init__.py | 0 .../version-11/features/_sidebar.json | 30 ++++++++++ .../version-11/features/accounting.md | 26 +++++++++ .../version-11/features/asset-management.md | 16 +++++ .../releases/version-11/features/framework.md | 17 ++++++ .../version-11/features/human-resources.md | 46 +++++++++++++++ .../version-11/features/marketplace.md | 1 + .../www/releases/version-11/features/other.md | 22 +++++++ foundation/www/releases/version-11/index.html | 58 +++++++++++++++++++ 14 files changed, 224 insertions(+), 4 deletions(-) create mode 100644 foundation/www/assets/img/setup/data-import /__init__.py create mode 100644 foundation/www/docs/user/manual/en/human-resources/tools/__init__.py create mode 100644 foundation/www/releases/__init__.py create mode 100644 foundation/www/releases/version-11/__init__.py create mode 100644 foundation/www/releases/version-11/features/__init__.py create mode 100644 foundation/www/releases/version-11/features/_sidebar.json create mode 100644 foundation/www/releases/version-11/features/accounting.md create mode 100644 foundation/www/releases/version-11/features/asset-management.md create mode 100644 foundation/www/releases/version-11/features/framework.md create mode 100644 foundation/www/releases/version-11/features/human-resources.md create mode 100644 foundation/www/releases/version-11/features/marketplace.md create mode 100644 foundation/www/releases/version-11/features/other.md create mode 100644 foundation/www/releases/version-11/index.html diff --git a/foundation/www/assets/img/setup/data-import /__init__.py b/foundation/www/assets/img/setup/data-import /__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/__init__.py b/foundation/www/docs/user/manual/en/human-resources/tools/__init__.py new file mode 100644 index 00000000..e69de29b 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. -Item - Deferred Revenue +Company Tree + +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. -Item - Deferred Revenue +Company Chart of Accounts 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 -Item - Deferred Revenue +Company Chart of Accounts ### Default Values 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..13cb0ecf --- /dev/null +++ b/foundation/www/releases/version-11/features/accounting.md @@ -0,0 +1,26 @@ +# Version 11: Accounting Enhancements + +### Company Tree + +### Standalone Credit / Debit Note + +### Reverse Journal Entry + +### Multi Finance Book + +### Bank Statement Upload + +### Tax Witholding + +### Deferred Revenue + +### Budget on Material Request and Purchase Order + +### Inter Company Transactions + +### Enhanced Bank Guarantee + +### Bank and Bank Account Master + +### Cost Center Numbering + 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..6314091c --- /dev/null +++ b/foundation/www/releases/version-11/features/asset-management.md @@ -0,0 +1,16 @@ +# Version 11: Asset Management Improvements + +### CWIP Accounting + +### Serialised asset + +### Improved workflow for managing assets + +### Multiple depreciation schedule based on finance book + +### Asset value adjustment + +### Improved Asset Movement between location or employee + - Issue + - Receive + - Movement 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..bb579f53 --- /dev/null +++ b/foundation/www/releases/version-11/features/framework.md @@ -0,0 +1,17 @@ +# Version 11: Framework Enhancements + +### Python 3! + +### Auto Repeat + +### User Permissions + +### Workflows + +### Editable Grids + +### Bulk Edit + +### Dynamic Charts + +### Chat \ No newline at end of file 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..a7414b8e --- /dev/null +++ b/foundation/www/releases/version-11/features/human-resources.md @@ -0,0 +1,46 @@ +# Version 11: Human Resource Management Enhancements + +### Enhanced Payroll + + - Salary Structure + - Submittable + - Salary Structure Assignment, instead of child table of employee + - Payroll Period + - Additional Salary + - Employee Tax Exemption + - Employee Benefits + - Formula on salary component + - Automated tax calculation for based on tax slab (India) + + +### Leave Management + - Leave Period + - Multiple Leave Types + - Optional Leave + - Earned Leave + - Parental Leave + - Leave Policy + - Leave Encashment + - Compensatory Leave + - Refactored Leave Application + - Approver based on department > patch + - Leave balance + +### Attendance Request + +### Shift Planning + + - Shift Type + - Shift Assignment + - Shift Request + +### Staffing Plan + +### Employee Onboarding and Separation + +### Employee Transfer + +### Employee Promotion + +### Department Hierarchy + 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..101bf882 --- /dev/null +++ b/foundation/www/releases/version-11/features/marketplace.md @@ -0,0 +1 @@ +# Marketplace \ No newline at end of file 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..2d4f85c3 --- /dev/null +++ b/foundation/www/releases/version-11/features/other.md @@ -0,0 +1,22 @@ +# Version 11: New Features + + +### Loyalty Management + +### Subscriptions + +### Shareholder Management + +### Production Plan and Job Card + +### Updated Timesheets + +### Integrations + +### Localizations + +### Update Qty After Submit + + +- GST India +- France diff --git a/foundation/www/releases/version-11/index.html b/foundation/www/releases/version-11/index.html new file mode 100644 index 00000000..6de4cef5 --- /dev/null +++ b/foundation/www/releases/version-11/index.html @@ -0,0 +1,58 @@ +{% extends "templates/base.html" %} +{% block title %}ERPNext Version 11{% endblock %} + + +{% macro card(title, body, link) %} +
+
+
+
{{ title }}
+
{{ body }}
+ Details +
+
+
+{% endmacro %} + +{% block content %} +
+
+

ERPNext Version 11

+

Expanding ERPNext to Serve Large Enterprises

+ Explore

+
+ {{ card( + "Financial Accounting", + "Multi-book financials, consolidated financials, inter-company transactions, deferred revenue, bank upload and more.", + "/releases/version-11/features/accounting" + ) }} + {{ card( + "Human Resources", + "Upgraded payroll, with configurable benefits and deductions, Upgraded leave management, leave periods, employee lifecycle and more.", + "/releases/version-11/features/human-resources" + ) }} + {{ card( + "Asset Management", + "Improved asset management with serialized assets, Capital Work in Progress (CWIP) accounting, asset movement tracking.", + "/releases/version-11/features/asset-management" + ) }} + {{ card( + "Marketplace", + "List your products for free in the in-app marketplace, and web portal, and communicate with buyers and sellers from inside ERPNext.", + "/releases/version-11/features/marketplace" + ) }} + {{ card( + "Framework", + "Python 3 support, redesigned user permissions for easy setup and maintenance, and condition based workflows, with email approvals.", + "/releases/version-11/features/framework" + ) }} + {{ card( + "Other Features", + "Tons of other new features like Loyalty points and coupons, new integrations including Woocommerce and much much more.", + "/releases/version-11/features/other" + ) }} +
+
+
+{% endblock %} +