deferred revenue and other docs

foundation/www/docs/user/manual/en/accounts/deferred-revenue.md

@@ -0,0 +1,35 @@
+# Deferred Revenue
+
+Deferred revenue, also known as unearned revenue, refers to advance payments a company receives for products or services that are to be delivered or performed in the future. 
+
+The company that receives the prepayment records the amount as Deferred revenue on their balance sheet as a liability. Deferred revenue is a liability because it refers to revenue that has not been earned and represents products or services that are owed to a customer. As the product or service is delivered over time, it is recognized as revenue on the income statement.
+
+### Deferred Revenue Usecase
+
+The internet and broadcasting services providers offers subscription plans on quanterly or yearly basis. They take complete payment in advance from the customer for couple of months, but book income on monthly basis in their books of accounts. Following is how they should configure Deferred Revenue accounting in ERPNext to automate the process.
+
+### Item
+
+In the Item master created for the subscription plan, under Deferred Revenue section, check field **Enable Deferred Revenue**. In this section, you can also select a Deferred Revenue account for this particular item and no. of months.
+
+<img class="screenshot" alt="Item - Deferred Revenue" src="{{docs_base_url}}/assets/img/accounts/deferred-item.png">
+
+### Sales Invoice
+
+On creation of Sales Invoice for the Deferred Revenue Item, instead of posting in the Income Account, Deferred Revenue account is Credited by the sale amount.
+
+<img class="screenshot" alt="Item - Deferred Revenue" src="{{docs_base_url}}/assets/img/accounts/deferred-invoice.gif">
+
+
+### Journal Entry
+
+Based on the From Date and To Date set for the Item in the Sales Invoice Item table, Journal Entries at the end of each month. It debits the value from Deferred Revenue account and credits Income Account selected for an Item in the Sales Invoice. Following is the example of Income for the deferred Revenue Item is booked via multiple Journal Entries.
+
+<img class="screenshot" alt="Item - Deferred Revenue" src="{{docs_base_url}}/assets/img/accounts/deferred-jv.png">
+
+### Video Help (Webinar Recording)
+
+<div class="embed-container">
+  <iframe src="https://www.youtube.com/embed/j6mx-EHU4aY" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
+  </iframe>
+</div>

foundation/www/docs/user/manual/en/accounts/index.txt

@@ -11,6 +11,7 @@ payments
 journal-entry
 inter-company-journal-entry
 payment-entry
+deferred-revenue
 subscription
 multi-currency-accounting
 advance-payment-entry

foundation/www/docs/user/manual/en/accounts/point-of-sales.md

@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 # Point of Sale Invoice
 
 For retail operations, the delivery of goods, accrual of sale and payment all happens in one event, that is usually called the “Point of Sale” (POS).

foundation/www/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md

@@ -1,53 +1,33 @@
-<!-- add-breadcrumbs -->
+# Leave Calculation In Salary Slip
-<h1>Leave Calculation In Salary Slip</h1>
 
 There are two types of leave which user can apply for.
-<br>
-<br>
-<ol>
-    <li>Paid Leave (Sick Leave, Privilege Leave, Casual Leave etc.)</li>
-    <li>Unpaid Leave
-        <br>
-    </li>
-</ol>Paid Leave are firstly allocated by HR manager. As and when Employee creates Leave Application, leaves allocated to him/her are deducted. These leaves doesn't have impact on the employee's Salary Slip.
-<br>
-<br>When Employee is out of paid leave, he create Leave Application for unpaid leave. The term used for unpaid leave in ERPNext is Leave Without Pay (LWP). These leaves does have impact on the Employee's Salary Slip.
-<br>
-<br>
-<div class="well">Just marking Absent in the Attendance record do not have impact on salary calculation of an Employee, as that absenteeism could be because of paid leave. Hence creating Leave Application should be created incase of absenteeism.<br></div>Let's consider
-a scenario to understand how leaves impact employees Salary Slip.
-<br>
-<br><b>Masters:</b>
 
-<br>
+* Paid Leave (Sick Leave, Privilege Leave, Casual Leave etc.)
-<br>
+* Unpaid Leave
-<ol>
-    <li>Setup Employee</li>
-    <li>Allocate him paid leaves</li>
-    <li>Create Salary Structure for that Employee. In the Earning and Deduction table, select which component of salary should be affected if Employee takes LWP.</li>
-    <li>Create Holiday List (if any), and link it with Employee master.</li>
-</ol>
-<p>When creating Salary Slip for an Employee, following is what you will see:</p>
-<img src="{{docs_base_url}}/assets/img/articles/SGrab_282.png">
-<br>
-<br><b>Working Days:</b> Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
-<br>
-<br>
-<div class="well">Human Resource &gt;&gt; Setup &gt;&gt; HR Setting
-    <br>
-    <br>Uncheck field "Include Holidays in Total No. of Working Days"
-    <br>
-</div>Holidays are counted based on Holiday List attached to the Employee's master.<b><br><br>Leave Without Pay: </b>Leave Without Pay is updated based on Leave Application made for this Employee, in the month for which Salary Slip is created, and which has
-Leave Type as "Leave Without Pay".
-<br>
-<br><b>Payment Days:</b> Following is how Payment Days are calculated:
-<br>
-<br>Payment Days = Working Days - Leave Without Pay
-<br>
-<br>As indicated above, if you have LWP checked for components in the earning and deducted table, you will notice a reduction in Amount based on no. of LWP of an Employee for that month.
-<br>
-<br>
-<img src="{{docs_base_url}}/assets/img/articles/SGrab_283.png" width="760"><br>
 
+Paid Leave are firstly allocated by HR manager. As and when Employee creates Leave Application, leaves allocated to him/her are deducted. These leaves doesn't have impact on the employee's Salary Slip.
 
-<!-- markdown -->
+When Employee is out of paid leave, he create Leave Application for unpaid leave. The term used for unpaid leave in ERPNext is Leave Without Pay (LWP). These leaves does have impact on the Employee's Salary Slip.
+
+<div class="well">Just marking Absent in the Attendance record do not have impact on salary calculation of an Employee, as that absenteeism could be because of paid leave. Hence creating Leave Application should be created incase of absenteeism. Let's consider a scenario to understand how leaves impact employees Salary Slip.
+
+1. Setup Employee
+1. Allocate him paid leaves
+1. Create Salary Structure for that Employee. In the Earning and Deduction table, select which component of salary should be affected if Employee takes LWP.
+1. Create Holiday List (if any), and link it with Employee master.
+
+**Working Days:** Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
+
+> Human Resource > Setup > HR Setting
+
+Uncheck field "Include Holidays in Total No. of Working Days"
+
+Holidays are counted based on Holiday List attached to the Employee's master.
+
+**Leave Without Pay:** Leave Without Pay is updated based on Leave Application made for this Employee, in the month for which Salary Slip is created, and which has Leave Type as "Leave Without Pay".
+
+Payment Days: Following is how Payment Days are calculated:
+
+Payment Days = Working Days - Leave Without Pay
+
+If you have LWP checked for the Salary Component, there will be reduction in Amount based on no. of LWP of an Employee for that month.

foundation/www/docs/user/manual/en/human-resources/articles/loan-management.md

@@ -1,56 +0,0 @@
-<!-- add-breadcrumbs -->
-<h1>Loan Management</h1>
-
-Loan is an sum of money paid by Employer to Employee based on certain terms and condition. There are multiple ways accounting for the loan can be managed. Company could collect loan from an employee separately. Or they can choose to deduct loan installment from the employee's salary.
-
-Let's check below how accounting can be managed for Loan in ERPNext.
-
-### 1. Setup Masters
-
-Create following Groups and Ledgers in Chart of Accounts if not there.
-      
-#### 1.1  Loan Account
-
-Create Group as 'Loans' under Current Assets and create loan A/C (Ledger) under it. [Check this link for new account creation](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters)
-
-![CoA]({{docs_base_url}}/assets/img/articles/Selection_433.png)
-
-#### 1.2 Salaries Account
-
-Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it.
-
-![CoA]({{docs_base_url}}/assets/img/articles/Selection_434.png)
-
-#### 1.3 Interest Account
-
-Create Ledger as 'Interest on Loan' under Indirect Income.
-
-### 2. Book Loan Amount
-
-Once loan amount is finalized, make journal voucher to book loan payment entry. You should Credit Loan amount to Bank/Cash account and Debit Loan amount loan account.  
-
-![Loan Entry]({{docs_base_url}}/assets/img/articles/Selection_435.png)
-
-### 3. Book Loan Recovery and Interest
-
-#### 3.1 Loan Recovery Entry
-
-If your employee pays separately for his/her loan installment and loan interest, then create journal voucher. 
-
-![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_436.png)
-
-#### 3.2 Loan Adjustment in Salary
-
-And if you deduct loan installment and interest from employees salary, then book journal entry for the same.
-
-![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_437.png)
-
-In the Salary Slip of an employee, then create two Deduction Types in Salary Structure. One as 'Loan Installment' and other one as 'Loan Interest'. So that you can update those values under this deduction heads.
-
-### 4. Loan Account Report
-
-After recovering loan and loan interest, General Ledger report will show the loan account details as follows.
-
-![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_439.png)
-
-<!-- markdown -->

foundation/www/docs/user/manual/en/human-resources/employee-onboarding-and-separation.md

@@ -1,19 +1,19 @@
 # Employee Onboarding and Separation
 
-In the process of hiring or releaving an Employee, there are set of standard activities which needs to be executed. This feature helps you maintain the master of these activities, and create set of Task at the time of each Employee hiring or releaving.
+In the process of hiring or relieving an Employee, there are set of standard activities which need to be executed. This feature helps you maintain the master of these activities, and create the set of Task at the time of each Employee hiring or relieving.
 
-Use Case: Let's assume that following are the activities which needs to be performed as soon as job applicant is approved to be hired.
+Use Case: Let's assume that following are the activities which need to be performed as soon as a job applicant is approved to be hired.
 
-- Perform a legal and professional backgroud check
+- Perform a legal and professional background check
 - Create an Employee master
 - Create an Email Account
 - Create an identity card
 - Allocate leaves
 
-Same way, you can have different set of activities to be performed when releaving an Employee, like:
+Same way, you can have a different set of activities to be performed when relieving an Employee, like:
 
-- Diasble access from the system
+- Disable access from the system
-- Collect assets from the Employee, if any allocated
+- Collect assets from threlievinge Employee, if any allocated
 - Collect ID card
 - Update employee master 
 - Perform full and final payment process in the payroll
@@ -26,9 +26,9 @@ In ERPNext, these standard activities can be tracked in the Employee Onboarding
 
 <img class="screenshot" alt="Onboarding Template" src="{{docs_base_url}}/assets/img/human-resources/onboarding-template.png">
 
-You can notice that for each Acitivity, you can also mention the User or Role, or one of it, to whom this activity will be assigned.
+You can notice that for each Activity, you can also mention the User or Role, or one of it, to whom this activity will be assigned.
 
-You can also maintain separate master for the Employee Separation Template, based on Department, Designation and Grade.
+You can also maintain separate master for the Employee Separation Template, based on Department, Designation, and Grade.
 
 ### Employee Onboarding
 
@@ -40,7 +40,7 @@ You can select an applicant from Job Applicant master, and fetch activities from
 
 ### Tasks and Assignments
 
-On submission on Employee Onboarding / Seperation, a Project will be created. Within the Project, a Tasks will also be created for each Actiovity. Again, each Task will be allocated, based on the User or Role selected for that Activity.
+On submission on Employee Onboarding / Separation, a Project will be created. Within the Project, a Tasks will also be created for each Activity. Again, each Task will be allocated, based on the User or Role selected for that Activity.
 
 <img class="screenshot" alt="Onboarding Template" src="{{docs_base_url}}/assets/img/human-resources/onboarding-tasks.gif">
 

foundation/www/docs/user/manual/en/manufacturing/production-plan.md

@@ -1,7 +1,7 @@
 <!-- add-breadcrumbs -->
 # Production Plan
 
-Production plan helps user to plan production aginst the multiple sales orders or the material requests and also plan for the purchase of the raw materials which will be used in the production.
+Production Plan helps user to plan production aginst the multiple sales orders or the material requests. Also, it helps in Material Procuremnt planning for the raw-material item, based on the quantity of finished product to be manufactured.
 
 To use the Production Plan, go to:
 

foundation/www/docs/user/manual/en/selling/sales-order.md

@@ -1,20 +1,21 @@
-<!-- add-breadcrumbs -->
 # Sales Order
 
-The Sales Order confirms your sales and triggers purchase (**Material
+The Sales Order confirms the receipt of an order from your customer. It is usually a binding Contract with your Customer. Once your customer confirms the Quotation you can convert your Quotation into
-Request**) shipment (**Delivery Note**), billing (**Sales Invoice**) and
-manufacturing (**Production Plan**)
-
-A Sales Order is usually a binding Contract with your Customer.
-
-Once your customer confirms the Quotation you can convert your Quotation into
 a Sales Order.
 
+There are various transactions which can be trigerred from Sales Order like;
+
+* Delivery Note
+* Sales Invoice
+* Material Request
+* Production Order
+* Project
+
 ### Sales Order Flow-Chart
 
 <img class="screenshot" alt="Sales Order flow" src="{{docs_base_url}}/assets/img/selling/sales-order-f.jpg">
 
-To create a new Sales Order go to:
+To create a new Sales Order, go to:
 
 > Selling > Sales Order > New Sales Order
 
@@ -29,27 +30,22 @@ Or you can create a new Sales Order and pull details from an Quotation.
 <img class="screenshot" alt="Make Sales Order from Quotation" src="{{docs_base_url}}/assets/img/selling/make-so.gif">
 
 Most of the information in your Sales Order is the same as the Quotation.
+
 There are a few amongst other things that a Sales Order will ask you to
 update.
 
-  * Enter delivery date agaist each item. If there are multiple items and if you enter delivery date in the first row, the date will be copied to other rows as well where it is blank.
+  * Enter Delivery Date agaist each item. If there are multiple items and if you enter delivery date in the first row, the date will be copied to other rows as well where it is blank.
   * Customer Purchase Order number: If your customer has sent you a Purchase Order, you can update its number for future reference (in billing).
 
 ### Packing List
 
-The “Packing List” table will be automatically updated when you “Save” the
+The “Packing List” table will be automatically updated when you “Save” the Sales Order. If any Items in your table are Product Bundle (packets), then the “Packing List” will contain the exploded (detailed) list of your Items.
-Sales Order. If any Items in your table are Product Bundle (packets), then the
-“Packing List” will contain the exploded (detailed) list of your Items.
 
 ### Reservation and Warehouses
 
-If your Sales Order contains Items for which inventory is tracked (Is Stock
+If your Sales Order contains Items for which inventory is tracked (Is Stock Item is “Yes”) then, ERPNext will ask you for “Reservation Warehouse”. If you have set a default Warehouse for the Item, it will automatically set this Warehouse here.
-Item is “Yes”) then, ERPNext will ask you for “Reservation Warehouse”. If you
-have set a default Warehouse for the Item, it will automatically set this
-Warehouse here.
 
-This “reserved” quantity will help you project what is the quantity you need
+This “reserved” quantity will help you project what is the quantity you need to purchase based on all your commitments.
-to purchase based on all your commitments.
 
 ### Taxes
 
@@ -67,24 +63,6 @@ To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/sett
 
 **Sales Persons:** ERPNext allows you to tag multiple Sales Persons who may have worked on this deal. You can also split the amount in targets of different Sales Persons and track how much incentives they earned on this deal.
 
-### Recurring Sales Orders
-
-If you have a recurring contract with a Customer where you are required to generate a Sales Order on a monthly, quarterly, half-yearly or annual basis, you can check the “Convert To Recurring Order” box. 
-
-Here you can fill in the details like; of how frequently you want to generate an Order in the 'Recurring Type' field, specify the day of of the month on which the Order needs to be generated in the 'Repeat On Day Of Month' field and the date on which the recurring orders should stop in the 'End Date' field.
-
-**Recurring Type:** Here you can update how frequently you want to generate an Order.
-
-**Repeat On Day Of Month:** You can specify the day of of the month on which the Order needs to be generated.
-
-**End Date:** The date on which the recurring orders should stop can be specified here.
-
-On updating the Sales Order, a Recurring ID will be generated which will be same for all recurring orders generated from this particular Sales Order.
-
-ERPNext will automatically create new Order and mail a notification to the Email Addresses you set in the 'Notification Email Address'field.
-
-<img class="screenshot" alt="Reccuring Sales Order" src="{{docs_base_url}}/assets/img/selling/recurring-sales-order.png">
-
 ### Next Steps
 
 Once you “Submit” your Sales Order, you can now trigger different aspects of
@@ -97,9 +75,7 @@ your organization:
 
 ### Submission
 
-Sales Order is a “Submittable” transaction. See Document Stages. You will be
+Sales Order is a “Submittable” transaction. See Document Stages. You will be able to execute dependent steps (like making a Delivery Note) only after “Submitting” this Sales Order.
-able to execute dependent steps (like making a Delivery Note) only after
-“Submitting” this Sales Order.
 
 ### Sales Order with Order type Maintenance
 
@@ -112,9 +88,7 @@ __Step 2:__ Mention taxes and other information.
 
 __Step 3:__ Save and Submit the form
 
-__Step 4:__ Once the form is submitted, the Action button will provide three
+__Step 4:__ Once the form is submitted, the Action button will provide three choices.i) Maintenance Visit ii) Maintenance Schedule iii) Invoice.
-choices.i) Maintenance Visit ii) Maintenance Schedule iii) Invoice.
-
 
 
 > **Note 1:**   

foundation/www/docs/user/manual/en/setting-up/articles/change-password.md

@@ -1,4 +1,3 @@
-<!-- add-breadcrumbs -->
 #Change User Password
 
 Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password.
@@ -12,7 +11,4 @@ Each ERPNext user can customize password for his/her ERPNext account. Also user
 
 <img alt="Change Password" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-password-2.png">
 
-Enter the new password and save the form to save changes.
+Enter the new password and save the form to save changes
-
-
-<!-- markdown -->

foundation/www/docs/user/manual/en/setting-up/company-setup.md

@@ -1,13 +1,42 @@
-<!-- add-breadcrumbs -->
+# Company
-# Company Setup
 
-Enter your company details to complete Company Setup. Mention the type of
+A company is a legal entity made up of an association of people for carrying on a commercial or industrial enterprise.
-business, under Domain. You can enter manufacturing, retail, or services
-depending on the nature of your business activity. If you have more than one
-companies, create the setup under the Company Setup page.
 
-After clicking on Accounts and click on Company.
+In ERPNext, first Company is created on completion of account creation. For each Company, you can set a domain as manufacturing, retail, or services depending on the nature of your business activity. 
+
+If you have more than one company, you can add them from:
 
 > Accounts > Company > New Company
 
+### Company Tree Structure
+
+The company is a tree-structured master. It allows you to define a federated and group company structure.
+
+<img class="screenshot" alt="Item - Deferred Revenue" src="{{docs_base_url}}/assets/img/accounts/company-tree.png">
+
+### Chart of Accounts
+
+On each Company, the master for Chart of Account is maintained separately. This allows you to maintain separate accounting for each company as per the legal requirements.
+
+<img class="screenshot" alt="Item - Deferred Revenue" src="{{docs_base_url}}/assets/img/accounts/company-coa.png">
+
+ERPNext has localized Chart of Accounts readily available for some countries. When creating new Company, you can choose to setup Chart of Account for it from one of the following options.
+
+* Standard Chart of Accounts
+* Based on Existing Company's Chart of Account
+
+<img class="screenshot" alt="Item - Deferred Revenue" src="{{docs_base_url}}/assets/img/accounts/company-coa-2.png">
+
+### Default Values
+
+Within the Company master, you can set lots of default values for master and accounts. These default account will help you in the quick posting of accounting transactions, where the value for the Account will be fetched from the Company master if provided. Following are the types of values for which default can be set in the Company master.
+
+* Letter Head
+* Bank Account
+* Holiday List
+* Sales Income Account
+* Cost of Goods Sold Account
+* Control Accounts related to perpetual inventory
+* Accounts related to Fixed Asset accounting
+
 {next}