erpnext/foundation
1
0
Fork 0
mirror of https://github.com/erpnext/foundation.git synced 2026-10-17 02:10:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts fixed

Browse Source
This commit is contained in:
Umair Sayed
2018-09-03 12:59:50 +05:30
parent 7f77f1bb26
commit 46de031a44
1949 changed files with 2862 additions and 234155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
foundation/www/docs/user/manual/en/CRM/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

2
foundation/www/docs/user/manual/en/CRM/contact.md
View File

@@ -45,3 +45,5 @@ Addresses can be entered individually (unlinked) or linked to customers, leads,
Linking is done in the reference section where the links can be established.
(Contributed by Robert Becht)
{next}

2
foundation/www/docs/user/manual/en/CRM/customer.md
View File

@@ -46,7 +46,7 @@ to create an Account in another Company, just change the Company value and
“Save” the Customer again.
By default, the system does not generate an account for every customer. All
Customers can be booked in one account called Debtors. In order to manage a
Customers can be booked in one account called Debitors. In order to manage a
separate account for each customer, you have to first create the account under
Accounts Receivable in the [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.html) and then add it on the customer's
form accounts table.

2
foundation/www/docs/user/manual/en/CRM/opportunity.md
View File

@@ -36,3 +36,5 @@ In some businesses, users collect the rates from their supplier against the cust
Pipeline” this is what you need to track if you want to be able to predict how
much business you are going to get in the future. Its always a good idea to be
able to track what is coming in order to adjust your resources.
{next}

27
foundation/www/docs/user/manual/en/CRM/setup/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

88
foundation/www/docs/user/manual/en/_sidebar.json
View File

@@ -1,27 +1,71 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"route": "/docs",
"title": "Home"
},
{
"route": "/docs/user/manual/en/introduction",
"title": "Introduction"
},
{
"route": "/docs/user/manual/en/setting-up",
"title": "Setting Up"
},
{
"route": "/docs/user/manual/en/accounts",
"title": "Accounts"
},
{
"route": "/docs/user/manual/en/stock",
"title": "Stock"
},
{
"route": "/docs/user/manual/en/crm",
"title": "CRM"
},
{
"route": "/docs/user/manual/en/selling",
"title": "Selling"
},
{
"route": "/docs/user/manual/en/buying",
"title": "Buying"
},
{
"route": "/docs/user/manual/en/manufacturing",
"title": "Manufacturing"
},
{
"route": "/docs/user/manual/en/projects",
"title": "Projects"
},
{
"route": "/docs/user/manual/en/human-resources",
"title": "Human Resources"
},
{
"route": "/docs/user/manual/en/support",
"title": "Support"
},
{
"route": "/docs/user/manual/en/education",
"title": "Education"
},
{
"route": "/docs/user/manual/en/healthcare",
"title": "Healthcare"
},
{
"route": "/docs/user/manual/en/non_profit",
"title": "Non Profit"
},
{
"route": "/docs/user/manual/en/customize-erpnext",
"title": "Customize"
},
{
"route": "/search_docs",
"title": "Search",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/accounts/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/accounts/articles/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

4
foundation/www/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
View File

@@ -35,4 +35,6 @@ You can notice that there is a difference of 400 in the Payment Amount and the A
<img alt="Deduction/Loss Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/withhold-2.gif">
Following same steps, you can also manage difference availed due to Currency Exchange Gain/Loss.
Following same steps, you can also manage difference availed due to Currency Exchange Gain/Loss.
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/bulk-payment-entry.md
View File

@@ -11,4 +11,6 @@ If you want to create a single payment entry adjusting against multiple invoices
### Demo of Bulk Payment Entry
<img class="screenshot" alt="Bulk Payment" src="{{docs_base_url}}/assets/img/accounts/bulk-payment.gif">
<img class="screenshot" alt="Bulk Payment" src="{{docs_base_url}}/assets/img/accounts/bulk-payment.gif">
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md
View File

@@ -33,4 +33,6 @@ Refresh system from Help menu to experience the change.
<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-account-1.gif">
<!-- markdown -->
<!-- markdown -->
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md
View File

@@ -11,4 +11,6 @@ If needed, you can also create a new receivable account and update in the Custom
**Answer:** You can, but it's not a recommend approach. If you want to create separate Receivable Account for each Customer for tracking receivable, then it not needed. You still view Account Receivable & General Ledger report for each Customer.
Just like Debtors, for tracking payables, default account called Creditors is created under Account Payables.
Just like Debtors, for tracking payables, default account called Creditors is created under Account Payables.
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md
View File

@@ -13,4 +13,6 @@ On clicking 'Make Difference Entry' button, new Row will be added under Journal
On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entri correctly.
<!-- markdown -->
<!-- markdown -->
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/exchange-rate-field-frozen.md
View File

@@ -12,4 +12,6 @@ In your sales and purchase transactions, if the field of Currency Exchange Rate
* Refresh your ERPNext account
* Check Sales / Purchase transaction once again
After this setting, the Exchange Rate field in the transactions should become editable once again.
After this setting, the Exchange Rate field in the transactions should become editable once again.
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-creation.md
View File

@@ -3,4 +3,6 @@
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.
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.
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md
View File

@@ -31,4 +31,6 @@ Save Global Default, and Reload your ERPNext account. Then, default Fiscal Year
Note: In transactions, you can manually select required Fiscal Year, from More Info section.
<!-- markdown -->
<!-- markdown -->
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md
View File

@@ -11,4 +11,6 @@ To freeze an Account, go to Chart of Accounts, and edit an Account.
If User has Role define in the  Account Setting assigned, then he/she will be able to set an Account as Frozen.
<img class="screenshot" alt="Download Backup" src="{{docs_base_url}}/assets/img/articles/freeze-account-2.png">
<img class="screenshot" alt="Download Backup" src="{{docs_base_url}}/assets/img/articles/freeze-account-2.png">
{next}

2
foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
View File

@@ -20,3 +20,5 @@ Now, the system will not allow to make any accounting entries before set date. I
You can still allow user with certain role to create/edit entries within 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">
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
View File

@@ -34,4 +34,6 @@ On saving, this Account will be frozen and will not be selectable in any account
<!-- markdown -->
<!-- markdown -->
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/how-to-manage-subscriptions-with-erpnext.md
View File

@@ -102,4 +102,6 @@ before changing the Subscription status to 'Canceled' or 'Unpaid'.
**Cancel Invoice After Grace Period** would cause ERPNext to automatically cancel a subscription if it is not paid before the grace period elapses. This setting is off by default.
**Prorate** would cause ERPNext to generate a prorated invoice when an active subscription is canceled by default.
If you would prefer a full invoice, uncheck the setting.
If you would prefer a full invoice, uncheck the setting.
{next}

2
foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
View File

@@ -22,3 +22,5 @@ One receipt of payment, exchange rate changed. As per the new exchange rate, pay
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.
<!-- markdown -->
{next}

1
foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
View File

@@ -37,3 +37,4 @@ If you have come to terms with party to follow standard exchange rate throughout
If system find Exchange Rate master for any currency, it is given preference over currency exchange rate.
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
View File

@@ -30,4 +30,6 @@ You can adjust Post Dated Payment Entry against an invoice via [Payment Reconcil
When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool](/docs/user/manual/en/accounts/tools/bank-reconciliation.html).
In the Chart of Accounts, you might find value of this Payment Entry already reflecting against bank Account. 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 the bank's statement.
<!-- markdown -->
<!-- markdown -->
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md
View File

@@ -7,4 +7,6 @@
**Answer: **On submission of a Purchase Invoice, payable is updated towards the Supplier. As per the accounting standards, Payable Account is aligned under Current Liability (credit side of Balance Sheet).
The error message indicates that Account selected in the Credit To field doesn't belong to the Liability Group. Please ensure that Payable Account selected in the Purchase Invoice is located under Liability group.
The error message indicates that Account selected in the Credit To field doesn't belong to the Liability Group. Please ensure that Payable Account selected in the Purchase Invoice is located under Liability group.
{next}

2
foundation/www/docs/user/manual/en/accounts/articles/round-off-account-validation.md
View File

@@ -29,3 +29,5 @@ You need to create Round-off Account in the Chart of Accounts and update in the
<img class="screenshot" alt="Fees Section" src="{{docs_base_url}}/assets/img/accounts/company-round-off-account.png">
Once Round-Off account this updated in the Company master, then try to submit Purchase Invoice once again.
{next}

2
foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
View File

@@ -79,3 +79,5 @@ To check Budget Variance report, go to:
[Click here to learn how to do budgeting from Cost Center](/docs/user/manual/en/accounts/budgeting.html).
<!-- markdown -->
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md
View File

@@ -15,4 +15,6 @@ Example: Education Cess is calculated based on the amount of GST tax.
**On Previous Row Total:** For each Tax row, a cumulative tax is calculated in the Total column. For the first row, total tax is calculated as Net Total + Tax amount at first row. If you want to apply a tax on the Total Amount of another tax row, then use this option.
If you select Type as Previous Row Amount or Previous Row Total, then you must also specify a Row No. whose Amount or Total should be considered for the calculation.
If you select Type as Previous Row Amount or Previous Row Total, then you must also specify a Row No. whose Amount or Total should be considered for the calculation.
{next}

2
foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
View File

@@ -8,3 +8,5 @@ If you have items delivery and invoicing happening at the same time, you can cre
On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc.
On submission of Sales Invoice, with general ledger posting, stock ledger posting will happen as well.
{next}

4
foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
View File

@@ -31,4 +31,6 @@ Check [here](/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-
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 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.
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.
{next}

2
foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
View File

@@ -20,3 +20,5 @@ Example journal entry (using Journal Voucher in ERPNext) for a withdrawal of $10
2. Debit **Owner's Draws** $1000
<!-- markdown -->
{next}

2
foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md
View File

@@ -125,7 +125,7 @@ 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.
- **Depreciation:** The expense account to book the depreciation of the 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.

4
foundation/www/docs/user/manual/en/accounts/credit-note.md
View File

@@ -15,7 +15,9 @@ Note: For credit note set the negative quantity while adding the item
#### Example
Customer Sagar Malhotra has purchased Nokia Lumia worth Rs 42,400 and at the time of delivery customer were found that the piece has been damaged. Now sagar has returned the product and he got his money back.
Customer Mr. Sagar Malhotra has purchased Nokia Lumia worth Rs 42,400 and at the time of delivery customer were found that the piece has been damaged. Now Sagar has returned the product and he got his money back.
Credit note with payment entry in ERPNext for above example is as below
<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/accounts/credit_note_example1.gif">
{next}

2
foundation/www/docs/user/manual/en/accounts/debit-note.md
View File

@@ -18,3 +18,5 @@ Note: For debit note set the negative quantity while adding the item
Debit note with payment entry in ERPNext
<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/accounts/debit_note_example1.gif">
{next}

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

@@ -6,7 +6,7 @@ The company that receives the prepayment records the amount as Deferred revenue
### 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.
The internet and broadcasting services providers offers subscription plans on quaterly 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
@@ -23,7 +23,7 @@ On creation of Sales Invoice for the Deferred Revenue Item, instead of posting i
### 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.
Based on the From Date and To Date set in the Sales Invoice Item table, Journal Entries are created automatically 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">
@@ -32,4 +32,6 @@ Based on the From Date and To Date set for the Item in the Sales Invoice Item ta
<div class="embed-container">
<iframe src="https://www.youtube.com/embed/j6mx-EHU4aY" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
</iframe>
</div>
</div>
{next}

4
foundation/www/docs/user/manual/en/accounts/exchange-rate-revaluation.md
View File

@@ -33,4 +33,6 @@ Steps :
<img class="screenshot" alt="Exchange Rate Revaluation Submitting" src="{{docs_base_url}}/assets/img/accounts/exchange-rate-revaluation/exchange-rate-revaluation-submit.png">
<img class="screenshot" alt="Journal Entry" src="{{docs_base_url}}/assets/img/accounts/exchange-rate-revaluation/journal-entry.png">
<img class="screenshot" alt="Journal Entry" src="{{docs_base_url}}/assets/img/accounts/exchange-rate-revaluation/journal-entry.png">
{next}

5
foundation/www/docs/user/manual/en/accounts/index.md
View File

@@ -1,8 +1,7 @@
# Accounts
At the end of sales and purchase cycle comes billing and payments. You may have
an accountant in your team, or you may be doing accounting yourself, or you may
have outsourced your accounting. In all the cases financial accounting forms the core of any business management system like an ERP.
Whether you have an accountant in your internal team OR you do it yourself OR you have chosen to outsourced it,
the financial accounting process is almost always at the center any business management system (aka an ERP system).
In ERPNext, your accounting operations consists of 3 main transactions:

1
foundation/www/docs/user/manual/en/accounts/index.txt
View File

@@ -20,6 +20,7 @@ advance-payment-entry
payment-request
credit-limit
bank-guarantee
loyalty-program
accounting-reports
accounting-entries
managing-fixed-assets

2
foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md
View File

@@ -15,7 +15,7 @@ Here is the example of Item on which 5% GST is applied only.
<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/item-wise-tax.png">
For the item which is exempted from GST totally, mention 0% as tax rate in the Item master.
For the item which is exempted from GST totally, mention 0% as tax rate in the Item master. Note that the Tax accounts set in Item Tax table (with changed tax rates) in Item master are part of the _default_ Sales / Purhcase Tax Template.
<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/exempted-item.png">

2
foundation/www/docs/user/manual/en/accounts/journal-entry.md
View File

@@ -108,7 +108,7 @@ in Govt. account.
* Credit: Sales Account
* Credit: Excise Duty Account
> Note: Applicable in India, might not be applicable for your Country.
> Note: Applicable in India, might not be applicable for your country.
Please check your country regulations.
{next}

71
foundation/www/docs/user/manual/en/accounts/loyalty-program.md Normal file
View File

@@ -0,0 +1,71 @@
<!-- add-breadcrumbs -->
# Loyalty Program
### What is a Loyalty Program?
A customer loyalty program is a structured and long-term marketing effort which provides incentives to repeat customers who demonstrate loyal buying behavior. Successful programs are designed to motivate customers in a business's target market to return often, make frequent purchases, and shun competitors.
<br>
To create a **Loyalty Program** go to:
> Accounts > Billing > Loyalty Program > New
<img class="screenshot" alt="Loyalty Program" src="{{docs_base_url}}/assets/img/accounts/loyalty-program.png">
In a Loyalty Program, you must select.
* Type of Program from the drop down.
* From Date - to provide when to start considering this Program.
* End Date - to provide till when should this Program's effect be considered.
* Auto Opt-in to automatically select a Program when creating a new Customer.
* Add rows for the Collection Tier. In each row, you must specify:
* Tier name to be assigned to a Customer based on his eligibility.
* Collection Factor - how much of an amount constitues 1 loyalty point.
* Minimum Spent - minimum transaction amount to be eligible for this tier.
* * *
## Loyalty Point Entry
<br>
**Loyalty Point Entry** acts as a log to give an overview about which Customer earned how many points across which Invoice. It holds the data Invoice and Customer.
<img class="screenshot" alt="Loyalty Program 3" src="{{docs_base_url}}/assets/img/accounts/loyalty-program-3.png">
* * *
## Customer
<br>
**Loyalty Program** section in Customer master.
<img class="screenshot" alt="Loyalty Program 1" src="{{docs_base_url}}/assets/img/accounts/loyalty-program-1.png">
<br>
**Loyalty Point** earned can be viewed in Customer's dashboard.
<img class="screenshot" alt="Loyalty Program 2" src="{{docs_base_url}}/assets/img/accounts/loyalty-program-2.png">
* * *
# How it works ?
### Earning Points
* Firstly, a **Loyalty Program** needs to be created (as shown in the first screenshot).
* Assign this **Loyalty Program** to a **Customer**.
* Goto `Sales Invoice > New` and create an invoice for the **Customer** to whom you have assigned **Loyalty Program**.
* For this example, an invoice is created with a grand total of `10000 INR` and according to the **Loyalty Program** for a minimum spent of `10000` INR, the Silver Tier collection factor will be eligible and for each `1000` INR spent, the **Customer** will receive 1 point (hence the total point earned on this transaction is 10).
* Upon submission of the invoice, **Loyalty Point Entry** will be created for this invoice (as shown above under Loyalty Program Entry section).
* In the **Loyalty Program** upon minimum spent of `19000`, Gold Tier would be eligible. So, if we were to duplicate our current invoice and submit it, the **Customer** will be automatically upgraded to Gold tier as his total expenditure under this current **Loyalty Program** has exceeded the minimum spent value for Gold tier collection factor (as his last invoice was `10000` INR and duplicated from that gives another invoice of `10000` INR, hence his total expenditure becomes `20000` INR).
> Note: The minimum spent in Loyalty Program does not mean a minimum value for a single invoice. Rather it means the sum of amount of invoices for that customer under a particular LOyalty Program scheme.
### Redeeming Points
* Continuing from the above example where we have created 1 invoice and earned 10 points over it, we create another invoice by duplicating the first, and under the collapsible section for **Loyalty Program**, we check the checkbox for `Redeem Loyalty Points`.
* The fields for `Loyalty Point`, `Redemption Account` and `Redemption Cost Center` will become visible under this section. The account and cost center will be fetched from the **Loyalty Program** assigned to the **Customer**.
* Since we have earned 10 points, we can use as many of them as we want. If we try to use more than what we have an error will be thrown.
* For this example, we'll use all 10 points to be redeemed. Doing so will enable another field which will display the amount calculated using ( loyalty point * convertion factor ). So basically, `10` INR will be lessened from our outstanding amount.
* When submitted, 2 **Loyalty Point Entry** will be created. One for redeemed, which will be a negative value and one for the current invoice (as the amount is still eligible under a tier).
> Note: For an invoice on which points have been earned, if a return invoice is created, it will delete the original Loyalty Point Entry and create a new one after subtracting the original amount with the returned amount. Also, when cancelling an invoice, its subsequent Loyalty Point Entry will also be deleted.
{next}

4
foundation/www/docs/user/manual/en/accounts/opening-accounts.md
View File

@@ -1,9 +1,7 @@
<!-- add-breadcrumbs -->
# 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
We recommend that you start using accounting in a new financial year, but you could start midway too. To setup your accounts, you will need the following for the “day” you start using accounting in ERPNext:
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 we recommend that you start using accounting in a new financial year, but you could start midway too. To setup your accounts, you will need the following for the “day” you start using accounting in ERPNext:
* Opening capital accounts - like your shareholder’s (or owner’) capital, loans, bank balances on that day.

2
foundation/www/docs/user/manual/en/accounts/payment-terms.md
View File

@@ -73,3 +73,5 @@ You can add Payments Terms in the "Payment Terms Schedule" section of the Docume
**Invoice Portion:** The percentage portion of the document represented in each row.
**Payment Amount:** The amount due from the portion of the invoice represented by each row.
{next}

2
foundation/www/docs/user/manual/en/accounts/payments.md
View File

@@ -29,7 +29,7 @@ For more details about payment entry [check here.](/docs/user/manual/en/accounts
## Journal Entry
To make paymant using journal entry, check below steps
To make payment using journal entry, check below steps
####Step 1: Activate Payment via Journal Entry

2
foundation/www/docs/user/manual/en/accounts/pricing-rule.md
View File

@@ -107,4 +107,6 @@ System apply the margin rate on the item price on selection of an item.
For more details about pricing rule [Click Here](/docs/user/manual/en/selling/articles/adding-margin.html)
{next}
<!-- markdown -->

2
foundation/www/docs/user/manual/en/accounts/sales-invoice.md
View File

@@ -106,5 +106,5 @@ not ideal as your Customer may or may not decide to pay up. But since your
Customer wants an “Invoice”, you could give the Customer a Quotation (in
ERPNext) titled as “Pro Forma Invoice”. This way everyone is happy.
This is a fairly common practice. We follow this at Frappé too.
This is a fairly common practice. We follow this at Frappe too.
{next}

27
foundation/www/docs/user/manual/en/accounts/setup/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

1
foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md
View File

@@ -22,3 +22,4 @@ Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country
Now supposed we try to create a Sales Order for a customer whose default Billing Country is India, system shall select Tax Rule 1.
In case the customers Billing Country was United Kingdom, the system would have selected Tax Rule 2.
{next}

27
foundation/www/docs/user/manual/en/accounts/share/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

6
foundation/www/docs/user/manual/en/accounts/subscription.md
View File

@@ -32,4 +32,8 @@ Mention discounts if any which will be applied on this particular subscription.
Before Subscription feature was added in ERPNext, the current Auto-Repeat feature was available as a Subscription only.
The Auto-Repeat feature which is applicable for multiple transactions like Sales Order, Purchase Order, Invoices, Journal Entry etc. Whereas based on Subscription, only Sales Invoices are auto-created.
The Auto-Repeat feature which is applicable for multiple transactions like Sales Order, Purchase Order, Invoices, Journal Entry etc. Whereas based on Subscription, only Sales Invoices are auto-created.
**Disabled**: It will stop to make auto recurring documents against the subscription
{next}

27
foundation/www/docs/user/manual/en/accounts/tools/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

2
foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md
View File

@@ -28,6 +28,6 @@ This voucher will transfer Profit or Loss (availed from P&L statment) to Closing
The Period Closing Voucher will make accounting entries (GL Entry) making all your Income and Expense Accounts zero and transferring Profit/Loss balance to the Closing Account.
<div class=well>If accounting entries are made in a closing fiscal year, even after Period Closing Voucher was created for that Fiscal Year, you should create another Period Closing Voucher. Later voucher will only transfer the pending P&L balance into Closing Account Head.</div>
**Note:** If accounting entries are made in a closing fiscal year, even after Period Closing Voucher was created for that Fiscal Year, you should create another Period Closing Voucher. Later voucher will only transfer the pending P&L balance into Closing Account Head.</div>
{next}

27
foundation/www/docs/user/manual/en/agriculture/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/agriculture/analytics/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/agriculture/crops_and_land/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

2
foundation/www/docs/user/manual/en/agriculture/index.md
View File

@@ -1,5 +1,5 @@
<!-- add-breadcrumbs -->
# ERPNext for Agriculture
# Agriculture
Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers, customers and logistics to name a few areas. ERPNext already helps organize these activities.

27
foundation/www/docs/user/manual/en/asset/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

7
foundation/www/docs/user/manual/en/asset/assets.md → foundation/www/docs/user/manual/en/asset/asset.md Executable file → Normal file
View File

@@ -1,8 +1,3 @@
<!-- add-breadcrumbs -->
# Managing Fixed Assets
In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Cars, etc. and manage depreciations, sale or disposal of those assets.
## Asset Category
Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
@@ -102,4 +97,4 @@ There is also a dedicated button "Transfer Asset" inside the Asset form to track
<img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/asset/asset-movement-using-button.png">
{next}
{next}

8
foundation/www/docs/user/manual/en/asset/index.md Executable file
View File

@@ -0,0 +1,8 @@
<!-- add-breadcrumbs -->
# Managing Fixed Assets
In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Cars, etc. and manage depreciations, sale or disposal of those assets.
### Topics
{index}

2
foundation/www/docs/user/manual/en/asset/index.txt Normal file
View File

@@ -0,0 +1,2 @@
asset
asset-maintenance

27
foundation/www/docs/user/manual/en/buying/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/buying/articles/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

15
foundation/www/docs/user/manual/en/buying/articles/amending-purchase-order-after-submit.md Normal file
View File

@@ -0,0 +1,15 @@
<!-- add-breadcrumbs -->
#Amending Purchase Order after Submit
Rate and Qty in Purchase Order can now be amended after Submit using the `Update Items` button.
<img alt="Update Items" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-update-items.png">
To Update Rate and Qty in a Submitted Purchase Order, click on the `Update Items` button. A dialog will pop up to let you make the change.
<img alt="Update Items" class="screenshot" src="{{docs_base_url}}/assets/img/articles/po-update-items-rate-and-qty.gif">
Please Note the following validations and usecases:
- Update Features checks if Purchase Order has Purchase Receipt and Purchase Invoice.
- Qty can be updated for un-received and for partially-received Purchase Order. For Purchase Order with completed Purchase Receipt, it cannot be updated.
- Rate can be updated for un-invoiced and partially-invoiced Purchase Order. For Purchase Order with submitted Purchase Invoice, it cannot be updated.

27
foundation/www/docs/user/manual/en/buying/setup/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/customer-portal/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/customize-erpnext/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/customize-erpnext/articles/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

6
foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
View File

@@ -8,8 +8,8 @@ There are three kind of reports in ERPNext.
Report Builder is an in-built report customization tool in ERPNext. This allows you to define specific fields of the form which shall be added in the report. Also you can set required filters, sorting and give preferred name to report.
<div class="embed-container">
<iframe src="https://www.youtube.com/watch?v=TxJGUNarcQs?rel=0" frameborder="0" allowfullscreen>
</iframe>
<iframe src="https://www.youtube.com/embed/TxJGUNarcQs?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
</iframe>
</div>
### 2. Query Report
@@ -24,4 +24,4 @@ Script Reports are written in Python and stored on server side. These are comple
Check Financial Analytics report in Accounts module for example of Script Report. Click [here](https://frappe.io/docs/user/en/guides/reports-and-printing/how-to-make-script-reports.html) to learn how to create Script Report.
<!-- markdown -->
<!-- markdown -->

2
foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md
View File

@@ -15,7 +15,7 @@ Every table (regardless of storage engine) has a maximum row size of 65,535 byte
The maximum row size constrains the number (and possibly size) of columns because the total length of all columns cannot exceed this size (65,535 bytes). For example, `utf8mb3` characters require up to 3 bytes per character, so for a `VARCHAR(140)` column, the server must allocate `140 × 3 = 420` bytes per value. Consequently, a table cannot contain more than `65,535 / 420 = 156` such columns.
In Frappé frapework, `VARCHAR(140)` type columns are created based on "Data", "Link", "Select", "Dynamic Link", "Password" and "Read Only" fieldtypes. Hence, you can create approximately 156 such columns in the system.
In Frappe frapework, `VARCHAR(140)` type columns are created based on "Data", "Link", "Select", "Dynamic Link", "Password" and "Read Only" fieldtypes. Hence, you can create approximately 156 such columns in the system.
### Solutions:

27
foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/education/Attendance/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/education/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/education/admission/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/education/fees/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

4
foundation/www/docs/user/manual/en/education/index.md
View File

@@ -1,6 +1,4 @@
<!-- add-breadcrumbs -->
<!-- add-breadcrumbs -->
# ERPNext for Education
# Education
The Education domain in ERPNext is designed to meet requirements of any organization which imparts knowledge and believe in doing it in an organized fashion. It has already been used at the schools, colleges and even at the private firms.

27
foundation/www/docs/user/manual/en/education/schedule/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/education/setup/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/education/student/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

2
foundation/www/docs/user/manual/en/education/student/guardian.md
View File

@@ -5,6 +5,6 @@ The Guardian doctype allows you to record the guardian details for a **Student**
<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/guardian.png">
The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements.
The email id added in the **Guardian** detail can be linked to an email group for sending newsletters or announcements.
{next}

4
foundation/www/docs/user/manual/en/education/student/student-group.md
View File

@@ -29,10 +29,10 @@ You can also update the **Email Group** for the Student Group. Click on Update E
<style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
</style>
<div class='embed-container'>
<iframe src='https://www.youtube.com/embed/QILiHiTD3uc'
<iframe src='https://www.youtube.com/embed/5K_smeeE1Q4'
frameborder='0' allowfullscreen>
</iframe>
</div>
</div>
{next}
{next}

4
foundation/www/docs/user/manual/en/education/student/student-log.md
View File

@@ -1,8 +1,8 @@
<!-- add-breadcrumbs -->
# Student Log
The Student log Doctype enables you to add and edit addtional information for a student.
You can make a note of student activities using Student log.
The **Student Log** Doctype enables you to add and edit addtional information for a student.
You can make a note of student activities using the **Student Log**.
Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
<img class="screenshot" alt="Student" src="{{docs_base_url}}/assets/img/education/student/student-log.png">

27
foundation/www/docs/user/manual/en/erpnext_integration/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

0
foundation/www/docs/user/manual/en/fleet_management/__init__.py
View File

27
foundation/www/docs/user/manual/en/fleet_management/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

67
foundation/www/docs/user/manual/en/fleet_management/index.md
View File

@@ -1,67 +0,0 @@
<!-- add-breadcrumbs -->
# Fleet Management
Fleet Management module helps your Organization manage their fleet of vehicles and track their expenses.
To use Fleet Management in ERPNext,
1. Set Up a Vehicle.
2. Enter Vehicle Logs regularly.
3. Make Expense Claims for Vehicle Expenses.
4. View Reports for Vehicle Expenses.
### Vehicle Set Up
The Vehicle Set Up allows you to define the different types of Vehicles in your Organization.It acts as the Vehicle Master for Fleet Management.
To create a new Vehicle go to:
ERPNext > Vehicle
* Enter License Plate,Make,Model,Odometer Value,Fuel Type and Fuel UOM for a quick entry.
<img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.1.png">
* Enter details like Insurance,Chassis,Vehicle Value,Location and Employee.
<img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.2.png">
* Enter Vehicle attributes like color,wheels,doors and last carbon check
<img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.3.png">
### Vehicle Log
Vehicle Log is used to enter Odometer readings,Fuel Expenses and Service Expense details.
To create a new Vehicle Log go to:
ERPNext > Vehicle Log
* Enter License Plate,Employee,Date,Odometer reading for a quick entry.
<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-log-2.1.png">
* Enter Refuelling details,Service details if applicable.
<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-log-2.2.png">
### Make Expense Claim
* Click on Make Expense Claim button .This button appears only in case of Submitted Vehicle Logs.
<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/expense-claim-3.1.png">
When you click on 'Make Expense Claim',
1. The date,employee,expense total are copied over to the created Expense Claim.
2. The sum of Fuel Expenses and Service Expenses is copied over to Expense Claim Amount.
3. Employee can submit the Expense Claim for further processing.
<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/expense-claim-3.2.png">
### Vehicle Expenses Report
* To track and monitor Vehicle Expenses you can use the Vehicle Expenses report.This report gives a one stop view of all your vehicle expenses month wise.
<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-expenses.png">

3
foundation/www/docs/user/manual/en/fleet_management/index.txt
View File

@@ -1,3 +0,0 @@
Vehicle
Vehicle Log
Vehicle Expenses

27
foundation/www/docs/user/manual/en/healthcare/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

2
foundation/www/docs/user/manual/en/healthcare/index.md
View File

@@ -1,5 +1,5 @@
<!-- add-breadcrumbs -->
# ERPNext for Healthcare
# Healthcare
Life is priceless, and you as a medical practioner needs a best tools to honour it. ERPNext Healthcare domain is a humble initiative to help you serve your patients better.

27
foundation/www/docs/user/manual/en/healthcare/setup/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/hospitality/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/human-resources/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

27
foundation/www/docs/user/manual/en/human-resources/articles/_sidebar.json
View File

@@ -1,27 +0,0 @@
[
{
"route": "/search_docs",
"title": "Search Docs ...",
"type": "input"
},
{
"route": "/docs",
"title": "Docs Home"
},
{
"route": "/docs/user",
"title": "User Guide"
},
{
"route": "/docs/current/api",
"title": "Server API"
},
{
"route": "/docs/current/models",
"title": "Models (Reference)"
},
{
"route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs",
"title": "Improve Docs"
}
]

18
foundation/www/docs/user/manual/en/human-resources/attendance.md
View File

@@ -1,18 +0,0 @@
<!-- add-breadcrumbs -->
# Attendance
An Attendance record stating that an Employee has been present on a particular
day can be created manually by:
> Human Resources > Documents > Attendance > New Attendance
<img class="screenshot" alt="Attendence" src="{{docs_base_url}}/assets/img/human-resources/attendence.png">
You can get a monthly report of your Attendance data by going to the “Monthly
Attendance Details” report.
You can easily set attendance for Employees using the [Employee Attendance Tool](/docs/user/manual/en/human-resources/tools/employee-attendance-tool.html)
You can also bulk upload attendence using the [Upload Attendence Tool](/docs/user/manual/en/human-resources/tools/upload-attendance.html)
{next}

18
foundation/www/docs/user/manual/en/human-resources/attendance-request.md → foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/attendance-request.md
View File

@@ -1,26 +1,26 @@
# Attendance Request
Using the Attendance Request DocType, employees can now submit their attendance request for the days when their attendance wasn't marked.
Using the Attendance Request document, employees can now submit their attendance request for the days when their attendance wasn't marked.
Just go to,
> Human Resources > Employee and Attendance > Attendance Request
> Human Resources > Employee and Attendance > Attendance Request > New Attendance Request
<img class="screenshot" alt="Attendance Request" src="{{docs_base_url}}/assets/img/human-resources/attendance-request.png">
- Fill up the details, mention the dates for which you want the attendance to be marked, reason and explanation.
- You can also choose if it has to be marked as a half day or not.
- Save it.
- Save it.
- On submission of the same, Attendance documents will be created for the days you mentioned.
<img class="screenshot" alt="Attendance Request Submit" src="{{docs_base_url}}/assets/img/human-resources/attendance-request-submission.png">
You can see in the below image, Attendance records are linked with Attendance Request which was submitted.
<img class="screenshot" alt="Attendance Request Linked" src="{{docs_base_url}}/assets/img/human-resources/attendance-request-linked.png">
<img class="screenshot" alt="Attendance Request Linked" src="{{docs_base_url}}/assets/img/human-resources/attendance-request-link.png">
So, if you cancel the Attendance request, the linked Attendance documents created will be cancelled as well.
<img class="screenshot" alt="Attendance Request Cancelled" src="{{docs_base_url}}/assets/img/human-resources/attendance-request-cancelled.png">
{next}
{next}

18
foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/attendance.md Executable file
View File

@@ -0,0 +1,18 @@
<!-- add-breadcrumbs -->
# Attendance
An Attendance record stating that an Employee has been present on a particular
day can be created manually by:
> Human Resources > Documents > Attendance > New Attendance
<img class="screenshot" alt="Attendance" src="{{docs_base_url}}/assets/img/human-resources/attendance.png">
You can get a monthly report of your Attendance data by going to the _Monthly
Attendance Details_ report.
You can easily set attendance for Employees using the [Employee Attendance Tool](/docs/user/manual/en/human-resources/employee_and_attendance/employee-attendance-tool.html)
You can also bulk upload attendance using the [Upload Attendence Tool](/docs/user/manual/en/human-resources/employee_and_attendance/upload-attendance.html)
{next}

6
foundation/www/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md → foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/employee-attendance-tool.md
View File

@@ -3,10 +3,10 @@
To go the attendance tool, go to:
> Human Resources > Tools > Employee Attendance Tool
> Human Resources > Employee and Attendance > Employee Attendance Tool
This tool allows you to add attendance records for multiple employees quickly.
<img class="screenshot" alt="Attendence upload" src="{{docs_base_url}}/assets/img/human-resources/employee-attendance-tool.png">
<img class="screenshot" alt="Attendance upload" src="{{docs_base_url}}/assets/img/human-resources/employee-attendance-tool.png">
{next}
{next}

6
foundation/www/docs/user/manual/en/human-resources/employee.md → foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/employee.md
View File

@@ -3,7 +3,7 @@
An individual who works part-time or full-time under a contract of employment, and has recognized rights and duties is your Employee.
In ERPNext, you can manage Employee master. The Employee master captures demographics, personal and professional details.
In ERPNext, you can manage Employee master. The Employee master captures demographics, personal and professional details.
<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/employee-view.gif">
@@ -19,7 +19,7 @@ You can further use this Employee master for performing various HR functions lik
To create new Employee go to:
> Human Resources > Employee > New
> Human Resources > Employee > New Employee
<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/employee.png">
@@ -35,4 +35,4 @@ Once an Employee is created, you can update Department, Designation, Employee to
<iframe src="https://www.youtube.com/embed/kkwOzeU4wFU?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
</div>
{next}
{next}

6
foundation/www/docs/user/manual/en/human-resources/employee_and_attendance/index.md Normal file
View File

@@ -0,0 +1,6 @@
<!-- add-breadcrumbs -->
# Employee and Attendance
With ERPNext it's super simple to manage employees, keep track of attendance records etc. ERPNext also allows you to bulk upload attendance of employees.
{index}

Some files were not shown because too many files have changed in this diff Show More