Merge branch 'develop' into payment-terms

erpnext/docs/user/manual/en/accounts/chart-of-accounts.md

@@ -108,6 +108,11 @@ Supplier).
 
 <img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-2.png">
 
+### Account Number
+A standard chart of accounts is organized according to a numerical system. Each major category will begin with a certain number, and then the sub-categories within that major category will all begin with the same number. For example, if assets are classified by numbers starting with the digit 1000, then cash accounts might be labeled 1100, bank accounts might be labeled 1200, accounts receivable might be labeled 1300, and so on. A gap between account numbers is generally maintained for adding accounts in the future.
+
+You can assign a number while creating an account from Chart of Accounts page. You can also edit a number from account record, by clicking "Update Account Number" button. On updating account number, system renames the account name automatically to embed the number in the account name.
+
 ### Other Account Types
 
 In ERPNext, you can also specify more information when you create a new
@@ -115,6 +120,19 @@ Account, this is there to help you select that particular account in a
 scenario like Bank Account or a Tax Account and has no effect on the Chart
 itself.
 
+Explanation of account types:
+- **Bank:** The account group under which bank account will be created.
+- **Cash:** The account group under which cash account will be created.
+- **Cost of Goods Sold:** The account to book the accumulated total of all costs used to manufacture / purchase a product or service, sold by a company.
+- **Depreciation:** The expense account to book the depreciation of teh fixed assets.
+- **Expenses Included In Valuation:** The account to book the expenses (apart from direct material costs) included in landed cost of an item/product, used in Perpetual Inventory, .
+- **Fixed Asset:** The account to maintain the costs of fixed assets.
+- **Payable:** The account which represents the amount owed by a company to its creditors.
+- **Receivable:** The account which represents the amount owed by a company by its debtors.
+- **Stock:** The account group under which the warehouse account will be created.
+- **Stock Adjustment:** An expense account to book any adjustment entry of stock/inventory, and generally comes at the same level of Cost of Goods Sold.
+- **Stock Received But Not Billed:** A temporary liability account which holds the value of stock received but not billed yet and used in Perpetual Inventory.
+
 ### Creating / Editing Accounts
 
 To create new Accounts, explore your Chart of Accounts and click on an Account
@@ -124,7 +142,8 @@ will see an option to “Open” or “Add Child” a new Account.
 <img class="screenshot" alt="Chart of Accounts" src="/docs/assets/img/accounts/chart-of-accounts-3.png">
 
 Option to create will only appear if you click on a Group (folder) type
-Account.
+Account. There you need to enter account name, account number and some more
+optional details.
 
 ERPNext creates a standard structure for you when the Company is created but
 it is up to you to modify or add or remove accounts.

erpnext/docs/user/manual/en/accounts/opening-accounts.md

@@ -1,4 +1,4 @@
-#Updating Opening Balance in Accounts
+# Updating Opening Balance in Accounts
 
 If you are a new company you can start using ERPNext accounting module by going to chart of accounts. However, if you are migrating from a legacy accounting system like Tally or a Fox Pro based software
 
@@ -13,28 +13,28 @@ If you were using another accounting software before, firstly you should close f
 > Opening entry is only for Balance Sheet accounts and not for the Accounts in the Profit and Loss statement.
 
   * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temporary Opening** account.
-  
+
   * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temporary Opening** account.
 
 ###Opening Entry
 
-####Step 1: New Journal Entry
+#### Step 1: New Journal Entry
 
 To open new Journal Entry, go to:
 
 `Explore > Accounts > Journal Entry`
 
-####Step 2: Entry Type
+#### Step 2: Entry Type
 
 If Entry Type is selected as Opening Entry, all the Balance Sheet Accounts will be auto-fetched in the Journal Entry.
 
 <img class="screenshot" alt="Opening Account" src="/docs/assets/img/accounts/opening-account-1.png">
 
-####Step 3: Posting Date
+#### Step 3: Posting Date
 
 Select Posting Date on which Accounts Opening Balance will be updated.
 
-####Step 4: Enter Debit/Credit Value
+#### Step 4: Enter Debit/Credit Value
 
 For each Account, enter opening value in the Debit or Credit column. As per the double entry valuation system, Total Debit value in a entry must be equal to Total Credit value.
 
@@ -86,9 +86,9 @@ To update stock opening balance, create [Stock Reconciliation entry](/docs/user/
 
 Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master](/docs/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field.
 
-### Outstanding Invoices
+### Outstanding Payables and Receivables
 
-After opening Journal Entries are made, you will need to enter each Sales Invoice and Purchase Invoice that is yet to be paid.
+After opening Journal Entries are made, you will need to enter the Sales Invoice and Purchase Invoice that is yet to be paid.
 
 Since you have already booked the income or expense on these invoices in the previous period, select **Temporary Opening** in the “Income” and “Expense” accounts.
 
@@ -96,4 +96,12 @@ Since you have already booked the income or expense on these invoices in the pre
 
 If you don’t care what items are in that invoice, just make a dummy item entry in the Invoice. Item code in the Invoice is not necessary, so it should not be such a problem.
 
+You can also do this quickly using the **Opening Invoice Creation Tool**
+
+To use this tool, just type "Opening Invoice" in the search bar and select the **Opening Invoice Creation Tool**
+
+Here, select the company and type of invoice (sales or purchase) and add a line item for each invoice you want to create.
+
+<img class="screenshot" alt="Opening Invoice Creation Tool" src="/docs/assets/img/accounts/opening-invoice-creation-tool.png">
+
 {next}

erpnext/docs/user/manual/en/stock/item/index.txt

@@ -4,3 +4,4 @@ item-variants
 purchase-details
 reorder
 item-valuation-fifo-and-moving-average
+item-settings

erpnext/docs/user/manual/en/stock/setup/stock-settings.md

@@ -4,4 +4,12 @@ You can set default settings for your stock related transactions here.
 
 <img class="screenshot" alt="Stock Settings" src="/docs/assets/img/stock/stock-settings.png">
 
+### Clean HTML Description
+
+Usually descriptions are copy-pasted from a website or Word / PDF file and they contain a lot of embedded style. This messes up the Print view of your invoices or quotes.
+
+To fix this, you can check "Convert Item Description to Clean HTML" in Stock Settings. This will ensure that when you save your Items, their descriptions will be cleaned up.
+
+If you want control your description views and llow any HTML to be embedded, you can uncheck this property.
+
 {next}