From a236601e731d96222b2bb52ea0e3a1ca4d94618e Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Tue, 23 Jul 2013 12:28:26 +0530 Subject: [PATCH 01/21] [docs] --- docs/docs.user.accounts.journal_voucher.md | 2 +- docs/docs.user.accounts.payments.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs.user.accounts.journal_voucher.md b/docs/docs.user.accounts.journal_voucher.md index 18615d1553..650f4e3124 100644 --- a/docs/docs.user.accounts.journal_voucher.md +++ b/docs/docs.user.accounts.journal_voucher.md @@ -32,7 +32,7 @@ A look at some of the common accounting entries that can be done via Journal Vou #### Expenses (non accruing) -Many times it may not be necessary to accrue an expense, but it can be directly be booked against an expense Account on payment. For example a travel allowance or a telephone bill. You can directly debit Telephone Expense (instead of your telephone company) and credit your Bank on payment. +Many times it may not be necessary to accrue an expense, but it can be directly booked against an expense Account on payment. For example a travel allowance or a telephone bill. You can directly debit Telephone Expense (instead of your telephone company) and credit your Bank on payment. - Debit: Expense Account (like Telephone expense) - Credit: Bank or Cash Account diff --git a/docs/docs.user.accounts.payments.md b/docs/docs.user.accounts.payments.md index 25c9c4b7eb..4bb064ca6a 100644 --- a/docs/docs.user.accounts.payments.md +++ b/docs/docs.user.accounts.payments.md @@ -42,7 +42,7 @@ To use this, go to: Select your “Bank” Account and enter the dates of your statement. Here you will get all the “Bank Voucher” type entries. In each of the entry on the right most column, update the “Clearance Date” and click on “Update”. -This way you will be able sync your bank statements and entries in the system. +This way you will be able to sync your bank statements and entries in the system. --- From 385b00bf3f285117eb872fe924175ee3ba697c83 Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Tue, 23 Jul 2013 13:00:27 +0530 Subject: [PATCH 02/21] [docs] --- docs/docs.user.accounts.reports.md | 4 ++-- docs/docs.user.hr.appraisal.md | 2 +- docs/docs.user.hr.expense_claim.md | 4 ++-- docs/docs.user.hr.md | 2 +- docs/docs.user.mfg.md | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/docs.user.accounts.reports.md b/docs/docs.user.accounts.reports.md index 915808b7e9..84356f65c5 100644 --- a/docs/docs.user.accounts.reports.md +++ b/docs/docs.user.accounts.reports.md @@ -22,10 +22,10 @@ The sum of all closing balances in a Trial Balance must be zero. ### Accounts Payable and Accounts Receivable (AP / AR) -These reports help you track the outstanding invoices to Customer and Suppliers. In this report, you will get your outstanding amounts period wise. i.e. between 0-30 days, 30-60 days and so on. +These reports help you to track the outstanding invoices sent to Customer and Suppliers. In this report, you will get your outstanding amounts period wise. i.e. between 0-30 days, 30-60 days and so on. You can also get your payables and receivables from direct reports on Sales Invoice and Purchase Invoice. ### Sales and Purchase Register -This is useful for making your tax statements invoice and Item wise. In this report, each tax Account is transposed in columns and for each Invoice and invoice Item, you will get how much individual tax has been paid based on the Taxes and Charges table. +This is useful for making your tax statements invoice and Item wise. In this report, each tax Account is transposed in columns and for each Invoice and invoice Item, you will get the amount of individual tax that has been paid based on the Taxes and Charges table. diff --git a/docs/docs.user.hr.appraisal.md b/docs/docs.user.hr.appraisal.md index e5bf7ffb3a..a02ba119a1 100644 --- a/docs/docs.user.hr.appraisal.md +++ b/docs/docs.user.hr.appraisal.md @@ -3,7 +3,7 @@ "_label": "Appraisal" } --- -In ERPNext, you can manage Employee Appraisals by creating an Appraisal Template for each role with the parameters that define the performance and giving a weight to each parameter. +In ERPNext, you can manage Employee Appraisals by creating an Appraisal Template for each role with the parameters that define the performance by giving appropriate weightage to each parameter. Once the Appraisal Template is completed, you can create Appraisal records for each period where you track performance. You can give points out of 5 for each parameter and the system will calculate the overall performance of the Employee. diff --git a/docs/docs.user.hr.expense_claim.md b/docs/docs.user.hr.expense_claim.md index fa6e8473eb..37c63cc22b 100644 --- a/docs/docs.user.hr.expense_claim.md +++ b/docs/docs.user.hr.expense_claim.md @@ -3,7 +3,7 @@ "_label": "Expense Claim" } --- -When Employee’s make expenses out their pocket on behalf of the company, like if they took a customer out for lunch, they can make a request for reimbursement via the Expense Claim form. +When Employee’s make expenses out of their pocket on behalf of the company, for example, if they take a customer out for lunch, they can make a request for reimbursement via the Expense Claim form. To make a new Expense Claim, go to: @@ -21,4 +21,4 @@ Comments can be added in the Comments section explaining why the claim was appro ### Booking the Expense and Reimbursement -The approved Expense Claim must be then be converted into a Journal Voucher and a payment must be made. Note: This amount should not be clubbed with Salary because the amount will then be taxable to the Employee. +The approved Expense Claim must then be converted into a Journal Voucher and a payment must be made. Note: This amount should not be clubbed with Salary because the amount will then be taxable to the Employee. diff --git a/docs/docs.user.hr.md b/docs/docs.user.hr.md index e585757073..e6f88b7819 100644 --- a/docs/docs.user.hr.md +++ b/docs/docs.user.hr.md @@ -3,7 +3,7 @@ "_label": "Human Resource Management" } --- -The Human Resources (HR) Module covers the processes linked to administering a team of co-workers. Most common among this is processing payroll by using the Salary Manager to generate Salary Slips. Most countries have complex tax rules stating what expenses can the company made on behalf of Employees and also expect the company to deduct taxes and social security from their payroll. +The Human Resources (HR) Module covers the processes linked to administering a team of co-workers. Most common among this is processing payroll by using the Salary Manager to generate Salary Slips. Most countries have complex tax rules stating what expenses can the company make on behalf of Employees and also expect the company to deduct taxes and social security from their payroll. Apart from that you can also track Leave Applications and balances, Expense Claims and upload Attendance data (even though the world has moved to a result-oriented culture, some countries still mandate companies to maintain an attendance register to ensure you are not over-working your team). diff --git a/docs/docs.user.mfg.md b/docs/docs.user.mfg.md index 50e0eebd15..9f01f762ca 100644 --- a/docs/docs.user.mfg.md +++ b/docs/docs.user.mfg.md @@ -10,7 +10,7 @@ The Manufacturing module in ERPNext helps you maintain multi-level Bill of Mater Broadly there are three types of Production Planning Systems - Make-to-Stock: In these systems, production is planned based on a forecast and then the Items are sold to distributors or customers. All fast moving consumer goods that are sold in retail shops like soaps, packaged water etc and electronics like phones etc are Made to Stock. -- Make-to-Order: In these systems, manufacturing takes place after an firm order is placed by a Customer. +- Make-to-Order: In these systems, manufacturing takes place after a firm order is placed by a Customer. - Engineer-to-Order: In this case each sale is a separate Project and has to be designed and engineered to the requirements of the Customer. Common examples of this are any custom business like furniture, machine tools, speciality devices, metal fabrication etc. Most small and medium sized manufacturing businesses are based on a make-to-order or engineer-to-order system and so is ERPNext. @@ -42,7 +42,7 @@ The state of art manufacturing philosophy (the rationale behind the planning pro The biggest cause of wastage in manufacturing is variation (in product and quantity). -So they standardized their products and sub-assemblies and sold fixed quantities based on what they produced not produce based on what they sold. This way, they had an extremely predictable and stable product mix. If they sold less than planned, they would simple stop production. +So they standardized their products and sub-assemblies and sold fixed quantities based on what they produced or did not produce based on what they sold. This way, they had an extremely predictable and stable product mix. If they sold less than planned, they would simply stop production. Their card signaling system kanban, would notify all their suppliers to stop production too. Hence they never used any of the complex material planning tools like MRP to play day-to-day material requirements, but a simple signaling system that said either STOP or GO. From 103cf657289a192761f375c655b232292cea8f0d Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Tue, 23 Jul 2013 16:43:41 +0530 Subject: [PATCH 03/21] [docs] --- docs/docs.user.mfg.production_order.md | 4 ++-- docs/docs.user.setup.accounting.md | 2 +- docs/docs.user.setup.data_import.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/docs.user.mfg.production_order.md b/docs/docs.user.mfg.production_order.md index af1ecefb07..46e719c7ed 100644 --- a/docs/docs.user.mfg.production_order.md +++ b/docs/docs.user.mfg.production_order.md @@ -3,7 +3,7 @@ "_label": "Production Order" } --- -Production Order (also called as Work Order) is a document that is given to the manufacturing shop floor by the Production Planner as a signal to product a certain quantity of a certain Item. Production Order also helps to generate the material requirements (Stock Entry) for the Item to be produced from its **Bill of Materials**. +Production Order (also called as Work Order) is a document that is given to the manufacturing shop floor by the Production Planner as a signal to produce a certain quantity of a certain Item. Production Order also helps to generate the material requirements (Stock Entry) for the Item to be produced from its **Bill of Materials**. The **Production Order** is generated directly from the **Production Planning Tool** based on Sales Orders. You can also create a direct Production Order by: @@ -13,7 +13,7 @@ The **Production Order** is generated directly from the **Production Planning To - Select the BOM - Select Quantities - Select Warehouses. WIP (Work-in-Progress) is where your Items will be transferred when you begin production and FG (Finished Goods) where you store finished Items before they are shipped. -- Select if you want to consider sub-assemblies (sub-Items that have their own BOM) as stock items or you want to explode the entire BOM when you make Stock Entries for this Item. What is means is that if you also maintain stock of your sub assemblies then you should set this as “No” and in your Stock Entires, it will also list the sub-assembly Item (not is sub-components). +- Select if you want to consider sub-assemblies (sub-Items that have their own BOM) as stock items or you want to explode the entire BOM when you make Stock Entries for this Item. What it means is that if you also maintain stock of your sub assemblies then you should set this as “No” and in your Stock Entires, it will also list the sub-assembly Item (not is sub-components). and “Submit” the Production Order. diff --git a/docs/docs.user.setup.accounting.md b/docs/docs.user.setup.accounting.md index c8e8bef9e7..af915397df 100644 --- a/docs/docs.user.setup.accounting.md +++ b/docs/docs.user.setup.accounting.md @@ -15,7 +15,7 @@ The Chart of Accounts helps you answer: - How much debt have you taken? - How much profit are you making (and hence paying tax)? - How much are you selling? -- How are your expenses broken up? +- What is your expense break- up You may note that as a business manager,it is very valuable to see how well your business is doing. diff --git a/docs/docs.user.setup.data_import.md b/docs/docs.user.setup.data_import.md index ae2ee4bcae..ddcaa7c5ea 100644 --- a/docs/docs.user.setup.data_import.md +++ b/docs/docs.user.setup.data_import.md @@ -29,7 +29,7 @@ Here are a few tips to fill your template: ### Overwriting ERPNext also allows you to overwrite all / certain columns. If you want to update certain columns, you can download the template with data.Remember to check on the “Overwrite” box before uploading. - +git > Note: For child records, if you select Overwrite, it will delete all the child records of that parent. ### Upload Limitations From b531f22b3ab1042b6cb3684c62133e58a99009d3 Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Wed, 24 Jul 2013 12:13:50 +0530 Subject: [PATCH 04/21] [docs] --- docs/docs.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/docs.md b/docs/docs.md index 1e516ca353..df2f041078 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -19,8 +19,20 @@
![Home Screen](img/home.png) -### Is this for me? +### What is ERPNext? -To starting hacking into ERPNext, you must have some understanding of how a dynamic web application works. There are hundreds of architectures and frameworks to make web development easier, but at the core there are a few elements that are important to understand. +ERPNext is an information system that links together entire organization's operations. It is a software package that offers convenience of managing all the business functions from a single platform. No need of going to different applications to process different requests. No need of saving data in different functional packages. Under one ERP "roof" you can manage Accounting, Warehouse Management, CRM, Human Resources, Supply Chain Management, Sales Management, and Website Design. -ERPNext is built on `wnframework` which is primarily developed for ERPNext but can be extended to make similar database driven applications. wnframework uses Python on the server-side and has a javascript based client for entering data, managing workflow and making reports. \ No newline at end of file +ERPNext is written by Web Notes Technologies keeping small and medium businesses in mind. + + It gives better access to crucial information as a whole rather than in fragments of different versions. + + It provides comparable financial reports. + + It avoids duplication of reports and redundant data. + + It allows better alignment across cross-functional departments. + + It facilitates Website Design and provides shopping cart facility. + + It gives better deployment on mobiles, tablets, desktops and large screens. \ No newline at end of file From cc9c2939c53fcb9cd38f1b13ecf493c3d364d156 Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Wed, 24 Jul 2013 12:26:01 +0530 Subject: [PATCH 05/21] [docs] --- docs/docs.user.website.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs.user.website.md b/docs/docs.user.website.md index ff88c02de7..e3fa449648 100644 --- a/docs/docs.user.website.md +++ b/docs/docs.user.website.md @@ -17,9 +17,9 @@ Websites are a core component of any business and having a good website usually Unless you are a web designer yourself. -Would not it be nice if there was a way to update your product catalog on your site automatically from your ERP? +Wouldn't it be nice if there was a way to update your product catalog on your site automatically from your ERP? -We thought exactly the same and hence built a small Website Development app right inside or ERPNext! Using ERPNext’s Website module, you can +We thought exactly the same and hence built a small Website Development app right inside ERPNext! Using ERPNext’s Website module, you can 1. Create Web Pages 1. Write a Blog From dd89bf0eb19c9904c21b4f90baeccc3d8d4a31bc Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Wed, 24 Jul 2013 12:39:47 +0530 Subject: [PATCH 06/21] [docs] --- docs/docs.user.tools.md | 2 +- docs/docs.user.website.blog.md | 2 +- docs/docs.user.website.web_page.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docs.user.tools.md b/docs/docs.user.tools.md index f040c2241a..891b756406 100644 --- a/docs/docs.user.tools.md +++ b/docs/docs.user.tools.md @@ -9,6 +9,6 @@ ] } --- -We live in an era when people are very comfortable communicating, discussing, asking, assigning work and getting feedback electronically. The internet acts a great medium to collaborate on work too. Taking this concept into ERP system, we have designed a bunch of tools whereby you can Assign transactions, manage your To Dos, share and maintain a Calendar, maintain a company wise Knowledge Base, Tag and Comment on transactions and send your Orders, Invoices etc via Email. You can also send instant messages to other users using the Messaging tool. +We live in an era when people are very comfortable communicating, discussing, asking, assigning work and getting feedback electronically. The Internet acts as a great medium to collaborate on work too. Taking this concept into ERP system, we have designed a bunch of tools whereby you can Assign transactions, manage your To Dos, share and maintain a Calendar, maintain a company wise Knowledge Base, Tag and Comment on transactions and send your Orders, Invoices etc via Email. You can also send instant messages to other users using the Messaging tool. These tools are integrated into all aspects of the product so that you can effectively manage your data and collaborate with your co-workers. \ No newline at end of file diff --git a/docs/docs.user.website.blog.md b/docs/docs.user.website.blog.md index cc58fbd416..4e2a782c68 100644 --- a/docs/docs.user.website.blog.md +++ b/docs/docs.user.website.blog.md @@ -5,7 +5,7 @@ --- Blogs are a great way to share your thoughts about your business and keep your customers and readers updated of what you are up to. -In the age of internet, writing assumes a lot more importance is because when people come to your website, they want to be read about your product and you. +In the age of internet, writing assumes a lot of significance because when people come to your website, they want to read about you and your product. To create a new blog, just create a new Blog from: diff --git a/docs/docs.user.website.web_page.md b/docs/docs.user.website.web_page.md index 30c9acdfbe..e856775203 100644 --- a/docs/docs.user.website.web_page.md +++ b/docs/docs.user.website.web_page.md @@ -21,4 +21,4 @@ The web link to your page will be the value of the “Page Name” field + “.h #### Images -You can attach images to your web page and show them using the HTML tag or using markdown format. the link for your file will be files/filename \ No newline at end of file +You can attach images to your web page and show them using the HTML tag or using markdown format. the link to your file will be files/filename \ No newline at end of file From 922c1806b7404eee81d9b3b6a3ef862067ace7bd Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Wed, 24 Jul 2013 12:46:49 +0530 Subject: [PATCH 07/21] [docs] --- docs/docs.user.tools.form_tools.md | 2 +- docs/docs.user.tools.todo.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs.user.tools.form_tools.md b/docs/docs.user.tools.form_tools.md index 30ebf57ff7..65943d70ed 100644 --- a/docs/docs.user.tools.form_tools.md +++ b/docs/docs.user.tools.form_tools.md @@ -13,4 +13,4 @@ Comments are a great way to add information about a transaction that is not a pa ### Tags -Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. ERPNext will also show you all the important tags in in the document list. +Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. ERPNext will also show you all the important tags in the document list. diff --git a/docs/docs.user.tools.todo.md b/docs/docs.user.tools.todo.md index 6421a5c1ac..131af69b75 100644 --- a/docs/docs.user.tools.todo.md +++ b/docs/docs.user.tools.todo.md @@ -14,7 +14,7 @@ Step 2: Add the User and other details This transaction will appear in: The To-do list of the user whom this is assigned to in “My List” section -In the “Assigned by me” section of the user who as assigned this activity. +In the “Assigned by me” section of the user who has assigned this activity. ### To Do From 7480d5560959c9e334c35c1a253cc05f293cc790 Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Wed, 24 Jul 2013 16:17:57 +0530 Subject: [PATCH 08/21] [docs] --- docs/docs.md | 18 +++++++----------- docs/docs.user.customize.custom_field.md | 2 +- docs/docs.user.customize.modules.md | 2 +- docs/docs.user.customize.print_format.md | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/docs.md b/docs/docs.md index df2f041078..0236426279 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -21,18 +21,14 @@ ### What is ERPNext? -ERPNext is an information system that links together entire organization's operations. It is a software package that offers convenience of managing all the business functions from a single platform. No need of going to different applications to process different requests. No need of saving data in different functional packages. Under one ERP "roof" you can manage Accounting, Warehouse Management, CRM, Human Resources, Supply Chain Management, Sales Management, and Website Design. +ERPNext is an information system that links together an entire organization's operations. It is a software package that offers convenience of managing all the business functions from a single platform. No need of going to different applications to process different requests. No need of saving data in different functional packages. Under one ERP "roof" you can manage Accounting, Warehouse Management, CRM, Human Resources, Supply Chain Management, Sales Management, and Website Design. ERPNext is written by Web Notes Technologies keeping small and medium businesses in mind. - It gives better access to crucial information as a whole rather than in fragments of different versions. +- It gives better access to crucial information as a whole rather than in fragments of different versions. +- It provides comparable financial reports. +- It avoids duplication of reports and redundant data. +- It allows better alignment across cross-functional departments. +- It facilitates Website Design and provides shopping cart facility. +- It gives better deployment on mobiles, tablets, desktops and large screens. - It provides comparable financial reports. - - It avoids duplication of reports and redundant data. - - It allows better alignment across cross-functional departments. - - It facilitates Website Design and provides shopping cart facility. - - It gives better deployment on mobiles, tablets, desktops and large screens. \ No newline at end of file diff --git a/docs/docs.user.customize.custom_field.md b/docs/docs.user.customize.custom_field.md index 9a7676b731..1dd2340b0c 100644 --- a/docs/docs.user.customize.custom_field.md +++ b/docs/docs.user.customize.custom_field.md @@ -11,7 +11,7 @@ In the form: - Select the Document on which you want to add the Custom Field. - Select the Type of field and the Options (see section on field types). -- Select where you want to field to appear in the Form (“after field” section). +- Select where you want the field to appear in the Form (“after field” section). and save the Custom Field. When you open a new / existing form of the type you selected in step 1, you will see it with the Custom Fields. diff --git a/docs/docs.user.customize.modules.md b/docs/docs.user.customize.modules.md index f838df9440..ff64b24317 100644 --- a/docs/docs.user.customize.modules.md +++ b/docs/docs.user.customize.modules.md @@ -5,7 +5,7 @@ --- ### Hiding Unused Features -As you have seen from this manual that ERPNext contains tons of feature that you may not use. We have observed that most users start with using 20% of the features, though a different 20%. To hide fields belonging to features you will not use, go to: +As you have seen from this manual that ERPNext contains tons of features which you may not use. We have observed that most users start with using 20% of the features, though a different 20%. To hide fields belonging to features you dont require, go to: > Setup > Customize ERPNext > Disable Features. diff --git a/docs/docs.user.customize.print_format.md b/docs/docs.user.customize.print_format.md index 82857e8d02..f8970c40da 100644 --- a/docs/docs.user.customize.print_format.md +++ b/docs/docs.user.customize.print_format.md @@ -6,7 +6,7 @@ Print Formats are the layouts that are generated when you want to Print or Email a transaction like a Sales Invoice. There are two types of Print Formats, - The auto-generated “Standard” Print Format: This type of format follows the same layout as the form and is generated automatically by ERPNext. -- Based on the Print Format document. This is templates in HTML that will be rendered with data. +- Based on the Print Format document. There are templates in HTML that will be rendered with data. ERPNext comes with a number of pre-defined templates in three styles: Modern, Classic and Spartan. You modify these templates or create their own. Editing ERPNext templates is not allowed because they may be over-written in an upcoming release. From ce4aa64287ec3ec61d7e935dbfbaa1c85d680e51 Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Mon, 29 Jul 2013 13:08:59 +0530 Subject: [PATCH 09/21] [docs] --- docs/docs.user.setup.first.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs.user.setup.first.md b/docs/docs.user.setup.first.md index 5947257dc7..c7d4aff815 100644 --- a/docs/docs.user.setup.first.md +++ b/docs/docs.user.setup.first.md @@ -18,4 +18,4 @@ This will also set the default **Currency** and time zone for your account. Once Congrats! You are already on your way. -The next step is to configure your Chart of Accounts or start adding users and setting their permissions. +The next step is to follow implementation instructions. From 955640a5af6e6536a40787e56e6e4270ec2cb614 Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Tue, 30 Jul 2013 15:11:47 +0530 Subject: [PATCH 10/21] [docs] --- docs/docs.user.selling.customer.md | 3 +-- docs/docs.user.setup.email.md | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/docs.user.selling.customer.md b/docs/docs.user.selling.customer.md index 1c2c22df50..05c4d9663a 100644 --- a/docs/docs.user.selling.customer.md +++ b/docs/docs.user.selling.customer.md @@ -10,7 +10,6 @@ You can either directly create your Customers via or upload it via the Data Import Tool. -In your normal operations, you can also create Customers from Leads. > Note: Customers are separate from Contacts and Addresses. A Customer can have multiple Contacts and Addresses. @@ -20,7 +19,7 @@ Contacts and Addresses in ERPNext are stored separately so that you can attach m To add a Contact or Address directly from the Customer record, click on “New Contact” or “New Address”. -> Tip: When you select a Customer in any transaction, one Contact and Address gets pre-selected. This is the “Default Contact or Address”. So make sure you set your defaults correctly! +> Tip: When you select a Customer in any transaction, one Contact and Address gets pre-selected. This is the “Default Contact or Address”. To Import multiple Contacts and Addresses from a spreadsheet, use the Data Import Tool. diff --git a/docs/docs.user.setup.email.md b/docs/docs.user.setup.email.md index 371ef93617..17ef4b611b 100644 --- a/docs/docs.user.setup.email.md +++ b/docs/docs.user.setup.email.md @@ -27,7 +27,7 @@ Set your outgoing mail server settings here. These are the same settings you wou A very useful email integration is to sync the incoming emails from support inbox into Support Ticket, so that you can track, assign and monitor support issues. -> **Case Study:** Here are ERPNext, we have regularly tracking incoming support issues via email at “support@erpnext.com”. At the time of writing we have answered more than 3000 tickets via this system. +> **Case Study:** Here at ERPNext, we have regularly tracked incoming support issues via email at “support@erpnext.com”. At the time of writing we had answered more than 3000 tickets via this system. To setup your Support integration, go to: @@ -35,7 +35,7 @@ To setup your Support integration, go to: To make ERPNext pull emails from your mail box, enter the POP3 settings. (POP3 is a way of extracting emails from your mailbox. It should be fairly easy to find out what your POP3 settings are. If you have problems, contact your email service provider). If you want to setup an auto reply, check on the “Send Autoreply” box and whenever someone sends an email, an autoreply will be sent. -Add a custom signature you want to send with your replies. +Add a custom signature which you want to send with your replies. ### Setting Auto-notification on Documents @@ -49,7 +49,7 @@ Check on the transactions you want to send via email directly on Submission and Email Digests allow you to get regular updates about your sales, expenses and other critical numbers directly in your Inbox. -Set your frequency, check all the items you want to receive in your weekly update and select the user ids who you want to send the Digest to. +Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to. Email Digests are a great way for top managers to keep track of the big numbers like “Sales Booked” or “Amount Collected” or “Invoices Raised” etc. From 34064ac8491c4416f747b614dd3ae1f65565cdc5 Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Tue, 30 Jul 2013 15:34:40 +0530 Subject: [PATCH 11/21] [docs] --- docs/docs.user.setup.taxes.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docs.user.setup.taxes.md b/docs/docs.user.setup.taxes.md index 70b7cc747c..ab917c14bb 100644 --- a/docs/docs.user.setup.taxes.md +++ b/docs/docs.user.setup.taxes.md @@ -11,7 +11,7 @@ For Tax Accounts that you want to use in the tax templates, you must mention the ## Sales Taxes and Charges Master -You must usually collect taxes from your Customer and pay them to the government. At times there may be multiple taxes for multiple government bodies like local government, state or provincial and federal or central government. +You must usually collect taxes from your Customer and pay them to the government. At times, you may have to pay multiple taxes to multiple government bodies like local government, state or provincial and federal or central government. The way ERPNext sets up taxes is via templates. Other types of charges that may apply to your invoices (like shipping, insurance etc.) can also be configured as taxes. @@ -36,9 +36,9 @@ In each row, you have to mention: - Amount: Tax amount. - Total: Cumulative total to this point. - Enter Row: If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row). -- Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to your customers. +- Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the rate in your main item table. This is useful where you want to give a flat price (inclusive of all taxes) to your customers. -Once your setup your template, you can now select this in your sales transactions. +Once you setup your template, you can select this in your sales transactions. ## Purchase Taxes and Charges Master From ca7e07e47b851d1b053b2e726bd806af56128400 Mon Sep 17 00:00:00 2001 From: Priya Shrivastava Date: Tue, 30 Jul 2013 15:40:02 +0530 Subject: [PATCH 12/21] [docs] --- docs/docs.user.setup.taxes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs.user.setup.taxes.md b/docs/docs.user.setup.taxes.md index ab917c14bb..84692c9235 100644 --- a/docs/docs.user.setup.taxes.md +++ b/docs/docs.user.setup.taxes.md @@ -36,7 +36,7 @@ In each row, you have to mention: - Amount: Tax amount. - Total: Cumulative total to this point. - Enter Row: If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row). -- Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the rate in your main item table. This is useful where you want to give a flat price (inclusive of all taxes) to your customers. +- Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the rate in your main item table. This is useful when you want to give a flat price (inclusive of all taxes) to your customers. Once you setup your template, you can select this in your sales transactions. From 963f8b7a13f016f465e29e0f6efcd4c092ffd8d3 Mon Sep 17 00:00:00 2001 From: Priya Date: Tue, 13 Aug 2013 12:56:10 +0530 Subject: [PATCH 13/21] [docs][minor] material request --- docs/docs.user.buying.material_request.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs.user.buying.material_request.md b/docs/docs.user.buying.material_request.md index 7c3f1516b7..5b876b2eb2 100644 --- a/docs/docs.user.buying.material_request.md +++ b/docs/docs.user.buying.material_request.md @@ -9,8 +9,8 @@ A Material Request can be generated: - By a User. - Automatically from a Sales Order. -- Automatically when the Projected Quantity (more on this later) of an Item in stores reaches a particular level. -- Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing. (more on this later too) +- Automatically when the Projected Quantity of an Item in stores reaches a particular level. +- Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing. To generate a Material Request manually go to: From 083ba78db4b366b8f6f62bdf2d68453b673c33cc Mon Sep 17 00:00:00 2001 From: Priya Date: Tue, 13 Aug 2013 14:24:41 +0530 Subject: [PATCH 14/21] [docs] --- docs/docs.user.buying.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs.user.buying.md b/docs/docs.user.buying.md index 6dd25f66e1..518c44f78d 100644 --- a/docs/docs.user.buying.md +++ b/docs/docs.user.buying.md @@ -5,6 +5,6 @@ --- If your business involves physical goods, buying is one of your core business activities. Your suppliers are as important as your customers and they must be provided with as much accurate information as possible. -Buying in right amounts at right quantities can affect your cash flow and profitability. +Buying in right amounts, in right quantities, can affect your cash flow and profitability. -ERPNext contains a set of transactions that will make your buying as efficient and seamless as possible. +ERPNext contains a set of transactions that will make your buying process as efficient and seamless as possible. From 6528f679b6f468465aac9b94cc210fb34bc77c78 Mon Sep 17 00:00:00 2001 From: Priya Date: Tue, 13 Aug 2013 14:26:41 +0530 Subject: [PATCH 15/21] [docs] --- docs/docs.user.buying.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs.user.buying.md b/docs/docs.user.buying.md index 518c44f78d..55e8437550 100644 --- a/docs/docs.user.buying.md +++ b/docs/docs.user.buying.md @@ -3,7 +3,7 @@ "_label": "Buying" } --- -If your business involves physical goods, buying is one of your core business activities. Your suppliers are as important as your customers and they must be provided with as much accurate information as possible. +If your business involves physical goods, buying is one of your core business activity. Your suppliers are as important as your customers and they must be provided with as much accurate information as possible. Buying in right amounts, in right quantities, can affect your cash flow and profitability. From e896b453145cdce5445556aa519fd9fb85ee570a Mon Sep 17 00:00:00 2001 From: Priya Date: Tue, 13 Aug 2013 15:47:26 +0530 Subject: [PATCH 16/21] [docs] --- docs/docs.user.buying.material_request.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs.user.buying.material_request.md b/docs/docs.user.buying.material_request.md index 5b876b2eb2..2ccb3996a3 100644 --- a/docs/docs.user.buying.material_request.md +++ b/docs/docs.user.buying.material_request.md @@ -10,7 +10,7 @@ A Material Request can be generated: - By a User. - Automatically from a Sales Order. - Automatically when the Projected Quantity of an Item in stores reaches a particular level. -- Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing. +- Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing activities. To generate a Material Request manually go to: @@ -19,7 +19,7 @@ To generate a Material Request manually go to: In the Material Request form, - Fill in the Items you want and their quantities. -- If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered to. This helps you to keep track of the Projected Quantity for this Item. +- If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the Projected Quantity for this Item. - You can also automatically get the Items from a Sales Order. - You can optionally add the Terms, using the Terms and Conditions master and also the reason. From 88d409cc839a8ce8c57e622861981920e7e0decd Mon Sep 17 00:00:00 2001 From: Priya Date: Wed, 14 Aug 2013 13:46:18 +0530 Subject: [PATCH 17/21] [docs] --- docs/docs.user.stock.valuation.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/docs.user.stock.valuation.md b/docs/docs.user.stock.valuation.md index 8ecf8fd7eb..cd2ad23b87 100644 --- a/docs/docs.user.stock.valuation.md +++ b/docs/docs.user.stock.valuation.md @@ -5,11 +5,13 @@ --- ### How are Items Valued? -One of the major features of any inventory system is that you can find out the value of any item based on its historic or average price. You can also find the value of all your items for your balance sheet. Why is valuation important? +One of the major features of any inventory system is that you can find out the value of any item based on its historic or average price. You can also find the value of all your items for your balance sheet. -- The buying price fluctuates. -- The value changes because of some process (value add). -- The value changes because of decay, loss etc. +Valuation is important because: + +- The buying price may fluctuate. +- The value may change because of some process (value add). +- The value may change because of decay, loss etc. You may encounter these terms, so lets clarify: @@ -18,7 +20,7 @@ You may encounter these terms, so lets clarify: There are two major ways in which ERPNext values your items. -- **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first that you bought first. For example, if you buy an Item at price X and then after a few days at price Y. Thus when you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y. +- **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y. ![FIFO](img/fifo.png) From c2f2103e4c9845017a4ff3941665f8608e27dd29 Mon Sep 17 00:00:00 2001 From: Priya Date: Wed, 14 Aug 2013 13:59:02 +0530 Subject: [PATCH 18/21] [docs] --- docs/docs.user.setup.codification.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/docs.user.setup.codification.md b/docs/docs.user.setup.codification.md index 513f7a9481..243e6ffb95 100644 --- a/docs/docs.user.setup.codification.md +++ b/docs/docs.user.setup.codification.md @@ -3,16 +3,16 @@ "_label": "Item Codification" } --- -If you already have a running business with a number of physical items, you would have probably coded your items. If you have not, you have a choice. We recommend you should codify, but its your call. +If you already have a full-fledged business with a number of physical items, you would have probably coded your items. If you have not, you have a choice. We recommend that you should codify if you have lot of products with long or complicated names. In case you have few products with short names, it is preferable to keep the Item Code same as Item Name. -Item codification is always a sensitive topic and wars have been fought on this (not joking). In our experience, when you have items that cross a certain size, life without codification is a nightmare. +Item codification has been a sensitive topic and wars have been fought on this (not joking). In our experience, when you have items that cross a certain size, life without codification is a nightmare. ### Benefits - Standard way of naming things. - Less likely to have duplicates. - Explicit definition. -- Help you quickly find if a similar item exists. +- Helps to quickly find if a similar item exists. - Item names get longer and longer as more types get introduced. Codes are shorter. ### Pain @@ -23,7 +23,7 @@ Item codification is always a sensitive topic and wars have been fought on this ### Example -You should have a simple manual / cheat-sheet to codify your items instead of just numbering them sequentially. Each letter should mean something. Here is an example: +You should have a simple manual / cheat-sheet to codify your Items instead of just numbering them sequentially. Each letter should mean something. Here is an example: If your business involves wooden furniture, then you may codify as follows: @@ -52,7 +52,7 @@ The last few letters could be sequential. So by looking at code **WM304** - you ### Standardization -If you have more than one person naming items, the style of naming items will change for everyone. Sometimes, even for one person, he or she may forget how did they name the item and may create a duplicate name _"Wooden Sheet 3mm" or "3mm Sheet of Wood"?_ +If you have more than one person naming items, the style of naming items will change for everyone. Sometimes, even for one person, he or she may forget how they had named the item and may create a duplicate name _"Wooden Sheet 3mm" or "3mm Sheet of Wood"?_ ### Rationalizing From eb3df651460ece1bd66554204a28606df04af668 Mon Sep 17 00:00:00 2001 From: Priya Date: Wed, 14 Aug 2013 15:51:02 +0530 Subject: [PATCH 19/21] [docs] --- docs/docs.user.buying.purchase_order.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/docs.user.buying.purchase_order.md b/docs/docs.user.buying.purchase_order.md index 47aba3e39b..90db2bda82 100644 --- a/docs/docs.user.buying.purchase_order.md +++ b/docs/docs.user.buying.purchase_order.md @@ -3,7 +3,7 @@ "_label": "Purchase Order" } --- -A Purchase Order is analogous to a Sales Order. It is usually a binding contract with your Supplier that you promise to buy this set of Items under the given conditions. +A Purchase Order is analogous to a Sales Order. It is usually a binding contract with your Supplier that you promise to buy a set of Items under the given conditions. In ERPNext, you can make a Purchase Order by going to: @@ -14,16 +14,16 @@ A Purchase Order can also be automatically created from a Purchase Request or S Entering a Purchase Order is very similar to a Purchase Request, additionally you will have to set: - Supplier.
 -- A “Required By” date on each Item: If you are expecting part delivery, your Supplier will know how much quantity to deliver at which date. This will help you from preventing over-supply. It will also help you track how well your Supplier is doing on timeliness. +- A “Required By” date on each Item: If you are expecting part delivery, your Supplier will know how much quantity to deliver at which date. This will help you from preventing over-supply. It will also help you to track how well your Supplier is doing on timeliness. ### Taxes -If your Supplier is going to charge you additional taxes or charge like a shipping or insurance charge, you can add it here. It will help you to accurately track your costs. Also if some of these charges add to the value of the product you will have to mention in the Taxes table. You can also use templates for your taxes. For more information on setting up your taxes see the Purchase Taxes and Charges Master. +If your Supplier is going to charge you additional taxes or charge like a shipping or insurance charge, you can add it here. It will help you to accurately track your costs. Also, if some of these charges add to the value of the product you will have to mention them in the Taxes table. You can also use templates for your taxes. For more information on setting up your taxes see the Purchase Taxes and Charges Master. ### Value Added Taxes (VAT) -Many times, the tax paid by you to a Supplier for an Item is the same tax you collect from your Customer. In many regions, what you pay to your government is only the difference between what you collect from your Customer and pay to your Supplier. This is called Value Added Tax (VAT). +Many a times, the tax paid by you to a Supplier, for an Item, is the same tax which you collect from your Customer. In many regions, what you pay to your government is only the difference between what you collect from your Customer and what you pay to your Supplier. This is called Value Added Tax (VAT). For example you buy Items worth X and sell them for 1.3X. So your Customer pays 1.3 times the tax you pay your Supplier. Since you have already paid tax to your Supplier for X, what you owe your government is only the tax on 0.3X. From 394d40e877ac5478a9842277ba216aca7c2af522 Mon Sep 17 00:00:00 2001 From: Priya Date: Wed, 14 Aug 2013 15:56:13 +0530 Subject: [PATCH 20/21] [docs] --- docs/docs.user.buying.supplier.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs.user.buying.supplier.md b/docs/docs.user.buying.supplier.md index ad9e4ae4e0..aa53a784f0 100644 --- a/docs/docs.user.buying.supplier.md +++ b/docs/docs.user.buying.supplier.md @@ -8,10 +8,10 @@ Suppliers are companies or individuals who provide you with products or services 1. Separate Account Ledgers are created for the Supplier in the Company under “Accounts Payable”. 1. You can have multiple Addresses and Contacts for Suppliers. 1. Suppliers are categorized as Supplier Type. -1. If you set “Credit Days”, this will automatically set the due date in Purchase Invoices. +1. If you set “Credit Days”, ERPNext will automatically set the due date in Purchase Invoices. You can create a new Supplier via: > Buying > Supplier > New Supplier -or importing from the Data Import Tool +or import from the Data Import Tool From cc9b922e006bc8d22ac4136a1da5dabb460bbb25 Mon Sep 17 00:00:00 2001 From: Priya Date: Wed, 14 Aug 2013 16:01:01 +0530 Subject: [PATCH 21/21] [docs] --- docs/docs.user.buying.supplier_quotation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs.user.buying.supplier_quotation.md b/docs/docs.user.buying.supplier_quotation.md index 0355fd02a2..37431f3353 100644 --- a/docs/docs.user.buying.supplier_quotation.md +++ b/docs/docs.user.buying.supplier_quotation.md @@ -8,7 +8,7 @@ If you have multiple **Suppliers** who supply you with the same **Item**, you us - You can easily compare prices in the future - Audit whether all Suppliers were given the opportunity to quote. -Supplier Quotations are not necessary for most small businesses. Always evaluate the cost of collecting information to the value it provides! You could only do this for high value items. +Supplier Quotations are not necessary for most small businesses. Always evaluate the cost of collecting information to the value it really provides! You could only do this for high value items. You can make a Supplier Quotation directly from: