From 024896d806e4ec8675783ab4b257fcd9b72cf6f5 Mon Sep 17 00:00:00 2001 From: Umair Sayyed Date: Thu, 16 Mar 2017 18:06:24 +0530 Subject: [PATCH] updated erpnext-learn pages --- erpnext/controllers/accounts_controller.py | 2 +- erpnext/docs/install.md | 4 +- erpnext/docs/license.html | 8 +- erpnext/docs/user/videos/learn/.txt | 0 erpnext/docs/user/videos/learn/budgeting.md | 7 ++ erpnext/docs/user/videos/learn/bulk-update.md | 7 ++ .../user/videos/learn/chart-of-accounts.md | 6 +- .../videos/learn/customer-and-supplier.md | 4 +- .../user/videos/learn/data-import-tool.md | 2 +- .../docs/user/videos/learn/distributors.md | 7 ++ erpnext/docs/user/videos/learn/employee.md | 6 +- .../docs/user/videos/learn/fixed-assets.md | 7 ++ erpnext/docs/user/videos/learn/index.md | 107 ++++++++++++++---- erpnext/docs/user/videos/learn/index.txt | 6 +- erpnext/docs/user/videos/learn/item.md | 4 +- .../user/videos/learn/lead-to-quotation.md | 6 +- .../learn/manufacturing-enigneer-to-order.md | 7 ++ .../learn/manufacturing-make-to-order.md | 7 ++ erpnext/docs/user/videos/learn/navigation.md | 4 +- .../videos/learn/opening-account-balances.md | 4 +- .../docs/user/videos/learn/opening-stock.md | 8 +- .../videos/learn/request-for-quotation.md | 7 ++ erpnext/docs/user/videos/learn/retailers.md | 7 ++ erpnext/docs/user/videos/learn/schools.md | 7 ++ erpnext/docs/user/videos/learn/services.md | 7 ++ erpnext/docs/user/videos/learn/taxes.md | 4 +- .../user/videos/learn/user-and-permission.md | 4 +- 27 files changed, 191 insertions(+), 58 deletions(-) create mode 100644 erpnext/docs/user/videos/learn/.txt create mode 100644 erpnext/docs/user/videos/learn/budgeting.md create mode 100644 erpnext/docs/user/videos/learn/bulk-update.md create mode 100644 erpnext/docs/user/videos/learn/distributors.md create mode 100644 erpnext/docs/user/videos/learn/fixed-assets.md create mode 100644 erpnext/docs/user/videos/learn/manufacturing-enigneer-to-order.md create mode 100644 erpnext/docs/user/videos/learn/manufacturing-make-to-order.md create mode 100644 erpnext/docs/user/videos/learn/request-for-quotation.md create mode 100644 erpnext/docs/user/videos/learn/retailers.md create mode 100644 erpnext/docs/user/videos/learn/schools.md create mode 100644 erpnext/docs/user/videos/learn/services.md diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 67d4822449..518f68632f 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -426,7 +426,7 @@ class AccountsController(TransactionBase): max_allowed_amt = flt(ref_amt * (100 + tolerance) / 100) if total_billed_amt - max_allowed_amt > 0.01: - frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings").format(item.item_code, item.idx, max_allowed_amt)) + frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings").format(item.item_code, item.idx, max_allowed_amt)) def get_company_default(self, fieldname): from erpnext.accounts.utils import get_company_default diff --git a/erpnext/docs/install.md b/erpnext/docs/install.md index c6a87cb809..26ad1286d3 100644 --- a/erpnext/docs/install.md +++ b/erpnext/docs/install.md @@ -8,7 +8,7 @@ To intall ERPNext, you will have to install the http://fsf.org/

+http://fsf.org/

Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

@@ -654,7 +654,7 @@ the exclusion of warranty; and each file should have at least the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <http://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper @@ -677,14 +677,14 @@ use an "about box".

You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow -the GNU GPL, see http://www.gnu.org/licenses/.

+the GNU GPL, see http://www.gnu.org/licenses/.

The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, -please read http://www.gnu.org/philosophy/why-not-lgpl.html.

+please read http://www.gnu.org/philosophy/why-not-lgpl.html.

\ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/.txt b/erpnext/docs/user/videos/learn/.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/docs/user/videos/learn/budgeting.md b/erpnext/docs/user/videos/learn/budgeting.md new file mode 100644 index 0000000000..35e2b75fe3 --- /dev/null +++ b/erpnext/docs/user/videos/learn/budgeting.md @@ -0,0 +1,7 @@ +# Budgeting + + + +**Duration: 3:26** + +Budgeting feature will help you from over-spending. In ERPNext, you can define budgets based on Cost Center and Projects. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/bulk-update.md b/erpnext/docs/user/videos/learn/bulk-update.md new file mode 100644 index 0000000000..a0b80a30f6 --- /dev/null +++ b/erpnext/docs/user/videos/learn/bulk-update.md @@ -0,0 +1,7 @@ +# Bulk Update Data + + + +**Duration: 1:38** + +Bulk Update Tool help you in over-writing value in the specific field of exitsting records. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/chart-of-accounts.md b/erpnext/docs/user/videos/learn/chart-of-accounts.md index f71013f9e5..6677fa6d85 100644 --- a/erpnext/docs/user/videos/learn/chart-of-accounts.md +++ b/erpnext/docs/user/videos/learn/chart-of-accounts.md @@ -1,9 +1,9 @@ # Chart of Accounts - + -**Duration: 2:26** +**Duration: 3:10** This tutorial walks you through setting up Accounts in the Chart of Account master. This is the most crucial master for getting your financial statement and other accounting reports correct. -Chart of Account is a tree structure master which allows user to define parent and child relationship between accounts. Also there are various account types (like Income a/c, Expense a/c, Bank a/c, Tax a/c etc.) which helps you segregate and filter out other accounts while creating transactions. +Chart of Account is a tree structure master which allows user to define parent and child relationship between accounts. Also there are various account types (like Income a/c, Expense a/c, Bank a/c, Tax a/c etc.) which helps you segregate and filter out other accounts while creating transactions. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/customer-and-supplier.md b/erpnext/docs/user/videos/learn/customer-and-supplier.md index ba0c5b8461..f9b8d5b040 100644 --- a/erpnext/docs/user/videos/learn/customer-and-supplier.md +++ b/erpnext/docs/user/videos/learn/customer-and-supplier.md @@ -1,7 +1,7 @@ # Customer and Supplier - + -**Duration: 3:21** +**Duration: 4:35** This video demonstrate creating Customer and Suppliers in ERPNext. It also covers setting up masters required for creating Customer and Supplier like Customer Group, Territory and Supplier Type. diff --git a/erpnext/docs/user/videos/learn/data-import-tool.md b/erpnext/docs/user/videos/learn/data-import-tool.md index a3272e959c..586c9b7b06 100644 --- a/erpnext/docs/user/videos/learn/data-import-tool.md +++ b/erpnext/docs/user/videos/learn/data-import-tool.md @@ -2,6 +2,6 @@ -**Duration: 6:32** +**Duration: 6:31** This video walks you through on importing data in ERPNext from spreadsheet files. This tools allows you in faster migration of masters and transactions from legacy system into ERPNext. You can also use this tool to export data from ERPNext, and keep it as a backup of specific document type. diff --git a/erpnext/docs/user/videos/learn/distributors.md b/erpnext/docs/user/videos/learn/distributors.md new file mode 100644 index 0000000000..9471f9e67d --- /dev/null +++ b/erpnext/docs/user/videos/learn/distributors.md @@ -0,0 +1,7 @@ +# ERPNext for Distributors + + + +**Duration: 51:47** + +This video is a recording of a webinar on how a distribution business can use ERPNext. It covers Selling, Buying, Stock and Accounts module. Also, you can can learn how serialised and batchwise inventory can be maintained in ERPNext. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/employee.md b/erpnext/docs/user/videos/learn/employee.md index e7f78a3405..b7c46e62e2 100644 --- a/erpnext/docs/user/videos/learn/employee.md +++ b/erpnext/docs/user/videos/learn/employee.md @@ -1,7 +1,7 @@ # Employee - + -**Duration: 1:59** +**Duration: 3:26** -This video walks you through adding Employee in ERPNext. +This is a help video on how to add and manage Employees in ERPNext. diff --git a/erpnext/docs/user/videos/learn/fixed-assets.md b/erpnext/docs/user/videos/learn/fixed-assets.md new file mode 100644 index 0000000000..31ccc94e9b --- /dev/null +++ b/erpnext/docs/user/videos/learn/fixed-assets.md @@ -0,0 +1,7 @@ +# Fixed Assets Management + + + +**Duration: 6:35** + +In this video, you will learn how to add Assets and manage Asset Depreciation in ERPNext. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md index a583524ca4..faaf49cd1f 100644 --- a/erpnext/docs/user/videos/learn/index.md +++ b/erpnext/docs/user/videos/learn/index.md @@ -9,12 +9,35 @@
+

ERPNext Demonstrations

+ +

Using ERPNext


@@ -26,11 +49,11 @@
  • User and Permissions - 4:20 + 6:16
  • Data Import Tool - 3:24 + 6:31
  • Printing and Branding @@ -38,23 +61,23 @@
  • Customer and Supplier - 3:21 + 4:35
  • Item and Pricing - 3:17 + 3:55
  • Opening Stock - 2:06 + 4:27
  • Chart of Accounts - 2:26 + 3:10
  • Opening Account Balances - 3:46 + 4:40
  • Email Account @@ -69,8 +92,12 @@

    CRM and Sales


    Accounts


    Manufacturing

    @@ -180,12 +223,22 @@ Production Order 2:24
    • +
  • + + ERPNext for Manufacturers (Make to Order) + 14:26 +
    • +
  • + + ERPNext for Manufacturers (Engineer to Order) + 44:40 +

    • Human Resource

    @@ -208,6 +261,10 @@ Point of Sale 2:34 +
  • + ERPNext for Retailers (Demo) + 39:21 +

    • Project

    @@ -235,6 +292,10 @@ Field Customization 3:10 +
  • + Bulk Update Data + 1:38 +
  • Workflow 3:38 diff --git a/erpnext/docs/user/videos/learn/index.txt b/erpnext/docs/user/videos/learn/index.txt index b9f567d21a..5510922ab8 100644 --- a/erpnext/docs/user/videos/learn/index.txt +++ b/erpnext/docs/user/videos/learn/index.txt @@ -39,4 +39,8 @@ drop-ship file-manager publish-items-on-website shopping-cart -report-builder \ No newline at end of file +report-builder +services +distributors +manufacturing-make-to-order +manufacturing-enigneer-to-order \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/item.md b/erpnext/docs/user/videos/learn/item.md index 79d5caf395..fdd668895f 100644 --- a/erpnext/docs/user/videos/learn/item.md +++ b/erpnext/docs/user/videos/learn/item.md @@ -1,7 +1,7 @@ # Item and Pricing - + -**Duration: 3:17** +**Duration: 3:55** This tutorial walks you through managing stock and service item in ERPNext. For each item, you can track its standard selling and buying price using Price List. diff --git a/erpnext/docs/user/videos/learn/lead-to-quotation.md b/erpnext/docs/user/videos/learn/lead-to-quotation.md index dcfef68905..a0bab2d57e 100644 --- a/erpnext/docs/user/videos/learn/lead-to-quotation.md +++ b/erpnext/docs/user/videos/learn/lead-to-quotation.md @@ -1,8 +1,8 @@ -# Lead to Quotation +# Customer Relationship Management (CRM) - + -**Duration: 2:00** +**Duration: 3:29** This video walks you through creating Lead in the CRM module. You can convert Lead into Opportunity, one which has good probability of conversion. When customer ask for the Quotation, you can fetch Lead and item details from Opportunity to Quotation. diff --git a/erpnext/docs/user/videos/learn/manufacturing-enigneer-to-order.md b/erpnext/docs/user/videos/learn/manufacturing-enigneer-to-order.md new file mode 100644 index 0000000000..b883b35316 --- /dev/null +++ b/erpnext/docs/user/videos/learn/manufacturing-enigneer-to-order.md @@ -0,0 +1,7 @@ +# ERPNext for Manufacturers (Engineer-to-Order) + + + +**Duration: 44:40** + +This video is a recording of a webinar on how a manufacturing company operating based on **engineer to order **. This session covers modules like Selling, Manufacturing, Buying and Accounts. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/manufacturing-make-to-order.md b/erpnext/docs/user/videos/learn/manufacturing-make-to-order.md new file mode 100644 index 0000000000..f1fe8d94f8 --- /dev/null +++ b/erpnext/docs/user/videos/learn/manufacturing-make-to-order.md @@ -0,0 +1,7 @@ +# ERPNext for Manufacturers (Make-to-Order) + + + +**Duration: 14:26** + +This video is a recording of a webinar on how a manufacturing company operating based on **make to order** can use ERPNext. This session covers modules like Selling, Manufacturing, Buying and Accounts. You can learn how to make a Bill of Materials of production item and plan for item's production from Sales Order. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/navigation.md b/erpnext/docs/user/videos/learn/navigation.md index 40adb828ac..609994087d 100644 --- a/erpnext/docs/user/videos/learn/navigation.md +++ b/erpnext/docs/user/videos/learn/navigation.md @@ -1,7 +1,7 @@ # User Interface and Navigation - + -**Duration: 1:17** +**Duration: 2:17** This video walks you through using the ERPNext "Desk" interface. The ERPNext User Interface is very web friendly and if you have used a website or mobile app before, the navigation should be very intuitive. diff --git a/erpnext/docs/user/videos/learn/opening-account-balances.md b/erpnext/docs/user/videos/learn/opening-account-balances.md index 518b892196..5521a5d2d6 100644 --- a/erpnext/docs/user/videos/learn/opening-account-balances.md +++ b/erpnext/docs/user/videos/learn/opening-account-balances.md @@ -1,7 +1,7 @@ # Opening Account Balances - + -**Duration: 3:46** +**Duration: 4:40** This video walks you through step to update opening account balances in ERPNext. Before updating opening balance for accounts, you should close your financial statements in the previous system. Closing balance of your legacy system should be updated as opening balance in ERPNext. diff --git a/erpnext/docs/user/videos/learn/opening-stock.md b/erpnext/docs/user/videos/learn/opening-stock.md index 6048039ddb..6009b40896 100644 --- a/erpnext/docs/user/videos/learn/opening-stock.md +++ b/erpnext/docs/user/videos/learn/opening-stock.md @@ -1,9 +1,7 @@ # Opening Stock - + -**Duration: 2:06** +**Duration: 4:27** -This tutorial demonstrates updating opening stock balance of an item. Following same steps, you can also reconcile stock of an item with respect to physical stock in a warehouse. - -If you maintain serialized inventory, [click here]({{docs_base_url}}/user/videos/learn/serialized-inventory.html) for the tutorial on updating it's opening stock in ERPNext. +This tutorial demonstrates updating opening stock balance of an item. Following same steps, you can also reconcile stock of an item with respect to physical stock in a warehouse. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/request-for-quotation.md b/erpnext/docs/user/videos/learn/request-for-quotation.md new file mode 100644 index 0000000000..2e3bfcb56a --- /dev/null +++ b/erpnext/docs/user/videos/learn/request-for-quotation.md @@ -0,0 +1,7 @@ +# Request for Quotation + + + +**Duration: 3:17** + +Request for Quotation feature allows you invite multiple Suppliers to provide their quotation. Suppliers can also provide quotation by logging into your ERPNext account. Based on the price quoted by them, Supplier Quotation will be created in your ERPNext account. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/retailers.md b/erpnext/docs/user/videos/learn/retailers.md new file mode 100644 index 0000000000..8460e4027b --- /dev/null +++ b/erpnext/docs/user/videos/learn/retailers.md @@ -0,0 +1,7 @@ +# ERPNext for Retailers + + + +**Duration: 24:27** + +This video is a recording of a webinar on how retailers can use ERPNext. For the ease of invoicing for retailers, we have a dedicated POS view. It takes care of invoicing, delivery and payment in one entry. Given the limitation of time availability and frequency of transaction, you can also create POS Invoices in the offline mode. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/schools.md b/erpnext/docs/user/videos/learn/schools.md new file mode 100644 index 0000000000..3553a533d6 --- /dev/null +++ b/erpnext/docs/user/videos/learn/schools.md @@ -0,0 +1,7 @@ +# ERPNext for Schools + + + +**Duration: 39:21** + +This video is a recording of a webinar on how education institutes can use ERPNext Schools module. It covers management of Student Applications, managing masters like Students, Programs and Courses. Also, you can manage processes like Course Scheduling, Student Assessment, Fees and Attendance. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/services.md b/erpnext/docs/user/videos/learn/services.md new file mode 100644 index 0000000000..e08a75cb7a --- /dev/null +++ b/erpnext/docs/user/videos/learn/services.md @@ -0,0 +1,7 @@ +# ERPNext for Services Business + + + +**Duration: 52:50** + +This video is a recording of a webinar on how service company can use ERPNext. It covers creating a Service Item, service Quotation and Sales Order, Managing Projects, Tasks and billing Customer based on Timesheet. Also you will learn how to manage customer support in ERPNext by using features like Issues and Warranty Claims. \ No newline at end of file diff --git a/erpnext/docs/user/videos/learn/taxes.md b/erpnext/docs/user/videos/learn/taxes.md index 992aa1d823..4a16480954 100644 --- a/erpnext/docs/user/videos/learn/taxes.md +++ b/erpnext/docs/user/videos/learn/taxes.md @@ -1,7 +1,7 @@ # Taxes - + -**Duration: 3:00** +**Duration: 5:13** This video walks you through setting up tax accounts in the Chart of Account. Based on the taxation rules, you can create multiple sales and purchase tax templates in ERPNext. diff --git a/erpnext/docs/user/videos/learn/user-and-permission.md b/erpnext/docs/user/videos/learn/user-and-permission.md index 62d728da1f..e1262c19e3 100644 --- a/erpnext/docs/user/videos/learn/user-and-permission.md +++ b/erpnext/docs/user/videos/learn/user-and-permission.md @@ -1,7 +1,7 @@ # User and Permissions - + -**Duration: 4:20** +**Duration: 6:16** This video tutorial walks you through setting up User and their permissions in ERPNext. Role Permission Manager tool allows you to define restricted access for the user, based on various criterion like, value in the specific field on the form, creator of the document etc.