[docs][fix] merge conflict

docs/docs.md

@@ -22,13 +22,13 @@
 
 ### 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.
+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.
+- It gives better deployment on mobiles, tablets, desktops and large screens.

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

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.
 
 ---
 

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.

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.
 

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.
 

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.
 

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.
 

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.

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).
 

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.
 

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.
 

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.
 

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. 
 

docs/docs.user.setup.data_import.md

@@ -63,7 +63,7 @@ If you have multiple child rows then you must start a new main item on a new row
 
 ### 5. 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.
+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.
 
 > Note: For child records, if you select Overwrite, it will delete all the child records of that parent.
 

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.
 

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.

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 when 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
 

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.

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.

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
 

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:
 

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

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 <img> HTML tag or using markdown format. the link for your file will be files/filename
+You can attach images to your web page and show them using the <img> HTML tag or using markdown format. the link to your file will be files/filename