diff --git a/erpnext/docs/assets/img/articles/recurring.gif b/erpnext/docs/assets/img/accounts/recurring.gif similarity index 100% rename from erpnext/docs/assets/img/articles/recurring.gif rename to erpnext/docs/assets/img/accounts/recurring.gif diff --git a/erpnext/docs/assets/img/articles/purchase-other-charges-1.png b/erpnext/docs/assets/img/articles/purchase-other-charges-1.png new file mode 100644 index 0000000000..f22660d0c0 Binary files /dev/null and b/erpnext/docs/assets/img/articles/purchase-other-charges-1.png differ diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html index 89ce174626..5762d0a52e 100644 --- a/erpnext/docs/current/index.html +++ b/erpnext/docs/current/index.html @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt index 1d4cdefe2b..76ace0b707 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/index.txt +++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt @@ -11,6 +11,5 @@ managing-transactions-in-multiple-currency fiscal-year-creation post-dated-cheque-entry 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 \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md index 57e69e8f18..66da24e8e0 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md +++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md @@ -14,7 +14,7 @@ To open new journal voucher go to 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. -JE Posting Date +JE Posting Date Note: Journal Voucher Reference Date should equal to or less than Posting Date. diff --git a/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md b/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md deleted file mode 100644 index d78715cba5..0000000000 --- a/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md +++ /dev/null @@ -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) - - \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md index d4fd384d18..a23b6e7553 100644 --- a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md +++ b/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. -
    -
  1. Total
    2. -
  2. Valuation
    3. -
  3. Total and Valuation
    4. -
- -
-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 + +Purchase Tax and Charges Categories + +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 - 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. +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. -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, value of tax/charge is booked in respective account. +When Purchase Invoice is submitted, general ledger posting will be done for tax/charge categorized as Total. ####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. \ No newline at end of file +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. \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md index 9beedf936d..4d25639774 100644 --- a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md +++ b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md @@ -10,7 +10,7 @@ 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. -Recurring Invoice +Recurring Invoice **From Date and To Date:** This defines contract period with the customer.