diff --git a/erpnext/change_log/v6/v6_2_0.md b/erpnext/change_log/v6/v6_2_0.md index 80788303aa7..004e90caa43 100644 --- a/erpnext/change_log/v6/v6_2_0.md +++ b/erpnext/change_log/v6/v6_2_0.md @@ -1 +1 @@ -- **[Multi-currency Accounting](https://manual.erpnext.com/contents/accounts/multi-currency-accounting)**: You can now have an Account in a different currency than your Company's currency +- **[Multi-currency Accounting](https://frappe.github.io/erpnext/user/guides/accounts/multi-currency-accounting)**: You can now have an Account in a different currency than your Company's currency diff --git a/erpnext/config/docs.py b/erpnext/config/docs.py index 911c950934f..3dfd77b6fc1 100644 --- a/erpnext/config/docs.py +++ b/erpnext/config/docs.py @@ -20,4 +20,11 @@ Among other things, ERPNext will help you to: And a lot lot lot more.""" def get_context(context): - context.title = "ERPNext" \ No newline at end of file + context.title = "ERPNext" + + context.top_bar_items = [ + {"label": "Contents", "url": context.docs_base_url + "/contents.html", "right": 1}, + {"label": "User Guide", "url": context.docs_base_url + "/user/guides", "right": 1}, + {"label": "Videos", "url": context.docs_base_url + "/user/videos", "right": 1}, + {"label": "Developer Docs", "url": context.docs_base_url + "/current", "right": 1} + ] \ No newline at end of file diff --git a/erpnext/docs/assets/home.png b/erpnext/docs/assets/home.png deleted file mode 100644 index 5fb77cc1b02..00000000000 Binary files a/erpnext/docs/assets/home.png and /dev/null differ diff --git a/erpnext/docs/assets/img/home.png b/erpnext/docs/assets/img/home.png new file mode 100644 index 00000000000..9b24870eb37 Binary files /dev/null and b/erpnext/docs/assets/img/home.png differ diff --git a/erpnext/docs/current/api/accounts/erpnext.accounts.general_ledger.html b/erpnext/docs/current/api/accounts/erpnext.accounts.general_ledger.html index c04c2f90749..5f16dae497a 100644 --- a/erpnext/docs/current/api/accounts/erpnext.accounts.general_ledger.html +++ b/erpnext/docs/current/api/accounts/erpnext.accounts.general_ledger.html @@ -1,7 +1,7 @@
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - 6.7.3 + 6.7.7 diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html index d8793ae8400..f10334deacf 100644 --- a/erpnext/docs/current/models/accounts/account.html +++ b/erpnext/docs/current/models/accounts/account.html @@ -7,7 +7,7 @@
- Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7 - Version 6.7.3 + Version 6.7.7
+ src="{{ url_prefix }}/assets/img/home.png">
diff --git a/erpnext/docs/user/guides/CRM/contact.md b/erpnext/docs/user/guides/CRM/contact.md index 02944312a2c..bedd33248da 100644 --- a/erpnext/docs/user/guides/CRM/contact.md +++ b/erpnext/docs/user/guides/CRM/contact.md @@ -5,12 +5,12 @@ To create a new Contact go to , > CRM > Contact > New -Contact +Contact Or you can add a Contact or Address directly from the Customer record, click on “New Contact” or “New Address”. -Contact +Contact > Tip: When you select a Customer in any transaction, one Contact and Address gets pre-selected. This is the “Default Contact or Address”. diff --git a/erpnext/docs/user/guides/CRM/customer.md b/erpnext/docs/user/guides/CRM/customer.md index c45cfcfb0f5..82c6ff97461 100644 --- a/erpnext/docs/user/guides/CRM/customer.md +++ b/erpnext/docs/user/guides/CRM/customer.md @@ -9,7 +9,7 @@ You can either directly create your Customers via or upload it via the Data Import Tool. -Customer +Customer > Note: Customers are separate from Contacts and Addresses. A Customer can have multiple Contacts and Addresses. @@ -19,7 +19,7 @@ have multiple Contacts and Addresses. Contacts and Addresses in ERPNext are stored separately so that you can attach multiple Contacts or Addresses to Customers and Suppliers. -Read [Contact](/contents/crm/contact) to know more. +Read [Contact]({{url_prefix}}/user/guides/crm/contact.html) to know more. ### Integration with Accounts @@ -48,12 +48,12 @@ You can set how much credit you want to allow for a Customer by adding the “Credit Limit”. You can also set a global “Credit Limit” in the Company master. Classifying Customers -ERPNext allows you to group your Customers using [Customer Group](/contents/crm/setup/customer-group) -and also divide them into [Territories](/contents/crm/setup/territory) +ERPNext allows you to group your Customers using [Customer Group]({{url_prefix}}/user/guides/crm/setup/customer-group.html) +and also divide them into [Territories]({{url_prefix}}/user/guides/crm/setup/territory.html) Grouping will help you get better analysis of your data and identify which Customers are profitable and which are not. Territories will help you set sales targets for the respective territories. -You can also mention [Sales Person](/contents/crm/setup/sales-person) against a customer. +You can also mention [Sales Person]({{url_prefix}}/user/guides/crm/setup/sales-person.html) against a customer. ### Sales Partner diff --git a/erpnext/docs/user/guides/CRM/lead.md b/erpnext/docs/user/guides/CRM/lead.md index b545ca320fb..f754c549a15 100644 --- a/erpnext/docs/user/guides/CRM/lead.md +++ b/erpnext/docs/user/guides/CRM/lead.md @@ -20,7 +20,7 @@ To create a Lead, go to: > Selling > Lead > New Lead -Lead +Lead ERPNext gives you a lot of options you may want to store about your Leads. For example what is the source, how likely are they to give you business etc. If diff --git a/erpnext/docs/user/guides/CRM/newsletter.md b/erpnext/docs/user/guides/CRM/newsletter.md index c2c9718cc3e..25cd2b0ae25 100644 --- a/erpnext/docs/user/guides/CRM/newsletter.md +++ b/erpnext/docs/user/guides/CRM/newsletter.md @@ -12,8 +12,8 @@ see how it looks to the recepient, you can use the test function. Save the document before testing. A test email will be sent to your email id. You can send the email to all the intended receipients by clicking on the send button. -Newsletter - New +Newsletter - New -Newsletter - Test +Newsletter - Test {next} diff --git a/erpnext/docs/user/guides/CRM/opportunity.md b/erpnext/docs/user/guides/CRM/opportunity.md index 41341681054..d6850c8d5cf 100644 --- a/erpnext/docs/user/guides/CRM/opportunity.md +++ b/erpnext/docs/user/guides/CRM/opportunity.md @@ -9,13 +9,13 @@ or open a “Open” Lead and click on “Create Opportunity” button. #### Figure 1: Create Opportunity -Opportunity +Opportunity You can also open a “Open” Lead and click on “Create Opportunity” button. #### Figure 2: Create Opportunity from an open Lead -Opportunity +Opportunity An Opportunity can also come from an existing Customer. You can create multiple Opportunities against the same Lead. In Opportunity, apart from the diff --git a/erpnext/docs/user/guides/CRM/setup/campaign.md b/erpnext/docs/user/guides/CRM/setup/campaign.md index 6b455125d02..36b55c3e12f 100644 --- a/erpnext/docs/user/guides/CRM/setup/campaign.md +++ b/erpnext/docs/user/guides/CRM/setup/campaign.md @@ -2,19 +2,19 @@ A Campaign is a full-scale implementation of a sales strategy to promote a product or a service. This is done in a market segment of a particular geographical area, to achieve specified objectives. -Campaign +Campaign -You can track [Lead](/contents/crm/lead), [Opportunity](/contents/crm/opportunity), [Quotation](/contents/selling/quotation) against a campaign. +You can track [Lead]({{url_prefix}}/user/guides/crm/lead.html), [Opportunity]({{url_prefix}}/user/guides/crm/opportunity.html), [Quotation]({{url_prefix}}/user/guides/selling/quotation.html) against a campaign. ###Track Leads against Campaign * To track a 'Lead' against a campaign select 'View Leads'. -Campaign - View Leads +Campaign - View Leads * You shall get a filtered list of all leads made against that campaign. * You can also create new leads by clicking 'New' -Campaign - New Lead +Campaign - New Lead {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/CRM/setup/customer-group.md b/erpnext/docs/user/guides/CRM/setup/customer-group.md index 2bbc533d3a8..6e6e1b95f19 100644 --- a/erpnext/docs/user/guides/CRM/setup/customer-group.md +++ b/erpnext/docs/user/guides/CRM/setup/customer-group.md @@ -3,12 +3,12 @@ You can also get trend analysis for each group. Typically Customers are grouped by market segment (that is usually based on your domain). -Customer Group Tree +Customer Group Tree > Tip: If you think all this is too much effort, you can leave it at “Default Customer Group”. But all this effort, will pay off when you start getting reports. An example of a sample report is given below: -![Sales Analytics](assets/old_images/erpnext/sales-analytics-customer.png) +![Sales Analytics]({{url_prefix}}/assets/old_images/erpnext/sales-analytics-customer.png) {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/CRM/setup/sales-person.md b/erpnext/docs/user/guides/CRM/setup/sales-person.md index 93dfb6354c7..4c6c0b6cbe3 100644 --- a/erpnext/docs/user/guides/CRM/setup/sales-person.md +++ b/erpnext/docs/user/guides/CRM/setup/sales-person.md @@ -3,7 +3,7 @@ chart of Sales Persons where each Sales Person’s target can be set individually. Again as in Territory, the target has to be set against Item Group. -Sales Person Tree +Sales Person Tree ####Sales Person in Transactions diff --git a/erpnext/docs/user/guides/accounts/accounting-entries.md b/erpnext/docs/user/guides/accounts/accounting-entries.md index 051400959b8..e67d999570e 100644 --- a/erpnext/docs/user/guides/accounts/accounting-entries.md +++ b/erpnext/docs/user/guides/accounts/accounting-entries.md @@ -4,7 +4,7 @@ business. * Mama (The Tea-stall owner) invests Rs 25000 to start the business. -![A&L](assets/old_images/erpnext/assets-1.png) +![A&L]({{url_prefix}}/assets/old_images/erpnext/assets-1.png) __Analysis:__ Mama invested 25000 in company, hoping to get some profit. In other words, company is liable to pay 25000 to Mama in the future. So, account @@ -14,7 +14,7 @@ will debited. * The company needs equipments (Stove, teapot, cups etc) and raw materials (tea, sugar, milk etc) immediately. He decides to buy from the nearest general store "Super Bazaar" who is a friend so that he gets some credit. Equipments cost him 2800 and raw materials worth of 2200. He pays 2000 out of total cost 5000. -![A&L](assets/old_images/erpnext/assets-2.png) +![A&L]({{url_prefix}}/assets/old_images/erpnext/assets-2.png) __Analysis:__ Equipments are "Fixed Assets" (because they have a long life) of the company and raw materials "Current Assets" (since they are used for day-to-day @@ -25,7 +25,7 @@ Bazaar" later, so Super Bazaar will be credited by 3000. * Mama (who takes care of all entries) decides to book sales at the end of the every day, so that he can analyze daily sales. At the end of the very first day, the tea stall sells 325 cups of tea, which gives net sales of Rs. 1575. The owner happily books his first day sales. -![A&L](assets/old_images/erpnext/assets-3.png) +![A&L]({{url_prefix}}/assets/old_images/erpnext/assets-3.png) __Analysis:__ Income has been booked in "Sales of Tea" account which has been credited to increase the value and the same amount will be debited to "Cash" @@ -36,7 +36,7 @@ sold" account by same amount. At the end of the month, the company paid the rent amount of stall (5000) and salary of one employee (8000), who joined from the very first day. -![A&L](assets/old_images/erpnext/assets-4.png) +![A&L]({{url_prefix}}/assets/old_images/erpnext/assets-4.png) ### Booking Profit @@ -47,7 +47,7 @@ its a liability for the company (it has to pay it to Mama). When the Balance Sheet is not balanced i.e. Debit is not equal to Credit, the profit has not yet been booked. To book profit, the following entry has to be made: -![A&L](assets/old_images/erpnext/assets-5.png) +![A&L]({{url_prefix}}/assets/old_images/erpnext/assets-5.png) Explanation: Company's net sales and expenses are 40000 and 20000 respectively. So, company made a profit of 20000. To make the profit booking diff --git a/erpnext/docs/user/guides/accounts/accounting-reports.md b/erpnext/docs/user/guides/accounts/accounting-reports.md index a7e401aaaaa..5026151860e 100644 --- a/erpnext/docs/user/guides/accounts/accounting-reports.md +++ b/erpnext/docs/user/guides/accounts/accounting-reports.md @@ -7,7 +7,7 @@ and between a period. This will help you to get a full update for all entries done in that period for that Account. General Ledger + src="{{url_prefix}}/assets/img/accounts/general-ledger.png"> ### Trial Balance @@ -20,7 +20,7 @@ the: * Credits * Closing -Trial Balance +Trial Balance The sum of all closing balances in a Trial Balance must be zero. @@ -30,7 +30,7 @@ These reports help you to track the outstanding invoices sent to Customer and Suppliers. In this report, you will get your outstanding amounts period wise. i.e. between 0-30 days, 30-60 days and so on. -Accounts Receivable +Accounts Receivable ### Sales and Purchase Register @@ -38,6 +38,6 @@ In this report, each tax Account is transposed in columns. For each Invoice and invoice Item, you will get the amount of individual tax that has been paid, based on the Taxes and Charges table. -Sales Register +Sales Register {next} diff --git a/erpnext/docs/user/guides/accounts/advance-payment-entry.md b/erpnext/docs/user/guides/accounts/advance-payment-entry.md index 72b7e5eb7b5..fa818fbd05c 100644 --- a/erpnext/docs/user/guides/accounts/advance-payment-entry.md +++ b/erpnext/docs/user/guides/accounts/advance-payment-entry.md @@ -24,7 +24,7 @@ the row "Is Advance" click 'Yes'. #### Figure 1 : Journal Entry -Advance Entry -Advace Payment +Advace Payment ### Double Entry Accounting @@ -41,7 +41,7 @@ will be credited because it has given value. #### Figure 2: Transaction and Difference Entry -Advace Payment +Advace Payment Save and submit the JV. If this document is not saved it will not be pulled in other accounting documents. @@ -55,7 +55,7 @@ advance in the advances table. The accounting will be adjusted accordingly. #### Figure 3: Receive Advance -Advace Payment +Advace Payment Save and submit the Sales Invoice. diff --git a/erpnext/docs/user/guides/accounts/budgeting.md b/erpnext/docs/user/guides/accounts/budgeting.md index 292fd9e335d..8733aa43e4b 100644 --- a/erpnext/docs/user/guides/accounts/budgeting.md +++ b/erpnext/docs/user/guides/accounts/budgeting.md @@ -16,13 +16,13 @@ Select a Cost Center and click on Open. #### Step 1: Click on Edit. -![](assets/old_images/erpnext/budgeting-1.png) +![]({{url_prefix}}/assets/old_images/erpnext/budgeting-1.png) -Accounts Receivable +Accounts Receivable #### Step 2: Enter Monthly Distribution. -![](assets/old_images/erpnext/budgeting-2-1.png) +![]({{url_prefix}}/assets/old_images/erpnext/budgeting-2-1.png) If you leave the** **distribution ID blank, ERPNext will calculate on a yearly @@ -32,7 +32,7 @@ basis or in equal proportion for every month. -![](assets/old_images/erpnext/budgeting-3.png) +![]({{url_prefix}}/assets/old_images/erpnext/budgeting-3.png) @@ -41,13 +41,13 @@ basis or in equal proportion for every month. ERPNext allows you to take a few budget actions. It signifies whether to stop , warn or Ignore if you exceed budgets. -![](assets/old_images/erpnext/budgeting-4.png) +![]({{url_prefix}}/assets/old_images/erpnext/budgeting-4.png) These can be defined from the Company record. -![](assets/old_images/erpnext/budgeting-4-1.png) +![]({{url_prefix}}/assets/old_images/erpnext/budgeting-4-1.png) diff --git a/erpnext/docs/user/guides/accounts/chart-of-accounts.md b/erpnext/docs/user/guides/accounts/chart-of-accounts.md index 67735bcc59e..148ef027401 100644 --- a/erpnext/docs/user/guides/accounts/chart-of-accounts.md +++ b/erpnext/docs/user/guides/accounts/chart-of-accounts.md @@ -22,7 +22,7 @@ your Chart of Accounts. Financial statement of your company is easily viewable in ERPNext. An Example of a financial statement is given below: -Financial Analytics Balance Sheet +Financial Analytics Balance Sheet To edit your Chart of Accounts in ERPNext go to: @@ -37,7 +37,7 @@ based on statutory (tax, compliance to government regulations) requirements. Let us understand the main groups of the Chart of Accounts. -Chart of Accounts +Chart of Accounts ### Balance Sheet Accounts @@ -75,7 +75,7 @@ beginning and end of your Fiscal Year, they become zero. In ERPNext it is easy to create a Profit and Loss analysis chart. An example of a Profit and Loss analysis chart is given below: -Financial Analytics Profit and Loss Statement +Financial Analytics Profit and Loss Statement (On the first day of the year you have not made any profit or loss, but you still have assets, hence balance sheet accounts never become zero at the @@ -95,7 +95,7 @@ Supplier). > Note: An Account “Ledger” is also sometimes called as Account “Head”. -Chart of Accounts +Chart of Accounts ### Other Account Types @@ -110,7 +110,7 @@ To create new Accounts, explore your Chart of Accounts and click on an Account group under which you want to create the new Account. On the right side, you will see an option to “Open” or “Add Child” a new Account. -Chart of Accounts +Chart of Accounts Option to create will only appear if you click on a Group (folder) type Account. diff --git a/erpnext/docs/user/guides/accounts/credit-limit.md b/erpnext/docs/user/guides/accounts/credit-limit.md index 1ab5e4dbb9e..df7f7f6e257 100644 --- a/erpnext/docs/user/guides/accounts/credit-limit.md +++ b/erpnext/docs/user/guides/accounts/credit-limit.md @@ -12,7 +12,7 @@ To set credit limit go to Customer - Master #### Figure 1: Credit Limit -Credit Limit +Credit Limit Go to the 'More Info section' and enter the amount in the field Credit Limit. @@ -27,7 +27,7 @@ accept orders or raise credit limits of customers. #### Figure 2: Credit Controller -Credit Limit +Credit Limit Save the changes. diff --git a/erpnext/docs/user/guides/accounts/item-wise-tax.md b/erpnext/docs/user/guides/accounts/item-wise-tax.md index b0edc81a305..fbc57436202 100644 --- a/erpnext/docs/user/guides/accounts/item-wise-tax.md +++ b/erpnext/docs/user/guides/accounts/item-wise-tax.md @@ -5,7 +5,7 @@ Taxes selected in the Tax and Other Charges in transactions are applied on all t Item master has tax table where you can list taxes which will be applied on it. -![Item wise Tax](assets/old_images/erpnext/item-wise-tax.png) +![Item wise Tax]({{url_prefix}}/assets/old_images/erpnext/item-wise-tax.png) Tax rate mentioned in the item master gets preference over tax rate entered in the transactions. @@ -17,7 +17,7 @@ In Taxes and Other Charges master, you should select all the applicable taxes wh For example, if few items has VAT 5 applied on them, other has Service Tax applied, and some other has Excise Duty applicable, then you tax master should have all these taxes selected. -![item wise tax master](assets/old_images/erpnext/item-wise-tax-master.png) +![item wise tax master]({{url_prefix}}/assets/old_images/erpnext/item-wise-tax-master.png) ####Step 3: Set Tax Rate as Zero in Taxes and Charges Template @@ -25,6 +25,6 @@ In the Taxes and Other Charges master, tax rate will be updated as ZERO. It mean Based on the above setting, you will have taxes applied on items as mentioned in the respective item master. Check following for an instance. -![item wise tax calculation](assets/old_images/erpnext/item-wise-tax-calc.png) +![item wise tax calculation]({{url_prefix}}/assets/old_images/erpnext/item-wise-tax-calc.png) {next} diff --git a/erpnext/docs/user/guides/accounts/journal-entry.md b/erpnext/docs/user/guides/accounts/journal-entry.md index 5807f9370a1..9da656d33c5 100644 --- a/erpnext/docs/user/guides/accounts/journal-entry.md +++ b/erpnext/docs/user/guides/accounts/journal-entry.md @@ -7,7 +7,7 @@ To create a Journal Entry go to: > Accounts > Documents > Journal Entry > New -Journal Entry +Journal Entry In a Journal Entry, you must select. diff --git a/erpnext/docs/user/guides/accounts/making-payments.md b/erpnext/docs/user/guides/accounts/making-payments.md index 2e7fc67ca5d..3b6209c712f 100644 --- a/erpnext/docs/user/guides/accounts/making-payments.md +++ b/erpnext/docs/user/guides/accounts/making-payments.md @@ -6,7 +6,7 @@ clicking on “Make Payment Entry” button on “Submitted” invoices. 3. Enter the cheque number, cheque date. 4. Save and Submit. -Manking Payment +Manking Payment Payments can also be made independent of invoices by creating a new Journal Voucher and selecting the type of payment. @@ -29,7 +29,7 @@ For payments to Suppliers, ### Example Payment Journal Entry -Manking Payment +Manking Payment * * * diff --git a/erpnext/docs/user/guides/accounts/multi-currency-accounting.md b/erpnext/docs/user/guides/accounts/multi-currency-accounting.md index d0e0db8c2cb..0b01110e26c 100644 --- a/erpnext/docs/user/guides/accounts/multi-currency-accounting.md +++ b/erpnext/docs/user/guides/accounts/multi-currency-accounting.md @@ -4,15 +4,15 @@ In ERPNext, you can make accounting entries in multiple currency. For example, i To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account. -Set Currency from Chart of Accounts +Set Currency from Chart of Accounts You can also assign / modify the currency by opening specific Account record for existing Accounts. -Modify Account Currency +Modify Account Currency For Customer / Supplier (Party), you can also define it's accounting currency in the Party record. If the Party's accounting currency is different from Company Currency, you have to mention Default Receivable / Payable Account in that currency. -Customer Accounting Currency +Customer Accounting Currency Once you defined Accounting Currency in Party / Account record, you are ready to make transactions against them. If Party's accounting currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If accounting currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party's Accounting Currency. In any case, currency of Receivable Account will always be same as accounting currency of the Party. @@ -31,7 +31,7 @@ Now, in POS, Paid Amount will be enetered in transaction currency, instead of ea Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency. -Sales Invoice Outstanding +Sales Invoice Outstanding ### Purchase Invoice @@ -41,14 +41,14 @@ Similarly, in Purchase Invoice, accounting entries will be made based on Supplie In Journal Entry, you can make transactions in different currencies. There is a checkbox "Multi Currency", to enable multi-currency entries. If "Multi Currency" option selected, you will be able to select accounts with different currencies. -Journal Entry Exchange Rate +Journal Entry Exchange Rate In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually. In a single Journal Entry, you can select accounts with only one alternate currency, apart from accounts in Company Currency. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically. -Journal Entry in multi currency +Journal Entry in multi currency #### Example 1: Payment Entry Against Customer With Alternate Currency @@ -56,7 +56,7 @@ Suppose, default currency of the company is INR and customer's accounting curren Exchange Rate in the payment entry should always be same as invoice (60), even if exchange rate on the payment date is 62. The bank account will be credited by the amount considering exchange rate as 62. Hence, Exchnage Gain / Loss will be booked based on exchange rate difference. -Payment Entry +Payment Entry #### Example 2: Inter-bank Transfer (USD -> INR) @@ -101,7 +101,7 @@ Lets say, Paypal account debited by following amounts over the week, which has n Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be look like below: -Inter Bank Transfer +Inter Bank Transfer ## Reports @@ -110,10 +110,10 @@ Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency. -General Ledger Report +General Ledger Report ### Accounts Receivable / Payable In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency. -Accounts Receivable Report \ No newline at end of file +Accounts Receivable Report \ No newline at end of file diff --git a/erpnext/docs/user/guides/accounts/opening-accounts.md b/erpnext/docs/user/guides/accounts/opening-accounts.md index 42b7e1df202..1a39ed6ac48 100644 --- a/erpnext/docs/user/guides/accounts/opening-accounts.md +++ b/erpnext/docs/user/guides/accounts/opening-accounts.md @@ -23,7 +23,7 @@ Based on Voucher Type You can select accounts based on the voucher type. In such a scenario, your balance sheet should be balanced. -Opening Account +Opening Account Also, note that if there are more than 300 ledgers, the system will crash. Thus to avoid such a situation, you can open accounts by using temporary accounts. @@ -46,16 +46,16 @@ Note: Make sure to set “Is Opening” as “Yes” in the More Info section. Complete Journal Entries on the Debit and Credit side. -![Opening Entry](assets/old_images/erpnext/opening-entry-1.png) +![Opening Entry]({{url_prefix}}/assets/old_images/erpnext/opening-entry-1.png) To update opening balance is to make Journal Entry for an individual/group of accounts. For example, if you want to update balance in three bank accounts, then make Journal Entrys in this manner. -![Opening Temp Entry](assets/old_images/erpnext/image-temp-opening.png) +![Opening Temp Entry]({{url_prefix}}/assets/old_images/erpnext/image-temp-opening.png) -![Opening Entry](assets/old_images/erpnext/opening-entry-2.png) +![Opening Entry]({{url_prefix}}/assets/old_images/erpnext/opening-entry-2.png) Temporary Asset and Liability account is used for balancing purpose. When you update opening balance in Liability Account, you can use Temporary Asset Account for balancing. @@ -72,7 +72,7 @@ After completing the accounting entries, the trial balance report will look like the one given below: -![Trial Balance](assets/old_images/erpnext/trial-balance-1.png) +![Trial Balance]({{url_prefix}}/assets/old_images/erpnext/trial-balance-1.png) #### Outstanding Invoices diff --git a/erpnext/docs/user/guides/accounts/opening-entry.md b/erpnext/docs/user/guides/accounts/opening-entry.md index bbab38a682a..2f341a1a086 100644 --- a/erpnext/docs/user/guides/accounts/opening-entry.md +++ b/erpnext/docs/user/guides/accounts/opening-entry.md @@ -2,6 +2,6 @@ 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, please visit [Opening Entry.](/contents/accounts/opening-accounts) +Fox Pro based software, please visit [Opening Entry.]({{url_prefix}}/user/guides/accounts/opening-accounts.html) {next} diff --git a/erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md index 9599b928aee..dbcfc000279 100644 --- a/erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md +++ b/erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md @@ -19,7 +19,7 @@ all your transactions against this Customer record. In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, Sales Order, Purchase Order etc. can be edited via the POS. There two steps to Setup POS: 1. Enable POS View via (Setup > Customize > Feature Setup) -2. Create a [POS Setting](/contents/setting-up/pos-setting) record +2. Create a [POS Setting]({{url_prefix}}/user/guides/setting-up/pos-setting.html) record #### Switch to POS View @@ -42,7 +42,7 @@ clicking on the Item image and the other, is through the Barcode / Serial No. **Barcode / Serial No** \- A Barcode / Serial No is an optical machine-readable representation of data relating to the object to which it is attached. Enter Barcode / Serial No in the box as shown in the image below and pause for a second, the item will be automatically added to the cart. -![POS](assets/old_images/erpnext/pos-add-item.png) +![POS]({{url_prefix}}/assets/old_images/erpnext/pos-add-item.png) > Tip: To change the quantity of an Item, enter your desired quantity in the quantity box. These are mostly used if the same Item is purchased in bulk. @@ -63,7 +63,7 @@ button. > Delete button appears only when Items are selected. -![POS](assets/old_images/erpnext/pos-remove-item.png) +![POS]({{url_prefix}}/assets/old_images/erpnext/pos-remove-item.png) ### Make Payment @@ -74,7 +74,7 @@ ready to make the Payment. Payment process is divided into 3 steps - 2. Select your “Mode of Payment”. 3. Click on “Pay” button to Save the document. -![POS Payment](assets/old_images/erpnext/pos-make-payment.png) +![POS Payment]({{url_prefix}}/assets/old_images/erpnext/pos-make-payment.png) Submit the document to finalise the record. After the document is submitted, you can either print or email it directly to the customer. diff --git a/erpnext/docs/user/guides/accounts/purchase-invoice.md b/erpnext/docs/user/guides/accounts/purchase-invoice.md index be01e2e3214..ce1aae882fd 100644 --- a/erpnext/docs/user/guides/accounts/purchase-invoice.md +++ b/erpnext/docs/user/guides/accounts/purchase-invoice.md @@ -9,7 +9,7 @@ To make a new Purchase Invoice, go to: or click on “Make Purchase Invoice” in Purchase Order or Purchase Receipt. -Purchase Invoice +Purchase Invoice The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and “Bill Date” helps to track the bill number as set by your Supplier for diff --git a/erpnext/docs/user/guides/accounts/sales-invoice.md b/erpnext/docs/user/guides/accounts/sales-invoice.md index 7ff5ac26fc6..5c95b319aaa 100644 --- a/erpnext/docs/user/guides/accounts/sales-invoice.md +++ b/erpnext/docs/user/guides/accounts/sales-invoice.md @@ -6,7 +6,7 @@ You can create a Sales Invoice directly from or Click on Make Invoice at the right hand corner of the Delivery Note. -Sales Invoice +Sales Invoice #### Accounting Impact diff --git a/erpnext/docs/user/guides/accounts/setup/accounts-settings.md b/erpnext/docs/user/guides/accounts/setup/accounts-settings.md index d7183d8a138..8465679f7fa 100644 --- a/erpnext/docs/user/guides/accounts/setup/accounts-settings.md +++ b/erpnext/docs/user/guides/accounts/setup/accounts-settings.md @@ -1,5 +1,5 @@ -Account Settings +Account Settings * Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role. diff --git a/erpnext/docs/user/guides/accounts/setup/cost-center.md b/erpnext/docs/user/guides/accounts/setup/cost-center.md index 3a81a5f22f8..79f1a3c3a2a 100644 --- a/erpnext/docs/user/guides/accounts/setup/cost-center.md +++ b/erpnext/docs/user/guides/accounts/setup/cost-center.md @@ -32,7 +32,7 @@ To setup your Chart of Cost Centers go to: > Accounts > Setup > Chart of Cost Centers -![Chart of Cost Center](assets/old_images/erpnext/chart-of-cost-centers.png) +![Chart of Cost Center]({{url_prefix}}/assets/old_images/erpnext/chart-of-cost-centers.png) Cost centers help you in one more activity, budgeting. @@ -53,7 +53,7 @@ define a budget distribution that the budget will follow. > Accounts > Setup > Budget Distribution > New Budget Distribution -![Budget Distribution](assets/old_images/erpnext/budgeting.png) +![Budget Distribution]({{url_prefix}}/assets/old_images/erpnext/budgeting.png) #### Budget Actions diff --git a/erpnext/docs/user/guides/accounts/setup/fiscal-year.md b/erpnext/docs/user/guides/accounts/setup/fiscal-year.md index 22824d3d916..5509e2fcdd2 100644 --- a/erpnext/docs/user/guides/accounts/setup/fiscal-year.md +++ b/erpnext/docs/user/guides/accounts/setup/fiscal-year.md @@ -18,6 +18,6 @@ choose to start its fiscal year on October 1. That way, they know what their income will be for that year, and can adjust their expenses to maintain their desired profit margins. -Fiscal Year +Fiscal Year {next} diff --git a/erpnext/docs/user/guides/accounts/setup/tax-rule.md b/erpnext/docs/user/guides/accounts/setup/tax-rule.md index 7d81bfc1ac0..fdbc7040225 100644 --- a/erpnext/docs/user/guides/accounts/setup/tax-rule.md +++ b/erpnext/docs/user/guides/accounts/setup/tax-rule.md @@ -1,6 +1,6 @@ -You can define which [Tax Template](/contents/setting-up/setting-up-taxes) must be applied on a Sales / Purchase transaction using Tax Rule. +You can define which [Tax Template]({{url_prefix}}/user/guides/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule. -Tax Rule +Tax Rule You can define Tax Rules for Sales or Purchase Taxes. While making a Transaction the system will select and apply tax template based on the tax rule defined. @@ -10,9 +10,9 @@ Let us consider a senario to understand Tax Rule Better. Suppose we define 2 Tax Rules as below. -Tax Rule +Tax Rule -Tax Rule +Tax Rule Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country as United Kingdom diff --git a/erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md index b9ab255d1d8..1fd0b378d7d 100644 --- a/erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md +++ b/erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md @@ -15,7 +15,7 @@ The Bank Reconciliation statement in ERPNext comes in the form of a report. #### Figure 1: Bank Reconciliation Statement -![](assets/old_images/erpnext/bank-reconciliation-2.png) +![]({{url_prefix}}/assets/old_images/erpnext/bank-reconciliation-2.png) @@ -45,7 +45,7 @@ __Step 4:__ Click on the JV from the table and update clearance date. #### Figure 2: Bank Reconciliation Tool -Bank Reconciliation +Bank Reconciliation __Step 5:__ Click on the button 'Update Clearance Date'. diff --git a/erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md index de968fcd509..bf4a65f243f 100644 --- a/erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md +++ b/erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md @@ -11,7 +11,7 @@ To use Payment Reconciliation Tool go to, Accounts > Tools > Payment Reconciliation -Payment Reconciliation +Payment Reconciliation __Step 1:__ Select the Account against whom the payments need to be reconciled. diff --git a/erpnext/docs/user/guides/accounts/tools/payment-tool.md b/erpnext/docs/user/guides/accounts/tools/payment-tool.md index 0d3c12a3c9a..f96ca5b91b5 100644 --- a/erpnext/docs/user/guides/accounts/tools/payment-tool.md +++ b/erpnext/docs/user/guides/accounts/tools/payment-tool.md @@ -11,14 +11,14 @@ To go to Payment Tool, click on Accounts > Tools > Payment Tool. 6. Click on Get Outstanding Vouchers to fetch all the valid Vouchers, Invoices and Orders against which a payment can be made/received. These will appear in the Against Voucher section. * __Note:__ In case User is paying a customer or receiving payment from a supplier, add the details regarding the relevant invoices and orders manually. -Payment Tool +Payment Tool 7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher -Payment Tool +Payment Tool 8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in. -Payment Tool +Payment Tool {next} diff --git a/erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md index 9a75ff44cdd..5c0e203d0d9 100644 --- a/erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md +++ b/erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md @@ -19,7 +19,7 @@ In ERPNext after making all the special entries via Journal Entry for the curren **Closing Fiscal Year** will be an year for which you are closing your financial statement. -Period Closing Voucher +Period Closing Voucher This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a libility account like Reserves and Surplus, or Capital Fund account as Closing Account. diff --git a/erpnext/docs/user/guides/buying/purchase-order.md b/erpnext/docs/user/guides/buying/purchase-order.md index 4577535d81e..b6badf62384 100644 --- a/erpnext/docs/user/guides/buying/purchase-order.md +++ b/erpnext/docs/user/guides/buying/purchase-order.md @@ -7,7 +7,7 @@ Supplier Quotation. #### Purchase Order Flow Chart -![Purchase Order](assets/old_images/erpnext/purchase-order-f.jpg) +![Purchase Order]({{url_prefix}}/assets/old_images/erpnext/purchase-order-f.jpg) In ERPNext, you can also make a Purchase Order directly by going to: @@ -15,7 +15,7 @@ In ERPNext, you can also make a Purchase Order directly by going to: #### Create Purchase Order -Purchase Order +Purchase Order Entering a Purchase Order is very similar to a Purchase Request, additionally you will have to set: @@ -73,7 +73,7 @@ Nos (from the Item form) #### Figure 3: Conversion of Purchase UOM to stock UOM -Purchase Order - UOM +Purchase Order - UOM __Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has 100 pieces. diff --git a/erpnext/docs/user/guides/buying/purchase-taxes.md b/erpnext/docs/user/guides/buying/purchase-taxes.md index 9ffacbe16e1..0e5ebb3a201 100644 --- a/erpnext/docs/user/guides/buying/purchase-taxes.md +++ b/erpnext/docs/user/guides/buying/purchase-taxes.md @@ -8,7 +8,7 @@ Orders and Purchase Invoices. > Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges Master -![Purchase-Taxes](assets/old_images/erpnext/purchase-taxes.png) +![Purchase-Taxes]({{url_prefix}}/assets/old_images/erpnext/purchase-taxes.png) diff --git a/erpnext/docs/user/guides/buying/setup/buying-settings.md b/erpnext/docs/user/guides/buying/setup/buying-settings.md index 9fc6973d6cf..dc9fa8e143a 100644 --- a/erpnext/docs/user/guides/buying/setup/buying-settings.md +++ b/erpnext/docs/user/guides/buying/setup/buying-settings.md @@ -1,6 +1,6 @@ Buying Settings is where you can define properties which will be applied in the Buying module's transactions. -![Buying Settings](assets/img/buying/buying-settings.png) +![Buying Settings]({{url_prefix}}/assets/img/buying/buying-settings.png) Let us look at the various options that can be configured: @@ -14,7 +14,7 @@ You can define or select the Naming Series pattern from: > Setup > Settings > Naming Series -[Click here to know more about defining a Naming Series.](/contents/setting-up/settings/naming-series) +[Click here to know more about defining a Naming Series.]({{url_prefix}}/user/guides/setting-up/settings/naming-series.html) ### 2. Default Supplier Type diff --git a/erpnext/docs/user/guides/buying/setup/supplier-type.md b/erpnext/docs/user/guides/buying/setup/supplier-type.md index 179200827f1..9ca89780696 100644 --- a/erpnext/docs/user/guides/buying/setup/supplier-type.md +++ b/erpnext/docs/user/guides/buying/setup/supplier-type.md @@ -14,7 +14,7 @@ You can create your own category of Supplier Type. > Buying > Setup > Supplier Type > New Supplier Type -Supplier Type +Supplier Type You can classify your suppliers from a range of choice available in ERPNext. Choose from a set of given options like Distributor, Electrical,Hardware, diff --git a/erpnext/docs/user/guides/buying/supplier-quotation.md b/erpnext/docs/user/guides/buying/supplier-quotation.md index 88ceb7c3380..a0047e68675 100644 --- a/erpnext/docs/user/guides/buying/supplier-quotation.md +++ b/erpnext/docs/user/guides/buying/supplier-quotation.md @@ -8,7 +8,7 @@ You can make a supplier quotation from a Material Request #### Supplier Quotation Flow-Chart -![Supplier Quotation](assets/old_images/erpnext/supplier-quotation-f.jpg) +![Supplier Quotation]({{url_prefix}}/assets/old_images/erpnext/supplier-quotation-f.jpg) You can also make a Supplier Quotation directly from: @@ -16,7 +16,7 @@ You can also make a Supplier Quotation directly from: #### Create Supplier Quotation -Supplier Quotation +Supplier Quotation If you have multiple Suppliers who supply you with the same Item, you usually send out a message (Request for Quote) to various Suppliers. In diff --git a/erpnext/docs/user/guides/buying/supplier.md b/erpnext/docs/user/guides/buying/supplier.md index 22cee737d49..9e20642c977 100644 --- a/erpnext/docs/user/guides/buying/supplier.md +++ b/erpnext/docs/user/guides/buying/supplier.md @@ -5,7 +5,7 @@ You can create a new Supplier via: > Buying > Documents > Supplier > New Supplier -Supplier Master +Supplier Master ### Contacts and Addresses diff --git a/erpnext/docs/user/guides/collaboration-tools/assignment.md b/erpnext/docs/user/guides/collaboration-tools/assignment.md index 959f3004b2e..d78cf0c7add 100644 --- a/erpnext/docs/user/guides/collaboration-tools/assignment.md +++ b/erpnext/docs/user/guides/collaboration-tools/assignment.md @@ -10,16 +10,16 @@ Following are the steps to assign document to another user. Assign to option is located at the footer of document. Clicking on Assignment Icon on the tool bar will fast-forward you to footer of same document. -![Assigned To Icon](assets/old_images/erpnext/assigned-to-icon.png) +![Assigned To Icon]({{url_prefix}}/assets/old_images/erpnext/assigned-to-icon.png) -![Assigned To](assets/old_images/erpnext/assigned-to.png) +![Assigned To]({{url_prefix}}/assets/old_images/erpnext/assigned-to.png) #### Step 2: Assign to User In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time. -![Assign User](assets/old_images/erpnext/assign-user.png) +![Assign User]({{url_prefix}}/assets/old_images/erpnext/assign-user.png) With assignment, you can also leave a comment for the review of asignee. @@ -27,13 +27,13 @@ With assignment, you can also leave a comment for the review of asignee. This transaction will appear in the To-do list of the ser in “Todo” section. -![Assign Todo](assets/old_images/erpnext/assign-todo.png) +![Assign Todo]({{url_prefix}}/assets/old_images/erpnext/assign-todo.png) ####Removing Assignment User will be able to remove assignment by clicking on "Assignment Completed" button in the document. -![Assign Remove](assets/old_images/erpnext/assign-remove.png) +![Assign Remove]({{url_prefix}}/assets/old_images/erpnext/assign-remove.png) Once assignment is set as completed, Status of its ToDo record will be set as Closed. diff --git a/erpnext/docs/user/guides/collaboration-tools/calendar.md b/erpnext/docs/user/guides/collaboration-tools/calendar.md index 27be7cf7246..5750777025c 100644 --- a/erpnext/docs/user/guides/collaboration-tools/calendar.md +++ b/erpnext/docs/user/guides/collaboration-tools/calendar.md @@ -11,7 +11,7 @@ To create event manually, you should first determine Calender View. If Event's s This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time. -![Calender Event Manually](assets/old_images/erpnext/calender-event-manually.png) +![Calender Event Manually]({{url_prefix}}/assets/old_images/erpnext/calender-event-manually.png) Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it. @@ -19,7 +19,7 @@ Based on the selection of time slot, Start Time and End Time will be updated in In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person person specified in this field. -![Calender Event Lead](assets/old_images/erpnext/calender-event-lead.png) +![Calender Event Lead]({{url_prefix}}/assets/old_images/erpnext/calender-event-lead.png) ####Birthday Event @@ -30,7 +30,7 @@ Birthday Event is created based on Date of Birth specified in the Employee maste You can set events as recurring in specific interval by Checking the "Repeat This Event". -![Calender Event Recurring](assets/old_images/erpnext/calender-event-recurring.png) +![Calender Event Recurring]({{url_prefix}}/assets/old_images/erpnext/calender-event-recurring.png) ###Permission for Event @@ -38,7 +38,7 @@ You can set Event as Private or Public. Private Events will be visible only to y Public Event, like Birthday will be visible to all. -![Calender Event Permission](assets/old_images/erpnext/calender-event-permission.png) +![Calender Event Permission]({{url_prefix}}/assets/old_images/erpnext/calender-event-permission.png) ###Event Reminders @@ -48,7 +48,7 @@ There are two ways you can receive email reminder for an event. In the Event master, checking "Send an email reminder in the morning" will trigger notifcation email to all the participants for this event. -![Calender Event Notification](assets/old_images/erpnext/calender-event-notification.png) +![Calender Event Notification]({{url_prefix}}/assets/old_images/erpnext/calender-event-notification.png) ####Create Email Digest @@ -58,6 +58,6 @@ Email Digest can be set from: `Setup > Email > Email Digest` -![Calender Email Digest](assets/old_images/erpnext/calender-email-digest.png) +![Calender Email Digest]({{url_prefix}}/assets/old_images/erpnext/calender-email-digest.png) {next} diff --git a/erpnext/docs/user/guides/collaboration-tools/collaborating-around-forms.md b/erpnext/docs/user/guides/collaboration-tools/collaborating-around-forms.md index adfdf874854..11c7b818e67 100644 --- a/erpnext/docs/user/guides/collaboration-tools/collaborating-around-forms.md +++ b/erpnext/docs/user/guides/collaboration-tools/collaborating-around-forms.md @@ -4,7 +4,7 @@ You can email any transaction from the system by clicking on the “Assigned to button in the right sidebar. A log of all your sent emails will be maintained in Communication. -![Forms](assets/old_images/erpnext/forms.png) +![Forms]({{url_prefix}}/assets/old_images/erpnext/forms.png) ### Comments @@ -14,6 +14,6 @@ be added in the right sidebar. ### Tags -[Read more about Tags](/contents/collaboration-tools/tags) +[Read more about Tags]({{url_prefix}}/user/guides/collaboration-tools/tags.html) {next} diff --git a/erpnext/docs/user/guides/collaboration-tools/messages.md b/erpnext/docs/user/guides/collaboration-tools/messages.md index dd8a5a86789..a905aeb546a 100644 --- a/erpnext/docs/user/guides/collaboration-tools/messages.md +++ b/erpnext/docs/user/guides/collaboration-tools/messages.md @@ -3,10 +3,10 @@ If you send a message to a user, and the user is logged in, it will appear as a popup message and the unread messages counter in the top toolbar will be updated. -![Message List](assets/old_images/erpnext/message-list.png) +![Message List]({{url_prefix}}/assets/old_images/erpnext/message-list.png) You can choose to send message to all the users, or to specific user. -![Messsage To](assets/old_images/erpnext/message-to.png) +![Messsage To]({{url_prefix}}/assets/old_images/erpnext/message-to.png) {next} diff --git a/erpnext/docs/user/guides/collaboration-tools/notes.md b/erpnext/docs/user/guides/collaboration-tools/notes.md index 601abeee4cb..a9abc4069fa 100644 --- a/erpnext/docs/user/guides/collaboration-tools/notes.md +++ b/erpnext/docs/user/guides/collaboration-tools/notes.md @@ -8,13 +8,13 @@ You can store your long notes under this section. It can contain your partner li Enter Title and Context. -![Note](assets/old_images/erpnext/note.png) +![Note]({{url_prefix}}/assets/old_images/erpnext/note.png) ####Set Permissions to select Users To make Note accessible for all, check "Public" under links section. If specific Note is to be made accessible to specific user, they shall be selected in the Share With table. -![Note Permission](assets/old_images/erpnext/note-permission.png) +![Note Permission]({{url_prefix}}/assets/old_images/erpnext/note-permission.png)
Notes can also be used as a knowledge base internally. You can also attach file in the Notes, and make it accessible to specific set of users only.
diff --git a/erpnext/docs/user/guides/collaboration-tools/tags.md b/erpnext/docs/user/guides/collaboration-tools/tags.md index 596fac025f6..7ada9f517db 100644 --- a/erpnext/docs/user/guides/collaboration-tools/tags.md +++ b/erpnext/docs/user/guides/collaboration-tools/tags.md @@ -1,5 +1,5 @@ Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. ERPNext will also show you all the important tags in the document list. -![Tags](assets/old_images/erpnext/tags-in-list.png) +![Tags]({{url_prefix}}/assets/old_images/erpnext/tags-in-list.png) {next} diff --git a/erpnext/docs/user/guides/collaboration-tools/to-do.md b/erpnext/docs/user/guides/collaboration-tools/to-do.md index b878b67374c..af1c5ac1fcc 100644 --- a/erpnext/docs/user/guides/collaboration-tools/to-do.md +++ b/erpnext/docs/user/guides/collaboration-tools/to-do.md @@ -1,10 +1,10 @@ To Do is a simple tool where all the activities [assigned](https://erpnext.com/collaboration-tools/assignment) to you and assigned by you are listed. You can also add your own to-do items in the list. -![Todo List](assets/old_images/erpnext/todo-list.png) +![Todo List]({{url_prefix}}/assets/old_images/erpnext/todo-list.png) When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo record itself. -![Todo Close](assets/old_images/erpnext/todo-close.png) +![Todo Close]({{url_prefix}}/assets/old_images/erpnext/todo-close.png) {next} diff --git a/erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md index 28cde25603f..b176d108824 100644 --- a/erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md +++ b/erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md @@ -2,21 +2,21 @@ ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web. -![Portal Menu](assets/old_images/erpnext/portal-menu.png) +![Portal Menu]({{url_prefix}}/assets/old_images/erpnext/portal-menu.png) Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance. -![Customer Portal](assets/old_images/erpnext/customer-portal-orders-1.png) +![Customer Portal]({{url_prefix}}/assets/old_images/erpnext/customer-portal-orders-1.png) #### Invoice with paid status. -![Invoice Paid](assets/old_images/erpnext/portal-invoice-paid.png) +![Invoice Paid]({{url_prefix}}/assets/old_images/erpnext/portal-invoice-paid.png) #### Invoice with billed status. -![Billed Invoice](assets/old_images/erpnext/portal-order-billed.png) +![Billed Invoice]({{url_prefix}}/assets/old_images/erpnext/portal-order-billed.png) {next} diff --git a/erpnext/docs/user/guides/customer-portal/issues.md b/erpnext/docs/user/guides/customer-portal/issues.md index 422b214db77..478e1b9e1bd 100644 --- a/erpnext/docs/user/guides/customer-portal/issues.md +++ b/erpnext/docs/user/guides/customer-portal/issues.md @@ -5,18 +5,18 @@ conversation. #### Empty Ticket List -![Ticket List](assets/old_images/erpnext/portal-ticket-list-empty.png) +![Ticket List]({{url_prefix}}/assets/old_images/erpnext/portal-ticket-list-empty.png) #### New Issue -![New Ticket](assets/old_images/erpnext/portal-new-ticket.png) +![New Ticket]({{url_prefix}}/assets/old_images/erpnext/portal-new-ticket.png) #### Open Issue -![Open Issue](assets/old_images/erpnext/portal-ticket-1.png) +![Open Issue]({{url_prefix}}/assets/old_images/erpnext/portal-ticket-1.png) #### Reply on Issue -![Reply Issue](assets/old_images/erpnext/portal-ticket-reply.png) +![Reply Issue]({{url_prefix}}/assets/old_images/erpnext/portal-ticket-reply.png) {next} diff --git a/erpnext/docs/user/guides/customer-portal/portal-login.md b/erpnext/docs/user/guides/customer-portal/portal-login.md index 1bd8775013a..9d657a827e0 100644 --- a/erpnext/docs/user/guides/customer-portal/portal-login.md +++ b/erpnext/docs/user/guides/customer-portal/portal-login.md @@ -1,6 +1,6 @@ To login into the customer account, the customer has to use his email id and the password sent by ERPNext; generated through the sign-up process. -![Login](assets/old_images/erpnext/customer-portal-login.png) +![Login]({{url_prefix}}/assets/old_images/erpnext/customer-portal-login.png) {next} diff --git a/erpnext/docs/user/guides/customer-portal/sign-up.md b/erpnext/docs/user/guides/customer-portal/sign-up.md index cabd58f9daa..2e95d494bc7 100644 --- a/erpnext/docs/user/guides/customer-portal/sign-up.md +++ b/erpnext/docs/user/guides/customer-portal/sign-up.md @@ -2,19 +2,19 @@ Customers have to log-in to the Company Website, and sign-up as a customer. #### Step 1: Click on Login Icon -![Sign Up](assets/old_images/erpnext/customer-portal-sign-up-1.png) +![Sign Up]({{url_prefix}}/assets/old_images/erpnext/customer-portal-sign-up-1.png) #### Step 2: Click on Sign Up Icon -![Sign Up](assets/old_images/erpnext/customer-portal-sign-up-2.png) +![Sign Up]({{url_prefix}}/assets/old_images/erpnext/customer-portal-sign-up-2.png) #### Step 3: Enter Customer Name and ID -![Sign Up](assets/old_images/erpnext/customer-portal-sign-up-3.png) +![Sign Up]({{url_prefix}}/assets/old_images/erpnext/customer-portal-sign-up-3.png) After the sign up process, a mail will be sent to the customers email id with the password details. diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-doctype.md b/erpnext/docs/user/guides/customize-erpnext/custom-doctype.md index 85d204968c4..02b08deef8f 100644 --- a/erpnext/docs/user/guides/customize-erpnext/custom-doctype.md +++ b/erpnext/docs/user/guides/customize-erpnext/custom-doctype.md @@ -19,7 +19,7 @@ in the Sales Order Doctype, then you should check Is Child Table. Else no. not be able to re-produce. 1. Custom?: This field will be checked by default when adding Custom Doctype. -![Doctype Basic](assets/img/setup/customize/doctype-basics.png) +![Doctype Basic]({{url_prefix}}/assets/img/setup/customize/doctype-basics.png) #### Fields @@ -34,7 +34,7 @@ Fields are much more than database columns, they can be: 1. Actions (button) 1. Attachments or Images -![Doctype fields](assets/img/setup/customize/Doctype-all-fields.png) +![Doctype fields]({{url_prefix}}/assets/img/setup/customize/Doctype-all-fields.png) When you add fields, you need to enter the **Type**. **Label** is optional for Section Break and Column Break. **Name** (`fieldname`) is the name of the database table column. @@ -44,19 +44,19 @@ You can also set other properties of the field like whether it is mandatory, rea In this section, you can define criteria based on which document for this doctype will be named. There are multiple criterion based on which document can be named, like naming based on the value in the specific field, or based on Naming Series, or based on value provided by the user in the prompt, which will be shown when saving document. In the following example, we are doing naming based on the value in the field **book_name**. -![Doctype Naming](assets/img/setup/customize/doctype-field-naming.png) +![Doctype Naming]({{url_prefix}}/assets/img/setup/customize/doctype-field-naming.png) #### Permission In this table, you should select roles and define permission roles for them for this Doctype. -![Doctype Permissions](assets/img/setup/customize/Doctype-permissions.png) +![Doctype Permissions]({{url_prefix}}/assets/img/setup/customize/Doctype-permissions.png) #### Save Doctype On saving doctype, you will get pop-up to provide name for this Doctype. -![Doctype Save](assets/img/setup/customize/Doctype-save.png) +![Doctype Save]({{url_prefix}}/assets/img/setup/customize/Doctype-save.png) #### Doctype in System @@ -65,10 +65,10 @@ Human Resource module, to access this doctype, go to: `Human Resource > Document > Book` -![Doctype List](assets/img/setup/customize/Doctype-list-view.png) +![Doctype List]({{url_prefix}}/assets/img/setup/customize/Doctype-list-view.png) #### Book master Using the fields entered, following is the master one book. -![Doctype List](assets/img/setup/customize/Doctype-book-added.png) +![Doctype List]({{url_prefix}}/assets/img/setup/customize/Doctype-book-added.png) diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-field.md b/erpnext/docs/user/guides/customize-erpnext/custom-field.md index ca5449bde80..ed30f529b10 100644 --- a/erpnext/docs/user/guides/customize-erpnext/custom-field.md +++ b/erpnext/docs/user/guides/customize-erpnext/custom-field.md @@ -13,7 +13,7 @@ You can also insert new Custom Field from [Customize Form](https://erpnext.com/c In Customize Form, for each field, you will find plus (+) option. When click on it, new row will be inserted above that field. You can enter properties for your Custom Field in the newly added blank row. -![Customize Form Custom Field](assets/old_images/erpnext/customize-form-custom-field.png) +![Customize Form Custom Field]({{url_prefix}}/assets/old_images/erpnext/customize-form-custom-field.png) Following are the steps to insert Custom Field in the existing form. @@ -25,35 +25,35 @@ As mentioned above, you can insert Custom Field from Custom Field form, and also You should select transaction or master in which you want to insert custom field. Let's assume you need to insert a custom link field in the Quotation form. In this case, Document will be "Quotation". -![Custom Field Document](assets/old_images/erpnext/custom-field-document.png) +![Custom Field Document]({{url_prefix}}/assets/old_images/erpnext/custom-field-document.png) ####Set Field Label Custom Field's name will be set based on its Label. If you want to create Custom Field with specific name, but with different label, then you should first set Label as you want Field Name to be set. After Custom Field is saved, you can edit the Field Label again. -![Custom Field Label](assets/old_images/erpnext/custom-field-label.png) +![Custom Field Label]({{url_prefix}}/assets/old_images/erpnext/custom-field-label.png) ####Select Insert After This field will have all the existing field of the form/doctype selected. Your Custom Field will be placed after field you select in the Insert After field. -![Custom Field Insert](assets/old_images/erpnext/custom-field-insert.png) +![Custom Field Insert]({{url_prefix}}/assets/old_images/erpnext/custom-field-insert.png) ####Select Field Type Click [here](https://erpnext.com/kb/customize/field-types) to learn more about types of field you can set for your Custom Field. -![Custom Field Type](assets/old_images/erpnext/custom-field-type.png) +![Custom Field Type]({{url_prefix}}/assets/old_images/erpnext/custom-field-type.png) ####Set Option If you are creating a Link field, then Doctype name with which this field will be linked to will be entered in the Option field. Click [here](https://erpnext.com/kb/customize/creating-custom-link-field) to learn more about creating custom link field. -![Custom Field Link](assets/old_images/erpnext/custom-field-link.png) +![Custom Field Link]({{url_prefix}}/assets/old_images/erpnext/custom-field-link.png) If field type is set as Select (drop down field), then all he possible result for this field should be listed in the Options field. Each possible result should be separate by row. -![Custom Field Option](assets/old_images/erpnext/custom-field-option.png) +![Custom Field Option]({{url_prefix}}/assets/old_images/erpnext/custom-field-option.png) For other field types, like Data, Date, Currency etc., Opton field will be left blank. @@ -68,7 +68,7 @@ You can set properties as: 1. Read Only: Checking this option will make custom field non-editable. 1. Allow on Submit: Checking this option will allow editing value in the field when in submitted transaction. -![Custom Field Properties](assets/old_images/erpnext/custom-field-properties.png) +![Custom Field Properties]({{url_prefix}}/assets/old_images/erpnext/custom-field-properties.png) ####Deleting Custom Field diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md b/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md index d22f186b44b..792460af5ae 100644 --- a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md +++ b/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md @@ -20,6 +20,6 @@ Then in the Sales Invoice Custom Script, add this line: * * * -See: [How to create a custom script](/contents/customize-erpnext/custom-scripts) +See: [How to create a custom script]({{url_prefix}}/user/guides/customize-erpnext/custom-scripts.html) {next} diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.md index efe484bb2db..13ba6c66934 100644 --- a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.md +++ b/erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.md @@ -4,7 +4,7 @@ Lead form, you can do so by creating your own script. > Setup > Customization > Custom Script -![Custom Script](assets/old_images/erpnext/custom-script.png) +![Custom Script]({{url_prefix}}/assets/old_images/erpnext/custom-script.png) ### Topics diff --git a/erpnext/docs/user/guides/customize-erpnext/customize-form.md b/erpnext/docs/user/guides/customize-erpnext/customize-form.md index 57487f2ee72..c76d6571a14 100644 --- a/erpnext/docs/user/guides/customize-erpnext/customize-form.md +++ b/erpnext/docs/user/guides/customize-erpnext/customize-form.md @@ -11,13 +11,13 @@ You can go to Customize Form from: System Manager will find Customize Form option in the Sales Order list (or any other form for that matter) view as well. -![Customize Form List View](assets/old_images/erpnext/customize-form-list-view.png) +![Customize Form List View]({{url_prefix}}/assets/old_images/erpnext/customize-form-list-view.png) ####Step 2: Select Docytpe/Document You should select Docytpe/Document which has field-to-be-customized located in it. -![Customize Form Document](assets/old_images/erpnext/customize-form-document.png) +![Customize Form Document]({{url_prefix}}/assets/old_images/erpnext/customize-form-document.png) ####Step 3:Edit Property @@ -25,7 +25,7 @@ On selecting Doctype/table, you will have all the fields of the table updated as On clicking Project Name row, fields to set various property for this field will be shown. To Customize the mandatory property for a field, there is a field called "Mandatory". Checking this field will set Project Name field as mandatory in the Quotation form. -![Customize Form Mandatory](assets/old_images/erpnext/customize-form-mandatory.png) +![Customize Form Mandatory]({{url_prefix}}/assets/old_images/erpnext/customize-form-mandatory.png) Like this, you can customize following properties of the field. @@ -38,7 +38,7 @@ Like this, you can customize following properties of the field. ####Step 4: Update -![Customize Form Update](assets/old_images/erpnext/customize-form-update.png) +![Customize Form Update]({{url_prefix}}/assets/old_images/erpnext/customize-form-update.png) Before checking Sales Order form, you should clear cache and refresh browser tab for customization to take effect. diff --git a/erpnext/docs/user/guides/customize-erpnext/document-title.md b/erpnext/docs/user/guides/customize-erpnext/document-title.md index 89e9c5cc465..338068adca1 100644 --- a/erpnext/docs/user/guides/customize-erpnext/document-title.md +++ b/erpnext/docs/user/guides/customize-erpnext/document-title.md @@ -21,13 +21,13 @@ You can define the title by setting document properties in braces `{}`. For exam {customer_name} for {project} Customize Title + src="{{url_prefix}}/assets/img/customize/customize-title.gif"> #### Fixed or Editable Titles If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document. Editable Title + src="{{url_prefix}}/assets/img/customize/editable-title.gif"> If you want a fixed title, you can set the rule in the **Options** property. In this way, the title will be automatically updated everytime the document is updated. diff --git a/erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md index b35a484f2d7..57154ad10ff 100644 --- a/erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md +++ b/erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md @@ -7,7 +7,7 @@ dont require, go to: > Setup > Tools > Hide/Unhide Features -![Hide Features](assets/old_images/erpnext/hide-features.png) +![Hide Features]({{url_prefix}}/assets/old_images/erpnext/hide-features.png) Check / uncheck the features you want to use and refresh your page for the changes to take effect. @@ -20,7 +20,7 @@ To hide modules (icons) from the home page, go to: Setup > Tools> Modules Setup -![Hide/Unhide Modules](assets/old_images/erpnext/hide-module.png) +![Hide/Unhide Modules]({{url_prefix}}/assets/old_images/erpnext/hide-module.png) > Note: Modules are automatically hidden for users that have no permissions on the documents within that module. For example, if a user has no permissions on diff --git a/erpnext/docs/user/guides/customize-erpnext/print-format.md b/erpnext/docs/user/guides/customize-erpnext/print-format.md index 74316fa9cac..c373d065de3 100644 --- a/erpnext/docs/user/guides/customize-erpnext/print-format.md +++ b/erpnext/docs/user/guides/customize-erpnext/print-format.md @@ -18,7 +18,7 @@ To create your own versions, open an existing template from: > Setup > Printing > Print Formats -![Print Format](assets/old_images/erpnext/customize/print-format.png) +![Print Format]({{url_prefix}}/assets/old_images/erpnext/customize/print-format.png) Select the type of Print Format you want to edit and click on the “Copy” button on the right column. A new Print Format will open up with “Is Standard” @@ -45,7 +45,7 @@ To edit / update your print and PDF settings, go to: > Setup > Printing and Branding > Print Settings -![Print Format](assets/old_images/erpnext/customize/print-settings.png) +![Print Format]({{url_prefix}}/assets/old_images/erpnext/customize/print-settings.png) #### Example diff --git a/erpnext/docs/user/guides/human-resources/appraisal.md b/erpnext/docs/user/guides/human-resources/appraisal.md index 7a5f24b1312..021d470c572 100644 --- a/erpnext/docs/user/guides/human-resources/appraisal.md +++ b/erpnext/docs/user/guides/human-resources/appraisal.md @@ -6,13 +6,13 @@ giving appropriate weightage to each parameter. #### Step 1: Select an Appraisal Template -Appraisal +Appraisal After you select the template, the remaining form appears. #### Step 2: Enter Employee Details -Appraisal +Appraisal Once the Appraisal Template is completed, you can create Appraisal records for each period where you track performance. You can give points out of 5 for each diff --git a/erpnext/docs/user/guides/human-resources/attendance.md b/erpnext/docs/user/guides/human-resources/attendance.md index 175c49542c4..66c3a4c5037 100644 --- a/erpnext/docs/user/guides/human-resources/attendance.md +++ b/erpnext/docs/user/guides/human-resources/attendance.md @@ -3,12 +3,12 @@ day can be created manually by: > Human Resources > Attendance > New Attendance -Attendence +Attendence You can get a monthly report of your Attendance data by going to the “Monthly Attendance Details” report. -You can also bulk uppload attendence using the [Upload Attendence Tool ](/contents/human-resources/tools/upload-attendance) +You can also bulk uppload attendence using the [Upload Attendence Tool ]({{url_prefix}}/user/guides/human-resources/tools/upload-attendance.html) {next} diff --git a/erpnext/docs/user/guides/human-resources/employee.md b/erpnext/docs/user/guides/human-resources/employee.md index 09bc4890fc7..331fe473962 100644 --- a/erpnext/docs/user/guides/human-resources/employee.md +++ b/erpnext/docs/user/guides/human-resources/employee.md @@ -4,6 +4,6 @@ To create new Employee go to: > Human Resources > Employee > New -Employee +Employee {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/expense-claim.md b/erpnext/docs/user/guides/human-resources/expense-claim.md index 13cb19d6813..0a86f9af873 100644 --- a/erpnext/docs/user/guides/human-resources/expense-claim.md +++ b/erpnext/docs/user/guides/human-resources/expense-claim.md @@ -6,7 +6,7 @@ To make a new Expense Claim, go to: > HR > Expense Claim > New Expense Claim -Expense Claim +Expense Claim Set the Employee ID, date and the list of expenses that are to be claimed and “Submit” the record. @@ -34,6 +34,6 @@ because the amount will then be taxable to the Employee. * To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim -Expense Claim - Project Link +Expense Claim - Project Link {next} diff --git a/erpnext/docs/user/guides/human-resources/holiday-list.md b/erpnext/docs/user/guides/human-resources/holiday-list.md index bd5f195c940..9676785c91c 100644 --- a/erpnext/docs/user/guides/human-resources/holiday-list.md +++ b/erpnext/docs/user/guides/human-resources/holiday-list.md @@ -17,7 +17,7 @@ on Holiday List. #### Figure 1: Holiday List -![](assets/old_images/erpnext/holiday-list-1.png) +![]({{url_prefix}}/assets/old_images/erpnext/holiday-list-1.png) @@ -40,7 +40,7 @@ Mention the holiday reason in the description and select the date from the #### Figure 2: Adding new holidays to the list -![](assets/old_images/erpnext/holiday-list-2.png) +![]({{url_prefix}}/assets/old_images/erpnext/holiday-list-2.png) diff --git a/erpnext/docs/user/guides/human-resources/human-resources-reports.md b/erpnext/docs/user/guides/human-resources/human-resources-reports.md index ac0a198935c..20d792b3192 100644 --- a/erpnext/docs/user/guides/human-resources/human-resources-reports.md +++ b/erpnext/docs/user/guides/human-resources/human-resources-reports.md @@ -4,31 +4,31 @@ Human Resources Reports Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves. -Employee Leave Balance +Employee Leave Balance ### Employee Birthday Employee Birthday Report shows Birthdays of your employees. -Employee Birthday +Employee Birthday ### Employee Information Employee Information Report shows Report View of important information recorded in Employee master. -Employee Information +Employee Information ### Monthly Salary Register Monthly Salary Register shows net pay and its components of employee(s) at a glance. -Monthly Salary Register +Monthly Salary Register ### Monthly Attendance Sheet Monthly Attendance Sheet shows monthly attendance of selected employee at a glance. -Monthly Attendance Sheet +Monthly Attendance Sheet {next} diff --git a/erpnext/docs/user/guides/human-resources/job-applicant.md b/erpnext/docs/user/guides/human-resources/job-applicant.md index 1b8e9a1f376..3fafa95f004 100644 --- a/erpnext/docs/user/guides/human-resources/job-applicant.md +++ b/erpnext/docs/user/guides/human-resources/job-applicant.md @@ -1,10 +1,10 @@ -You can mantain a list of People who have applied for a [Job Opening](/contents/human-resources/job-opening). +You can mantain a list of People who have applied for a [Job Opening]({{url_prefix}}/user/guides/human-resources/job-opening.html). To create a new Job Applicant go to > Human Resource > Job Applicant > New -Job Applicant +Job Applicant ### Linking with an Email Account @@ -20,6 +20,6 @@ system shall create a New Job Applicant against each email received on the mailb * In 'Append To' select 'Job Applicant' -Email Account +Email Account {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/job-opening.md b/erpnext/docs/user/guides/human-resources/job-opening.md index eeb29ecd654..bfe914c3644 100644 --- a/erpnext/docs/user/guides/human-resources/job-opening.md +++ b/erpnext/docs/user/guides/human-resources/job-opening.md @@ -4,7 +4,7 @@ To create a new Job Opening go to > Human Resource > Job Opening > New -Job Opening +Job Opening {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/leave-application.md b/erpnext/docs/user/guides/human-resources/leave-application.md index 8cb1943d8d2..ecc4677c714 100644 --- a/erpnext/docs/user/guides/human-resources/leave-application.md +++ b/erpnext/docs/user/guides/human-resources/leave-application.md @@ -5,7 +5,7 @@ Type and the period for which the leave is taken. > Human Resources > Leave Application > New Leave Application -Leave Application +Leave Application ###Setting Leave Approver @@ -13,12 +13,12 @@ Type and the period for which the leave is taken. * You need to mention a list of Leave Approvers against an Employee in the Employee Master. -Leave Approver +Leave Approver > Tip : If you want all users to create their own Leave Applications, you can set their “Employee ID” as a match rule in the Leave Application Permission -settings. See the earlier discussion on [Setting Up Permissions](/contents/setting-up/users-and-permissions) +settings. See the earlier discussion on [Setting Up Permissions]({{url_prefix}}/user/guides/setting-up/users-and-permissions.html) for more info. -You assign Leaves aginast an Employee check [Leave Allocation](/contents/human-resources/setup/leave-allocation) +You assign Leaves aginast an Employee check [Leave Allocation]({{url_prefix}}/user/guides/human-resources/setup/leave-allocation.html) {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/offer-letter.md b/erpnext/docs/user/guides/human-resources/offer-letter.md index 34bceee55e6..16176f1a0d4 100644 --- a/erpnext/docs/user/guides/human-resources/offer-letter.md +++ b/erpnext/docs/user/guides/human-resources/offer-letter.md @@ -5,12 +5,12 @@ In ERPNext you can make a record of the Offer Letters that you can given to cand > Human Resource > Offer Letter > New -Offer Letter +Offer Letter -> Note: An offer letter can be made only against a [Job Applicant](/contents/human-resources/job-applicant) +> Note: An offer letter can be made only against a [Job Applicant]({{url_prefix}}/user/guides/human-resources/job-applicant.html) There is a pre-designed print format to print you offer letter. -Offer Letter +Offer Letter {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/salary-and-payroll.md b/erpnext/docs/user/guides/human-resources/salary-and-payroll.md index 849e4e66b77..64c8f3ccdea 100644 --- a/erpnext/docs/user/guides/human-resources/salary-and-payroll.md +++ b/erpnext/docs/user/guides/human-resources/salary-and-payroll.md @@ -44,7 +44,7 @@ To create a new Salary Structure go to: #### Figure 1:Salary Structure -Salary Structure +Salary Structure ### In the Salary Structure, @@ -76,7 +76,7 @@ Slip. #### Figure 2: Salary Slip -Salary Slip +Salary Slip You can also create salary slip for multiple employees using Process Payroll: @@ -84,7 +84,7 @@ You can also create salary slip for multiple employees using Process Payroll: #### Figure 3: Process Payroll -Process Payroll +Process Payroll In Process Payroll, diff --git a/erpnext/docs/user/guides/human-resources/setup/branch.md b/erpnext/docs/user/guides/human-resources/setup/branch.md index 931da08540d..9fc71d534d6 100644 --- a/erpnext/docs/user/guides/human-resources/setup/branch.md +++ b/erpnext/docs/user/guides/human-resources/setup/branch.md @@ -1,5 +1,5 @@ Branches of your organization -Branch +Branch {next} diff --git a/erpnext/docs/user/guides/human-resources/setup/deduction-type.md b/erpnext/docs/user/guides/human-resources/setup/deduction-type.md index 613f55a233e..dde17a303fb 100644 --- a/erpnext/docs/user/guides/human-resources/setup/deduction-type.md +++ b/erpnext/docs/user/guides/human-resources/setup/deduction-type.md @@ -4,7 +4,7 @@ To create a new Deduction Type > Human Resource > Setup > Deduction Type > New -Deduction Type +Deduction Type {next} diff --git a/erpnext/docs/user/guides/human-resources/setup/department.md b/erpnext/docs/user/guides/human-resources/setup/department.md index 3b6e8c0a9b3..8376626751e 100644 --- a/erpnext/docs/user/guides/human-resources/setup/department.md +++ b/erpnext/docs/user/guides/human-resources/setup/department.md @@ -1,5 +1,5 @@ Departments in your organization -Department +Department {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/setup/designation.md b/erpnext/docs/user/guides/human-resources/setup/designation.md index d680d40b949..c8af1069b72 100644 --- a/erpnext/docs/user/guides/human-resources/setup/designation.md +++ b/erpnext/docs/user/guides/human-resources/setup/designation.md @@ -1,5 +1,5 @@ Designations in your organization -Designation +Designation {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/setup/earning-type.md b/erpnext/docs/user/guides/human-resources/setup/earning-type.md index c469f197792..ab97634e4d6 100644 --- a/erpnext/docs/user/guides/human-resources/setup/earning-type.md +++ b/erpnext/docs/user/guides/human-resources/setup/earning-type.md @@ -4,7 +4,7 @@ To create a new Earning Type > Human Resource > Setup > Earning Type > New -Earning Type +Earning Type {next} diff --git a/erpnext/docs/user/guides/human-resources/setup/employment-type.md b/erpnext/docs/user/guides/human-resources/setup/employment-type.md index 5f56ebce7cf..84b6aad470a 100644 --- a/erpnext/docs/user/guides/human-resources/setup/employment-type.md +++ b/erpnext/docs/user/guides/human-resources/setup/employment-type.md @@ -1,5 +1,5 @@ Various employment contracts you have with your employees. -Employment Type +Employment Type {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/setup/holiday-list.md b/erpnext/docs/user/guides/human-resources/setup/holiday-list.md index 42d6263ea58..ea64cdfa452 100644 --- a/erpnext/docs/user/guides/human-resources/setup/holiday-list.md +++ b/erpnext/docs/user/guides/human-resources/setup/holiday-list.md @@ -1,5 +1,5 @@ You can specify the Holidays for a particular year using Holiday List. -Holiday List +Holiday List {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/setup/hr-settings.md b/erpnext/docs/user/guides/human-resources/setup/hr-settings.md index 9b404d2d90c..f349fc74f19 100644 --- a/erpnext/docs/user/guides/human-resources/setup/hr-settings.md +++ b/erpnext/docs/user/guides/human-resources/setup/hr-settings.md @@ -2,6 +2,6 @@ GLobal settings for HR related documents -HR Settings +HR Settings {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md b/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md index c828b0fdc58..985b0c0e610 100644 --- a/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md +++ b/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md @@ -1,7 +1,7 @@ Helps you allocate Leaves to a particular Employee -Leave Allocation +Leave Allocation -To assign leaves to multiple employees use the [Leave Allocation Tool](/contents/human-resources/tools/leave-allocation-tool) +To assign leaves to multiple employees use the [Leave Allocation Tool]({{url_prefix}}/user/guides/human-resources/tools/leave-allocation-tool.html) {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/setup/leave-type.md b/erpnext/docs/user/guides/human-resources/setup/leave-type.md index 93ed0c38b92..78b3ab660a8 100644 --- a/erpnext/docs/user/guides/human-resources/setup/leave-type.md +++ b/erpnext/docs/user/guides/human-resources/setup/leave-type.md @@ -1,6 +1,6 @@ Specify the Type of Leave that can be allocated against an Employee -Leave Type +Leave Type * 'Max Days Leave Allowed' specifies the maximum number of days this type of leave can be taken at a strech. * 'Is LWP' specifies if the Leave is without Pay. diff --git a/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md index e7c5a1d22b4..a1fa8018fe1 100644 --- a/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md +++ b/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md @@ -1,5 +1,5 @@ Leave Allocation tool helps you allocated a specific number of leaves for your employees. -Leave Application +Leave Application {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/human-resources/tools/upload-attendance.md b/erpnext/docs/user/guides/human-resources/tools/upload-attendance.md index 9595f20e0b5..5f70933ddae 100644 --- a/erpnext/docs/user/guides/human-resources/tools/upload-attendance.md +++ b/erpnext/docs/user/guides/human-resources/tools/upload-attendance.md @@ -4,6 +4,6 @@ To upload the attendance go to: > Human Resources > Upload Attendance -Attendence upload +Attendence upload {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/introduction/key-workflows.md b/erpnext/docs/user/guides/introduction/key-workflows.md index 0d79843125c..f83c8a61080 100644 --- a/erpnext/docs/user/guides/introduction/key-workflows.md +++ b/erpnext/docs/user/guides/introduction/key-workflows.md @@ -3,10 +3,10 @@ This diagram covers how ERPNext tracks your company information across key functions. This diagram does not cover all the features of ERPNext. -![](assets/old_images/erpnext/overview.png) +![]({{url_prefix}}/assets/old_images/erpnext/overview.png) -[Full Resolution](assets/old_images/erpnext/overview.png) +[Full Resolution]({{url_prefix}}/assets/old_images/erpnext/overview.png) _Note: Not all of the steps are mandatory. ERPNext allows you to freely skip steps if you want to simplify the process._ diff --git a/erpnext/docs/user/guides/introduction/the-champion.md b/erpnext/docs/user/guides/introduction/the-champion.md index 4795baa48bc..596ff4b0039 100644 --- a/erpnext/docs/user/guides/introduction/the-champion.md +++ b/erpnext/docs/user/guides/introduction/the-champion.md @@ -2,7 +2,7 @@

The Champion

- + We have seen dozens of ERP implementations over the past few years and we realize that successful implementation is a lot about intangibles and diff --git a/erpnext/docs/user/guides/manufacturing/bill-of-materials.md b/erpnext/docs/user/guides/manufacturing/bill-of-materials.md index 3ed999d4720..9ddf81ab4b6 100644 --- a/erpnext/docs/user/guides/manufacturing/bill-of-materials.md +++ b/erpnext/docs/user/guides/manufacturing/bill-of-materials.md @@ -8,11 +8,11 @@ To make a new BOM: > Manufacturing > Bill of Materials > New BOM -Task +Task * To add Operations select 'With Operation'. The Operations table shall appear. -Task +Task * Select the Item for which you want to make the BOM. * Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary. @@ -25,17 +25,17 @@ To make a new BOM: * Add the list of Items you require for each operation, with its quantity. This Item could be a purchased Item or a sub-assembly with its own BOM. If the row Item is a manufactured Item and has multiple BOMs, select the appropriate BOM. You can also define if a part of the Item goes into scrap. -Costing +Costing * This cost can be updated on by using the 'Update Cost' button. -Update Cost +Update Cost ### Materials Required(exploded) This table lists down all the Material required for the Item to be Manufactured. It also fetches sub-assemblies along with the quantity. -Exploded Section +Exploded Section {next} diff --git a/erpnext/docs/user/guides/manufacturing/introduction.md b/erpnext/docs/user/guides/manufacturing/introduction.md index 627fe0fc895..2d60e6780b1 100644 --- a/erpnext/docs/user/guides/manufacturing/introduction.md +++ b/erpnext/docs/user/guides/manufacturing/introduction.md @@ -1,4 +1,4 @@ -Task +Task ### Types of Production Planning diff --git a/erpnext/docs/user/guides/manufacturing/operation.md b/erpnext/docs/user/guides/manufacturing/operation.md index b688f2f1d8e..6c77089438a 100644 --- a/erpnext/docs/user/guides/manufacturing/operation.md +++ b/erpnext/docs/user/guides/manufacturing/operation.md @@ -6,6 +6,6 @@ You can also create a Operation by: > Manufacturing > Documents > Operation > New -Operation +Operation {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/manufacturing/production-order.md b/erpnext/docs/user/guides/manufacturing/production-order.md index 13c7143c1cd..c9729be6f08 100644 --- a/erpnext/docs/user/guides/manufacturing/production-order.md +++ b/erpnext/docs/user/guides/manufacturing/production-order.md @@ -10,7 +10,7 @@ by: > Manufacturing > Documents > Production Order > New -Production Order +Production Order ### Creating Production Orders @@ -26,11 +26,11 @@ by: * By default the system fetchs workstation and duration for Production Order Operations from the selected BOM. -PO Opeartions +PO Opeartions * If you wish to reassign the wrokstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order. -PO reassigning Operations +PO reassigning Operations * Select the respective operation, and change its workstation. * You can also change the Operating Time for that operation @@ -47,28 +47,28 @@ by: * Click on 'Transfer Materials for Manufacturing'. -Transfer Materials +Transfer Materials * Mention the quantity of materials to be transfered. -Material Transfer Qty +Material Transfer Qty * Submit the Stock Entry -Stock Entry for PO +Stock Entry for PO * Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry. -Stock Entry for PO +Stock Entry for PO ### Making Time Logs -* Progress in the Production Order can be tracked using [Time Log](/contents/projects/time-log) +* Progress in the Production Order can be tracked using [Time Log]({{url_prefix}}/user/guides/projects/time-log.html) * Time Logs are created against Production Order Operations. * Drafts of Time Logs are also created based on the scheduled operations when an Production Order is Submitted. * To create more Time Logs against an operation select 'Make TIme Log' in the respective operation. -Make TL against PO +Make TL against PO ###Updating Finished Goods @@ -76,11 +76,11 @@ by: * This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse. * Click on 'Update Finished Goods'. -Update Finished Goods +Update Finished Goods * Mention the quantity of materials to be transfered. -Update Finished Goods Qty +Update Finished Goods Qty > Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry. @@ -95,7 +95,7 @@ by: 4. Update Finished Goods: This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse. 5. To check all Time Logs made against the Production Order click on 'Show Time Logs' -PO - stop +PO - stop * You can Also re-start a stopped Production Order. diff --git a/erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md index 39cf23e7bba..eb0a08c5ffc 100644 --- a/erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md +++ b/erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md @@ -2,7 +2,7 @@ > Manufacturing > Production Order > Setup > Manufacturing Settings -Manufacturing Settings +Manufacturing Settings * Allow Overtime - Specify if workstations are to allow overtime.(schedule operations outside working hours) diff --git a/erpnext/docs/user/guides/manufacturing/subcontracting.md b/erpnext/docs/user/guides/manufacturing/subcontracting.md index 36286a7ccda..832e8a23340 100644 --- a/erpnext/docs/user/guides/manufacturing/subcontracting.md +++ b/erpnext/docs/user/guides/manufacturing/subcontracting.md @@ -15,7 +15,7 @@ sub-contracting feature of ERPNext. 2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go). 3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”. -![Subcontract](assets/old_images/erpnext/subcontract.png) +![Subcontract]({{url_prefix}}/assets/old_images/erpnext/subcontract.png) diff --git a/erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md index f5b6eb85e3a..8722d2645c4 100644 --- a/erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md +++ b/erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md @@ -33,7 +33,7 @@ If we have more items to be added , or existing items to be edited in the BOM of To update new BOM updated in the BOM of finished item, where CPU is selected as raw-material, you can use BOM Replace tool. -BOM replace Tool +BOM replace Tool In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer). diff --git a/erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md index 7a7790e30f9..b966e7a8c94 100644 --- a/erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md +++ b/erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md @@ -11,7 +11,7 @@ To use the Production Planning Tool, go to: > Manufacturing > Tools > Production Planning Tool -Production Planing Tool +Production Planing Tool @@ -20,7 +20,7 @@ To use the Production Planning Tool, go to: * Select sales orders for MRP using filters (Time, Item, and Customer) * Click on Get Sales Order to generate a list. -Production Planing Tool +Production Planing Tool @@ -28,11 +28,11 @@ To use the Production Planning Tool, go to: You can add/remove or change quantity of these Items. -Production Planing Tool +Production Planing Tool #### Step 3: Create Production Orders -Production Planing Tool +Production Planing Tool @@ -40,7 +40,7 @@ You can add/remove or change quantity of these Items. Create Material Request for Items with projected shortfall. -Production Planing Tool +Production Planing Tool diff --git a/erpnext/docs/user/guides/manufacturing/workstation.md b/erpnext/docs/user/guides/manufacturing/workstation.md index 864d1164840..abc8933f41d 100644 --- a/erpnext/docs/user/guides/manufacturing/workstation.md +++ b/erpnext/docs/user/guides/manufacturing/workstation.md @@ -8,12 +8,12 @@ You can also create a Workstation by: > Manufacturing > Documents > Workstation > New -Workstation +Workstation In workstation specify the workstation working hours under the 'working hour' section. You can also specify the working hours based on shifts. While scheduling Production Order, system will check for the availability of the workstation based on the working hours specified. -> Note : You can enable overtime for your workstation in [Manufacturing Settings](/contents/manufacturing/setup/manufacturing-settings) +> Note : You can enable overtime for your workstation in [Manufacturing Settings]({{url_prefix}}/user/guides/manufacturing/setup/manufacturing-settings.html) {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/projects/activity-cost.md b/erpnext/docs/user/guides/projects/activity-cost.md index 79269530bf2..3ad95fc14b8 100644 --- a/erpnext/docs/user/guides/projects/activity-cost.md +++ b/erpnext/docs/user/guides/projects/activity-cost.md @@ -1,4 +1,4 @@ Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type. This rate is pulled by the system while making Time Logs. It is used for Project Costing. -Activity Cost +Activity Cost diff --git a/erpnext/docs/user/guides/projects/activity-type.md b/erpnext/docs/user/guides/projects/activity-type.md index 62010f00e5f..a59885378ff 100644 --- a/erpnext/docs/user/guides/projects/activity-type.md +++ b/erpnext/docs/user/guides/projects/activity-type.md @@ -1,6 +1,6 @@ Activity Type makes a list of the different types of activities against which a Time Log can be made. -Activity Type +Activity Type By default the following Activity Types are created. diff --git a/erpnext/docs/user/guides/projects/project.md b/erpnext/docs/user/guides/projects/project.md index 4d4a45d710a..9b265c0abbe 100644 --- a/erpnext/docs/user/guides/projects/project.md +++ b/erpnext/docs/user/guides/projects/project.md @@ -1,67 +1,67 @@ Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it. -Project +Project ### Managing tasks Project can be divided into multiple Tasks. -Task can be created via Project document itself or can be created via [Task](/contents/projects/tasks) +Task can be created via Project document itself or can be created via [Task]({{url_prefix}}/user/guides/projects/tasks.html) -Project +Project * To view Task made against a Project click on 'Tasks' -Project - View Task +Project - View Task -Project - Task List +Project - Task List * You can also view the Tasks from the Project document itself -Project - Task Grid +Project - Task Grid ### Managing time -ERPNext uses [Time Log](/contents/projects/time-log) to track the progress of a Project. +ERPNext uses [Time Log]({{url_prefix}}/user/guides/projects/time-log.html) to track the progress of a Project. You can create Time Logs against each task. The Actual Start and End Time along with the costing shall then be updated based on the Time Log. * To view Time Log made against a Project click on 'Time Logs' -Project - View Time Log +Project - View Time Log -Project - Time Log List +Project - Time Log List * You can also create a Time Log directlly and link it to the Project. -Project - Link Time Log +Project - Link Time Log ### Managing expenses -You can book [Expense Claim](/contents/human-resources/expense-claim) against a project task. +You can book [Expense Claim]({{url_prefix}}/user/guides/human-resources/expense-claim.html) against a project task. The system shall update the total amount from expense claims in the project costing section. * To view Expense Claims made against a Project click on 'Expense Claims' -Project - View Expense Claim +Project - View Expense Claim * You can also create a Expense Claims directlly and link it to the Project. -Project - Link Expense Claim +Project - Link Expense Claim * Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section -Project - Total Expense Claim +Project - Total Expense Claim ### Cost Center -You can make a [Cost Center](/contents/accounts/setup/cost-center) against a Project or use an existing cost center to track all expenses made against that project. +You can make a [Cost Center]({{url_prefix}}/user/guides/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project. -Project - Cost Center +Project - Cost Center ###Project Costing The Project Costing section helps you track the time and expenses incurred against the project. -Project - Costing +Project - Costing * The Costing Section is updated based on Time Logs made. @@ -69,9 +69,9 @@ The Project Costing section helps you track the time and expenses incurred again ###Billing -You can make/link a [Sales Order](/contents/selling/sales-order) against a project. Once linked you can use the standard sales module to bill your customer against the Project. +You can make/link a [Sales Order]({{url_prefix}}/user/guides/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project. -Project - Sales Order +Project - Sales Order ###Gantt Chart @@ -80,8 +80,8 @@ ERPNext gives you a illustrated view of tasks scheduled against that project in * To view gantt chart against a project, go to that project and click on 'Gantt Chart' -Project - View Gantt Chart +Project - View Gantt Chart -Project - Gantt Chart +Project - Gantt Chart {next} diff --git a/erpnext/docs/user/guides/projects/tasks.md b/erpnext/docs/user/guides/projects/tasks.md index 574a58862da..6ee97a0e78f 100644 --- a/erpnext/docs/user/guides/projects/tasks.md +++ b/erpnext/docs/user/guides/projects/tasks.md @@ -1,13 +1,13 @@ Project is divided into Tasks. In ERPNext, you can also create a Task independently. -Task +Task ### Status of the Task A Task can have either of the following status - Open, Working, Pending Review, Closed, Cancelled. -Task - Status +Task - Status * By default each new Task created shall have the status set to 'Open'. @@ -17,7 +17,7 @@ A Task can have either of the following status - Open, Working, Pending Review, You can specify a list of dependent task under the 'Depends On' section. -Depends On +Depends On * You cannot close the parent Task until all 'Dependant Task' are closed. @@ -25,35 +25,35 @@ You can specify a list of dependent task under the 'Depends On' section. ### Managing Time -ERPNext uses [Time Log](/contents/projects/time-log) to track the progress of a Task. +ERPNext uses [Time Log]({{url_prefix}}/user/guides/projects/time-log.html) to track the progress of a Task. You can create multiple Time Logs against each task. The Actual Start and End Time along with the costing shall then be updated based on the Time Log. * To view Time Log made against a Task click on 'Time Logs' -Task - View Time Log +Task - View Time Log -Task - Time Log List +Task - Time Log List * You can also create a Time Log directlly and link it to the Task. -Task - Link Time Log +Task - Link Time Log ### Managing Expenses -You can book [Expense Claim](/contents/human-resource-management/expense-claim) against a task. +You can book [Expense Claim]({{url_prefix}}/user/guides/human-resource-management/expense-claim.html) against a task. The system shall update the total amount from expense claims in the costing section. * To view Expense Claims made against a Task click on 'Expense Claims' -Task - View Expense Claim +Task - View Expense Claim * You can also create a Expense Claims directlly and link it to the Task. -Task - Link Expense Claim +Task - Link Expense Claim * Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section -Task - Total Expense Claim +Task - Total Expense Claim {next} diff --git a/erpnext/docs/user/guides/projects/time-log-batch.md b/erpnext/docs/user/guides/projects/time-log-batch.md index 4135bb14383..e16383bb946 100644 --- a/erpnext/docs/user/guides/projects/time-log-batch.md +++ b/erpnext/docs/user/guides/projects/time-log-batch.md @@ -6,17 +6,17 @@ OR Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Log Batch" button and these Time Logs will be selected. -Time Log - Drag Calender +Time Log - Drag Calender ###Making Sales Invoice * After submitting the Time Log Batch, "Make Invoice" button shall appear. -Time Log - Drag Calender +Time Log - Drag Calender * Click on that button to raise a Sales Invoice against the Time Log Batch. -Time Log - Drag Calender +Time Log - Drag Calender * When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Log Batch and their status will change to "Billed". diff --git a/erpnext/docs/user/guides/projects/time-log.md b/erpnext/docs/user/guides/projects/time-log.md index a299b5202fb..c1802089aaa 100644 --- a/erpnext/docs/user/guides/projects/time-log.md +++ b/erpnext/docs/user/guides/projects/time-log.md @@ -7,7 +7,7 @@ They can be used to track the following * Project * Internal References -Time Log +Time Log ###Creating Time Logs @@ -18,15 +18,15 @@ They can be used to track the following To create Time Logs via Calender, go to Time Log and select Calendar. -Time Log - View Calender +Time Log - View Calender * To create a Time Log for multiple days, click and drag the cursor across days. -Time Log - Drag Calender +Time Log - Drag Calender * You can also create Time Logs from 'week' and 'day' view of the calender. -Time Log - Drag Calender +Time Log - Drag Calender * Time Logs for Manufacturing processes needs to be created from the Production Order. * To create more Time Logs against Operations select the respective operation and click on the 'Make Time Log' button. @@ -35,15 +35,15 @@ To create Time Logs via Calender, go to Time Log and select Calendar. * If you wish to bill against a Time Log you need to select the 'Billable' option. -* In the costing section, the system will pull up the Costing & Billing rate from [Activity Cost](/contents/projects/activity-cost) +* In the costing section, the system will pull up the Costing & Billing rate from [Activity Cost]({{url_prefix}}/user/guides/projects/activity-cost.html) based on the Employee and Activity Type specified. * The system shall then calculate the Costing and Billing amount based on the Hours mentioned in the Time Log. * If 'Billable' is not selected, the system shall display the 'Billing Amount' as 0. -Time Log - Costing +Time Log - Costing -* After submitting the Time Log, you need to create [Time Log batch](/contents/projects/time-log-batch) to further bill the Time Log. +* After submitting the Time Log, you need to create [Time Log batch]({{url_prefix}}/user/guides/projects/time-log-batch.html) to further bill the Time Log. {next} diff --git a/erpnext/docs/user/guides/selling/quotation.md b/erpnext/docs/user/guides/selling/quotation.md index b260d90e230..25590e07cae 100644 --- a/erpnext/docs/user/guides/selling/quotation.md +++ b/erpnext/docs/user/guides/selling/quotation.md @@ -11,11 +11,11 @@ To create a new Quotation go to: You can also create a Quotation from an Opportunity. -Make Quotation from Opportunity +Make Quotation from Opportunity Or You can create a new Quotation and pull details from an Opportunity. -Make Quotation from Opportunity +Make Quotation from Opportunity A Quotation contains details about: @@ -35,7 +35,7 @@ attach the corresponding image in the Item master. The rates you quote may depend on two things. - * The Price List: If you have multiple Price Lists, you can select a Price List or tag it to the Customer (so that it is auto-selected). Your Item prices will automatically be updated from the Price List.For details refer [Price List](/contents/setting-up/price-lists) + * The Price List: If you have multiple Price Lists, you can select a Price List or tag it to the Customer (so that it is auto-selected). Your Item prices will automatically be updated from the Price List.For details refer [Price List]({{url_prefix}}/user/guides/setting-up/price-lists.html) * The Currency: If you are quoting to a Customer in a different currency, you will have to update the conversion rates to enable ERPNext to save the information in your standard Currency. This will help you to analyze the value of your Quotations in standard Currency. @@ -43,7 +43,7 @@ The rates you quote may depend on two things. To add taxes to your Quotation, you can either select a tax template, Sales Taxes and Charges Template or add the taxes on your own. To understand taxes in -detail visit [Taxes](/contents/setting-up/setting-up-taxes) +detail visit [Taxes]({{url_prefix}}/user/guides/setting-up/setting-up-taxes.html) You can add taxes in the same manner as the Sales Taxes and Charges Template. diff --git a/erpnext/docs/user/guides/selling/sales-order.md b/erpnext/docs/user/guides/selling/sales-order.md index 313f46e621a..b1438eb34b0 100644 --- a/erpnext/docs/user/guides/selling/sales-order.md +++ b/erpnext/docs/user/guides/selling/sales-order.md @@ -11,7 +11,7 @@ a Sales Order. ### Sales Order Flow-Chart -![Sales Order](assets/old_images/erpnext/sales-order-f.jpg) +![Sales Order]({{url_prefix}}/assets/old_images/erpnext/sales-order-f.jpg) To create a new Sales Order go to: @@ -21,11 +21,11 @@ To create a new Sales Order go to: You can also create a Sales Order from a submitted Quotation. -Make Sales Order from Quotation +Make Sales Order from Quotation Or you can create a new Sales Order and pull details from an Quotation. -Make Sales Order from Quotation +Make Sales Order from Quotation Most of the information in your Sales Order is the same as the Quotation. There are a few amongst other things that a Sales Order will ask you to @@ -72,7 +72,7 @@ On updating the Sales Order, a Recurring ID will be generated which will be same ERPNext will automatically create new Order and mail a notification to the email IDs you set in the 'Notification Email Address'field. -Reccuring Sales Order +Reccuring Sales Order ### Next Steps diff --git a/erpnext/docs/user/guides/selling/setup/item-price.md b/erpnext/docs/user/guides/selling/setup/item-price.md index 1a25670e6a8..a235341cef0 100644 --- a/erpnext/docs/user/guides/selling/setup/item-price.md +++ b/erpnext/docs/user/guides/selling/setup/item-price.md @@ -14,7 +14,7 @@ Step 1: Select Price List You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. -![Item Price list](assets/old_images/erpnext/item-price-list.png) +![Item Price list]({{url_prefix}}/assets/old_images/erpnext/item-price-list.png) On selection of Price List, its currency and for selling or buying property will be fetched as well. @@ -24,13 +24,13 @@ Step 2: Select Item Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well. -![Item Price Item](assets/old_images/erpnext/item-price-item.png) +![Item Price Item]({{url_prefix}}/assets/old_images/erpnext/item-price-item.png) Step 3: Enter Rate Enter selling/buying rate of an item in Price List currency. -![Item Price Rate](assets/old_images/erpnext/item-price-rate.png) +![Item Price Rate]({{url_prefix}}/assets/old_images/erpnext/item-price-rate.png) Step 4: Save Item Price diff --git a/erpnext/docs/user/guides/selling/setup/product-bundle.md b/erpnext/docs/user/guides/selling/setup/product-bundle.md index 2b83b0ef8c6..bb11b980519 100644 --- a/erpnext/docs/user/guides/selling/setup/product-bundle.md +++ b/erpnext/docs/user/guides/selling/setup/product-bundle.md @@ -13,7 +13,7 @@ To create new Product Bundle, Go to: Selling > Setup > Product Bundle > New -Product Bundle +Product Bundle ###Select Parent Item @@ -33,7 +33,7 @@ In Package Item section, you will list all the child items for which we maintain When making Sales transactions like Sales Invoice, Sales Order and Delivery Note, Parent Item will be selected in the main item table. -Product Bundle +Product Bundle On selection on Parent Item in the main item table, its child items will be fetched in Packing List table of the transaction. If child item is the serialized item, you will be able to specify its Serial Mo. diff --git a/erpnext/docs/user/guides/selling/setup/sales-partner.md b/erpnext/docs/user/guides/selling/setup/sales-partner.md index 820caed10e0..8710972093c 100644 --- a/erpnext/docs/user/guides/selling/setup/sales-partner.md +++ b/erpnext/docs/user/guides/selling/setup/sales-partner.md @@ -10,7 +10,7 @@ To create a sales partner go to: Sales Partners are saved with Sales Partner name provided by user. -Sales Partner +Sales Partner You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount. @@ -19,16 +19,16 @@ You can track their address and contact details and also allocate Sales Partner To include the name of your Partner on your website, check the "Show in Website" box. When click on "Show in Website", you will see field where you can attach logo of partner's company and enter brief and introduction of partner. -Sales Partner +Sales Partner To see listing of partner, you should go to: https://example.erpnext.com/partners -![Sales Partner Listing](assets/old_images/erpnext/sales-partner-listing.png) +![Sales Partner Listing]({{url_prefix}}/assets/old_images/erpnext/sales-partner-listing.png) Following is the complete partners details published on the website. -![Sales Partner Published](assets/old_images/erpnext/sales-partner-published.png) +![Sales Partner Published]({{url_prefix}}/assets/old_images/erpnext/sales-partner-published.png) {next} diff --git a/erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md index 1da5adaf97a..812e7aca040 100644 --- a/erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md +++ b/erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md @@ -12,7 +12,7 @@ To allocate target, you should open specific Sales Person master. In the Sales Person master, you will find table called Sales Person Target. -![Sales Person Target Item Group](assets/old_images/erpnext/sales-person-target-item-group.png) +![Sales Person Target Item Group]({{url_prefix}}/assets/old_images/erpnext/sales-person-target-item-group.png) In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. @@ -22,7 +22,7 @@ In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. If you wish to spread allocated target across months, then you shoult setup Target Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation). -![Sales Person Target Distribution](assets/old_images/erpnext/sales-person-target-distribution.png) +![Sales Person Target Distribution]({{url_prefix}}/assets/old_images/erpnext/sales-person-target-distribution.png) ####Report - Sales Person Target Variance Item Groupwise @@ -32,7 +32,7 @@ To check this report, go to: This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report. -![Sales Person Item Group Report](assets/old_images/erpnext/sales-person-item-group-report.png) +![Sales Person Item Group Report]({{url_prefix}}/assets/old_images/erpnext/sales-person-item-group-report.png) As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report. @@ -48,7 +48,7 @@ To allocate target to Sales Person based on Territory, you can should select spe In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master. -![Sales Person Territory Manager](assets/old_images/erpnext/sales-person-territory-manager.png) +![Sales Person Territory Manager]({{url_prefix}}/assets/old_images/erpnext/sales-person-territory-manager.png) ####2.2 Allocating Target @@ -62,7 +62,7 @@ Using this master, you can divide target Qty or Amount across various months. This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report. -![Sales Person Territory Report](assets/old_images/erpnext/sales-person-territory-report.png) +![Sales Person Territory Report]({{url_prefix}}/assets/old_images/erpnext/sales-person-territory-report.png) --- @@ -74,7 +74,7 @@ To create new Budget Distriibution master, go to: `Accounts > Setup > Budget Distributon` -![Target Distribution](assets/old_images/erpnext/target-distribution.png) +![Target Distribution]({{url_prefix}}/assets/old_images/erpnext/target-distribution.png) You can link target distribution while allocation targets in Sales Person as well as in Territory master. diff --git a/erpnext/docs/user/guides/selling/setup/selling-settings.md b/erpnext/docs/user/guides/selling/setup/selling-settings.md index 05885119937..4bf67823ddb 100644 --- a/erpnext/docs/user/guides/selling/setup/selling-settings.md +++ b/erpnext/docs/user/guides/selling/setup/selling-settings.md @@ -1,7 +1,7 @@ Selling Setting is where you can define propertiese which will be applied in your selling transactions. Let's check into each property one by one. -Selling Settings +Selling Settings ####1. Customer Naming By diff --git a/erpnext/docs/user/guides/selling/setup/shipping-rule.md b/erpnext/docs/user/guides/selling/setup/shipping-rule.md index 13dfe4ca937..7fc24f19618 100644 --- a/erpnext/docs/user/guides/selling/setup/shipping-rule.md +++ b/erpnext/docs/user/guides/selling/setup/shipping-rule.md @@ -1,6 +1,6 @@ Using Shipping Rule you can define the cost for delivering the product to the customer. You can define different shipping rules for the same item across different territories. -Shipping Rule +Shipping Rule {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/setting-up/authorization-rule.md b/erpnext/docs/user/guides/setting-up/authorization-rule.md index ae1e8abbfdc..3afdd79865d 100644 --- a/erpnext/docs/user/guides/setting-up/authorization-rule.md +++ b/erpnext/docs/user/guides/setting-up/authorization-rule.md @@ -34,7 +34,7 @@ Select approvers Role. It will be Sales Manager role which if assigned to user, Set Above Value. Given the exmaple, Above Value will be set as 10000. -Authorization Rule +Authorization Rule If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message. diff --git a/erpnext/docs/user/guides/setting-up/bar-code.md b/erpnext/docs/user/guides/setting-up/bar-code.md index 55848151cf2..0f54d9784c2 100644 --- a/erpnext/docs/user/guides/setting-up/bar-code.md +++ b/erpnext/docs/user/guides/setting-up/bar-code.md @@ -18,7 +18,7 @@ setup, check the box that says Item Barcode. #### Figure 1: Check the box 'Item Barcode' -Barcode +Barcode To start scanning with a bar-code, go to @@ -39,7 +39,7 @@ Then go to Accounts and click on Sales Invoice. Check the box 'Is POS' #### Figure 2: Check the box 'Is POS' -Barcode +Barcode Go to Item and click on Add new row. diff --git a/erpnext/docs/user/guides/setting-up/data/bulk-rename.md b/erpnext/docs/user/guides/setting-up/data/bulk-rename.md index fbbbc81e3d3..2aec08be350 100644 --- a/erpnext/docs/user/guides/setting-up/data/bulk-rename.md +++ b/erpnext/docs/user/guides/setting-up/data/bulk-rename.md @@ -12,6 +12,6 @@ This tool will allow you to rename multiple records at the same time. To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**. -Bulk Rename +Bulk Rename {next} diff --git a/erpnext/docs/user/guides/setting-up/data/data-import-tool.md b/erpnext/docs/user/guides/setting-up/data/data-import-tool.md index c59955b534d..2a7eff11ed0 100644 --- a/erpnext/docs/user/guides/setting-up/data/data-import-tool.md +++ b/erpnext/docs/user/guides/setting-up/data/data-import-tool.md @@ -4,7 +4,7 @@ master data, into the system. To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button: -Start Import +Start Import The tool has two sections, one to download a template and the second to upload the data. @@ -20,7 +20,7 @@ with it too. The child tables are linked to the parent tables and are implemented where there are multiple values for any property. For example an Item can have multiple prices, An Invoice has multiple Items and so on. -Download Template +Download Template * Click on the table you want to download or "All Tables" * For bulk editing, you can click on "Download With Data" @@ -30,19 +30,19 @@ Item can have multiple prices, An Invoice has multiple Items and so on. After downloading the template, open it in a spreadsheet application and fill in the data below the column headings. -![Spreadsheet](assets/old_images/erpnext/import-3.png) +![Spreadsheet]({{url_prefix}}/assets/old_images/erpnext/import-3.png) Then export your template or save it as a **Comma Separated Values** (CSV) file. -![Spreadsheet](assets/old_images/erpnext/import-4.png) +![Spreadsheet]({{url_prefix}}/assets/old_images/erpnext/import-4.png) ### 3\. Upload the .csv File Finally attach the .csv file in the section. Click on the "Upload and Import" button. -Upload +Upload #### Notes: diff --git a/erpnext/docs/user/guides/setting-up/email/email-account.md b/erpnext/docs/user/guides/setting-up/email/email-account.md index 270760962a3..37ceddb7c3f 100644 --- a/erpnext/docs/user/guides/setting-up/email/email-account.md +++ b/erpnext/docs/user/guides/setting-up/email/email-account.md @@ -10,7 +10,7 @@ ERPNext will create templates for a bunch of email accounts by default. Not all There are 2 types of email accounts, outgoing and incoming. Outgoing email accounts use an SMTP service to send emails and emails are retrived from your inbox using a POP service. Most email providers such as GMail, Outlook or Yahoo provide these services. -Defining Criteria +Defining Criteria ### Outgoing Email Accounts @@ -18,13 +18,13 @@ All emails sent from the system, either by the user to a contact or notification To setup an outgoing Email Account, check on **Enable Outgoing** and set your SMTP server settings, if you are using a popular email service, these will be preset for you. -Outgoing EMail +Outgoing EMail ### Incoming Email Accounts To setup an incoming Email Account, check on **Enable Incoming** and set your POP3 settings, if you are using a popular email service, these will be preset for you. -Incoming EMail +Incoming EMail ### How ERPNext handles replies @@ -34,6 +34,6 @@ In ERPNext when you send an email to a contact like a customer, the sender will If you would like ERPNext to notify you if an email is unreplied for a certain amount of time, then you can set **Notify if Unreplied**. Here you can set the number of minutes to wait before notifications are sent and whom the notifications must go to. -Incoming EMail +Incoming EMail {next} diff --git a/erpnext/docs/user/guides/setting-up/email/email-alerts.md b/erpnext/docs/user/guides/setting-up/email/email-alerts.md index c51738aa2ff..4b1dad6ffed 100644 --- a/erpnext/docs/user/guides/setting-up/email/email-alerts.md +++ b/erpnext/docs/user/guides/setting-up/email/email-alerts.md @@ -33,9 +33,9 @@ To setup an Email Alert: ### Example 1. Defining the Criteria - Defining Criteria + Defining Criteria 1. Setting the Recipients and Message - Set Message + Set Message {next} diff --git a/erpnext/docs/user/guides/setting-up/email/email-digest.md b/erpnext/docs/user/guides/setting-up/email/email-digest.md index dc6dd8df763..390c566b8af 100644 --- a/erpnext/docs/user/guides/setting-up/email/email-digest.md +++ b/erpnext/docs/user/guides/setting-up/email/email-digest.md @@ -12,6 +12,6 @@ To set up Email Digest, go to: Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to. -Email Digest +Email Digest {next} diff --git a/erpnext/docs/user/guides/setting-up/email/sending-email.md b/erpnext/docs/user/guides/setting-up/email/sending-email.md index ff9c03a6c93..61a76c58075 100644 --- a/erpnext/docs/user/guides/setting-up/email/sending-email.md +++ b/erpnext/docs/user/guides/setting-up/email/sending-email.md @@ -2,8 +2,8 @@ In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document. -Send Email +Send Email -**Note:** You must have outgoing [email accounts](/contents/setting-up/email/email-account) setup for this. +**Note:** You must have outgoing [email accounts]({{url_prefix}}/user/guides/setting-up/email/email-account.html) setup for this. {next} diff --git a/erpnext/docs/user/guides/setting-up/email/setting-up-email.md b/erpnext/docs/user/guides/setting-up/email/setting-up-email.md index 448cf4bf435..0fb46587650 100644 --- a/erpnext/docs/user/guides/setting-up/email/setting-up-email.md +++ b/erpnext/docs/user/guides/setting-up/email/setting-up-email.md @@ -24,7 +24,7 @@ To setup your outgoing mails, go to #### Figure 1: Set up outgoing mail server. -![Email Settings](assets/old_images/erpnext/email-settings1.png) +![Email Settings]({{url_prefix}}/assets/old_images/erpnext/email-settings1.png) Set your outgoing mail server settings here. These are the same settings you would use in your Outlook, Thunderbird, Apple Mail or other such email @@ -51,7 +51,7 @@ To setup your Support integration, go to: #### Figure 2: Setup support Integration -![Email Settings](assets/old_images/erpnext/email-settings2.png) +![Email Settings]({{url_prefix}}/assets/old_images/erpnext/email-settings2.png) To make ERPNext pull emails from your mail box, enter the POP3 settings. (POP3 is a way of extracting emails from your mailbox. It should be fairly easy to @@ -69,7 +69,7 @@ contact mentioned in the document. To set this up, go to: #### Figure 3: Set Auto Notification -![Auto Notification](assets/old_images/erpnext/auto-notification.png) +![Auto Notification]({{url_prefix}}/assets/old_images/erpnext/auto-notification.png) Check on the transactions you want to send via email directly on Submission and add a custom message if you want on these documents. @@ -91,5 +91,5 @@ To setup Email Digests, go to: #### Figure 4: Set up Email Digest -![Email Digest](assets/old_images/erpnext/email-digest.png) +![Email Digest]({{url_prefix}}/assets/old_images/erpnext/email-digest.png) diff --git a/erpnext/docs/user/guides/setting-up/pos-setting.md b/erpnext/docs/user/guides/setting-up/pos-setting.md index 74be63be12a..8380877e040 100644 --- a/erpnext/docs/user/guides/setting-up/pos-setting.md +++ b/erpnext/docs/user/guides/setting-up/pos-setting.md @@ -14,10 +14,10 @@ from: Set default values as defined. -POS Setting +POS Setting > Important : If you specify a particular User, the POS setting will be applied only to that User. If the User option is left blank, the setting will -be set for all users. To understand POS in detail visit [Point of Sale](/contents/accounts/point-of-sale-pos-invoice) +be set for all users. To understand POS in detail visit [Point of Sale]({{url_prefix}}/user/guides/accounts/point-of-sale-pos-invoice.html) {next} diff --git a/erpnext/docs/user/guides/setting-up/price-lists.md b/erpnext/docs/user/guides/setting-up/price-lists.md index 19ac41ffa78..2acd83dbb1d 100644 --- a/erpnext/docs/user/guides/setting-up/price-lists.md +++ b/erpnext/docs/user/guides/setting-up/price-lists.md @@ -8,7 +8,7 @@ You can create new Price List > Selling/Buying/Stock > Setup > Price List >> New -Price List +Price List * These Price List will be used when creating Item Price record to track selling or buying price of an item. Click here to learn more about Item Price. diff --git a/erpnext/docs/user/guides/setting-up/print/address-template.md b/erpnext/docs/user/guides/setting-up/print/address-template.md index e2b310803a9..70682b2e9cf 100644 --- a/erpnext/docs/user/guides/setting-up/print/address-template.md +++ b/erpnext/docs/user/guides/setting-up/print/address-template.md @@ -26,6 +26,6 @@ Here is the default template: ### Example -Print Heading +Print Heading {next} diff --git a/erpnext/docs/user/guides/setting-up/print/letter-head.md b/erpnext/docs/user/guides/setting-up/print/letter-head.md index fec38e9bfc2..1e69540d130 100644 --- a/erpnext/docs/user/guides/setting-up/print/letter-head.md +++ b/erpnext/docs/user/guides/setting-up/print/letter-head.md @@ -14,10 +14,10 @@ You can create / manage Letter Heads from: ### Example -Print Heading +Print Heading This is how the letter head looks in a document print: -Print Heading +Print Heading {next} diff --git a/erpnext/docs/user/guides/setting-up/print/print-format-builder.md b/erpnext/docs/user/guides/setting-up/print/print-format-builder.md index 36db3ae3b73..3af05f5e1ad 100644 --- a/erpnext/docs/user/guides/setting-up/print/print-format-builder.md +++ b/erpnext/docs/user/guides/setting-up/print/print-format-builder.md @@ -10,19 +10,19 @@ or Open the document for which you want to make a print format. Click the Printe ### Step 1: Make a new Format -Send Email +Send Email ### Step 2: Add a new Field To add a field, just drag it from the left sidebar and add it in your layout. You can edit the layout by clicking on the settings icon. -Send Email +Send Email ### Step 3 To remove a field, just drag it back into the fields sidebar. -Send Email +Send Email ### Step 4 @@ -30,7 +30,7 @@ You can add customized text, HTML in your print format, just add the **Custom HT Then click on **Edit HTML** to edit your content. -Send Email +Send Email To save your format, just click on the **Save** button on the top. diff --git a/erpnext/docs/user/guides/setting-up/print/print-headings.md b/erpnext/docs/user/guides/setting-up/print/print-headings.md index e63e2531844..4c492e08359 100644 --- a/erpnext/docs/user/guides/setting-up/print/print-headings.md +++ b/erpnext/docs/user/guides/setting-up/print/print-headings.md @@ -8,10 +8,10 @@ You can create print headings from : #### Figure 1: Save Print Heading -Print Heading +Print Heading Example of a change in print heading is shown below: -Print Heading +Print Heading {next} diff --git a/erpnext/docs/user/guides/setting-up/print/print-settings.md b/erpnext/docs/user/guides/setting-up/print/print-settings.md index e998d6234d5..a4788df66e1 100644 --- a/erpnext/docs/user/guides/setting-up/print/print-settings.md +++ b/erpnext/docs/user/guides/setting-up/print/print-settings.md @@ -6,6 +6,6 @@ To edit print settings, go to: > Setup > Printing and Branding > Print Settings -Print Settings +Print Settings {next} diff --git a/erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md index d025157fc9e..383ca48a3c8 100644 --- a/erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md +++ b/erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md @@ -6,13 +6,13 @@ To setup Terms and Condition master, go to: `Selling > Terms and Condition > New` -Terms and Conditions +Terms and Conditions ### 2. Editing in HTML Content of Terms and Condition can be formatted as per your preference, and also insert images where needed. If you have expertise in HTML, you will also find option to edit the content of Terms and Condition in HTML. -Terms and Conditions, Edit HTML +Terms and Conditions, Edit HTML This also allows you to use Terms and Condition master for footer, which otherwise is not availale in ERPNext as dedicated functionality. Since contents of Terms and Condition is always the last to appear in the print format, details of footer should be inserted at the end of the content, so that it actually appears as footer in the print format. @@ -20,6 +20,6 @@ This also allows you to use Terms and Condition master for footer, which otherwi In transactions, you will find section of Terms and Condition where you will be able to search and fetched required Terms and Condition master. -Terms and Conditions, Select in document +Terms and Conditions, Select in document {next} diff --git a/erpnext/docs/user/guides/setting-up/setting-up-taxes.md b/erpnext/docs/user/guides/setting-up/setting-up-taxes.md index 3923ddc3f78..0c428198685 100644 --- a/erpnext/docs/user/guides/setting-up/setting-up-taxes.md +++ b/erpnext/docs/user/guides/setting-up/setting-up-taxes.md @@ -22,11 +22,11 @@ sales or purchase tax rate specified by you as default rates. Item Tax table can be found as a section within the Item Master document. -Item Tax +Item Tax * **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive. -Inclusive Tax +Inclusive Tax * **Exception to the rule**: Item tax settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account * **Item tax is overwrite-able**: You can overwrite or change the item tax rate by going to the Item master in the Item tax table. @@ -49,7 +49,7 @@ have to go to: > Setup > Accounts > Sales Taxes and Charge Master -Sales Tax Master +Sales Tax Master When you create a new master, you will have to add a row for each tax type. diff --git a/erpnext/docs/user/guides/setting-up/settings/global-defaults.md b/erpnext/docs/user/guides/setting-up/settings/global-defaults.md index ca654e58844..fd3868c9b0d 100644 --- a/erpnext/docs/user/guides/setting-up/settings/global-defaults.md +++ b/erpnext/docs/user/guides/setting-up/settings/global-defaults.md @@ -6,6 +6,6 @@ You can set default values for your documents from Global Defaults Whenever a new document is created, these values will be set as default. -Global Defaults +Global Defaults {next} diff --git a/erpnext/docs/user/guides/setting-up/settings/module-settings.md b/erpnext/docs/user/guides/setting-up/settings/module-settings.md index be0a47be0fb..db54494c19c 100644 --- a/erpnext/docs/user/guides/setting-up/settings/module-settings.md +++ b/erpnext/docs/user/guides/setting-up/settings/module-settings.md @@ -10,6 +10,6 @@ For example if you are in the services business, you want to hide the Manufactur Check / uncheck the items to show / hide. -Module Settings +Module Settings {next} diff --git a/erpnext/docs/user/guides/setting-up/settings/naming-series.md b/erpnext/docs/user/guides/setting-up/settings/naming-series.md index 16f73ea2985..4c3f2c10de5 100644 --- a/erpnext/docs/user/guides/setting-up/settings/naming-series.md +++ b/erpnext/docs/user/guides/setting-up/settings/naming-series.md @@ -42,7 +42,7 @@ name and the starting point in the “Update Series” section. See how to set the naming series -Naming Series +Naming Series {next} diff --git a/erpnext/docs/user/guides/setting-up/settings/system-settings.md b/erpnext/docs/user/guides/setting-up/settings/system-settings.md index 4b2dcee2aec..a529171dabd 100644 --- a/erpnext/docs/user/guides/setting-up/settings/system-settings.md +++ b/erpnext/docs/user/guides/setting-up/settings/system-settings.md @@ -6,6 +6,6 @@ To open System Settings, go to: > Setup > Settings > System Settings -System Settings +System Settings {next} diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md index 79ead1bd34f..4e2ffe8917a 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md @@ -2,7 +2,7 @@ Select your language. ERPNext is available in more than 20 languages. -Language +Language --- diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md index 6896f4bb5fb..61e3c494c9d 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md @@ -3,7 +3,7 @@ In this final step, please enter the names of the Items you buy or sell. Add Items +src="{{url_prefix}}/assets/img/setup-wizard/step-10.png"> Please set the group of the item (Product / Service) and unit of measure. Don't worry you will be able to edit all of this later. diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-2-currency-and-timezone.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-2-currency-and-timezone.md index ad5147b2651..17a3821c752 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-2-currency-and-timezone.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-2-currency-and-timezone.md @@ -2,7 +2,7 @@ Set your country name, currency and timezone. -Currency +Currency --- diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md index f586778154c..9b20dd0fb4a 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md @@ -3,7 +3,7 @@ Enter Users Profile Details like Name, User ID and preferred password. User +src="{{url_prefix}}/assets/img/setup-wizard/step-3.png"> --- diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-4-company-details.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-4-company-details.md index 197fa55f6c1..cb5947bc5ab 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-4-company-details.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-4-company-details.md @@ -3,7 +3,7 @@ Enter Company Details like Name, Abbreviation and Financial Year Details. Company Details +src="{{url_prefix}}/assets/img/setup-wizard/step-4.png"> --- diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-5-letterhead-and-logo.md index 4ead0810b27..ad91d244a71 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-5-letterhead-and-logo.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-5-letterhead-and-logo.md @@ -3,7 +3,7 @@ Attach Company Letterhead and Company Logo. Company Logo and Letterhead +src="{{url_prefix}}/assets/img/setup-wizard/step-5.png"> --- @@ -15,7 +15,7 @@ Click on the box ‘Attach Letterhead’ . Select the image file from the place You may choose to skip this step if your letterhead is not ready. -To select letterhead later through the setup module, read [Letter-head](/contents/setting-up/print/letter-head) +To select letterhead later through the setup module, read [Letter-head]({{url_prefix}}/user/guides/setting-up/print/letter-head.html) #### To "attach as web-link" diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-6-add-users.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-6-add-users.md index 4aeadf3f6b6..06cc778c371 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-6-add-users.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-6-add-users.md @@ -3,6 +3,6 @@ Add other users and assign them roles based on their job responsibilities. Users +src="{{url_prefix}}/assets/img/setup-wizard/step-6.png"> {next} diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-7-tax-details.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-7-tax-details.md index fef997a0523..02148675e37 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-7-tax-details.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-7-tax-details.md @@ -3,7 +3,7 @@ Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type. Tax Details +src="{{url_prefix}}/assets/img/setup-wizard/step-7.png"> Just set the tax name and the standard percentage levied. @@ -17,6 +17,6 @@ A value added tax (VAT) is a form of consumption tax. From the perspective of th The purpose of VAT is to generate tax revenues to the government similar to the corporate income tax or the personal income tax. For Example: When you shop at a departmental store and avail discount on the products, the store charges you 5% extra on the total bill as the VAT. -To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes](/contents/setting-up/setting-up-taxes) +To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes]({{url_prefix}}/user/guides/setting-up/setting-up-taxes.html) {next} diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-8-customer-names.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-8-customer-names.md index e0dd7434623..04ac27cc6da 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-8-customer-names.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-8-customer-names.md @@ -4,7 +4,7 @@ Enter your Customer names and the contact person from that organisation. Customers +src="{{url_prefix}}/assets/img/setup-wizard/step-8.png"> --- @@ -18,6 +18,6 @@ Customer Name: American Power Mills Contact Name: Shiv Agarwal -To understand Customer in detail visit [Customer Details](/contents/CRM/customer) +To understand Customer in detail visit [Customer Details]({{url_prefix}}/user/guides/CRM/customer.html) {next} diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md index 1fb702c9f27..48bca9484a4 100644 --- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md +++ b/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md @@ -3,10 +3,10 @@ Enter a few of your Suppliers' names. Suppliers +src="{{url_prefix}}/assets/img/setup-wizard/step-9.png"> --- -To understand Suppliers in detail visit [Supplier Master](/contents/buying/supplier-master) +To understand Suppliers in detail visit [Supplier Master]({{url_prefix}}/user/guides/buying/supplier-master.html) {next} diff --git a/erpnext/docs/user/guides/setting-up/sms-setting.md b/erpnext/docs/user/guides/setting-up/sms-setting.md index 0d324d7a833..f2e21aa31db 100644 --- a/erpnext/docs/user/guides/setting-up/sms-setting.md +++ b/erpnext/docs/user/guides/setting-up/sms-setting.md @@ -17,7 +17,7 @@ Example URL: http://instant.smses.com/web2sms.php?username=&password;=&to;=&sender;=&message;= -![SMS Settings](assets/old_images/erpnext/sms-setting2.jpg) +![SMS Settings]({{url_prefix}}/assets/old_images/erpnext/sms-setting2.jpg) > Note: the string up to the "?" is the SMS Gateway URL @@ -35,6 +35,6 @@ Note that some parameters in the URL are static.You will get static values from your SMS Provider like username, password etc. These static values should be entered in the Static Parameters table. -![SMS Setting](assets/old_images/erpnext/sms-settings1.png) +![SMS Setting]({{url_prefix}}/assets/old_images/erpnext/sms-settings1.png) {next} diff --git a/erpnext/docs/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.md index 21049c44a13..9bcafe3e266 100644 --- a/erpnext/docs/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.md +++ b/erpnext/docs/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.md @@ -27,11 +27,11 @@ To perform Stock Reconciliation, go to: A predefined template of an spreadsheet file should be followed for importing item's stock levels and valuations. Open new Stock Reconciliation form to see download option. -Stock Reconciliation +Stock Reconciliation #### Step 2: Enter Data in csv file. -![Stock Reco Data](assets/old_images/erpnext/stock-reco-data.png) +![Stock Reco Data]({{url_prefix}}/assets/old_images/erpnext/stock-reco-data.png) The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse. If you do not want to change the quantity or valuation rate of an Item, you should leave it blank. @@ -41,7 +41,7 @@ So leave the field blank. #### **Step 3: Upload file and Enter Values in Stock Reconciliation Form -Stock Reconciliation +Stock Reconciliation **Posting Date** @@ -63,11 +63,11 @@ report. The report will show you all types of rates. #### Step 4: Review the reconciliation data -![Stock Reco Review](assets/old_images/erpnext/stock-reco-upload.png) +![Stock Reco Review]({{url_prefix}}/assets/old_images/erpnext/stock-reco-upload.png) ### Stock Ledger Report -![Stock Reco Ledger](assets/old_images/erpnext/stock-reco-ledger.png) +![Stock Reco Ledger]({{url_prefix}}/assets/old_images/erpnext/stock-reco-ledger.png) **How Stock Reconciliation Works** diff --git a/erpnext/docs/user/guides/setting-up/territory.md b/erpnext/docs/user/guides/setting-up/territory.md index 7ef1a23c031..89f1d14e27e 100644 --- a/erpnext/docs/user/guides/setting-up/territory.md +++ b/erpnext/docs/user/guides/setting-up/territory.md @@ -5,6 +5,6 @@ each Item Group and get reports that will show your actual performance in the territory v/s what you had planned. You can also set different pricing for the same product sold across different territories. -Territory Tree +Territory Tree {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/setting-up/third-party-backups.md b/erpnext/docs/user/guides/setting-up/third-party-backups.md index 5f352c944db..a65c533d490 100644 --- a/erpnext/docs/user/guides/setting-up/third-party-backups.md +++ b/erpnext/docs/user/guides/setting-up/third-party-backups.md @@ -9,7 +9,7 @@ __Step 2:__ Click on Manage Third Party Backup #### Figure 1: Manage Third Party Backup -![Third Party Backups](assets/old_images/erpnext/third-party-backups.png) +![Third Party Backups]({{url_prefix}}/assets/old_images/erpnext/third-party-backups.png) On the Backup Manager page, enter the email addresses of those people whom you wish to notify about the upload status. Under the topic 'Sync with Dropbox', @@ -22,11 +22,11 @@ then select the Never option. #### Figure 2: Allow Dropbox Access -![Backup Manager](assets/old_images/erpnext/backup-manager.png) +![Backup Manager]({{url_prefix}}/assets/old_images/erpnext/backup-manager.png) You need to login to your dropbox account, with your user id and password. -![Dropbox Access](assets/old_images/erpnext/dropbox-access.png) +![Dropbox Access]({{url_prefix}}/assets/old_images/erpnext/dropbox-access.png) ## Open Source Users diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md index c3408a6dbd7..7272178c3e4 100644 --- a/erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md +++ b/erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md @@ -6,7 +6,7 @@ Users can be added by the System Manager. If you are a System Manager, you can a ### 1. List of Users -User List +User List To add a new user, click on "New" @@ -25,19 +25,19 @@ After saving, you will see a list of roles and a checkbox next to it. Just check the user to have and save the document. To click on what permissions translate into roles, click on the role name. -User Roles +User Roles ### 4. Setting Module Access Users will have access to all modules for which they have role based access. If you want to block certain modules for certain users, un-check the module from the list. -User Block Module +User Block Module ### 5. Security Settings If you wish to give the user access to the system only between office hours, or during weekends, mention it under security settings. -User Security +User Security {next} diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md index d9c476d75e3..87144888e84 100644 --- a/erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md +++ b/erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md @@ -5,7 +5,7 @@ ERPNext has a role-based permission system. It means that you can assign Roles t To start with, go to: > Setup > Permissions > Role Permissions Manager -Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager +Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager Permissions are applied on a combination of: @@ -28,7 +28,7 @@ Permissions are applied on a combination of: If enabled, a user with that role will be able to access only specific Documents for that Document Type. Such specific Document access is defined in the list of User Permissions. Additionally, User Permissions defined for other Document Types also get applied if they are related to the current Document Type through Link Fields. To set, User Permissions go to: - > Setup > Permissions > [User Permissions Manager](/contents/setting-up/users-and-permissions/user-permissions) + > Setup > Permissions > [User Permissions Manager]({{url_prefix}}/user/guides/setting-up/users-and-permissions/user-permissions.html) --- @@ -38,37 +38,37 @@ Permissions are applied on a combination of: Leave Application is a good **example** that encompasses all areas of Permission System. -Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User +Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User 1. **It should be created by an Employee.** For this, Employee Role should be given Read, Write, Create permissions. -Giving Read, Write and Create Permissions to Employee for Leave Application +Giving Read, Write and Create Permissions to Employee for Leave Application 1. **An Employee should only be able to access his/her Leave Application.** Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.) -Limiting access to Leave Applications for a user with Employee Role via User Permissions Manager +Limiting access to Leave Applications for a user with Employee Role via User Permissions Manager 1. **HR Manager should be able to see all Leave Applications.** Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled. -Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access. +Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access. 2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.** Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.) -Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee. +Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee. 3. **It should be Approved / Rejected only by HR User or Leave Approver.** The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1. -Limiting read access for a set of fields to certain Roles +Limiting read access for a set of fields to certain Roles 4. **HR User should be able to delegate Leave Applications to his/her subordinates** HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users. -Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application' +Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application' {next} diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md index e39c010c566..471efc1c5a4 100644 --- a/erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md +++ b/erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md @@ -4,6 +4,6 @@ In addition to user and role permissions, you can also Share a document with ano To share a document, open the document, click on the "+" icon under sharing and select the user - + {next} diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md index 58b89dc6ef2..2e2220aa2d6 100644 --- a/erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md +++ b/erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md @@ -8,7 +8,7 @@ To start with, go to: > Setup > Permissions > User Permissions Manager
- User Permissions Manager
User Permissions Manager displaying how users can access only a specific Company.
@@ -19,21 +19,21 @@ User 'aromn@example.com' has Sales User role and we want to limit the user to ac 1. We add a User Permissions row for Company.
- User Permissions For Company
Add User Permissions row for a combination of User 'aromn@example.com' and Company 'Wind Power LLC'.
1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked.
- Role Permissions for All on Company
Read Permission with Apply User Permissions checked for DocType Company.
1. The combined effect of the above two rules lead to User 'aromn@example.com' having only Read access to Company 'Wind Power LLC'.
- Effect of Role and User Permissions on Company
Access is limited to Company 'Wind Power LLC'.
@@ -41,29 +41,29 @@ User 'aromn@example.com' has Sales User role and we want to limit the user to ac 1. We want this User Permission on Company to get applied on other documents like Quotation, Sales Order, etc. These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'aromn@example.com' to acces these documents having Company 'Wind Power LLC'.
- Sales User Role Permissions for Quotation
Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked.
- Quotation List limited to results for Company 'Wind Power LLC'
Quotation List is limited to results for Company 'Wind Power LLC' for User 'aromn@example.com'.
1. User Permissions get applied automatically based on Link Fields, just like how it worked for Quotation. But, Lead Form has 4 Link fields: Territory, Company, Lead Owner and Next Contact By. Say, you want Leads to limit access to Users based only on Territory, even though you have defined User Permissions for DocTypes User, Territory and Company. You can do this by setting 'Ignore User Permissions' for Link fields: Company, Lead Owner and Next Contact By.
- Role Permissions on Lead for Sales User Role
Sales User can Read, Write and Create Leads limited by User Permissions.
- Set Ingore User Permissions from Setup > Customize > Customize Form
Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.
- Lead List is limited to records with Territory 'United States'
Due to the effect of the above combination, User 'aromn@example.com' can only access Leads with Territory 'United States'.
diff --git a/erpnext/docs/user/guides/setting-up/workflows.md b/erpnext/docs/user/guides/setting-up/workflows.md index 329eaf5b1ec..26080973ffa 100644 --- a/erpnext/docs/user/guides/setting-up/workflows.md +++ b/erpnext/docs/user/guides/setting-up/workflows.md @@ -11,7 +11,7 @@ will get an indication that the HR department has Accepted or Rejected. The Manager, who is the approving authority, will either Approve or Reject this request. Accordingly,the user will get his Approved or Rejected status. -![Workflow](assets/old_images/erpnext/workflow-leave-fl.jpg) +![Workflow]({{url_prefix}}/assets/old_images/erpnext/workflow-leave-fl.jpg) To make this Workflow and transition rules go to : @@ -19,11 +19,11 @@ To make this Workflow and transition rules go to : #### Step 1: Enter the different states of Leave Approval Process. -Workflow +Workflow #### Step 2: Enter Transition Rules. -Workflow +Workflow #### Notes: @@ -50,17 +50,17 @@ Leave. When a Leave Application is submitted, the status on the right hand corner of the page shows as "Applied" -![Workflow Employee LA](assets/old_images/erpnext/workflow-employee-la.png) +![Workflow Employee LA]({{url_prefix}}/assets/old_images/erpnext/workflow-employee-la.png) When the HR User logs in, he can either Approve or Reject. If approved the status on the right hand corner of the page shows as Approved. However, a blue band of information is displayed saying approval is pending by leave approver. -![Leave Approver](assets/old_images/erpnext/workflow-hr-user-la.png) +![Leave Approver]({{url_prefix}}/assets/old_images/erpnext/workflow-hr-user-la.png) When the leave approver opens the Leave Application page, he should select the status and convert to Approved or Rejected. -![Workflow Leave Approver](assets/old_images/erpnext/workflow-leave-approver-la.png) +![Workflow Leave Approver]({{url_prefix}}/assets/old_images/erpnext/workflow-leave-approver-la.png) {next} diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md b/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md index 972c7aaef74..4907186a674 100644 --- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md +++ b/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md @@ -19,7 +19,7 @@ balance. This improves accuracy of Balance Sheet and Profit and Loss statement. To check accounting entries for a particular stock transaction, please check -[examples](/contents/stock/accounting-of-inventory-stock/perpetual-inventory) +[examples]({{url_prefix}}/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.html) #### **Advantages** @@ -64,6 +64,6 @@ This complete process is called Periodic Inventory. If you are an existing user using Periodic Inventory and want to use Perpetual Inventory, you have to follow some steps to migrate. For details, check -[Migration From Periodic Inventory](/contents/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory). +[Migration From Periodic Inventory]({{url_prefix}}/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html). {next} diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md index f630691dfc2..c3d10ed8c34 100644 --- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md +++ b/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md @@ -20,7 +20,7 @@ Steps: > Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement -![Activation](assets/old_images/erpnext/accounting-for-stock-1.png) +![Activation]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-1.png) * Create Stock Entry (Material Transfer) to transfer available stock from existing warehouse to new warehouse. As stock will be available in the new warehouse, you should select the new warehouse for all the future transactions. diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md index b6adc368ee4..ee62942ecde 100644 --- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md +++ b/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md @@ -143,11 +143,11 @@ details of Purchase Receipt:

Stock Ledger

-![prstockledger](assets/old_images/erpnext/accounting-for-stock-2.png) +![prstockledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-2.png) **General Ledger** -![prgeneralledger](assets/old_images/erpnext/accounting-for-stock-3.png) +![prgeneralledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-3.png) As stock balance increases through Purchase Receipt, "Store" and "Fixed Asset Warehouse" accounts are debited and a temporary account "Stock Receipt But Not @@ -162,7 +162,7 @@ Purchase Invoice for the same. The general ledger entries are as follows: **General Ledger** -![pigeneralledger](assets/old_images/erpnext/accounting-for-stock-4.png) +![pigeneralledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-4.png) Here "Stock Received But Not Billed" account is debited and nullified the effect of Purchase Receipt. @@ -220,11 +220,11 @@ at $300. Following are the details of Delivery Note: **Stock Ledger** -![dnstockledger](assets/old_images/erpnext/accounting-for-stock-5.png) +![dnstockledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-5.png) **General Ledger** -![dngeneralledger](assets/old_images/erpnext/accounting-for-stock-6.png) +![dngeneralledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-6.png) As item is delivered from "Stores" warehouse, "Stores" account is credited and equal amount is debited to the expense account "Cost of Goods Sold". The @@ -254,11 +254,11 @@ of the Sales Invoice are same as the above Delivery Note. **Stock Ledger** -![sistockledger](assets/old_images/erpnext/accounting-for-stock-7.png) +![sistockledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-7.png) **General Ledger** -![sigeneralledger](assets/old_images/erpnext/accounting-for-stock-8.png) +![sigeneralledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-8.png) Here, apart from normal account entries for invoice, "Stores" and "Cost of Goods Sold" accounts are also affected based on the valuation amount. @@ -292,11 +292,11 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -![mrstockledger](assets/old_images/erpnext/accounting-for-stock-9.png) +![mrstockledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-9.png) **General Ledger** -![mrstockledger](assets/old_images/erpnext/accounting-for-stock-10.png) +![mrstockledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-10.png) * * * @@ -327,11 +327,11 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -![mistockledger](assets/old_images/erpnext/accounting-for-stock-11.png) +![mistockledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-11.png) **General Ledger** -![mistockledger](assets/old_images/erpnext/accounting-for-stock-12.png) +![mistockledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-12.png) * * * @@ -364,8 +364,8 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -![mtnstockledger](assets/old_images/erpnext/accounting-for-stock-13.png) +![mtnstockledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-13.png) **General Ledger** -![mtngeneralledger](assets/old_images/erpnext/accounting-for-stock-14.png) \ No newline at end of file +![mtngeneralledger]({{url_prefix}}/assets/old_images/erpnext/accounting-for-stock-14.png) \ No newline at end of file diff --git a/erpnext/docs/user/guides/stock/batch.md b/erpnext/docs/user/guides/stock/batch.md index cdb9cdd60e0..4cb7f064e7a 100644 --- a/erpnext/docs/user/guides/stock/batch.md +++ b/erpnext/docs/user/guides/stock/batch.md @@ -16,7 +16,7 @@ Batch master is created before creation of Purchase Receipt. Hence eveytime there is Purchase Receipt or Production entry being made for a batch item, you will first create its Batch No, and then select it in Purcase order or Production Entry. -batch +batch > Note: In stock transactions, Batch IDs will be filtered based on Item Code, Warehouse, Batch Expiry Date (compared with Posting date of a transaction) and Actual Qty in Warehouse. diff --git a/erpnext/docs/user/guides/stock/delivery-note.md b/erpnext/docs/user/guides/stock/delivery-note.md index e2cdd5ec5d4..1cdf41f547e 100644 --- a/erpnext/docs/user/guides/stock/delivery-note.md +++ b/erpnext/docs/user/guides/stock/delivery-note.md @@ -13,7 +13,7 @@ create a new Delivery Note from: or from a “Submitted” Sales Order (that is not already shipped) by clicking on “Make Delivery Note”. -Delivery Note +Delivery Note You can also “fetch” the details from an unshipped Sales Order. @@ -22,7 +22,7 @@ details are carried over from your Sales Order. ### Shipping Packets or Items with Product Bundle -If you are shipping Items that have a [Product Bundle](/contents/selling/setup/sales-bom), ERPNext will automatically +If you are shipping Items that have a [Product Bundle]({{url_prefix}}/user/guides/selling/setup/sales-bom.html), ERPNext will automatically create a “Packing List” table for you based on the sub-Items in that Item. If your Items are serialized, then for Product Bundle type of Items, you will have diff --git a/erpnext/docs/user/guides/stock/installation-note.md b/erpnext/docs/user/guides/stock/installation-note.md index d59c8e4ae7a..c4e3bc0faed 100644 --- a/erpnext/docs/user/guides/stock/installation-note.md +++ b/erpnext/docs/user/guides/stock/installation-note.md @@ -1,5 +1,5 @@ You can use installation note to record the instalation of a product having a serial number. -Installation Note +Installation Note {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/stock/item-price.md b/erpnext/docs/user/guides/stock/item-price.md index 1a25670e6a8..a235341cef0 100644 --- a/erpnext/docs/user/guides/stock/item-price.md +++ b/erpnext/docs/user/guides/stock/item-price.md @@ -14,7 +14,7 @@ Step 1: Select Price List You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. -![Item Price list](assets/old_images/erpnext/item-price-list.png) +![Item Price list]({{url_prefix}}/assets/old_images/erpnext/item-price-list.png) On selection of Price List, its currency and for selling or buying property will be fetched as well. @@ -24,13 +24,13 @@ Step 2: Select Item Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well. -![Item Price Item](assets/old_images/erpnext/item-price-item.png) +![Item Price Item]({{url_prefix}}/assets/old_images/erpnext/item-price-item.png) Step 3: Enter Rate Enter selling/buying rate of an item in Price List currency. -![Item Price Rate](assets/old_images/erpnext/item-price-rate.png) +![Item Price Rate]({{url_prefix}}/assets/old_images/erpnext/item-price-rate.png) Step 4: Save Item Price diff --git a/erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md index 2e1f28608e5..3cabe3585be 100644 --- a/erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md +++ b/erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md @@ -19,7 +19,7 @@ There are two major ways in which ERPNext values your items. * **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y. -![FIFO](assets/old_images/erpnext/fifo.png) +![FIFO]({{url_prefix}}/assets/old_images/erpnext/fifo.png) * **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be: diff --git a/erpnext/docs/user/guides/stock/item/index.md b/erpnext/docs/user/guides/stock/item/index.md index a3696128c63..89ec5e5c51a 100644 --- a/erpnext/docs/user/guides/stock/item/index.md +++ b/erpnext/docs/user/guides/stock/item/index.md @@ -5,11 +5,11 @@ ERPNext is optimized for itemized management of your sales and purchase. If you ## Item Properties * **Item Name:** Item name is the actual name of your product or service. - * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification](/contents/stock/item/item-codification) - * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group](/contents/stock/setup/item-group) + * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification]({{url_prefix}}/user/guides/stock/item/item-codification.html) + * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group]({{url_prefix}}/user/guides/stock/setup/item-group.html) * **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list. * **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item. - * **Variant:** A Item Variant is a different version of a Item.To learn more about managing varaints see [Item Variants](/contents/stock/item/item-variants) + * **Variant:** A Item Variant is a different version of a Item.To learn more about managing varaints see [Item Variants]({{url_prefix}}/user/guides/stock/item/item-variants.html) ### Upload an Image @@ -34,7 +34,7 @@ These numbers help to track individual units or batches of Items which you sell. > Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry. - * [Discussion on Serialized Inventory](/contents/setting-up/stock-reconciliation-for-non-serialized-item) + * [Discussion on Serialized Inventory]({{url_prefix}}/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.html) ### Re Ordering @@ -50,7 +50,7 @@ tax Account, “VAT 10%” and this particular Item is exempted from tax, then y select “VAT 10%” in the first column, and set “0” as the tax rate in the second column. -Go to [Setting Up Taxes](/contents/setting-up/setting-up-taxes) to understand this topic in detail. +Go to [Setting Up Taxes]({{url_prefix}}/user/guides/setting-up/setting-up-taxes.html) to understand this topic in detail. ### Inspection @@ -66,7 +66,7 @@ Length, Finish etc. ### Purchase Details -![Purchase Details](assets/old_images/erpnext/item-purchase.png) +![Purchase Details]({{url_prefix}}/assets/old_images/erpnext/item-purchase.png) **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse. @@ -76,7 +76,7 @@ Length, Finish etc. ### Sales Details -![Sales Details](assets/old_images/erpnext/item-sales.png) +![Sales Details]({{url_prefix}}/assets/old_images/erpnext/item-sales.png) **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. @@ -84,8 +84,8 @@ Length, Finish etc. ### Manufacturing And Website -![Manufacturing](assets/old_images/erpnext/item-manufacturing-website.png) +![Manufacturing]({{url_prefix}}/assets/old_images/erpnext/item-manufacturing-website.png) -Visit [Manufacturing](/contents/manufacturing) and [Website ](/contents/website)to understand these topics in detail. +Visit [Manufacturing]({{url_prefix}}/user/guides/manufacturing.html) and [Website ]({{url_prefix}}/user/guides/website.html)to understand these topics in detail. {next} diff --git a/erpnext/docs/user/guides/stock/item/item-variants.md b/erpnext/docs/user/guides/stock/item/item-variants.md index 1f3300d8c27..256a37ead86 100644 --- a/erpnext/docs/user/guides/stock/item/item-variants.md +++ b/erpnext/docs/user/guides/stock/item/item-variants.md @@ -6,19 +6,19 @@ To use Item Variants in ERPNext, create an Item and check 'Has Variants' * The Item shall then be referred as a 'Template' -Has Variants +Has Variants On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table. In case the attribute has Numeric Values, you can specify the range and increment values here. -Valid Attributes +Valid Attributes > Note: You cannot make Transactions against a 'Template' To create 'Item Variants' against a 'Template' select 'Make Variants' -Make Variants +Make Variants -Make Variants +Make Variants -To learn more about setting Attributes Master check [Item Attributes](/contents/stock/setup/item-attribute) +To learn more about setting Attributes Master check [Item Attributes]({{url_prefix}}/user/guides/stock/setup/item-attribute.html) diff --git a/erpnext/docs/user/guides/stock/item/purchase-details.md b/erpnext/docs/user/guides/stock/item/purchase-details.md index e4acac6b8f4..47f724c1f70 100644 --- a/erpnext/docs/user/guides/stock/item/purchase-details.md +++ b/erpnext/docs/user/guides/stock/item/purchase-details.md @@ -7,7 +7,7 @@ When this Item is delivered, the delivery date and the expiry period is saved in A warranty means a guarantee or a promise which provides assurance by one party to the other party which allows for a legal remedy if that promise is not true or followed. A warranty period is a time period in which a purchased product may be returned or exchanged. -![Warranty](assets/old_images/erpnext/faq-warranty.png) +![Warranty]({{url_prefix}}/assets/old_images/erpnext/faq-warranty.png) # How To Name A Manufacturer Part Number? @@ -17,6 +17,6 @@ Go to the purchase details section of the Item form, and enter the number on the A manufacturer part number is a series of numbers and /or letters that has been given to a part by the manufacturer. The manufacturer part number belongs to the manufacturer and helps distinguish the part from other manufacturers. If two parts come from different manufacturers, they will have different MPNs. This allows businesses to identify which company made the part. -![Part No](assets/old_images/erpnext/faq-manufacturer-part-no.png) +![Part No]({{url_prefix}}/assets/old_images/erpnext/faq-manufacturer-part-no.png) __For Example:__ A refrigerator will have different parts which will have manufacturer part number. Thus, when any part fails and you want to replace it, you can simply order that part based on its part number. diff --git a/erpnext/docs/user/guides/stock/item/reorder.md b/erpnext/docs/user/guides/stock/item/reorder.md index 6b3d5138fd1..34a079f13e6 100644 --- a/erpnext/docs/user/guides/stock/item/reorder.md +++ b/erpnext/docs/user/guides/stock/item/reorder.md @@ -8,7 +8,7 @@ Go to the Re-order section of the Item form in the Stock module. The Re-order level is the point at which stock on a particular item has diminished to a point where it needs to be replenished. To order based on Re-order level can avoid shortages. Re-order level can be determined based on the lead time and the average daily consumption. -![Reorder Level](assets/old_images/erpnext/faq-reorder-level.png) +![Reorder Level]({{url_prefix}}/assets/old_images/erpnext/faq-reorder-level.png) __For example:__ You can set your reorder level of bath towels at 10. When there are only 10 towels remaining in stock, the system will either send a mail or take action depending upon what you have selected in global settings. @@ -20,7 +20,7 @@ To setup Reorder quantity, go to the Re-order section of the Item form. In the f Re-order quantity is the quantity to order, so that the sum of ordering cost and holding cost is at its minimum.The re-order quantity is based on the minimum order quantity specified by the supplier and many other factors. -![Reorder Quantity](assets/old_images/erpnext/faq-reorder-qty.png) +![Reorder Quantity]({{url_prefix}}/assets/old_images/erpnext/faq-reorder-qty.png) __For example:__ If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption. diff --git a/erpnext/docs/user/guides/stock/material-request.md b/erpnext/docs/user/guides/stock/material-request.md index e1555db21e7..69ce0ea9b39 100644 --- a/erpnext/docs/user/guides/stock/material-request.md +++ b/erpnext/docs/user/guides/stock/material-request.md @@ -1,7 +1,7 @@ A Material Request is a simple document identifying a requirement of a set of Items (products or services) for a particular reason. -![Workflow](assets/old_images/erpnext/material-request-workflow.jpg) +![Workflow]({{url_prefix}}/assets/old_images/erpnext/material-request-workflow.jpg) To generate a Material Request manually go to: @@ -9,14 +9,14 @@ To generate a Material Request manually go to: #### Creating Material Request -Material Request +Material Request A Material Request can be generated: * Automatically from a Sales Order. * Automatically when the Projected Quantity of an Item in stores reaches a particular level. * Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing activities. - * If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the [Projected Quantity](/contents/stock/projected-quantity) for this Item. + * If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the [Projected Quantity]({{url_prefix}}/user/guides/stock/projected-quantity.html) for this Item. A Material Request can be of type: diff --git a/erpnext/docs/user/guides/stock/opening-stock.md b/erpnext/docs/user/guides/stock/opening-stock.md index 4288f6697cf..ef285d20aa5 100644 --- a/erpnext/docs/user/guides/stock/opening-stock.md +++ b/erpnext/docs/user/guides/stock/opening-stock.md @@ -10,6 +10,6 @@ In both cases, you should enter "Difference/Expense Account" as **Temporary Open If you are not making opening Stock Entry, you can select "Stock Adjustment" account in Difference/Expense Account field which is an expense account. -To understand Opening Stock for serialzed Items visit [Stock Reconciliation](/contents/setting-up/stock-reconciliation-for-non-serialized-item) +To understand Opening Stock for serialzed Items visit [Stock Reconciliation]({{url_prefix}}/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.html) {next} diff --git a/erpnext/docs/user/guides/stock/projected-quantity.md b/erpnext/docs/user/guides/stock/projected-quantity.md index 0cac9aa6fb3..796d427f4ed 100644 --- a/erpnext/docs/user/guides/stock/projected-quantity.md +++ b/erpnext/docs/user/guides/stock/projected-quantity.md @@ -11,7 +11,7 @@ maintained to serve unexpected demands. Having a tight control of the projected inventory is crucial to determine shortages and to calculate the right order quantity. -![Projected Quantity Stock Report](assets/old_images/erpnext/projected-quantity-stock-report.png) +![Projected Quantity Stock Report]({{url_prefix}}/assets/old_images/erpnext/projected-quantity-stock-report.png) > Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty - diff --git a/erpnext/docs/user/guides/stock/purchase-receipt.md b/erpnext/docs/user/guides/stock/purchase-receipt.md index 0a79b96fb07..68f29d47606 100644 --- a/erpnext/docs/user/guides/stock/purchase-receipt.md +++ b/erpnext/docs/user/guides/stock/purchase-receipt.md @@ -10,7 +10,7 @@ You can make a Purchase Receipt directly from: or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”. -Purchase Receipt +Purchase Receipt ### Rejections diff --git a/erpnext/docs/user/guides/stock/purchase-return.md b/erpnext/docs/user/guides/stock/purchase-return.md index df86353fb52..5a924a2c1e6 100644 --- a/erpnext/docs/user/guides/stock/purchase-return.md +++ b/erpnext/docs/user/guides/stock/purchase-return.md @@ -6,16 +6,16 @@ You can create a Purchase Return by simply making a Purchase Receipt with negati First open the original Purchase Receipt, against which supplier delivered the items. -Original Purchase Receipt +Original Purchase Receipt Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount. -Return Against Purchase Receipt +Return Against Purchase Receipt On submission of Return Purchase Return, system will decrease item qty from the mentioned warehouse. To maintain correct stock valuation, stock balance will also go up according to the original purchase rate of the returned items. -Return Stock Ledger +Return Stock Ledger If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger. -Return Stock Ledger \ No newline at end of file +Return Stock Ledger \ No newline at end of file diff --git a/erpnext/docs/user/guides/stock/sales-return.md b/erpnext/docs/user/guides/stock/sales-return.md index 0105820bda2..15b8b11b214 100644 --- a/erpnext/docs/user/guides/stock/sales-return.md +++ b/erpnext/docs/user/guides/stock/sales-return.md @@ -6,22 +6,22 @@ In ERPNext, you can create a Sales Return by simply making a Delivery Note / Sal First open the original Delivery Note / Sales Invoice, against which customer returned the items. -Original Delivery Note +Original Delivery Note Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount. -Return Against Delivery Note +Return Against Delivery Note You can also create the return entry against original Sales Invoice, to return stock along with credit note, check "Update Stock" option in Return Sales Invoice. -Return Against Sales Invoice +Return Against Sales Invoice On submission of Return Delivery Note / Sales Invoice, system will increase stock balance in the mentioned warehouse. To maintain correct stock valuation, stock balance will go up according to the original purchase rate of the returned items. -Return Stock Ledger +Return Stock Ledger In case of Return Sales Invoice, Customer account will be credited and associated income and tax account will be debited. If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger. -Return Stock Ledger \ No newline at end of file +Return Stock Ledger \ No newline at end of file diff --git a/erpnext/docs/user/guides/stock/serial-no.md b/erpnext/docs/user/guides/stock/serial-no.md index daeb7e13d78..678bd4d4f7f 100644 --- a/erpnext/docs/user/guides/stock/serial-no.md +++ b/erpnext/docs/user/guides/stock/serial-no.md @@ -20,7 +20,7 @@ Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales Invoice). When a new Serial No is created directly, its warehouse cannot be set. -Serial Number +Serial Number * The Status is set based on Stock Entry. diff --git a/erpnext/docs/user/guides/stock/setup/item-attribute.md b/erpnext/docs/user/guides/stock/setup/item-attribute.md index d34f3a6a4cd..a39c9ee8fc2 100644 --- a/erpnext/docs/user/guides/stock/setup/item-attribute.md +++ b/erpnext/docs/user/guides/stock/setup/item-attribute.md @@ -1,16 +1,16 @@ You can define Attributes and attribute values for your Item Variants here. -Attribute Master +Attribute Master #### Non Numeric Attributes * For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table. -Attribute Master +Attribute Master #### Numeric Attributes * If your attribute is Numeric, select Numeric Values * Specify the Range and the Increment Value -Attribute Master +Attribute Master diff --git a/erpnext/docs/user/guides/stock/setup/item-group.md b/erpnext/docs/user/guides/stock/setup/item-group.md index 0f8b6558bec..1d2343d4859 100644 --- a/erpnext/docs/user/guides/stock/setup/item-group.md +++ b/erpnext/docs/user/guides/stock/setup/item-group.md @@ -5,7 +5,7 @@ product is used as a raw-material, you have to name it under the Raw-material category. In case, your product is used only in trading, you can categorise it under Trading. -Item Group Tree +Item Group Tree ### Create a Item Group @@ -13,7 +13,7 @@ under Trading. * Select 'Add Child' -Add Item Group +Add Item Group ### Delete an Item Group @@ -21,6 +21,6 @@ under Trading. * Select 'delete' -Add Item Group +Add Item Group {next} diff --git a/erpnext/docs/user/guides/stock/setup/stock-settings.md b/erpnext/docs/user/guides/stock/setup/stock-settings.md index 9e79b6a4010..409037a1e87 100644 --- a/erpnext/docs/user/guides/stock/setup/stock-settings.md +++ b/erpnext/docs/user/guides/stock/setup/stock-settings.md @@ -1,5 +1,5 @@ You can set default settings for your stock related transactions here. -Stock Settings +Stock Settings {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/stock/stock-entry.md b/erpnext/docs/user/guides/stock/stock-entry.md index f0c88bf0cdb..ab8bf12d048 100644 --- a/erpnext/docs/user/guides/stock/stock-entry.md +++ b/erpnext/docs/user/guides/stock/stock-entry.md @@ -5,7 +5,7 @@ To make a Stock Entry you have to go to: > Stock > Stock Entry > New -Stock Entry +Stock Entry Stock Entries can be made for the following purposes: @@ -27,15 +27,15 @@ If the stock entry is an incoming entry i.e any item is receiving at a target wa To add additional costs, enter the description and amount of the cost in the Additional Costs table. -Stock Entry Additional Costs +Stock Entry Additional Costs The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate. -Stock Entry Item Valuation Rate +Stock Entry Item Valuation Rate If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account. -Additional Costs General Ledger +Additional Costs General Ledger > **Note:** To update Stock from a spreadsheet, see Stock Reconciliation. diff --git a/erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md index d67ff234de9..aa146b47f7a 100644 --- a/erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md +++ b/erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md @@ -20,7 +20,7 @@ You can update landed cost any time in the future via Landed Cost Voucher. In the document, you can select multiple Purchase Receipts and fetch all items from those Purchase Receipts. Then you should add applicable charges in “Taxes and Charges” table. You can easily delete an item if the added charges is not applicable to that item. The added charges are proportionately distributed among all the items based their amount. -Landed Cost Vouher +Landed Cost Vouher ### What happend on submission? diff --git a/erpnext/docs/user/guides/stock/tools/packing-slip.md b/erpnext/docs/user/guides/stock/tools/packing-slip.md index ea21fe27561..2c133bd9cdc 100644 --- a/erpnext/docs/user/guides/stock/tools/packing-slip.md +++ b/erpnext/docs/user/guides/stock/tools/packing-slip.md @@ -2,6 +2,6 @@ A packing slip is a document listing the items in a shipment. Usually attached t While Shipping a product 'Draft' for Delivery Notes are created. You can make a Packing Slip from these Delivery Notes (Draft) -Packing Slip +Packing Slip {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/stock/tools/quality-inspection.md b/erpnext/docs/user/guides/stock/tools/quality-inspection.md index 020447c48f9..175fa235534 100644 --- a/erpnext/docs/user/guides/stock/tools/quality-inspection.md +++ b/erpnext/docs/user/guides/stock/tools/quality-inspection.md @@ -3,6 +3,6 @@ Inspection. To enable ERPNext to perform this function, go to : > Stock > Quality Inspection > New -Quality Inspection +Quality Inspection {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/stock/tools/stock-uom-replace-utility.md b/erpnext/docs/user/guides/stock/tools/stock-uom-replace-utility.md index d8e92f47e48..3c5428a38f2 100644 --- a/erpnext/docs/user/guides/stock/tools/stock-uom-replace-utility.md +++ b/erpnext/docs/user/guides/stock/tools/stock-uom-replace-utility.md @@ -5,6 +5,6 @@ This tool will help you to change the UOM (Unit of measurement) of an existing I You need to select an Item, system fetches the Existing UOM of that item. You can then select the new UOM for that item and specify the conversion factor. -Stock Uom Replace +Stock Uom Replace {next} diff --git a/erpnext/docs/user/guides/stock/warehouse.md b/erpnext/docs/user/guides/stock/warehouse.md index ec32215095f..60dd30cd074 100644 --- a/erpnext/docs/user/guides/stock/warehouse.md +++ b/erpnext/docs/user/guides/stock/warehouse.md @@ -9,7 +9,7 @@ could also go to the Setup module and click on Warehouse under Master Data. > Stock > Warehouse > New Warehouse -Warehouse +Warehouse In ERPNext, every Warehouse must belong to a specific company, to maintain company wise stock balance. The Warehouses are saved with their respective diff --git a/erpnext/docs/user/guides/support/issue.md b/erpnext/docs/user/guides/support/issue.md index 9033a955ca4..984a00bac7f 100644 --- a/erpnext/docs/user/guides/support/issue.md +++ b/erpnext/docs/user/guides/support/issue.md @@ -11,7 +11,7 @@ Frappe system. > Support > Issue > New Issue -Issue +Issue #### Discussion Thread diff --git a/erpnext/docs/user/guides/support/maintenance-schedule.md b/erpnext/docs/user/guides/support/maintenance-schedule.md index 2510da5f370..1ae3a3079c9 100644 --- a/erpnext/docs/user/guides/support/maintenance-schedule.md +++ b/erpnext/docs/user/guides/support/maintenance-schedule.md @@ -10,7 +10,7 @@ To create a new Maintenance Schedule go to: > Support > Maintenance Schedule > New Maintenance Schedule -Maintenance Schedule +Maintenance Schedule In the Maintenance Schedule, there are two sections: diff --git a/erpnext/docs/user/guides/support/maintenance-visit.md b/erpnext/docs/user/guides/support/maintenance-visit.md index 690c2a85553..4f2bdbf3325 100644 --- a/erpnext/docs/user/guides/support/maintenance-visit.md +++ b/erpnext/docs/user/guides/support/maintenance-visit.md @@ -4,7 +4,7 @@ Maintenance Visit from: > Support > Maintenance Visit > New Maintenance Visit -Maintenance Visit +Maintenance Visit The Maintenance Visit contains information about the: diff --git a/erpnext/docs/user/guides/support/warranty-claim.md b/erpnext/docs/user/guides/support/warranty-claim.md index 8506b3e7803..a9d1b8bb778 100644 --- a/erpnext/docs/user/guides/support/warranty-claim.md +++ b/erpnext/docs/user/guides/support/warranty-claim.md @@ -15,7 +15,7 @@ To create a new **Warranty Claim**: > Support > Warranty Claim > New Warranty Claim -![Warranty Claim](assets/img/support/warranty-claim.png) +![Warranty Claim]({{url_prefix}}/assets/img/support/warranty-claim.png) If a Customer visit is required to address the issue, you can create a new Maintenance Visit record from this. diff --git a/erpnext/docs/user/guides/website/add-products-to-website.md b/erpnext/docs/user/guides/website/add-products-to-website.md index 77035c888da..55b7900b222 100644 --- a/erpnext/docs/user/guides/website/add-products-to-website.md +++ b/erpnext/docs/user/guides/website/add-products-to-website.md @@ -7,7 +7,7 @@ generated automatically. ##### Step 1: Save Image -![Webimage](assets/old_images/erpnext/item-webimage.png) +![Webimage]({{url_prefix}}/assets/old_images/erpnext/item-webimage.png) @@ -17,13 +17,13 @@ Under the Website section, please check the box that says 'show in Website'. Once the box is checked, the page will display other fields for entering information. -![Webimage](assets/old_images/erpnext/item-webimage-1.png) +![Webimage]({{url_prefix}}/assets/old_images/erpnext/item-webimage-1.png) ##### Step 3: Enter Website Details -![Webimage](assets/old_images/erpnext/item-webimage-2.png) +![Webimage]({{url_prefix}}/assets/old_images/erpnext/item-webimage-2.png) The page name will be generated automatically. Mention the Item-Group under which the Item will be displayed. @@ -37,18 +37,18 @@ names, make Item Groups with those names and check the box that says 'show in Website'. For Example, if you wish to create a category called 'Bags', create a Item Group named Bags. -![Item Group](assets/old_images/erpnext/itemgroup-webimage-bags.png) +![Item Group]({{url_prefix}}/assets/old_images/erpnext/itemgroup-webimage-bags.png) Once the Item Group is created go to the Website Settings page under Website. Enter the Label, Url, and Parent Label. -![Item Group](assets/old_images/erpnext/itemgroup-website-settings.png) +![Item Group]({{url_prefix}}/assets/old_images/erpnext/itemgroup-website-settings.png) #### Webpage labels -![Webpage](assets/old_images/erpnext/webpage-labels.png) +![Webpage]({{url_prefix}}/assets/old_images/erpnext/webpage-labels.png) Add more Items under a particular Item Group. @@ -58,12 +58,12 @@ Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag, check the 'Show in Website'box. The Items will be placed under the Label Bags on the Webpage. -![Item Group](assets/old_images/erpnext/itemgroup-websettings.png) +![Item Group]({{url_prefix}}/assets/old_images/erpnext/itemgroup-websettings.png) Item Group Display -![Item Group Display](assets/old_images/erpnext/webpage-itemgroup-display.png) +![Item Group Display]({{url_prefix}}/assets/old_images/erpnext/webpage-itemgroup-display.png) {next} diff --git a/erpnext/docs/user/guides/website/blog-post.md b/erpnext/docs/user/guides/website/blog-post.md index 043dfdee931..e0b88627a73 100644 --- a/erpnext/docs/user/guides/website/blog-post.md +++ b/erpnext/docs/user/guides/website/blog-post.md @@ -8,13 +8,13 @@ To create a new blog, just create a new Blog from: > Website > Blog > New Blog -Blog Post +Blog Post You can format a blog using the Markdown format.You can also access your blog by going to the page “blog.html”. #### A sample blog-page. -Blog Sample +Blog Sample {next} diff --git a/erpnext/docs/user/guides/website/blogger.md b/erpnext/docs/user/guides/website/blogger.md index 8ef573d27ac..c548817a612 100644 --- a/erpnext/docs/user/guides/website/blogger.md +++ b/erpnext/docs/user/guides/website/blogger.md @@ -1,6 +1,6 @@ Blogger is a user who can post blogs. You can mention a shori bio about the blogger and also set a avatar here. -Blogger +Blogger {next} \ No newline at end of file diff --git a/erpnext/docs/user/guides/website/product-listing-on-website.md b/erpnext/docs/user/guides/website/product-listing-on-website.md index defd1965500..0acc8fae93d 100644 --- a/erpnext/docs/user/guides/website/product-listing-on-website.md +++ b/erpnext/docs/user/guides/website/product-listing-on-website.md @@ -7,7 +7,7 @@ generated automatically. ##### Step 1: Save Image -![Webimage](assets/old_images/erpnext/item-webimage.png) +![Webimage]({{url_prefix}}/assets/old_images/erpnext/item-webimage.png) @@ -17,13 +17,13 @@ Under the Website section, please check the box that says 'show in Website'. Once the box is checked, the page will display other fields for entering information. -![Webimage](assets/old_images/erpnext/item-webimage-1.png) +![Webimage]({{url_prefix}}/assets/old_images/erpnext/item-webimage-1.png) ##### Step 3: Enter Website Details -![Webimage](assets/old_images/erpnext/item-webimage-2.png) +![Webimage]({{url_prefix}}/assets/old_images/erpnext/item-webimage-2.png) The page name will be generated automatically. Mention the Item-Group under which the Item will be displayed. @@ -37,18 +37,18 @@ names, make Item Groups with those names and check the box that says 'show in Website'. For Example, if you wish to create a category called 'Bags', create a Item Group named Bags. -![Item Group](assets/old_images/erpnext/itemgroup-webimage-bags.png) +![Item Group]({{url_prefix}}/assets/old_images/erpnext/itemgroup-webimage-bags.png) Once the Item Group is created go to the Website Settings page under Website. Enter the Label, Url, and Parent Label. -![Item Group](assets/old_images/erpnext/itemgroup-website-settings.png) +![Item Group]({{url_prefix}}/assets/old_images/erpnext/itemgroup-website-settings.png) #### Webpage labels -![Webpage](assets/old_images/erpnext/webpage-labels.png) +![Webpage]({{url_prefix}}/assets/old_images/erpnext/webpage-labels.png) Add more Items under a particular Item Group. @@ -58,11 +58,11 @@ Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag, check the 'Show in Website'box. The Items will be placed under the Label Bags on the Webpage. -![Item Group](assets/old_images/erpnext/itemgroup-websettings.png) +![Item Group]({{url_prefix}}/assets/old_images/erpnext/itemgroup-websettings.png) Item Group Display -![Item Group Display](assets/old_images/erpnext/webpage-itemgroup-display.png) +![Item Group Display]({{url_prefix}}/assets/old_images/erpnext/webpage-itemgroup-display.png) diff --git a/erpnext/docs/user/guides/website/setup/website-settings.md b/erpnext/docs/user/guides/website/setup/website-settings.md index 5f86a04e19e..95d705a2a03 100644 --- a/erpnext/docs/user/guides/website/setup/website-settings.md +++ b/erpnext/docs/user/guides/website/setup/website-settings.md @@ -1,10 +1,10 @@ Most of the website related settings can be defined here. -Website Settings +Website Settings ####Landing Page -* Home Page: You can specify which [Web Page](/contents/website/web-page) must be the homepage of the website +* Home Page: You can specify which [Web Page]({{url_prefix}}/user/guides/website/web-page.html) must be the homepage of the website * Home Page is Products: if Checked, the Home page will be the default Item Group for the website. @@ -14,7 +14,7 @@ Most of the website related settings can be defined here. Select the theme for the website. You can create new Theme for you website also. -Website Theme +Website Theme * Select 'create new website theme' if you wish to customize the default website theme. @@ -23,13 +23,13 @@ Select the theme for the website. You can create new Theme for you website also. You can add a banner/ logo to your website here. Attach the image and click on set banner from Image. An HTML code will be generated by the system under Banner HTML. -Banner +Banner ####Top Bar You can set the menus items in the Top Bar here. -Top Bar +Top Bar * Similarlly you can also set sidebar and footer links. @@ -37,7 +37,7 @@ You can set the menus items in the Top Bar here. You can integrate the website using Google Analytics and enable social media sharing for post shared on the website. -Integrations +Integrations * You can disable public signup to your ERPNext account by checking 'disable signup' diff --git a/erpnext/docs/user/guides/website/shopping-cart.md b/erpnext/docs/user/guides/website/shopping-cart.md index 8f9235fc62a..0c27f4bb7a2 100644 --- a/erpnext/docs/user/guides/website/shopping-cart.md +++ b/erpnext/docs/user/guides/website/shopping-cart.md @@ -12,13 +12,13 @@ To set up a shopping cart, go to the selling module. #### Step 1: Enter Company Details and Default Territory. -![Shopping Cart](assets/old_images/erpnext/shopping-cart-1.png) +![Shopping Cart]({{url_prefix}}/assets/old_images/erpnext/shopping-cart-1.png) #### Step 2: Enter Price List, Tax Master and Shipping Rule. -![Shopping Cart](assets/old_images/erpnext/shopping-cart-2.png) +![Shopping Cart]({{url_prefix}}/assets/old_images/erpnext/shopping-cart-2.png) @@ -29,13 +29,13 @@ Customers can click on the cart and enter the amount of quantity they wish to buy. The Item number will be stored on the right hand corner of the page, next to the flower sign. -![Shopping Cart](assets/old_images/erpnext/shopping-cart-display-1.png) +![Shopping Cart]({{url_prefix}}/assets/old_images/erpnext/shopping-cart-display-1.png) Click on the flower sign on the right hand side to see the cart details. Click on the cart to get the final amount details. -![Shopping Cart](assets/old_images/erpnext/shopping-cart-display-amount.png) +![Shopping Cart]({{url_prefix}}/assets/old_images/erpnext/shopping-cart-display-amount.png) {next} diff --git a/erpnext/docs/user/guides/website/web-form.md b/erpnext/docs/user/guides/website/web-form.md index 5bffbdaf3f6..9fa8a1b5a18 100644 --- a/erpnext/docs/user/guides/website/web-form.md +++ b/erpnext/docs/user/guides/website/web-form.md @@ -17,7 +17,7 @@ To create a new **Web Form** go to: 1. Select if you require the user to login, edit records, manage multiple records etc. 1. Add the fields you want in the record. -Web Form +Web Form --- @@ -25,7 +25,7 @@ To create a new **Web Form** go to: Once you create the web form, you can view it on the url and test it out! -Web form +Web form --- diff --git a/erpnext/docs/user/guides/website/web-page.md b/erpnext/docs/user/guides/website/web-page.md index 440f8bb933b..2a4c6162356 100644 --- a/erpnext/docs/user/guides/website/web-page.md +++ b/erpnext/docs/user/guides/website/web-page.md @@ -4,7 +4,7 @@ To create a new Web Page, go to: > Website > Web Page > New -Web Page +Web Page #### Title diff --git a/erpnext/docs/user/videos/index.md b/erpnext/docs/user/videos/index.md index c043c13f5a5..9976dd4bad5 100644 --- a/erpnext/docs/user/videos/index.md +++ b/erpnext/docs/user/videos/index.md @@ -1,13 +1,13 @@ # ERPNext Videos

- Learn ERPNext + Learn ERPNext

- - + +
@@ -24,7 +24,7 @@
- +
diff --git a/erpnext/docs/user/videos/learn/index.html b/erpnext/docs/user/videos/learn/index.html index 70343a20e28..2dceecf9f6d 100644 --- a/erpnext/docs/user/videos/learn/index.html +++ b/erpnext/docs/user/videos/learn/index.html @@ -12,7 +12,7 @@

Using ERPNext