Merge branch 'master' into serial_no

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

docs/docs.user.buying.md

@@ -3,8 +3,8 @@
 	"_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 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.

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.
 

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

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:
 

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

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.stock.item.md

@@ -7,64 +7,59 @@
 	]
 }
 ---
-An Item is simply a product or service which you sell or buy from your Customers or Suppliers. ERPNext is optimized for itemized management of your sales and purchase. However, you can skip creating Items. If you are in services, you can create an Item for each services that your offer.
+An Item is your company's product or a service.The term Item is applicable to your core products as well as your raw materials. It can be a product or service that you buy/sell from your customers/ suppliers. ERPNext allows you to manage all sorts of items like raw-materials, sub-assemblies, finished goods, item variants and service items. 
 
-There are two main categories of Items in ERPNext
+ERPNext is optimized for itemized management of your sales and purchase. If you are in services, you can create an Item for each services that your offer. Completing the Item Master is very essential for successful implementation of ERPNext.
 
-- Stock Items
-- Non Stock Items
+## Item Properties
 
-As you may have guessed, inventory balances are tracked for stock items and not for
-non-stock items. Non-stock items could be services or consumables that are not tracked.
+- **Item Name:** Item name is the actual name of your product or service.
+- **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification](docs.user.setup.codification.html)
+- **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under Item Group.
+- **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list. 
+- **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item.
 
-### Item Groups
+![Item Properties](img/item-properties.png)
 
-ERPNext allows you to classify items into groups. This will help you in getting reports about various classes of items and also help in cataloging your items for the website.
+### Upload an Image
 
-### Warehouses
+To  upload an image for your icon that will appear in all transactions, save the partially filled form. Only after your file is saved a “+” button will appear besides the Image icon. Click on this sign and upload the image.
 
-In ERPNext you can create Warehouses to identify where your Items reside. 
+![Item Properties](img/item-add-image.png)
 
-There are two main Warehouse Types that are significant in ERPNext.
+### Item Pricing
 
-Stores: These are where your incoming Items are kept before they are consumed or sold. You can have as many “Stores” type Warehouses as you wish. Stores type warehouses are significant because if you set an Item for automatic re-order, ERPNext will check its quantities in all “Stores” type Warehouses when deciding whether to re-order or not.
+Item Price and Price Lists: ERPNext lets you maintain multiple selling prices for an Item using Price Lists. A Price List is a place where different rate plans can be stored. It’s a name you can give to a set of Item prices. In case you have different zones (based on the shipping costs), for different currencies etc, you can maintain different Price Lists. A Price List is formed when you create different Item Prices. To import Item Price visit “Import Item Price”.
 
-Asset: Items marked as type “Fixed Asset” are maintained in Asset Type Warehouses. This helps you to separate them for the Items that are consumed as a part of your regular operations or “Cost of Goods Sold”.
+## Inventory : Warehouse and Stock Setting
 
-### Item Taxes
+In ERPNext, you can select  different type of Warehouses to stock your different Items. This can be selected based on Item types. It could be Fixed Asset Item, Stock Item or even Manufacturing Item. 
 
-These settings are only required if this particular Item has a different tax rate than what is the rate defined in the standard tax Account.
+- **Stock Item:** If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item.
+- **Default Warehouse:** This is the Warehouse that is automatically selected in your transactions. 
+- **Allowance Percentage:** This is the  percent by which you will be allowed to over-bill or  over-deliver this Item. If not set, it will select from  the Global Defaults. 
+- **Valuation Method:** There are two options to maintain valuation of stock. FIFO (first in -  first out) and Moving Average. To understand this topic in detail please visit “ Item Valuation, FIFO and Moving Average”.
 
-For example, you have a tax Account, “VAT 10%” and this particular item is exempted from this tax, then you select “VAT 10%” in the first column, and set “0” as the tax rate in the second column.
+### Serialized and Batched Inventory
+
+These numbers help to track individual units or batches of Items which you sell. It also tracks warranty and returns. In case any individual Item is recalled by the supplier the number system helps to track individual Item. The numbering system  also manages expiry dates. Please note that if you sell your items in thousands, and if the items are very small like pens or erasers, you need not serialize them. In ERPNext, you will have to mention the serial number in some accounting entries. To create serial numbers you will have to manually create all the numbers in your entries. If your product is not a big consumer durable Item, if it has no warranty and has no chances of being  recalled, avoid giving serial numbers. 
+
+> Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
+
+- [Disucssion on Serialized Inventory](docs.user.stock.serialized.html)
+
+### Re Ordering
+
+- **Re-order level** suggests the amount of stock balance in the Warehouse. 
+- **Re-order Qty** suggests the amount of stock to be ordered  to maintain minimum stock levels.
+- **Minimum Order Qty** is the minimum quantity for which a Material Request / Purchase Order must be made.
+
+### Item Tax
+
+These settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account. For example,  If you have a tax Account, “VAT 10%” and this particular Item is exempted from tax, then you select “VAT 10%” in the first column, and set “0” as the tax rate in the second column.
 
 ### Inspection
 
-Inspection Required: If an incoming inspection (at the time of delivery from the Supplier) is mandatory for this Item, mention “Inspection Required” as “Yes”. The system will ensure that a Quality Inspection will be prepared and approved before a Purchase Receipt is submitted.
+Inspection Required: If an incoming inspection (at the time of delivery from the Supplier) is mandatory for this Item, mention “Inspection Required” as “Yes”. The system will ensure that a Quality Inspection will be prepared and approved before a Purchase 	Receipt is submitted.
 
-Inspection Criteria: If a Quality Inspection is prepared for this Item, then this template of criteria will automatically be updated in the Quality Inspection table of the Quality Inspection.

Examples of Criteria are: Weight, Length, Finish etc.
-
-### Item Pricing and Price Lists
-
-ERPNext lets you maintain multiple selling prices for an Item using Price Lists. A Price List is a name you can give to a set of Item prices.
-
-Why would you want Price Lists? You have different prices for different zones (based on the shipping costs), for different currencies, regions etc.
-
-#### Negative Stock
-
-FIFO is the more accurate system of the two but has a disadvantage. You cannot have negative stock in FIFO. This means that you cannot make forward transactions that would make your stock negative. Why is this? Because sequences are so important to FIFO, you cannot track the value of the stock if it does not exist!
-
-In Moving Average, since each item has an “average” value, the value of the negative stock is also based on this “average”.
-
-### Serial Numbers and Batches
-
-In scenarios where you may have to track individual units or batches of Items you sell, ERPNext allows you to manage Serial Numbers and Batches.
-
-Why is this useful?
-
-- To track warranty and returns.
-- To trace individual Items incase they are recalled by the Supplier.
-- To manage expiry.
-
-In ERPNext, Serial Number and Batch are separate entities and all stock transactions for Items that serialized or batches must be tagged with either the Batch or Serial Number.
-
-> Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
+Inspection Criteria: If a Quality Inspection is prepared for this Item, then this template of criteria will automatically be updated in the Quality Inspection table of the Quality Inspection. Examples of Criteria are: Weight, Length, Finish etc.

docs/docs.user.stock.serialized.md

@@ -11,10 +11,40 @@ You can also track from which **Supplier** you purchased the **Serial No** and t
 
 If your Item is *serialized* you will have to enter the Serial Nos in the related column with each Serial No in a new line.
 
+### Serial Nos and Inventory
+
+Inventory of an Item can only be affected if the Serial No is transacted via a Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales Invoice). When a new Serial No is created directly, its warehouse cannot be set.
+
+### Using Serial Nos
+
+To add a Serial No to a stock transaction, you can set the Serial No in the serial no field:
+
+![Serial No Entry](img/serial-no-entry.png)
+
+### Creation
+
+Serial Nos can automatically be created from a Stock Entry or Purchase Receipt. If you mention Serial No in the Serial Nos column, it will automatically create those serial Nos.
+
+### Automatic Series
+
+If in the Item Master, the Serial No Series is mentioned, you can leave the Serial No column blank in a Stock Entry / Purchase Receipt and Serial Nos will automatically be set from that series.
+
+#### Step 1: Mention the Series in the Item
+
+![Automatic Series](img/item-serial-no-series.png)
+
+#### Step 2: Keep Serial No field blank in your entry
+
+#### Step 3: Save / Submit your transaction (Serial Nos Automatically Updated)
+
+![Serial No Created Message](img/serial-no-auto-1.png)
+
+![Serial No Updated in Transaction](img/serial-no-auto-2.png)
+
+
 ### Importing and Updating Serial Nos
 
-Serial Nos cannot be imported from Stock Reconciliation. To import Serial Nos, you will have to use the Data Import Tool. When you import the Serial Nos, the stock level of its corresponding Item will be automatically updated.
-
+Serial Nos cannot be imported from Stock Reconciliation. To import Serial Nos, you will have to use the Data Import Tool.
 
 ### Using Serial Numbers for Multiple Purposes
 

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)
 

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

patches/august_2013/p02_rename_price_list.py

@@ -5,6 +5,8 @@ from __future__ import unicode_literals
 import webnotes
 
 def execute():
+	webnotes.reload_doc("website", "doctype", "shopping_cart_price_list")
+	
 	for t in [
 			("Supplier Quotation", "price_list_name", "buying_price_list"),
 			("Purchase Order", "price_list_name", "buying_price_list"),
@@ -23,7 +25,7 @@ def execute():
 		if t[2] in table_columns and t[1] in table_columns:
 			# already reloaded, so copy into new column and drop old column
 			webnotes.conn.sql("""update `tab%s` set `%s`=`%s`""" % (t[0], t[2], t[1]))
-			webnotes.conn.sql("""alter table `tab%s` drop column `%s`""" % (t[0], t[1]))
+			webnotes.conn.sql_ddl("""alter table `tab%s` drop column `%s`""" % (t[0], t[1]))
 		elif t[1] in table_columns:
 			webnotes.conn.sql_ddl("alter table `tab%s` change `%s` `%s` varchar(180)" % t)
 

patches/august_2013/p05_employee_birthdays.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import webnotes
 
 def execute():
+	webnotes.reload_doc("core", "doctype", "event")
 	webnotes.conn.sql("""delete from `tabEvent` where repeat_on='Every Year' and ref_type='Employee'""")
 	for employee in webnotes.conn.sql_list("""select name from `tabEmployee` where status='Active' and 
 		ifnull(date_of_birth, '')!=''"""):

public/js/utils.js

@@ -42,7 +42,7 @@ $.extend(erpnext, {
 		
 		var $btn = $('<button class="btn btn-sm btn-default">Add Serial No</button>')
 			.appendTo($("<div>")
-				.css({"margin-bottom": "10px"})
+				.css({"margin-bottom": "10px", "margin-top": "-10px"})
 				.appendTo(grid_row.fields_dict.serial_no.$wrapper));
 				
 		$btn.on("click", function() {

selling/utils.py

@@ -81,7 +81,7 @@ def get_item_details(args):
 def _get_serial_nos_by_fifo(args, item_bean):
 	return "\n".join(webnotes.conn.sql_list("""select name from `tabSerial No` 
 		where item_code=%(item_code)s and warehouse=%(warehouse)s and status='Available' 
-		order by datetime(purchase_date, purchase_time) asc limit %(qty)s""" % {
+		order by timestamp(purchase_date, purchase_time) asc limit %(qty)s""", {
 			"item_code": args.item_code,
 			"warehouse": args.warehouse,
 			"qty": cint(args.qty)

stock/doctype/purchase_receipt/purchase_receipt.js

@@ -127,7 +127,7 @@ cur_frm.cscript.new_contact = function(){
 cur_frm.fields_dict['purchase_receipt_details'].grid.get_field('project_name').get_query = function(doc, cdt, cdn) {
 	return{
 		filters:[
-			['project', 'status', 'not in', 'Completed, Cancelled']
+			['Project', 'status', 'not in', 'Completed, Cancelled']
 		]
 	}
 }

stock/doctype/serial_no/serial_no.js

@@ -1,3 +1,10 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
 // License: GNU General Public License v3. See license.txt
 
+cur_frm.add_fetch("customer", "customer_name", "customer_name")
+cur_frm.add_fetch("supplier", "supplier_name", "supplier_name")
+
+cur_frm.add_fetch("item_code", "item_name", "item_name")
+cur_frm.add_fetch("item_code", "description", "description")
+cur_frm.add_fetch("item_code", "item_group", "item_group")
+cur_frm.add_fetch("item_code", "brand", "brand")

stock/doctype/serial_no/serial_no.py

@@ -11,6 +11,7 @@ from webnotes import msgprint, _
 from controllers.stock_controller import StockController
 
 class SerialNoCannotCreateDirectError(webnotes.ValidationError): pass
+class SerialNoCannotCannotChangeError(webnotes.ValidationError): pass
 
 class DocType(StockController):
 	def __init__(self, doc, doclist=[]):
@@ -19,8 +20,9 @@ class DocType(StockController):
 		self.via_stock_ledger = False
 
 	def validate(self):
-		if self.doc.fields.get("__islocal") and not self.via_stock_ledger:
-			webnotes.throw(_("Serial No cannot be created directly"), SerialNoCannotCreateDirectError)
+		if self.doc.fields.get("__islocal") and self.doc.warehouse:
+			webnotes.throw(_("New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"), 
+				SerialNoCannotCreateDirectError)
 			
 		self.validate_warranty_status()
 		self.validate_amc_status()
@@ -47,9 +49,9 @@ class DocType(StockController):
 			item_code, warehouse = webnotes.conn.get_value("Serial No", 
 				self.doc.name, ["item_code", "warehouse"])
 			if item_code != self.doc.item_code:
-				webnotes.throw(_("Item Code cannot be changed for Serial No."))
+				webnotes.throw(_("Item Code cannot be changed for Serial No."), SerialNoCannotCannotChangeError)
 			if not self.via_stock_ledger and warehouse != self.doc.warehouse:
-				webnotes.throw(_("Warehouse cannot be changed for Serial No."))
+				webnotes.throw(_("Warehouse cannot be changed for Serial No."), SerialNoCannotCannotChangeError)
 			
 		if not self.doc.warehouse and self.doc.status=="Available":
 			self.doc.status = "Not Available"

stock/doctype/serial_no/serial_no.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-16 10:59:15", 
   "docstatus": 0, 
-  "modified": "2013-08-14 18:26:23", 
+  "modified": "2013-08-16 10:16:00", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -12,9 +12,9 @@
   "autoname": "field:serial_no", 
   "description": "Distinct unit of an Item", 
   "doctype": "DocType", 
-  "document_type": "Other", 
+  "document_type": "Master", 
   "icon": "icon-barcode", 
-  "in_create": 1, 
+  "in_create": 0, 
   "module": "Stock", 
   "name": "__common__", 
   "search_fields": "item_code,status"
@@ -58,7 +58,7 @@
  }, 
  {
   "default": "In Store", 
-  "description": "Only Serial Nos with status \"In Store\" can be delivered.", 
+  "description": "Only Serial Nos with status \"Available\" can be delivered.", 
   "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
@@ -96,11 +96,12 @@
   "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
   "options": "Item", 
-  "read_only": 1, 
+  "read_only": 0, 
   "reqd": 1, 
   "search_index": 0
  }, 
  {
+  "description": "Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt", 
   "doctype": "DocField", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
@@ -219,7 +220,7 @@
   "label": "Creation Time", 
   "no_copy": 1, 
   "read_only": 1, 
-  "reqd": 1
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
@@ -232,7 +233,7 @@
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "read_only": 1, 
-  "reqd": 1, 
+  "reqd": 0, 
   "search_index": 0
  }, 
  {
@@ -250,7 +251,7 @@
   "label": "Supplier", 
   "no_copy": 1, 
   "options": "Supplier", 
-  "read_only": 1
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
@@ -337,7 +338,7 @@
   "oldfieldtype": "Link", 
   "options": "Customer", 
   "print_hide": 1, 
-  "read_only": 1, 
+  "read_only": 0, 
   "search_index": 0
  }, 
  {

stock/doctype/serial_no/test_serial_no.py

@@ -16,5 +16,14 @@ class TestSerialNo(unittest.TestCase):
 	def test_cannot_create_direct(self):
 		sr = webnotes.new_bean("Serial No")
 		sr.doc.item_code = "_Test Serialized Item"
+		sr.doc.warehouse = "_Test Warehouse - _TC"
+		sr.doc.serial_no = "_TCSER0001"
 		sr.doc.purchase_rate = 10
-		self.assertRaises(SerialNoCannotCreateDirectError, sr.insert)
+		self.assertRaises(SerialNoCannotCreateDirectError, sr.insert)
+		
+		sr.doc.warehouse = None
+		sr.insert()
+		self.assertTrue(sr.doc.name)
+		
+		sr.doc.warehouse = "_Test Warehouse - _TC"
+		self.assertTrue(SerialNoCannotCannotChangeError, sr.doc.save)

stock/doctype/stock_ledger_entry/stock_ledger_entry.py

@@ -165,7 +165,6 @@ class DocType(DocListController):
 		sr.doc.serial_no = serial_no
 		sr.doc.status = "Available"
 		sr.doc.item_code = self.doc.item_code
-		sr.doc.warehouse = self.doc.warehouse
 		sr.doc.purchase_rate = self.doc.incoming_rate
 		sr.doc.purchase_document_type = self.doc.voucher_type
 		sr.doc.purchase_document_no = self.doc.voucher_no
@@ -173,6 +172,10 @@ class DocType(DocListController):
 		sr.doc.purchase_time = self.doc.posting_time
 		sr.make_controller().via_stock_ledger = True
 		sr.insert()
+		
+		# set warehouse
+		sr.doc.warehouse = self.doc.warehouse
+		sr.save()
 		webnotes.msgprint(_("Serial No created") + ": " + sr.doc.name)
 		return sr.doc.name