Merge branch 'umairsy-develop' into develop

erpnext/docs/current/index.html

@@ -52,4 +52,4 @@
 
 <!-- autodoc -->
 <!-- jinja -->
-<!-- static -->
+<!-- static -->

erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md

@@ -36,6 +36,6 @@ On submission of Stock Reconciliation, depreciation will booked for items asset
 
 <img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/depreciation-4.png">
 
-Click [here]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item) for steps to be followed when making Stock Reconciliation entry.
+Click [here]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html) for steps to be followed when making Stock Reconciliation entry.
 
 <!-- markdown -->

erpnext/docs/user/manual/en/accounts/articles/fiscal-year-creation.md

@@ -0,0 +1,5 @@
+# Fiscal Year Creation
+
+New Fiscal Year should be created each year, at the end of the current fiscal year. Creation of new Fiscal Year before its begining has been automated in ERPNext.
+
+Three days prior to the end of the current Fiscal Year, system checks if new Fiscal Year for the incoming year is already created. If not, then system auto-creates new Fiscal Year.

erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md

@@ -12,7 +12,7 @@ Only User with System Manager's Role Assigned has permission to create new Fisca
 
 `Accounts > Setup > Fiscal Year`
 
-Click [here]({{docs_base_url}}/user/manual/en/accounts/setup/fiscal-year) to learn more about Fiscal Year.
+Click [here]({{docs_base_url}}/user/manual/en/accounts/setup/fiscal-year.html) to learn more about Fiscal Year.
 
 #### Set Fiscal Year as Default
 
@@ -29,4 +29,5 @@ Default Fiscal Year will be updated in the Global Default setting as well. You c
 Save Global Default, and Reload your ERPNext account. Then, default Fiscal Year will be auto-updated in your transactions.
 
 Note: In transactions, you can manually select required Fiscal Year, from More Info section.
+
 <!-- markdown -->

erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md

@@ -0,0 +1,21 @@
+#Freeze Accounting Entries
+
+To freeze accounting entries upto a certain date, follow below given steps.
+
+#### Step 1: Go to:
+
+`Accounts > Setup > Accounts Settings`
+
+#### Step 2: Set Date
+
+Set date in the **Accounts Frozen Upto** field.
+
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-1.png">
+
+Now, the system will not allow to make any accounting entries before set date. If at all someone tries creating entries, system will show error message as below.
+
+<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-2.png">
+
+You can still allow user with certain role to create/edit entries beyound accounts frozen date. You can set that Role in the Account Settings itself.
+
+<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-3.png">

erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.md

@@ -1,18 +0,0 @@
-#How to freeze accounting entries upto a specific date?
-
-To freeze accounting entries upto a certain date, follow these steps:
-
-#### Step 1: Go to 
-
-`Accounts > Setup > Accounts Settings
-
-
-#### Step 2: Set the date in:
-
-Accounts Frozen Upto field.
-
-<img src="{{docs_base_path}}/assets/img/articles/freeze-accounting-entry.png" height="302" width="488">
-
-Now, the system will not allow to make accounting entries before that date. 
-
-But you can allow a specific Role, to make/edit accounting entries before that date. To do that set the desired **Role**, in Role Allowed to Set Frozen Accounts &amp; Edit Frozen Entries field.

erpnext/docs/user/manual/en/accounts/articles/index.txt

@@ -4,16 +4,12 @@ changing-parent-account
 depreciation-for-fixed-asset-items
 difference-entry-button
 fiscal-year-error
-how-to-freeze-accounting-entries-upto-a-specific-date
+freeze-accounting-entries
-how-to-freeze-accounting-ledger
+how-to-freeze-accouting-ledger
 manage-foreign-exchange-difference
 managing-transactions-in-multiple-currency
-new-fiscal-year-auto-create-feature
+fiscal-year-creation
-pos-view
 post-dated-cheque-entry
-pricing-rule
-recurring-order-and-invoices
 update-stock-option-in-sales-invoice
-updating-opening-balance-in-accounts-using-temporary-account
 what-is-the-differences-of-total-and-valuation-in-tax-and-charges
-withdrawing-salary-from-owners-equity-account
+withdrawing-salary-from-owners-equity-account

erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md

@@ -1,25 +1,23 @@
 # Manage Foreign Exchange Difference
 
-When you book Sales Invoices and Purchase invoices in multiple currencies, you will have to deal with currency difference while booking payment entry. You can easily manage this in ERPNext in following ways.  
+In ERPNext, you can create transactions in the foriegn currency as well. When creating transaction in the foreign currency, system updates current exchanage rate with respect to customer/supplier's currency and base currency on your Company. Since Exchange Rate is always flucuating, on might receive payment from the client on exchange rate different from one mentioned in the Sales/Purchase Invoice. Following is the intruction on how to manage different amount avail in payment entry due to exchange rate change.
 
-####Add Expense Account
+#### Add Expense Account
 
-To mange currency difference, create Account **Foreign Exchange Gain/Loss**.
+To mange currency difference, create Account **Foreign Exchange Gain/Loss**. This account is generally created on the Expense side of P&L statement. However, you can place it under another group as per your accounting requirement.
 
-![Account]({{docs_base_url}}/assets/img/articles/Selection_577.png)
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/exchange-rate-difference-1.png">
 
-####Book Payment Entry
+#### Book Payment Entry
 
-In the payment voucher, update invoice amount against Customer or Supplier account, then update actual payment amount against Bank/ Cash account. Add new row and select Foreign Exchange Gain/Loss to update currency difference amount.
+In the payment voucher, update invoice amount against Customer or Supplier account, then update actual payment amount against Bank/Cash account. Add new row and select Foreign Exchange Gain/Loss to update currency difference amount.
 
-####Scenario
+In the below scenario, Sales Invoice was made EUR, at the exchange rate of 1.090. As per this rate, Sales Invoice amount in USD (base currency) was $1000.
 
-Below is the Sales Invoice for a customer in Europe. The base currency of a Company in USD. Sales Invoice is  made at the exchange rate (USD to Eur) of 1.128.
+One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenerio.
 
-![Sales Invoice]({{docs_base_url}}/assets/img/articles/Selection_576.png)
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/exchange-rate-difference-2.gif">
 
-When receiving payment from the customer, exchange rate changed to 1.20. As per the update in the exchange rate, payment was for $120. Following is how payment entry will be booked to adjust the difference amount.
+In case you incur loss due to change foriegn exchnage rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc.
-
-![Journal Entry image]({{docs_base_url}}/assets/img/articles/Selection_578.png) 
 
 <!-- markdown -->

erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md

@@ -1,39 +1,38 @@
 #Managing Transactions In Multiple Currency
 
-You can make transaction in your base currency as well as in customer or supplier currencies. When you make transaction in your customer or supplier currency, the same currency reflects only in print format of that transaction. And system pass back end
+In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. In transaction is created in the parties currency, their currency symbol is updated in the print foramt as well.
-entry in your base currency.
+
-<br>
+Let's consider a Sales Invoice, where your base currency is of a Company is USD and party currency is EUR.
-<br>To understand this scenario will take example of Sales Invoice, where your base currency is INR and your customer currency is USD.
+
-<br>
+#### Step 1: New Sales Invoice
-<br>Following are steps to create Sales Invoice in customer currency.
+
-<br>&nbsp;
+`Accounts > Documents > Sales Invoice > New`
-<br><b>Step 1:</b> Go to Selling &gt;&gt; Documents &gt;&gt; Sales Invoice &gt;&gt; (+) New.
+
-<br>
+#### Step 2: Select Party
-<br><b>Step 2:</b> Select Customer and Enter other details.
+
-<br>
+Select Customer from the Customer master. If default Currency is updated in the Customer master, same will be fetched in the Sales Invoice as well, as Customer Currency.
-<br>
+
-<img src="{{docs_base_path}}/assets/img/articles/Selection_012.png">
+#### Step 3: Exchange Rate
-<br><b>Step 3:</b> Select customer currency and related Price List.
+
-<br>
+Currenct Exchange between between base currency and customer currency will auto-fetch.
-<br>
+
-<img src="{{docs_base_path}}/assets/img/articles/Selection_016.png">
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/multiple-currency-1.gif">
-<br>
+
-<br>
+#### Step 4: Update Details
-<br>On selecting customer currency 'Exchange Rate' field will open under Currency field, where you will enter exchange rate of customer currency to basic currency. In our case for USD to INR. You can check exchange rate online
+
-for your customer currency to your currency.
+Update other details like Item, Taxes, Terms. In the Taxes and other Charges table, charges of type Actual should be updated in the Customer's currency.
-<br>
+
-<br>Also you can set default customer currency in customer master. Which will auto fetch in transactions.
+#### Step 4: Save and Submit
-<br>
+
-<br>
+Save Sales Invoice and then check Print Format. For all the Currency field (rate, amount, totals) Customer's Currency symbol will be updated as well.
-<img src="{{docs_base_path}}/assets/img/articles/Selection_017.png">&nbsp;
+
-<br>System has Currency Exchange master, where you can set currency exchange masters for your multiple currencies. To Set this go to Accounts &gt; Setup &gt; Currency Exchange. <br><br><b>Step 4:</b> Select Item details.<br>
+<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/multiple-currency-2.png">
-<br>On selecting Item details Sales invoice Total section will look like below image.
+
-<br>
+#### Currency Exchange Masters
-<br>
+
-<img src="{{docs_base_path}}/assets/img/articles/Selection_018.png" width="750">
+If you have come to terms with party to follow standard exchange rate throughout, you can capture it by creating Currency Exchange Rate master. To create new Currency Exchange Rate master, go to:
-<br>
+
-<br>
+`Accounts > Setup > Currency Exchange`
-<br>
+
-<b>Step 5:</b> Save and Submit <br><br>Enter other details like Taxes and charges, Terms and Condition if there and save and submit the invoice form. After submit click on Printer Icon to check print preview. The same document print or email document will you send to your customer or supplier.<br>For our case it will look as below image.<br><br><img src="{{docs_base_path}}/assets/img/articles/Selection_019.png">&nbsp;&nbsp; <br>
+ If system find Exchange Rate master for any cuurrecy, it is given preference over currency exchnage rate.
-<br>
+
-<br>

erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.md

@@ -1,7 +0,0 @@
-#New Fiscal Year Auto-Create feature
-
-New Fiscal Year needs to be created each year at the end of the previous fiscal year. This Process however has been automated in ERPNext.
-
-Three days prior to the end of the existing fiscal year; the system shall check if the user has created a new fiscal year for the incoming year. If not the system generates a new fiscal year. All fiscal year Companies are also linked with the new fiscal year as in the previous year.
-	
-<img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-03 at 5.03.10 pm.png"

erpnext/docs/user/manual/en/accounts/articles/pos-view.md

@@ -1,11 +0,0 @@
-#POS View
-
-POS view renders form in a different layout, mainly designed for the quick selection of items. This view has primarily been designed for the retail business, who needs to be quick at invoicing.
-
-<img src="{{docs_base_path}}/assets/img/articles/$SGrab_219.png">
-
-Using POS View, you can make complete Sales Invoice, without switching to standard form view.
-
-**Question:** Why do I get error message for missing fields when making Purchase Receipt or other sales/purchase transactions from POS View?
-
-Though POS View is mainly designed for Sales Invoice, but it is also made available in all the sales and purchase transactions. In other transactions, POS View is only meant for quick selection of items. This view will not provide all the fields which are available in the standard form view. Hence, you shall use POS View in other transactions just for Item selection, and revert to form view for enter values in other mandatory fields.

erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md

@@ -1,32 +1,32 @@
 #Post Dated Cheque Entry
 
-Post Dated Cheque is a cheque dated on future date given to another party. This actually works as an advance payment which will could be cleared post cheque date only.
+Post Dated Cheque is a cheque dated on future date. Party generally give post dated cheque, as advance payment. This cheque would be cleared only after cheque date has arrived.
 
-In ERPNext, you can manage post dated cheque entries via journal voucher. Following are step to book payment entry for post dated cheque.
+In ERPNext, create Journal Entries for post dated cheque.
 
-####New Journal Voucher
+####New Journal Entry
 
 To open new journal voucher go to 
 
-`Accounts > Documents > Journal Voucher > New`
+`Accounts > Documents > Journal Entry > New`
 
-####Set Posting Date and other details
+#### Set Posting Date
 
-Assuming your Cheque Date is 31st December, 2014 (or any future date) and you need value of this cheque to reflect in the bank balance after cheque date only.
+Assuming your Cheque Date is 31st December, 2016 (or any future date). As a result, this posting in your bank ledger will appear on Posting Date updated.
 
-![Journal Voucher]({{docs_base_url}}/assets/img/articles/Selection_005d73bc7.png)
+<img alt="JE Posting Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/post-dated-1.gif">
 
 Note: Journal Voucher Reference Date should equal to or less than Posting Date.
 
-####Step 3: Save and Submit Journal Voucher
+####Step 3: Save and Submit
 
-After entering required details Save and Submit the Journal Voucher.
+After entering required details, Save and Submit the Journal Entry.
 
 ####Adjusting Post Dated  Cheque Entry
 
-If Post Dated Journal Voucher needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool](https://erpnext.com/user-guide/accounts/payment-reconciliation).
+If Post Dated Journal Entry needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
 
-When cheque is cleared in the future date, i.e. actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool](https://erpnext.com/user-guide/accounts/bank-reconciliation).
+When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/bank-reconciliation.html).
 
-You might find value of this Journal Voucher already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of balance as per system, and balance expected in the bank.
+You might find value of this Journal Entry already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in a account.
 <!-- markdown -->

erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md

@@ -1,75 +0,0 @@
-#Pricing Rule
-
-Pricing Rule allows you to define rules based on which item's price or discount to be applied is determined.
-
-### Scenario:
-
-Following are the few cases which can be addressed using Pricing Rule.
-
-1. As per the promotional sale policy, if customer purchases more than 10 units of an item, he enjoys 20% discount. 
-
-2. For Customer "XYZ", selling price for the specific or group of "Products" should be updated as ###.
-
-3. Items categorized under specific Item Group has same selling or buying price.
-
-4. Customers catering to specific Customer Group has same selling price.
-
-5. Supplier's categorized under common Supplier Type should have same buying rate applied.
-
-To have %Discount and Price List Rate for an Item auto-applied, you should set Pricing Rules for it.
-
-Pricing Rule master has two sections:
-
-### 1. Applicability Section:
-
-In this section, conditions are set for the Pricing Rule. When transaction meets condition as specified in the Pricing Rule, Price or Discount as specified in the Item master will be applicable. You can set condition on following values.
-
-####1.1 Applicable On:
-
-![Applicable On]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png)
-
-If you want Pricing Rule to be applied on all the items, you should apply rule based on Item Group, and select most Parent Item Group for a value.
-
-####1.2 Applicable For:
-
-Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
-
-![Applicable for]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png)
-
-####1.3 Quantity:
-
-Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
-
-![Pricing Rule Qty limit]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png)
-
-###2. Application:
-
-Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
-
-![Pricing Rule Apply on]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png)
-
-####2.1 Price
-
-Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
-
-![Pricing Rule Price]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png)
-
-####2.2 Discount Percentage
-
-Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
-
-![Rule Discount Percent]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png)
-
-#### Validity
-
-Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
-
-![Pricing Rule Validity]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png)
-
-####Disable
-
-Check Disable to inactive specific Pricing Rule.
-
-![Pricing Rule Disabled]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png)
-
-<!-- markdown -->

erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md

@@ -25,7 +25,7 @@ To create new Cost Center, go to:
 
 `Accounts > Setup > Cost Center`
 
-[Click here to learn how to manage Cost Centers.]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center)
+[Click here to learn how to manage Cost Centers.]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center.html)
 
 #### 1.3 Update Cost Center in the Project
 
@@ -75,6 +75,6 @@ To check Budget Variance report, go to:
 
 `Accounts > Standard Reports > Budget Variance Report`
 
-[Click here to learn how to do budgeting from Cost Center]({{docs_base_url}}/user/manual/en/accounts/budgeting).
+[Click here to learn how to do budgeting from Cost Center]({{docs_base_url}}/user/manual/en/accounts/budgeting.html).
 
 <!-- markdown -->

erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md

@@ -1,9 +1,9 @@
-#Update Stock Option in Sales Invoice
+#Delivery from Sales Invoice
 
-The <i>Update Stock</i> check box is available in the <i>Items</i> section within <i>Sales Invoice</i> form.
+If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invocice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse.
 
-<img src="{{docs_base_path}}/assets/img/articles/kb_updatestk_field.png" height="221" width="603">
+<img alt="Update Stock" class="screenshot" src="{{docs_base_url}}/assets/img/articles/update-stock.png">
 
-Usually the Sales Invoice is a voucher specifying the amount to be paid against Quantity delivered/to be delivered as per a particular Sales Order.
+On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc.
 
-Checking the update Stock option before submitting an Invoice will directly deduct the Stock from the Inventory on submission of the Sales Invoice. In such a case the Sales Invoice also satisfies the function of a Delivery Note.
+On submission of Sales Invoice, with general ledger posting, stock ledger posting will happen as well.

erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md

@@ -1,44 +0,0 @@
-# Updating Opening Balance in Accounts using Temporary Account
-
-For updating opening balances in the Accounts, you will need to use temporary adjustment accounts. In the Chart of Account, two adjustment accounts will be created by default.
-
-1. Temporary Account (Assets)
-2. Temporary Account (Liabilities)
-
-Since ERPNext is a double entry accounting system, it requires balancing on debit side with credit side in an accounting entry. When start working on fresh ERPNext account, you will have to update opening balance in your Balance Sheet accounts. You can update opening balance in account(s), and use Temporary Account for balancing purpose.
-
-Let's consider a scenario of updating opening balance in an Account using temporary account.
-
-#### Identifying Accounts to Update Opening Balance
-
-Say we have following customer's ledger, and have receivable from them. This receivable should be updated as opening balance in their account.
-
-1. Comtek Solutions
-1. Walky Tele Solution
-
-Also we can update opening balance on Bank and Cash account.
-
-1. Bank of Baroda
-1. Cash
-
-All these accounts are located on the Current Asset side, hence will have Debit balance.
-
-#### Identifying Temporary Account
-
-To update debit balance in them, we will have to select Credit account for balancing it. Out of the temporary accounts available, we can use `Temporary Account (Liabilities)`.
-
-##### Opening Balance Entry
-
-For Current Asset account, their current balance will be updated on the Debit side. The total value of Debit will be entered as Credit Balance for the Temporary Account (Liability).
-
-![Debit Opening Balance]({{docs_base_url}}/assets/img/articles/$SGrab_431.png)
-
-Same way, you will update opening balance for the liability account. Since Liability accounts will have credit balance, you will have to select Temporary Account (Asset), which is a Debit account for balancing purpose.
-
-After you have updated opening balance in all the Asset and Liability account, you will find that balance in the temporary account will be equal. If balance in temporary accounts is not equal, it must be because opening balance is not updated in some account, or other account was used for balancing purpose.
-
-Since temporary account were used only for balancing purpose, it shall not have any balance in it. To nullify balance in these accounts, you should create a Journal Voucher which will set balance as zero in these account.
-
-![Temporary Account Nullified]({{docs_base_url}}/assets/img/articles/$SGrab_432.png)
-
-<!-- markdown -->

erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md

@@ -1,37 +1,33 @@
 #Purchase Tax or Charges Categories
 
 Consider Tax or Charge field in Purchase Taxes and Charges master has three values.
-<ol>
-    <li>Total</li>
-    <li>Valuation</li>
-    <li>Total and Valuation</li>
-	</ol>
-	
-<img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-04-15 at 6.04.02 pm.png"><br>
 
-Let's consider an example to understand an effect of value selected in Consider Tax or Charge field. We purchase 10 units of item, at the rate of 800, total purchase amount would be 800. Purchased item has 4% VAT tax and INR 100 transportation charges were incurred.
+- Total
+- Valuation
+- Total and Valuation
+
+<img alt="Purchase Tax and Charges Categories" class="screenshot" src="{{docs_base_url}}/assets/img/articles/purchase-other-charges-1.png">
+
+Let's consider an example to understand an effect of each charge type. We purchase ten units of item, at the rate of 800. total purchase amount is 800. Purchased item has 4% VAT applied on it, and INR 100 was incurred in transportation.
 
 ####Total:
 
-=An amount of tax/charge categorized Total will be accounted in the total of purchase transactions, but not in the value of purchased item.
+Tax or Charge categorized as **Total** will be included in the total of purchase transactions. But it will not have impact on the valuation of item purchased.
 
-If VAT 4% is applied on item, it will amount to INR 32. Since VAT is the 
+If VAT 4% is applied on item, it will amount to INR 32 (at item's based rate is 800). Since VAT is the [consumption tax](https://frappe.io/blog/erpnext-features/managing-consumption-tax), its should be added value of Purchase Order/Invoice, since it will be included in payable towards supplier. But its should not be added to the value of Purchased item.
-<a href="https://frappe.io/blog/erpnext-features/managing-consumption-tax" target="_blank"> consumption tax</a>, its should be added value of Purchase Order/Invoice, since it will be included in payable towards supplier, but its should not be added to the value of Purchased item.
 
-Hence for tax or charge you wish to be added to transaction total but not to the valuation of item, it should be categorized as Total.
+When Purchase Invoice is submitted, general ledger posting will be done for tax/charge categorized as Total.
-
-When Purchase Invoice is submitted, value of tax/charge is booked in respective account.
 
 ####Valuation:
 
-An amount of tax/charge categorized as Valuation will be added in the value of purchased item, but will not be added to the value of purchase transaction.
+Tax or charge categorized as **Valuation** will be added in the value of purchased item, but not in the total of that purchase transaction.
 
-Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, it will be not be added to the total of purchase transaction, because it should not be reflected to supplier, as it will be irrelevant for them.
+Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, this charge will be not be added to the total of purchase transaction, because it your expense, and should not be reflected to the supplier.
 
-When Purchase Invoice is submitted, value of tax/charge is booked in respective account. Transportation expense will be booked
+Check [here]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) to learn general posting done for expense categorized as Valuation.
 
 ####Total and Valuation:
 
-An amount of tax/charge categorized as for Total and Valuation will be added in the value of purchase item, as well as will be included in the totals of purchase transactions.
+Tax or Charge categorized as for **Total and Valuation** will be added in the valuation of item, as well as in the totals of purchase transactions.
 
-Let's assume that transporter was arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this INR 100 transportation charges will be added to actual purchase amount of INR 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.
+Let's assume that transportion is arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this, INR 100 transportation charge will be added to the actual purchase amount 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.

erpnext/docs/user/manual/en/accounts/index.txt

@@ -13,6 +13,9 @@ opening-accounts
 item-wise-tax
 point-of-sale-pos-invoice
 multi-currency-accounting
+recurring-orders-and-invoices
+pricing-rule
 tools
 setup
 articles
+

erpnext/docs/user/manual/en/accounts/pricing-rule.md

@@ -0,0 +1,82 @@
+#Pricing Rule
+
+Pricing Rule is a master where you can define rules based on which discount is applied to specific Customer or Supplier.
+### Scenario:
+
+Following are the few cases which can be addressed using Pricing Rule.
+
+1. As per the promotional sale policy, if customer purchases more than 10 units of an item, he enjoys 20% discount. 
+
+2. For Customer "XYZ", selling price for the specific Item should be updated as ###.
+
+3. Items categorized under specific Item Group has same selling or buying price.
+
+4. Customers balonging to specific Customer Group should get ### selling price, ot % of Discount on Items.
+
+5. Supplier's categorized under specific Supplier Type should have ### buying rate applied.
+
+To have %Discount and Price List Rate for an Item auto-applied, you should create Pricing Rules for it.
+
+Pricing Rule master has two sections:
+
+### 1. Applicability Section:
+
+In this section, conditions are set for the application of Pricing Rule. When transaction meets condition as specified in this section, Price or Discount as specified in the Pricing Rule will be applied. You can set condition on following values.
+
+####1.1 Applicable On:
+
+<img alt="Applicable On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-on.png">
+
+If you want Pricing Rule to be applied on all the items, select based on Item Group. For value, select **All Item Group** (parent Item Group).
+
+####1.2 Applicable For:
+
+Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
+
+<img alt="Applicable for" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-for.png">
+
+####1.3 Quantity:
+
+Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
+
+<img alt="Applicable Qty" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-qty.png">
+
+###2. Application:
+
+Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
+
+<img alt="Applicable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-application.png">
+
+####2.1 Price
+
+Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
+
+<img alt="Applicable Price" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-price.png">
+
+#### 2.2 Discount Percentage
+
+Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
+
+<img alt="Discount" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-discount.png">
+
+If %Discount is to be applied on all Price Lists, then leave Price List field blank.
+
+#### Validity
+
+Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
+
+<img alt="Validity" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-validity.png">
+
+#### Priority
+
+If two or more Pricing Rules are found based on same conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.
+
+<img alt="Priority" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-priority.png">
+
+#### Disable
+
+Check to Disable Pricing Rule.
+
+<img alt="Disable" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pricing-rule-disable.png">
+
+<!-- markdown -->

erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md

@@ -10,11 +10,11 @@ Feature of setting document as recurring is available in Sales Order, Sales Invo
 
 Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check **Is Recurring** to set document as recurring.
 
-<img alt="Recurring Invoice" class="screenshot" src="{{docs_base_path}}/assets/img/articles/is-recurring.gif">
+<img alt="Recurring Invoice" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/recurring.gif">
 
 **From Date and To Date:** This defines contract period with the customer.
 
-**Repeat on the Day of Month:** If recurring type is set as Monthly, then it will be day of the month on which&nbsp; recurring invoice will be generated.
+**Repeat on the Day of Month:** If recurring type is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
 
 **End Date:** Date after which auto-creation of recurring invoice will be stopped.
 

erpnext/docs/user/manual/en/using-erpnext/articles/index.txt

@@ -7,4 +7,5 @@ merging-documents
 rename-tool
 renaming-documents
 search-filters
-tree-master-renaming
+tree-master-renaming
+pos-view

erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md

@@ -0,0 +1,11 @@
+#POS View
+
+POS (point of sale) view renders form in a different layout, optimized for the quick selection of items. This view has primarily been designed for the retail business.
+
+Using POS View, you can only create Sales Invoice, without switching to standard form view. For other transactions, like Sales Order, Delivery Note, Purchase Order, Purchase Receipt etc., POS View is only used for Item selection. For entering other values in the transaction, you should switch to form view.
+
+<img alt="POS View" class="screenshot" src="{{docs_base_url}}/assets/img/articles/pos-view.gif">
+
+For creating POS Invoice, check following help video.
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/4WkelWkbP_c" frameborder="0" allowfullscreen></iframe>

erpnext/docs/user/manual/en/using-erpnext/index.txt

@@ -6,3 +6,4 @@ calendar
 assignment
 tags
 articles
+pos-view