-
-
-
-
-
- ERPNext Documentation
-Detailed explanation for all ERPNext features and developer API
-
-
-
- 
-
-
- 
ERPNext')
- context.app.splash_light_background = True
- context.top_bar_items = [
- {"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},
- {"label": "Videos", "url": context.docs_base_url + "/user/videos", "right": 1},
- {"label": "API", "url": context.docs_base_url + "/current", "right": 1},
- {"label": "Forum", "url": 'https://discuss.erpnext.com', "right": 1}
- ]
+source_link = "https://github.com/frappe/erpnext"
\ No newline at end of file
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index b6f8b7deef..97bd771fa2 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -179,7 +179,6 @@ class calculate_taxes_and_totals(object):
for n, item in enumerate(self.doc.get("items")):
item_tax_map = self._load_item_tax_rate(item.item_tax_rate)
-
for i, tax in enumerate(self.doc.get("taxes")):
# tax_amount represents the amount of tax for the current step
current_tax_amount = self.get_current_tax_amount(item, tax, item_tax_map)
@@ -202,36 +201,45 @@ class calculate_taxes_and_totals(object):
# set tax after discount
tax.tax_amount_after_discount_amount += current_tax_amount
- if getattr(tax, "category", None):
- # if just for valuation, do not add the tax amount in total
- # hence, setting it as 0 for further steps
- current_tax_amount = 0.0 if (tax.category == "Valuation") \
- else current_tax_amount
+ current_tax_amount = self.get_tax_amount_if_for_valuation_or_deduction(current_tax_amount, tax)
- current_tax_amount *= -1.0 if (tax.add_deduct_tax == "Deduct") else 1.0
-
- # Calculate tax.total viz. grand total till that step
# note: grand_total_for_current_item contains the contribution of
# item's amount, previously applied tax and the current tax on that item
if i==0:
- tax.grand_total_for_current_item = flt(item.net_amount + current_tax_amount, tax.precision("total"))
+ tax.grand_total_for_current_item = flt(item.net_amount + current_tax_amount)
else:
tax.grand_total_for_current_item = \
- flt(self.doc.get("taxes")[i-1].grand_total_for_current_item + current_tax_amount, tax.precision("total"))
-
- # in tax.total, accumulate grand total of each item
- tax.total += tax.grand_total_for_current_item
+ flt(self.doc.get("taxes")[i-1].grand_total_for_current_item + current_tax_amount)
# set precision in the last item iteration
if n == len(self.doc.get("items")) - 1:
self.round_off_totals(tax)
+ self.set_cumulative_total(i, tax)
+
+ self._set_in_company_currency(tax,
+ ["total", "tax_amount", "tax_amount_after_discount_amount"])
# adjust Discount Amount loss in last tax iteration
if i == (len(self.doc.get("taxes")) - 1) and self.discount_amount_applied \
and self.doc.discount_amount and self.doc.apply_discount_on == "Grand Total":
self.adjust_discount_amount_loss(tax)
+ def get_tax_amount_if_for_valuation_or_deduction(self, tax_amount, tax):
+ # if just for valuation, do not add the tax amount in total
+ # if tax/charges is for deduction, multiply by -1
+ if getattr(tax, "category", None):
+ tax_amount = 0.0 if (tax.category == "Valuation") else tax_amount
+ tax_amount *= -1.0 if (tax.add_deduct_tax == "Deduct") else 1.0
+ return tax_amount
+ def set_cumulative_total(self, row_idx, tax):
+ tax_amount = tax.tax_amount_after_discount_amount
+ tax_amount = self.get_tax_amount_if_for_valuation_or_deduction(tax_amount, tax)
+
+ if row_idx == 0:
+ tax.total = flt(self.doc.net_total + tax_amount, tax.precision("total"))
+ else:
+ tax.total = flt(self.doc.get("taxes")[row_idx-1].total + tax_amount, tax.precision("total"))
def get_current_tax_amount(self, item, tax, item_tax_map):
tax_rate = self._get_tax_rate(tax, item_tax_map)
@@ -251,8 +259,6 @@ class calculate_taxes_and_totals(object):
current_tax_amount = (tax_rate / 100.0) * \
self.doc.get("taxes")[cint(tax.row_id) - 1].grand_total_for_current_item
- current_tax_amount = flt(current_tax_amount, tax.precision("tax_amount"))
-
self.set_item_wise_tax(item, tax, tax_rate, current_tax_amount)
return current_tax_amount
@@ -267,11 +273,9 @@ class calculate_taxes_and_totals(object):
tax.item_wise_tax_detail[key] = [tax_rate,flt(item_wise_tax_amount, tax.precision("base_tax_amount"))]
def round_off_totals(self, tax):
- tax.total = flt(tax.total, tax.precision("total"))
tax.tax_amount = flt(tax.tax_amount, tax.precision("tax_amount"))
- tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount, tax.precision("tax_amount"))
-
- self._set_in_company_currency(tax, ["total", "tax_amount", "tax_amount_after_discount_amount"])
+ tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount,
+ tax.precision("tax_amount"))
def adjust_discount_amount_loss(self, tax):
discount_amount_loss = self.doc.grand_total - flt(self.doc.discount_amount) - tax.total
diff --git a/erpnext/controllers/tests/test_mapper.py b/erpnext/controllers/tests/test_mapper.py
index 0e2d6d0b4e..14738c5ff2 100644
--- a/erpnext/controllers/tests/test_mapper.py
+++ b/erpnext/controllers/tests/test_mapper.py
@@ -4,7 +4,7 @@ import frappe
import random, json
import frappe.utils
-from frappe.utils import nowdate
+from frappe.utils import nowdate, add_months
from frappe.model import mapper
from frappe.test_runner import make_test_records
@@ -44,7 +44,9 @@ class TestMapper(unittest.TestCase):
"doctype": "Quotation",
"quotation_to": "Customer",
"customer": customer,
- "order_type": "Sales"
+ "order_type": "Sales",
+ "transaction_date" : nowdate(),
+ "valid_till" : add_months(nowdate(), 1)
})
for item in item_list:
qtn.append("items", {"qty": "2", "item_code": item.item_code})
diff --git a/erpnext/crm/doctype/item/test_item.js b/erpnext/crm/doctype/item/test_item.js
index 2f50ebedc3..b48f93aded 100644
--- a/erpnext/crm/doctype/item/test_item.js
+++ b/erpnext/crm/doctype/item/test_item.js
@@ -18,7 +18,8 @@ QUnit.test("test: item", function (assert) {
{item_group: "Products"},
{is_stock_item: is_stock_item},
{standard_rate: keyboard_cost},
- {opening_stock: no_of_items_to_stock}
+ {opening_stock: no_of_items_to_stock},
+ {default_warehouse: "Stores - RB"}
]
),
() => {
@@ -43,7 +44,8 @@ QUnit.test("test: item", function (assert) {
{item_group: "Products"},
{is_stock_item: is_stock_item},
{standard_rate: screen_cost},
- {opening_stock: no_of_items_to_stock}
+ {opening_stock: no_of_items_to_stock},
+ {default_warehouse: "Stores - RB"}
]
),
@@ -54,7 +56,8 @@ QUnit.test("test: item", function (assert) {
{item_group: "Products"},
{is_stock_item: is_stock_item},
{standard_rate: CPU_cost},
- {opening_stock: no_of_items_to_stock}
+ {opening_stock: no_of_items_to_stock},
+ {default_warehouse: "Stores - RB"}
]
),
@@ -62,7 +65,15 @@ QUnit.test("test: item", function (assert) {
() => frappe.tests.make(
"Item", [
{item_code: "Laptop"},
- {item_group: "Products"}
+ {item_group: "Products"},
+ {default_warehouse: "Stores - RB"}
+ ]
+ ),
+ () => frappe.tests.make(
+ "Item", [
+ {item_code: "Computer"},
+ {item_group: "Products"},
+ {is_stock_item: 0},
]
),
@@ -73,10 +84,37 @@ QUnit.test("test: item", function (assert) {
{item_group: "Products"},
{is_stock_item: is_stock_item},
{standard_rate: scrap_cost},
- {opening_stock: no_of_items_to_stock}
+ {opening_stock: no_of_items_to_stock},
+ {default_warehouse: "Stores - RB"}
+ ]
+ ),
+ () => frappe.tests.make(
+ "Item", [
+ {item_code: "Test Product 4"},
+ {item_group: "Products"},
+ {is_stock_item: 1},
+ {has_batch_no: 1},
+ {create_new_batch: 1},
+ {uoms:
+ [
+ [
+ {uom:"Unit"},
+ {conversion_factor: 10},
+ ]
+ ]
+ },
+ {taxes:
+ [
+ [
+ {tax_type:"SGST - "+frappe.get_abbr(frappe.defaults.get_default("Company"))},
+ {tax_rate: 0},
+ ]
+ ]},
+ {has_serial_no: 1},
+ {standard_rate: 100},
+ {opening_stock: 100},
]
),
-
() => done()
]);
});
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 692a6ba7bf..ae792ac4a0 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
import random, json
import frappe, erpnext
+from frappe.utils.nestedset import get_root_of
from frappe.utils import flt, now_datetime, cstr, random_string
from frappe.utils.make_random import add_random_children, get_random
from erpnext.demo.domains import data
@@ -361,10 +362,13 @@ def setup_pos_profile():
pos.update_stock = 0
pos.write_off_account = 'Cost of Goods Sold - '+ company_abbr
pos.write_off_cost_center = 'Main - '+ company_abbr
+ pos.customer_group = get_root_of('Customer Group')
+ pos.territory = get_root_of('Territory')
pos.append('payments', {
'mode_of_payment': frappe.db.get_value('Mode of Payment', {'type': 'Cash'}, 'name'),
- 'amount': 0.0
+ 'amount': 0.0,
+ 'default': 1
})
pos.insert()
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 0b644c42d3..1570df5963 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -67,7 +67,7 @@ def work():
if random.randint(0, 1):
#make journal entry against expense claim
- je = frappe.get_doc(make_bank_entry(expense_claim.name))
+ je = frappe.get_doc(make_bank_entry("Expense Claim", expense_claim.name))
je.posting_date = frappe.flags.current_date
je.cheque_no = random_string(10)
je.cheque_date = frappe.flags.current_date
diff --git a/erpnext/docs/assets/img/pos-setting/default_mop.png b/erpnext/docs/assets/img/pos-setting/default_mop.png
new file mode 100644
index 0000000000..bd1e7a07e9
Binary files /dev/null and b/erpnext/docs/assets/img/pos-setting/default_mop.png differ
diff --git a/erpnext/docs/assets/img/pos-setting/item_customer_group.png b/erpnext/docs/assets/img/pos-setting/item_customer_group.png
new file mode 100644
index 0000000000..6117a8f266
Binary files /dev/null and b/erpnext/docs/assets/img/pos-setting/item_customer_group.png differ
diff --git a/erpnext/docs/assets/img/pos-setting/pos-setting.png b/erpnext/docs/assets/img/pos-setting/pos-setting.png
deleted file mode 100644
index 606119921c..0000000000
Binary files a/erpnext/docs/assets/img/pos-setting/pos-setting.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/pos-setting/pos_profile.png b/erpnext/docs/assets/img/pos-setting/pos_profile.png
new file mode 100644
index 0000000000..a8bd4acaa0
Binary files /dev/null and b/erpnext/docs/assets/img/pos-setting/pos_profile.png differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permission-company.png b/erpnext/docs/assets/img/users-and-permissions/user-permission-company.png
deleted file mode 100644
index eb529f1792..0000000000
Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permission-company.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permission-quotation.png b/erpnext/docs/assets/img/users-and-permissions/user-permission-quotation.png
deleted file mode 100644
index ee7a19b51a..0000000000
Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permission-quotation.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png
deleted file mode 100644
index 0aececd0d6..0000000000
Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png
deleted file mode 100644
index 5f55e37b40..0000000000
Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png
deleted file mode 100644
index 23564fafe6..0000000000
Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-new.gif b/erpnext/docs/assets/img/users-and-permissions/user-permissions-new.gif
deleted file mode 100644
index 609bf257e2..0000000000
Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permissions-new.gif and /dev/null differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png
deleted file mode 100644
index dd9ed49d68..0000000000
Binary files a/erpnext/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png and /dev/null differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-perms/ignore-user-permissions.png b/erpnext/docs/assets/img/users-and-permissions/user-perms/ignore-user-permissions.png
new file mode 100644
index 0000000000..56e0d44bcf
Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/user-perms/ignore-user-permissions.png differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png b/erpnext/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png
new file mode 100644
index 0000000000..d2762dd7b6
Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-perms/permitted-documents.png b/erpnext/docs/assets/img/users-and-permissions/user-perms/permitted-documents.png
new file mode 100644
index 0000000000..2558b62d01
Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/user-perms/permitted-documents.png differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-perms/select-document-types.png b/erpnext/docs/assets/img/users-and-permissions/user-perms/select-document-types.png
new file mode 100644
index 0000000000..b54d36ac87
Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/user-perms/select-document-types.png differ
diff --git a/erpnext/docs/assets/img/users-and-permissions/user-perms/view-selected-documents.png b/erpnext/docs/assets/img/users-and-permissions/user-perms/view-selected-documents.png
new file mode 100644
index 0000000000..bc2ce7854b
Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/user-perms/view-selected-documents.png differ
diff --git a/erpnext/docs/contents.html b/erpnext/docs/contents.html
deleted file mode 100644
index 59d0b4459d..0000000000
--- a/erpnext/docs/contents.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-Detailed explanation for all ERPNext features and developer API
-
- ERPNext is a fully featured ERP system designed for Small and Medium Sized -business. ERPNext covers a wide range of features including Accounting, CRM, -Inventory management, Selling, Purchasing, Manufacturing, Projects, HR & -Payroll, Website, E-Commerce and much more.
- -ERPNext is based on the Frappe Framework is highly customizable and extendable. -You can create Custom Form, Fields, Scripts and can also create your own Apps -to extend ERPNext functionality.
- -ERPNext is Open Source under the GNU General Public Licence v3 and has been -listed as one of the Best Open Source Softwares in the world by many online -blogs.
- -To install this app, login to your site and click on "Installer". Search for ERPNext and click on "Install"
-Go to your bench folder and setup the new app
-$ bench get-app erpnext https://github.com/frappe/erpnext
-$ bench new-site testsite
-$ bench --site testsite install-app erpnextLogin to your site to configure the app.
- -Frappe Technologies Pvt. Ltd. (info@erpnext.com)
-Version 3, 29 June 2007
- -Copyright (C) 2007 Free Software Foundation, Inc. -http://fsf.org/
- -Everyone is permitted to copy and distribute verbatim copies of this -license document, but changing it is not allowed.
- -The GNU General Public License is a free, copyleft license for -software and other kinds of works.
- -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom -to share and change all versions of a program--to make sure it remains -free software for all its users. We, the Free Software Foundation, use -the GNU General Public License for most of our software; it applies -also to any other work released this way by its authors. You can apply -it to your programs, too.
- -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things.
- -To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you -have certain responsibilities if you distribute copies of the -software, or if you modify it: responsibilities to respect the freedom -of others.
- -For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights.
- -Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it.
- -For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions.
- -Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the -manufacturer can do so. This is fundamentally incompatible with the -aim of protecting users' freedom to change the software. The -systematic pattern of such abuse occurs in the area of products for -individuals to use, which is precisely where it is most unacceptable. -Therefore, we have designed this version of the GPL to prohibit the -practice for those products. If such problems arise substantially in -other domains, we stand ready to extend this provision to those -domains in future versions of the GPL, as needed to protect the -freedom of users.
- -Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish -to avoid the special danger that patents applied to a free program -could make it effectively proprietary. To prevent this, the GPL -assures that patents cannot be used to render the program non-free.
- -The precise terms and conditions for copying, distribution and -modification follow.
- -"This License" refers to version 3 of the GNU General Public License.
- -"Copyright" also means copyright-like laws that apply to other kinds -of works, such as semiconductor masks.
- -"The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations.
- -To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of -an exact copy. The resulting work is called a "modified version" of -the earlier work or a work "based on" the earlier work.
- -A "covered work" means either the unmodified Program or a work based -on the Program.
- -To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well.
- -To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user -through a computer network, with no transfer of a copy, is not -conveying.
- -An interactive user interface displays "Appropriate Legal Notices" to -the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion.
- -The "source code" for a work means the preferred form of the work for -making modifications to it. "Object code" means any non-source form of -a work.
- -A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language.
- -The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it.
- -The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work.
- -The Corresponding Source need not include anything that users can -regenerate automatically from other parts of the Corresponding Source.
- -The Corresponding Source for a work in source code form is that same -work.
- -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law.
- -You may make, run and propagate covered works that you do not convey, -without conditions so long as your license otherwise remains in force. -You may convey covered works to others for the sole purpose of having -them make modifications exclusively for you, or provide you with -facilities for running those works, provided that you comply with the -terms of this License in conveying all material for which you do not -control copyright. Those thus making or running the covered works for -you must do so exclusively on your behalf, under your direction and -control, on terms that prohibit them from making any copies of your -copyrighted material outside their relationship with you.
- -Conveying under any other circumstances is permitted solely under the -conditions stated below. Sublicensing is not allowed; section 10 makes -it unnecessary.
- -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures.
- -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such -circumvention is effected by exercising rights under this License with -respect to the covered work, and you disclaim any intention to limit -operation or modification of the work as a means of enforcing, against -the work's users, your or third parties' legal rights to forbid -circumvention of technological measures.
- -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program.
- -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee.
- -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these -conditions:
- -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate.
- -You may convey a covered work in object code form under the terms of -sections 4 and 5, provided that you also convey the machine-readable -Corresponding Source under the terms of this License, in one of these -ways:
- -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work.
- -A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, -family, or household purposes, or (2) anything designed or sold for -incorporation into a dwelling. In determining whether a product is a -consumer product, doubtful cases shall be resolved in favor of -coverage. For a particular product received by a particular user, -"normally used" refers to a typical or common use of that class of -product, regardless of the status of the particular user or of the way -in which the particular user actually uses, or expects or is expected -to use, the product. A product is a consumer product regardless of -whether the product has substantial commercial, industrial or -non-consumer uses, unless such uses represent the only significant -mode of use of the product.
- -"Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to -install and execute modified versions of a covered work in that User -Product from a modified version of its Corresponding Source. The -information must suffice to ensure that the continued functioning of -the modified object code is in no case prevented or interfered with -solely because modification has been made.
- -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM).
- -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or -updates for a work that has been modified or installed by the -recipient, or for the User Product in which it has been modified or -installed. Access to a network may be denied when the modification -itself materially and adversely affects the operation of the network -or violates the rules and protocols for communication across the -network.
- -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying.
- -"Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions.
- -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission.
- -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders -of that material) supplement the terms of this License with terms:
- -All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying.
- -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms.
- -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; the -above requirements apply either way.
- -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11).
- -However, if you cease all violation of this License, then your license -from a particular copyright holder is reinstated (a) provisionally, -unless and until the copyright holder explicitly and finally -terminates your license, and (b) permanently, if the copyright holder -fails to notify you of the violation by some reasonable means prior to -60 days after the cessation.
- -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice.
- -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10.
- -You are not required to accept this License in order to receive or run -a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so.
- -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License.
- -An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts.
- -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it.
- -A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version".
- -A contributor's "essential patent claims" are all patent claims owned -or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License.
- -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version.
- -In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party.
- -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid.
- -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it.
- -A patent license is "discriminatory" if it does not include within the -scope of its coverage, prohibits the exercise of, or is conditioned on -the non-exercise of one or more of the rights that are specifically -granted under this License. You may not convey a covered work if you -are a party to an arrangement with a third party that is in the -business of distributing software, under which you make payment to the -third party based on the extent of your activity of conveying the -work, and under which the third party grants, to any of the parties -who would receive the covered work from you, a discriminatory patent -license (a) in connection with copies of the covered work conveyed by -you (or copies made from those copies), or (b) primarily for and in -connection with specific products or compilations that contain the -covered work, unless you entered into that arrangement, or that patent -license was granted, prior to 28 March 2007.
- -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law.
- -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under -this License and any other pertinent obligations, then as a -consequence you may not convey it at all. For example, if you agree to -terms that obligate you to collect a royalty for further conveying -from those to whom you convey the Program, the only way you could -satisfy both those terms and this License would be to refrain entirely -from conveying the Program.
- -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such.
- -The Free Software Foundation may publish revised and/or new versions -of the GNU General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in -detail to address new problems or concerns.
- -Each version is given a distinguishing version number. If the Program -specifies that a certain numbered version of the GNU General Public -License "or any later version" applies to it, you have the option of -following the terms and conditions either of that numbered version or -of any later version published by the Free Software Foundation. If the -Program does not specify a version number of the GNU General Public -License, you may choose any version ever published by the Free -Software Foundation.
- -If the Program specifies that a proxy can decide which future versions -of the GNU General Public License can be used, that proxy's public -statement of acceptance of a version permanently authorizes you to -choose that version for the Program.
- -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version.
- -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND -PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE -DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION.
- -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR -CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT -NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR -LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM -TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER -PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee.
- -END OF TERMS AND CONDITIONS
- -If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these -terms.
- -To do so, attach the following notices to the program. It is safest to -attach them to the start of each source file to most effectively state -the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found.
- - <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-Also add information on how to contact you by electronic and paper -mail.
- -If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode:
- - <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-The hypothetical commands `show w' and `show c' should show the -appropriate parts of the General Public License. Of course, your -program's commands might be different; for a GUI interface, you would -use an "about box".
- -You should also get your employer (if you work as a programmer) or -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. For more information on this, and how to apply and follow -the GNU GPL, see http://www.gnu.org/licenses/.
- -The GNU General Public License does not permit incorporating your -program into proprietary programs. If your program is a subroutine -library, you may consider it more useful to permit linking proprietary -applications with the library. If this is what you want to do, use the -GNU Lesser General Public License instead of this License. But first, -please read http://www.gnu.org/philosophy/why-not-lgpl.html.
- - - \ No newline at end of file diff --git a/erpnext/docs/license.md b/erpnext/docs/license.md index b0310f64f2..d3c0b8d2ab 100644 --- a/erpnext/docs/license.md +++ b/erpnext/docs/license.md @@ -4,8 +4,8 @@(c) 2013 Frappe Technologies Pvt Ltd. Mumbai -ERPNext is a trademark of Frappe Technologies
+(c) 2013 Frappé Technologies Pvt Ltd. Mumbai +ERPNext is a trademark of Frappé Technologies
The ERPNext code is licensed under the GNU General Public License (v3) as mentioned below and the Documentation is licensed under Creative Commons (CC-BY-SA-3.0)
diff --git a/erpnext/docs/temp.py b/erpnext/docs/temp.py deleted file mode 100644 index 0cddeaa670..0000000000 --- a/erpnext/docs/temp.py +++ /dev/null @@ -1,10 +0,0 @@ -import os, re - -for basepath, folders, files in os.walk("."): - for f in files: - if f.endswith(".html") or f.endswith(".md"): - with open(os.path.join(basepath, f), "r") as c: - content = c.read() - - for path in re.findall("""{{.?docs_base_url.?}}([^'"\)]*)""", content): - print path diff --git a/erpnext/docs/user/index.md b/erpnext/docs/user/index.md index 7ce09d357e..2ed4ed32a9 100644 --- a/erpnext/docs/user/index.md +++ b/erpnext/docs/user/index.md @@ -2,5 +2,5 @@ Learn ERPNext by watching the user manual or training videos. -1. [User Manual]({{docs_base_url}}/user/manual) -1. [Help Videos]({{docs_base_url}}/user/videos/learn) +1. [User Manual](/docs/user/manual) +1. [Help Videos](/docs/user/videos/learn) diff --git a/erpnext/docs/user/manual/de/Beispiel/index.md b/erpnext/docs/user/manual/de/Beispiel/index.md index 1a613515f5..635507fc8e 100644 --- a/erpnext/docs/user/manual/de/Beispiel/index.md +++ b/erpnext/docs/user/manual/de/Beispiel/index.md @@ -1,2 +1,4 @@ +# Beispiel + Hier steht die Übersetzung Beigetragen von CWT Connector & Wire Technology GmbH diff --git a/erpnext/docs/user/manual/de/CRM/contact.md b/erpnext/docs/user/manual/de/CRM/contact.md index b937c65d18..49b5ffb0db 100644 --- a/erpnext/docs/user/manual/de/CRM/contact.md +++ b/erpnext/docs/user/manual/de/CRM/contact.md @@ -7,11 +7,11 @@ Um einen neuen Kontakt zu erstellen, gehe Sie zu > CRM > Dokumente > Kontakt > Neu -
+
Alternativ können Sie einen Kontakt oder eine Adresse auch direkt aus dem Kundendatensatz erstellen. Klicken Sie hierzu auf "Neuer Kontakt" oder "Neue Adresse".
-
+
> Tipp: Wenn Sie in einer beliebigen Transaktion einen Kunden auswählen, wird ein Kontakt und eine Adresse vorselektiert. Das sind dann der Standardkontakt und die Standardadresse.
diff --git a/erpnext/docs/user/manual/de/CRM/customer.md b/erpnext/docs/user/manual/de/CRM/customer.md
index c730c6876b..c7d6654858 100644
--- a/erpnext/docs/user/manual/de/CRM/customer.md
+++ b/erpnext/docs/user/manual/de/CRM/customer.md
@@ -7,7 +7,7 @@ Sie können Ihre Kunden entweder direkt erstellen über
> CRM > Dokumente > Kunde > Neu
-
+
oder einen Upload über ein Datenimportwerkzeug durchführen.
@@ -17,7 +17,7 @@ oder einen Upload über ein Datenimportwerkzeug durchführen.
Kontakte und Adressen werden in ERPNext getrennt gespeichert, damit Sie mehrere verschiedene Kontakte oder Adressen mit Kunden und Lieferanten verknüpfen können.
-Lesen Sie hierzu auch [Kontakt]({{docs_base_url}}/user/manual/de/CRM/contact.html).
+Lesen Sie hierzu auch [Kontakt](/docs/user/manual/de/CRM/contact.html).
### Einbindung in Konten
diff --git a/erpnext/docs/user/manual/de/CRM/lead.md b/erpnext/docs/user/manual/de/CRM/lead.md
index 8bb9ce4f16..47a4492633 100644
--- a/erpnext/docs/user/manual/de/CRM/lead.md
+++ b/erpnext/docs/user/manual/de/CRM/lead.md
@@ -16,6 +16,6 @@ Um einen Lead zu generieren, gehen Sie zu:
> CRM > Dokumente > Lead > Neu
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/CRM/newsletter.md b/erpnext/docs/user/manual/de/CRM/newsletter.md
index 8a18e6425f..bc7e989421 100644
--- a/erpnext/docs/user/manual/de/CRM/newsletter.md
+++ b/erpnext/docs/user/manual/de/CRM/newsletter.md
@@ -7,8 +7,8 @@ In ERPNext können sie diese Benutzerschnittstelle nutzen um eine große Zahl vo
Wählen Sie die Liste der Empfänger aus, an die Sie die E-Mail senden wollen. Tragen Sie Ihren Inhalt in das Nachrichtenfeld ein und versenden Sie den Newsletter. Wenn Sie die E-Mail vorher testen wollen, um zu sehen, wie sie für den Empfänger aussieht, können Sie die Testfunktion nutzen. Speichern Sie das Dokument vor dem Test. Eine Test-E-Mail wird dann an Ihr E-Mail-Konto gesendet. Sie können die E-Mail an alle vorgesehenen Empfänger senden, wenn Sie auf die Schaltfläche "Senden" klicken.
-
+
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/CRM/opportunity.md b/erpnext/docs/user/manual/de/CRM/opportunity.md
index c9122f3d85..181348f115 100644
--- a/erpnext/docs/user/manual/de/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/de/CRM/opportunity.md
@@ -11,11 +11,11 @@ Alternativ können Sie einen offenen Lead öffnen und auf die Schaltfläche "Opp
### Abbildung 1: Opportunity erstellen
-
+
### Abbildung 2: Opportunity aus einem offenen Lead heraus erstellen
-
+
Eine Opportunity kann auch aus einem bereits vorhandenen Kunden heraus entstehen. Sie können mehrere verschiedene Opportunities zum gleichen Lead erstellen. In einer Opportunity können Sie abgesehen von der Kommunikation auch die Artikel mit vermerken, nach denen der Lead oder Kontakt sucht.
diff --git a/erpnext/docs/user/manual/de/CRM/setup/campaign.md b/erpnext/docs/user/manual/de/CRM/setup/campaign.md
index c9b1ac80d9..700bb325c3 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/campaign.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/campaign.md
@@ -3,19 +3,19 @@
Eine Kampagne ist eine groß angelegte Umsetzung einer Vertriebsstrategie um ein Produkt oder eine Dienstleistung zu bewerben. Dies erfolgt in einem Marktsegment in einer bestimmten geographischen Region um bestimmte Ziele zu erreichen.
-
+
-Sie können in einer Kampagne [Leads]({{docs_base_url}}/user/manual/de/CRM/lead.html), [Opportunities]({{docs_base_url}}/user/manual/de/CRM/opportunity.html) und [Angebote]({{docs_base_url}}/user/manual/de/selling/quotation.html) nachverfolgen.
+Sie können in einer Kampagne [Leads](/docs/user/manual/de/CRM/lead.html), [Opportunities](/docs/user/manual/de/CRM/opportunity.html) und [Angebote](/docs/user/manual/de/selling/quotation.html) nachverfolgen.
### Leads zu einer Kampagne nachverfolgen
* Um einen Lead zu einer Kampagne nach zu verfolgen, wählen Sie "Leads anzeigen" aus.
-
+
* Sie sollten jetzt eine gefilterte Übersicht aller Leads erhalten, die zu dieser Kampagne gehören.
* Sie können auch einen neuen Lead erstellen indem Sie auf "Neu" klicken.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
index 4cdeb22fd7..c7ec3e226d 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
@@ -3,10 +3,10 @@
Kundengruppen versetzen Sie in die Lage Ihre Kunden zu organisieren. Sie können auch Rabatte auf der Basis von Kundengruppen berechnen. Außerdem können Sie Trendanalysen für jede Gruppe erstellen. Typischerweise werden Kunden nach Marktsegmenten gruppiert (das basiert normalerweise auf Ihrer Domäne).
-
+
> Tipp: Wenn Sie der Meinung sind, dass hier zu viel Aufwand getrieben wird, dann können Sie es bei einer Standard-Kundengruppe belassen. Aber der gesamte Aufwand wird sich dann auszahlen, wenn Sie die ersten Berichte erhalten. Ein Beispiel eines Berichts ist unten abgebildet.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/CRM/setup/sales-person.md b/erpnext/docs/user/manual/de/CRM/setup/sales-person.md
index 77d6ea0c48..f615da4b44 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/sales-person.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/sales-person.md
@@ -3,7 +3,7 @@
Vertriebsmitarbeiter verhalten sich wie Regionen. Sie können ein Organigramm der Vertriebsmitarbeiter erstellen, in dem individuell das Vertriebsziel des Vertriebsmitarbeiters vermerkt werden kann. Genauso wie in der Region muss das Ziel einer Artikelgruppe zugeordnet werden.
-
+
### Vertriebspersonen in Transaktionen
diff --git a/erpnext/docs/user/manual/de/accounts/accounting-entries.md b/erpnext/docs/user/manual/de/accounts/accounting-entries.md
index fc5a259c67..8367dbfbd6 100644
--- a/erpnext/docs/user/manual/de/accounts/accounting-entries.md
+++ b/erpnext/docs/user/manual/de/accounts/accounting-entries.md
@@ -5,19 +5,19 @@ Das Konzept der Buchführung erklärt sich über unten angeführtes Beispiel: Wi
* Max Mustermann (Inhaber des Teeladens) investiert 25.000 Euro um die Geschäftstätigkeit zu beginnen.
-
+
**Analyse:** Max Mustermann investiert 25.000 Euro in das Unternehmen in der Hoffnung Gewinne zu erhalten. In anderen Worten schuldet die Firma 25.000 Euro an Max Mustermann, die in der Zukunft zurück gezahlt werden müssen. Deshalb ist das Konto Max Mustermann ein Verbindlichkeitenkonto und wird im Haben gebucht. Aufgrund der Investition steigen die Barmittel der Firma, "Kasse" ist ein Vermögenswert des Unternehmens und wird im Soll gebucht.
* Die Firma benötigt sofort Geschäftsausstattung (Kocher, Teekannen, Tassen, etc.) und Rohmaterial (Tee, Zucker, Milch, etc.). Max Mustermann beschliesst im nächstgelegenen Gemischtwarenladen "Superbasar", mit dem er freundschaftlich verbunden ist, einzukaufen, und erhält dort Kredit. Die Geschäftsausstattung hat einen Wert von 2.800 Euro und das Rohmaterial von 2.200 Euro. Er zahlt 2.000 Euro von den insgesamt 5.000 Euro.
-
+
**Analyse:** Die Geschäftsausstattung ist Anlagevermögen der Firma (weil sie eine lange Lebensdauer hat) und das Rohmaterial ist Umlaufvermögen (weil es für das Tagesgeschäft verwendet wird). Aus diesem Grund wurden die Konten "Geschäftsausstattung" und "Warenbestand" im Soll gebucht und im Bestand erhöht. Max Mustermann zahlt 2.000 Euro, deshalb reduziert sich das Konto "Kasse" um diesen Betrag, weil der Geschäftsvorfall im Haben gebucht wird. Weil Max Mustermann Kredit erhält, und vereinbart wurde, dass 3.000 Euro später an "Superbasar" gezahlt werden, werden 3.000 Euro im Soll auf das Verbindlichkeitenkonto "Superbasar" gebucht.
* Max Mustermann (, der sich um die Buchungen kümmert,) beschliesst zum Ende jeden Tages die Verkäufe zu buchen, so dass er täglich die Verkäufe analysieren kann. Am Ende des allerersten Tages hat der Teeladen 325 Tassen Tee verkauft, was einen Umsatz von 1.575 Euro ergibt. Der Inhaber verbucht hocherfreut die Umsätze seines ersten Tages.
-
+
**Analyse:** Der Ertrag wird auf dem Konto "Teeverkäufe" im Haben verbucht und der selbe Betrag wird auf dem Konto "Kasse" im Soll verbucht. Nehmen wir an, dass es 800 Euro kostet 325 Tassen Tea zuzubereiten. Deshalb reduziert sich das Konto "Waren" im Haben um 800 Euro und der Aufwand wird auf dem Konto "Warenaufwand" in selber Höhe im Soll gebucht.
@@ -27,7 +27,7 @@ Das Konzept der Buchführung erklärt sich über unten angeführtes Beispiel: Wi
Im Laufe des Monats kauft die Firma weiteres Rohmaterial für die Geschäftstätigkeit ein. Nach einem Monat bucht Max Mustermann den Gewinn um die Bilanz und die Gewinn- und Verlustrechnung auszugleichen. Den Gewinn erhält Max Mustermann und nicht die Firma, da es sich für die Firma um eine Verbindlichkeit handelt (sie muss ihn an Max Mustermann zahlen). Wenn die Bilanz nicht ausgeglichen ist, d. h. Aktive und Passive nicht gleich sind, dann wurde der Gewinn noch nicht verbucht. Um den Gewinn zu buchen, muss der folgende Buchungssatz erstellt werden:
-
+
Erklärung: Die Nettoumsätze und Aufwände der Firme belaufen sich auf 40.000 bzw. 20.000 Euro. Die Firma hat also einen Gewinn von 20.000 Euro erwirtschaftet. Bei der Verbuchung des Gewinns wird dieser auf dem Konto GuV im Soll gebucht und die Gegenbuchung auf dem Konto "Eigenkapital" im Haben. Der Saldo des Kassenkontos der Firma beträgt 44.000 Euro und es ist Rohmaterial im Wert von 1.000 Euro übrig.
diff --git a/erpnext/docs/user/manual/de/accounts/accounting-reports.md b/erpnext/docs/user/manual/de/accounts/accounting-reports.md
index b9f0fca267..deab83b2ad 100644
--- a/erpnext/docs/user/manual/de/accounts/accounting-reports.md
+++ b/erpnext/docs/user/manual/de/accounts/accounting-reports.md
@@ -8,7 +8,7 @@ Hier sehen Sie einige der wichtigsten Berichte aus dem Rechnungswesen:
Das Hauptbuch basiert auf der Tabelle der Hauptbucheinträge und kann nach einem Konto und einem Zeitraum gefiltert werden. Das hilft Ihnen dabei einen Überblick über alle Buchungen zu erhalten, die zu einem Konto in einem bestimmten Zeitraum getätigt wurden.
+ src="/docs/assets/img/accounts/general-ledger.png">
### Probebilanz
@@ -19,7 +19,7 @@ Eine Probebilanz ist eine Liste von Kontoständen aller Konten (Bücher und Grup
* Summe Haben
* Schlußstand
-
+
Die Summe aller Schlußstände in einer Probebilanz muss 0 sein.
@@ -27,12 +27,12 @@ Die Summe aller Schlußstände in einer Probebilanz muss 0 sein.
Diese Berichte helfen Ihnen dabei, die offenen Posten bei Rechnungen von Kunden und Lieferanten nachzuverfolgen. In diesem Bericht sehen Sie die offenen Beträge nach Zeiträumen geordnet, d. h. 0-30 Tage, 30-60 Tage und so weiter.
-
+
### Auflistung der Verkäufe und Einkäufe
In diesem Bericht wird jedes Steuerkonto in Spalten dargestellt. Für jede Rechnung und jeden Rechnungsposten erhalten Sie den Betrag und die individuelle Steuer, die gezahlt wurde, basierend auf der Tabelle der Steuern und Abgaben.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md
index 288b35ed57..54633b2182 100644
--- a/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/de/accounts/advance-payment-entry.md
@@ -15,7 +15,7 @@ Da der Kunde 5.000 Euro bar angezahlt hat, wird dieser Betrag als Habenbuchung z
#### Abbildung 1: Journalbuchung bei Vorkasse
-
+
### Doppelte Buchführung
@@ -23,7 +23,7 @@ Bei der doppelten Buchführung hat jede Transaktion einen positiven oder negativ
#### Abbildung 2: Transaktion und Ausgleichsbuchung
-
+
Speichern und übertragen Sie den Buchungssatz. Wenn das Dokument nicht gespeichert wird, dann wird es in anderen Buchungsdokumenten nicht übernommen.
@@ -33,7 +33,7 @@ Um die Ausgangsrechnung mit einem Buchungssatz zu verknüpfen, der die Buchung z
#### Abbildung 3: Anzahlung erhalten
-
+
Speichern und übertragen Sie die Ausgangsrechnung
diff --git a/erpnext/docs/user/manual/de/accounts/budgeting.md b/erpnext/docs/user/manual/de/accounts/budgeting.md
index 88ef179802..7495e3c91e 100644
--- a/erpnext/docs/user/manual/de/accounts/budgeting.md
+++ b/erpnext/docs/user/manual/de/accounts/budgeting.md
@@ -11,29 +11,29 @@ Um ein Budget zuzuweisen, gehen Sie zu Rechnungswesen > Einstellungen > Übersic
#### Schritt 1: Klicken Sie auf "Öffnen
-
+
#### Schritt 2: Monatliche Verteilung eingeben
-
+
Wenn Sie die Verteilungs-ID leer lassen, kalkuliert ERPNext auf einer jährlichen Basis und bricht auf die Monate herunter.
#### Schritt 3: Fügen Sie eine neue Zeile hinzu und wählen Sie das Budget-Konto
-
+
### Anlegen einer neuen Verteilungs-ID
ERPNext erlaubt es Ihnen einige Aktionen für Budgets einzustellen. Das legt fest, ob bei Überschreiten des Budgets gestoppt, gewarnte oder ignoriert werden soll.
-
+
Das kann über die Firmenstammdaten eingestellt werden.
-
+
Auch dann, wenn Sie für überschrittene Budgets "ignorieren" auswählen, bekommen Sie eine Fülle von Informationen über den Bericht zur Abweichung zwischen Budget und Istwert. Dieser Bericht zeigt Ihnen auf monatlicher Basis die tatsächlichen Ausgaben verglichen mit den budgetierten Ausgaben.
diff --git a/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md
index 551367e66e..b9e93e0f2e 100644
--- a/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md
+++ b/erpnext/docs/user/manual/de/accounts/chart-of-accounts.md
@@ -17,7 +17,7 @@ Als Manager werden Sie zu schätzen wissen, wenn Sie beurteilen können wie Ihr
Sie können in ERPNext leicht die finanzielle Lage Ihres Unternehmens einsehen. Ein Beispiel für eine Finanzanalyse sehen Sie unten abgebildet.
-
+
Um Ihren Kontenplan in ERPNext zu bearbeiten gehen Sie zu:
@@ -27,7 +27,7 @@ Im Kontenplan erhalten Sie eine Baumstruktur der Konten(bezeichnungen) und Konte
Lassen Sie uns die Hauptgruppen des Kontenplans besser verstehen lernen.
-
+
### Bilanzkonten
@@ -47,7 +47,7 @@ Entgegen den Bilanzkonten, repräsentieren Gewinn und Verlustkonnten (GuV) keine
In ERPNext ist es einfach eine graphische Auswertung von Gewinn und Verlust zu erstellen. Im Folgenden ist ein Beispiel einer GuV-Analyse abgebildet:
-
+
(Am ersten Tag eines Jahres haben Sie noch keinen Gewinn oder Verlust gemacht, aber Sie haben bereits Vermögen, deshalb haben Bestandskonten zum Anfang oder Ende eines Zeitraums einen Wert.)
@@ -61,7 +61,7 @@ Buchungstransaktionen können nur zu Kontobüchern erstellt werden (nicht zu Gru
> Anmerkung: Ein Kontenbuch wird manchmal auch als Kontokopf bezeichnet.
-
+
### Andere Kontentypen
@@ -71,7 +71,7 @@ Wenn sie in ERPNext ein neues Konto anlegen, können Sie dazu auch Informationen
Um ein neues Konto zu erstellen, gehen Sie Ihren Kontenplan durch und klicken Sie auf die Kontengruppe unter der Sie das neue Konto erstellen wollen. Auf der rechten Seite finden Sie die Option ein neues Konto zu "öffnen" oder ein Unterkonto zu erstellen.
-
+
Die Option zum Erstellen erscheint nur dann, wenn Sie auf ein Konto vom Typ Gruppe (Ordner) klicken.
diff --git a/erpnext/docs/user/manual/de/accounts/credit-limit.md b/erpnext/docs/user/manual/de/accounts/credit-limit.md
index dc13819b67..b769817f91 100644
--- a/erpnext/docs/user/manual/de/accounts/credit-limit.md
+++ b/erpnext/docs/user/manual/de/accounts/credit-limit.md
@@ -9,7 +9,7 @@ Um das Kreditlimit einzustellen, gehen Sie zur Kundenvorlage
### Abbildung 1: Kreditlinie
-
+
Gehen Sie zum Abschnitt "Kreditlimit" und geben Sie den Betrag in das Feld "Kreditlimit" ein.
@@ -21,7 +21,7 @@ Im Feld Kredit-Controller wählen Sie die Rolle aus, die dazu autorisiert sein s
### Abbildung 2: Kredit-Controller
-
+
Speichern Sie die Änderungen
diff --git a/erpnext/docs/user/manual/de/accounts/item-wise-tax.md b/erpnext/docs/user/manual/de/accounts/item-wise-tax.md
index 2ebe80fdcd..768693c99c 100644
--- a/erpnext/docs/user/manual/de/accounts/item-wise-tax.md
+++ b/erpnext/docs/user/manual/de/accounts/item-wise-tax.md
@@ -7,7 +7,7 @@ Wenn Sie über die Einstellung "Steuern und andere Abgaben" Steuern auswählen,
Die Artikelstammdaten beinhalten eine Tabelle, in der Sie Steuern, die angewendet werden sollen, auflisten können.
-
+
Der im Artikelstamm angegebene Steuersatz hat gegenüber dem Steuersatz, der in Transaktionen angegeben wird, Vorrang.
@@ -19,7 +19,7 @@ In den Stammdaten für Steuern und andere Abgaben sollten Sie alle auf Artikel a
Beispiel: Wenn Sie Artikel mit 5% Umsatzsteuer haben, bei anderen eine Dienstleistungssteuer anfällt und bei wieder anderen eine Luxussteuer, dann sollten Ihre Steuerstammdaten auch alle drei Steuern enthalten.
-
+
#### Schritt 3: Steuersatz in den Stammdaten für Steuern und Abgaben auf 0 einstellen
@@ -27,6 +27,6 @@ In den Stammdaten für Steuern und andere Abgaben wird der Steuersatz mit 0% ein
Basierend auf den obigen Einstellungen werden Steuern also wie in den Artikelstammdaten angegeben angewendet. Probieren Sie beispielsweise Folgendes aus:
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/journal-entry.md b/erpnext/docs/user/manual/de/accounts/journal-entry.md
index 08851308ce..3ccc0490ef 100644
--- a/erpnext/docs/user/manual/de/accounts/journal-entry.md
+++ b/erpnext/docs/user/manual/de/accounts/journal-entry.md
@@ -7,7 +7,7 @@ Um einen neuen Buchungssatz zu erstellen, gehen Sie zu:
> Rechnungswesen > Dokumente > Journalbuchung > Neu
-
+
In einem Buchungssatz müssen Sie folgendes tun:
diff --git a/erpnext/docs/user/manual/de/accounts/making-payments.md b/erpnext/docs/user/manual/de/accounts/making-payments.md
index 0c2e041c50..00c8d106bd 100644
--- a/erpnext/docs/user/manual/de/accounts/making-payments.md
+++ b/erpnext/docs/user/manual/de/accounts/making-payments.md
@@ -8,7 +8,7 @@ Zahlungen zu Ausgangs- oder Eingangsrechnungen können über die Schaltfläche "
1. Geben Sie Schecknummer und Scheckdatum ein.
1. Speichern und Übertragen Sie.
-
+
Zahlungen können auch unabhängig von Rechnungen erstellt werden, indem Sie einen neuen Journalbeleg erstellen und die Zahlungsart auswählen.
@@ -30,7 +30,7 @@ Für Zahlungen an Lieferanten gilt:
### Beispiel eines Buchungssatzes für eine Zahlung
-
+
---
diff --git a/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md
index ad9eaaf337..0b0adaa39e 100644
--- a/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/de/accounts/multi-currency-accounting.md
@@ -7,15 +7,15 @@ In ERPNext können Sie Buchungen in unterschiedlichen Währungen erstellen. Beis
Um mit Buchungen in unterschiedlichen Währungen zu beginnen, müssen Sie die Buchungswährung im Datensatz des Kontos einstellen. Sie können bei der Anlage eine Währung aus dem Kontenplan auswählen.
-
+
Sie können die Währung auch zuordnen oder bearbeiten, indem Sie den jeweiligen Datensatz für bereits angelegte Konten öffnen.
-
+
Für Kunden/Lieferanten können Sie die Buchungswährung auch im Gruppendatensatz einstellen. Wenn sich die Buchungswährung der Gruppe von der Firmenwährung unterscheidet, müssen Sie die Standardkonten für Forderungen und Verbindlichkeiten auf diese Währung einstellen.
-
+
Wenn Sie die Buchungswährung für einen Artikel oder eine Gruppe eingestellt haben, können Sie Buchungen zu ihnen erstellen. Wenn sich die Buchungswährung der Gruppe von der Firmenwährung unterscheidet, dann beschränkt das System beim Erstellen von Transaktionen für diese Gruppe Buchungen auf diese Währung. Wenn die Buchungswährung die selbe wie die Firmenwährung ist, können Sie Transaktionen für diese Guppe in jeder beliebigen Währung erstellen. Aber die Hauptbuch-Buchungen werden immer in der Buchungswährung der Gruppe vorliegen. In jedem Fall ist die Wärung des Verbindlichkeitenkontos immer gleich der Buchungswährung der Gruppe.
@@ -33,7 +33,7 @@ Nun wird im POS der gezahlte Betrag in der Transaktionswährung eingegeben, im G
Der ausstehende Betrag und Anzahlungsbeträge werden immer in der Währung des Kundenkontos kalkuliert und angezeigt.
-
+
#### Eingangsrechnung
@@ -43,13 +43,13 @@ In ähnlicher Art und Weise werden in Eingangsrechnungen Buchungen basierend auf
In einer Journalbuchung können Sie Transaktionen in unterschiedlichen Währungen erstellen. Es gibt ein Auswahlfeld "Unterschiedliche Währungen" um Buchungen in mehreren Währungen zu aktivieren. Wenn die Option "Unterschiedliche Währungen" ausgewählt wurde, können Sie Konten mit unterschiedlichen Währungen auswählen.
-
+
In der Kontenübersicht zeigt das System den Abschnitt Währung an und holt sich die Kontenwährung und den Wechselkurs automatisch, wenn Sie ein Konto mit ausländischer Währung auswählen. Sie können den Wechselkurs später manuell ändern/anpassen.
In einem einzelnen Buchungssatz können Sie nur Konten mit einer alternativen Währung auswählen, abweichend von Konten in der Firmenwährung. Die Beträge für Soll und Haben sollten in der Kontenwährung eingegeben werden, das System berechnet und zeigt dann den Betrag für Soll und Haben automatisch in der Firmenwährung.
-
+
#### Beispiel 1: Zahlungsbuchung eines Kunden in alternativer Währung
@@ -57,7 +57,7 @@ Nehmen wir an, dass die Standardwährung einer Firma Indische Rupien ist, und di
Der Wechselkurs in der Zahlungsbuchung sollte immer der selbe wie auf der Rechnung (60) sein, auch dann, wenn der Wechselkurs am Tag der Zahlung 62 beträgt. Dem Bankkonto wird der Betrag mit einem Wechselkurs von 62 gut geschrieben. Deshalb wird ein Wechelkursgewinn bzw. -verlust basierend auf dem Unterschied im Wechselkurs gebucht.
-
+
#### Beispiel 2: Überweisung zwischen Banken (US-Dollar -> Indische Rupien)
@@ -100,7 +100,7 @@ Nehmen wir an, dass das Paypal-Konto folgende Beträge, die noch nicht auf Ihr a
Angenommen, der Wechselkurs am Zahlungstag ist 62, dann schaut die Buchung zur Banküberweisung wie folgt aus:
-
+
### Berichte
@@ -108,12 +108,12 @@ Angenommen, der Wechselkurs am Zahlungstag ist 62, dann schaut die Buchung zur B
Im Hauptbuch zeigt das System den Betrag einer Gutschrift/Lastschrift in beiden Währungen an, wenn nach Konto gefiltert wurde, und wenn die Kontenwährung unterschiedlich zur Firmenwährung ist.
-
+
#### Forderungs- und Verbindlichkeitenkonten
Im Bericht zu den Konten Forderungen und Verbindlichkeiten zeigt das System alle Beträge in der Währung der Gruppe/in der Kontenwährung an.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/opening-accounts.md b/erpnext/docs/user/manual/de/accounts/opening-accounts.md
index f264fc80ea..3edcadcdab 100644
--- a/erpnext/docs/user/manual/de/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/de/accounts/opening-accounts.md
@@ -20,7 +20,7 @@ Wir gehen davon aus, dass Sie mit der Buchhaltung in einem neuen Geschäftsjahr
Sie können Konten basierend auf Belegarten auswählen. In so einem Szenario sollte Ihre Bilanz ausgeglichen sein.
-
+
Beachten Sie bitte auch, dass das System abstürzt, wenn es mehr als 300 Bücher gibt. Um so eine Situation zu vermeiden, können Sie Konten über temporäre Konten eröffnen.
@@ -38,13 +38,13 @@ Hinweis: Stellen Sie sicher, dass im Abschnitt "Weitere Informationen" "Ist Erö
Vervollständigen Sie die Buchungssätze auf der Soll- und Haben-Seite.
-
+
Um einen Eröffnungsstand einzupflegen, erstellen Sie einen Buchungssatz für ein Konto oder eine Gruppe von Konten.
Beispiel: Wenn Sie die Kontenstände von drei Bankkonten einpflegen möchten, dann erstellen Sie Buchungssätze der folgenden Art und Weise:
-
+
Um einen Ausgleich herzustellen, wird ein temporäres Konto für Vermögen und Verbindlichkeiten verwendet. Wenn Sie einen Anfangsbestand in einem Verbindlichkeitenkonto einpflegen, können Sie zum Ausgleich ein temporäres Vermögenskonto verwenden.
@@ -59,7 +59,7 @@ Sie können zwei Eröffnungsbuchungssätze erstellen:
Wenn Sie die Buchungen erstellt haben, schaut der Bericht zur Probebilanz in etwa wie folgt aus:
-
+
### Offene Rechnungen
diff --git a/erpnext/docs/user/manual/de/accounts/opening-entry.md b/erpnext/docs/user/manual/de/accounts/opening-entry.md
index 8195fafdb2..66c1439a71 100644
--- a/erpnext/docs/user/manual/de/accounts/opening-entry.md
+++ b/erpnext/docs/user/manual/de/accounts/opening-entry.md
@@ -3,6 +3,6 @@
Wenn Sie eine neue Firma erstellen, dann können Sie das ERPNext-Modul Rechnungswesen starten, indem Sie in den Kontenplan gehen.
-Wenn Sie aber von einem reinen Buchhaltungsprogramm wie Tally oder einer FoxPro-basieren Software migrieren, dann lesen Sie unter [Eröffnungsbilanz]({{docs_base_url}}/user/manual/de/accounts/opening-accounts.html) nach.
+Wenn Sie aber von einem reinen Buchhaltungsprogramm wie Tally oder einer FoxPro-basieren Software migrieren, dann lesen Sie unter [Eröffnungsbilanz](/docs/user/manual/de/accounts/opening-accounts.html) nach.
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/point-of-sales-invoice.md b/erpnext/docs/user/manual/de/accounts/point-of-sales-invoice.md
index d64e27292c..d33125909a 100644
--- a/erpnext/docs/user/manual/de/accounts/point-of-sales-invoice.md
+++ b/erpnext/docs/user/manual/de/accounts/point-of-sales-invoice.md
@@ -12,7 +12,7 @@ Sie können eine Ausgangsrechnung des Typs POS erstellen, indem Sie "Ist POS" an
In ERPNext können über den POS alle Verkaufs- und Einkaufstransaktionen, wie Ausgangsrechnung, Angebot, Kundenauftrag, Lieferantenauftrag, usw. bearbeitet werden. Über folgende zwei Schritte richten Sie den POS ein:
1. Aktivieren Sie die POS-Ansicht über Einstellungen > Anpassen > Funktionseinstellungen
-2. Erstellen Sie einen Datensatz für die [POS-Einstellungen]({{docs_base_url}}/user/manual/de/setting-up/pos-setting.html)
+2. Erstellen Sie einen Datensatz für die [POS-Einstellungen](/docs/user/manual/de/setting-up/pos-setting.html)
#### Auf die POS-Ansicht umschalten
@@ -33,7 +33,7 @@ An der Kasse muss der Verkäufer die Artikel, die der Kunde kauft, auswählen. I
**Barcode/Seriennummer:** Ein Barcode/eine Seriennummer ist eine optionale maschinenlesbare Möglichkeit Daten zu einem Objekt einzulesen, mit dem er/sie verbunden ist. Geben Sie wie auf dem Bild unten angegeben den Barcode/die Seriennummer in das Feld ein und warten Sie einen kurzen Moment, dann wird der Artikel automatisch zum Einkaufswagen hinzugefügt.
-
+
> Tipp: Um die Menge eines Artikels zu ändern, geben Sie die gewünschte Menge im Feld "Menge" ein. Das wird hauptsächliche dann verwendet, wenn ein Artikel in größeren Mengen gekauft wird.
@@ -50,7 +50,7 @@ Wenn Sie mehrere verschiedene Artikel auf einmal entfernen möchten, wählen Sie
> Die Schaltfläche "Löschen" erscheint nur, wenn Artikel ausgewählt wurden.
-
+
### Zahlung durchführen
@@ -60,7 +60,7 @@ Wenn alle Artikel mit Mengenangabe im Einkaufswagen hinzugefügt wurden, können
2. Wählen Sie die Zahlungsart aus.
3. Klicken Sie auf die Schaltfläche "Zahlen" um das Dokument abzuspeichern.
-
+
Übertragen Sie das Dokument um den Datensatz abzuschliessen. Nachdem das Dokument übertragen wurde, können Sie es entweder ausdrucken oder per E-Mail versenden.
diff --git a/erpnext/docs/user/manual/de/accounts/purchase-invoice.md b/erpnext/docs/user/manual/de/accounts/purchase-invoice.md
index b3952ef683..6aec9b5de6 100644
--- a/erpnext/docs/user/manual/de/accounts/purchase-invoice.md
+++ b/erpnext/docs/user/manual/de/accounts/purchase-invoice.md
@@ -9,7 +9,7 @@ Um eine neue Eingangsrechnung zu erstellen, gehen Sie zu:
oder klicken Sie in einem Lieferantenauftrag oder einem Kaufbeleg auf "Eingangsrechnung erstellen".
-
+
Das Konzept des Veröffentlichungsdatums ist das gleiche wie bei der Ausgangsrechnung. Rechnungsnummer und Rechnungsdatum helfen Ihnen dabei nachzuvollziehen, unter welchen Daten die Rechnung bei Ihrem Lieferanten ausgewiesen ist.
diff --git a/erpnext/docs/user/manual/de/accounts/sales-invoice.md b/erpnext/docs/user/manual/de/accounts/sales-invoice.md
index 03b36d811c..7ce30bb637 100644
--- a/erpnext/docs/user/manual/de/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/de/accounts/sales-invoice.md
@@ -9,7 +9,7 @@ Sie können eine Ausgangsrechnung direkt erstellen über:
oder indem Sie in der rechten Ecke des Lieferscheins auf "Rechnung erstellen" klicken.
-
+
### Auswirkung auf die Buchhaltung
@@ -53,6 +53,6 @@ Wenn Sie einem Kunden eine Rechnung ausstellen wollen, damit dieser eine Anzahlu
"Proforma" bezieht sich auf eine Formsache. Warum sollte man das tun? Wenn Sie eine Ausgangsrechnung buchen, dann erscheint diese bei den Forderungen und den Erträgen. Das ist genau dann nicht optimal, wenn nicht sicher ist, ob Ihr Kunden die Anzahlung auch wirklich leistet. Wenn Ihr Kunden aber dennoch eine "Rechnung" will, dann geben Sie ihm ein Angebot (in ERPNext) das als "Proforma-Rechnung" bezeichnet wird. Auf diese Weise ist jeder glücklich.
-Das ist ein weithin gebräuchliches Verfahren. Wir bei Frappe machen das genauso.
+Das ist ein weithin gebräuchliches Verfahren. Wir bei Frappé machen das genauso.
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/setup/account-settings.md b/erpnext/docs/user/manual/de/accounts/setup/account-settings.md
index d0d9beff82..44aafa4398 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/account-settings.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/account-settings.md
@@ -1,7 +1,7 @@
# Konteneinstellungen
Beigetragen von CWT Connector & Wire Technology GmbH
-
+
* Konten gesperrt bis: Sperren Sie Konten-Transaktionen bis zu einem bestimmten Datum. Niemand bis auf die angegebene Rolle kann dann Buchungen zu diesem Konto erstellen oder verändern.
diff --git a/erpnext/docs/user/manual/de/accounts/setup/cost-center.md b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
index be42c805a2..a7ed877555 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
@@ -22,7 +22,7 @@ Um Ihren Kostenstellenplan einzurichten, gehen Sie zu:
>Rechnungswesen > Einstellungen > Kostenstellenplan
-
+
Kostenstellen helfen Ihnen bei der Erstellung von Budgets für Geschäftstätigkeiten.
@@ -36,7 +36,7 @@ Sie könne ein Budget in der Kostenstelle einrichten. Wenn Sie saisonale Verkäu
> Rechnungswesen > Einstellungen > Budgetverteilung > Neu
-
+
### Budgetaktionen
diff --git a/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md
index ce4c750d82..817c55748b 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/fiscal-year.md
@@ -5,6 +5,6 @@ Ein Geschäftsjahr wird auch als Finanzjahr oder Budgetjahr bezeichnet. Es wird
Ein Geschäftsjahr startet normalerweise zu Beginn eines Quartals, wie zum Beispiel am 1. April, 1. Juli oder 1. Oktober. Jedoch geht bei den meisten Firmen das Geschäftsjahr mit dem Kalenderjahr einher und startet am 1. Januar. In den meisten Fällen ist es der einfachere und leichtere Weg. Für einige Organisationen ist es vorteilhaft das Geschäftsjahr zu einem anderen Zeitpunkt zu starten. So können beispielsweise Geschäfte, die saisonal arbeiten zum 1. Juli oder 1. Oktober starten. Ein Geschäft, welches im Herbst den größten Gewinn erwirtschaftet und die größten Ausgaben im Frühling hat, könnte sich auch für den 1. Okober entscheiden. Auf diese Weise weis es wie hoch der Gewinn für das Jahr sein wird und kann seine Ausgaben so anpassen, dass das Gewinnziel erreicht wird.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
index 73d4907213..52fd1d755f 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/tax-rule.md
@@ -1,9 +1,9 @@
# Steuerregeln
Beigetragen von CWT Connector & Wire Technology GmbH
-Sie können festlegen, welche [Steuervorlage]({{docs_base_url}}/user/manual/de/setting-up/setting-up-taxes.html) auf eine Verkaufs-/Einkaufstransaktion angewendet wird, wenn Sie die Funktion Steuerregel verwenden.
+Sie können festlegen, welche [Steuervorlage](/docs/user/manual/de/setting-up/setting-up-taxes.html) auf eine Verkaufs-/Einkaufstransaktion angewendet wird, wenn Sie die Funktion Steuerregel verwenden.
-
+
Sie können Steuerregeln für Umsatz- und für Vorsteuern erstellen. Wenn Sie eine Transaktion durchführen, wählt das System Steuervorlagen basierend auf den definierten Steuerregeln aus und wendet sie an. Das System filtert Steuerregeln nach der Anzahl der maximal zutreffenden Bedingungen.
@@ -11,9 +11,9 @@ Betrachten wir ein Szenario um Steuerregeln besser zu verstehen.
Angenommen wird haben zwei Steuerregeln wie unten abgebildet erstellt.
-
+
-
+
In unserem Beispiel gilt Regel 1 für Indien und Regel 2 für Großbritannien.
diff --git a/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md
index da1901c8b9..47a0dfefb0 100644
--- a/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md
+++ b/erpnext/docs/user/manual/de/accounts/tools/bank-reconciliation.md
@@ -11,7 +11,7 @@ Der Kontoauszug erscheint in ERPNext in der Form eines Berichtes.
#### Abbilung 1: Kontoauszug
-
+
Wenn Sie den Bericht erhalten, überprüfen Sie bitte, ob das Feld "Abwicklungsdatum" wie bei der Bank angegeben mit dem Kontoauszug übereinstimmt. Wenn die Beträge übereinstimmen, dann werden die Abwicklungsdaten abgeglichen. Wenn die Beträge nicht übereinstimmen, dann überprüfen Sie bitte die Abwicklungsdaten und die Journalbuchungen/Buchungssätze.
@@ -33,7 +33,7 @@ Jetzt werden alle Buchungen im angegebenen Zeitraum in der Tabelle darunter ange
#### Abbildung 2: Werkzeug zum Kontenabgleich
-
+
**Schritt 5:** Klicken Sie auf die Schaltfläche "Abwicklungsdatum aktualisieren"
diff --git a/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md
index 59b73e8fcc..22e15d4d23 100644
--- a/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md
+++ b/erpnext/docs/user/manual/de/accounts/tools/payment-reconciliation.md
@@ -7,7 +7,7 @@ Um das Werkzeug zum Zahlungsabgleich zu verwenden, gehen Sie zu:
> Rechnungswesen > Werkzeuge > Zahlungsabgleich
-
+
**Schritt 1:** Wählen Sie das Konto aus, zu dem die Zahlungen abgeglichen werden sollen.
diff --git a/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md
index 97795aa6a7..b76945c9b7 100644
--- a/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md
+++ b/erpnext/docs/user/manual/de/accounts/tools/payment-tool.md
@@ -23,14 +23,14 @@ Um zum Zahlungswerkzeug zu gelangen, gehen Sie zu
* **Hinweis**: Für den Fall, dass der Benutzer an einen Kunden zahlt oder von einem Lieferanten eine Zahlung erhält, fügen Sie manuell Anmerkungen hinzu, die sich auf zutreffende Rechnungen oder Aufträge beziehen.
-
+
7\. Sobald die Daten angezogen wurden, klicken Sie auf die detaillierte Buchung und geben Sie den Zahlungsbetrag zur Rechnung/Bestellung/zum Beleg ein.
-
+
8\. Klicken Sie auf "Buchungssatz erstellen" um einen neuen Buchungssatz mit den entsprechenden Einzelheiten zu erstellen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md
index 539e7f97be..0f9407356f 100644
--- a/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md
+++ b/erpnext/docs/user/manual/de/accounts/tools/period-closing-voucher.md
@@ -22,7 +22,7 @@ Das **Transaktionsdatum** ist das Datum, zu dem der Periodenabschlussbeleg erste
Das **abzuschließende Geschäftsjahr** ist das Jahr, für das Sie Ihre Finanzbuchhaltung abschliessen.
-
+
Dieser Beleg überträgt den Gewinn oder Verlust (über die GuV ermittelt) in die Schlußbilanz. Sie sollten ein Konto vom Typ Verbindlichkeiten, wie Gewinnrücklagen oder Überschuss, oder vom Typ Kapital als Schlußkonto auswählen.
diff --git a/erpnext/docs/user/manual/de/buying/purchase-order.md b/erpnext/docs/user/manual/de/buying/purchase-order.md
index 7c72d1e108..a161d64265 100644
--- a/erpnext/docs/user/manual/de/buying/purchase-order.md
+++ b/erpnext/docs/user/manual/de/buying/purchase-order.md
@@ -7,7 +7,7 @@ Ein Lieferantenauftrag kann automatisch aus einer Materialanfrage oder einem Lie
### Flußdiagramm der Lieferantenbestellung
-
+
In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über:
@@ -15,7 +15,7 @@ In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über:
### Einen Lieferantenauftrag erstellen
-
+
Einen Lieferantenauftrag einzugeben ist sehr ähnlich zu einer Lieferantenanfrage. Zusätzlich müssen Sie Folgendes eingeben:
@@ -50,7 +50,7 @@ Beispiel: Wenn Sie Ihr Rohmaterial in großen Mengen in Großverpackungen eingek
### Abbildung 3: Umrechung von Einkaufsmaßeinheit in Lagermaßeinheit
-
+
**Schritt 4:** Geben Sie den Umrechnungsfaktor von einer in die andere Maßeinheit an. Beispiel: 100, wenn eine Kiste 100 Stück umfasst.
diff --git a/erpnext/docs/user/manual/de/buying/setup/buying-settings.md b/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
index e6f0d97a61..e5ee4a4c82 100644
--- a/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
+++ b/erpnext/docs/user/manual/de/buying/setup/buying-settings.md
@@ -3,7 +3,7 @@
Hier können Sie Werte einstellen, die in den Transaktionen des Moduls Einkauf zugrunde gelegt werden.
-
+
Lassen Sie uns die verschiedenen Optionen durckgehen.
@@ -17,7 +17,7 @@ Sie können den Nummernkreis selbst definieren oder einstellen:
> Einstellungen > Einstellungen > Nummernkreis
-[Klicken Sie hier, wenn Sie mehr über Nummernkreise wissen möchten]({{docs_base_url}}/user/manual/de/setting-up/settings/naming-series.html)
+[Klicken Sie hier, wenn Sie mehr über Nummernkreise wissen möchten](/docs/user/manual/de/setting-up/settings/naming-series.html)
### 2. Standard-Lieferantentyp
diff --git a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
index a379ec8192..172aef727c 100644
--- a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
@@ -9,7 +9,7 @@ Aufbauend darauf, was die Lieferanten anbieten, werden Sie in verschiedene Kateg
> Einkauf > Einstellungen > Lieferantentyp > Neuer Lieferantentyp
-
+
Sie können Ihre Lieferanten aus einem breiten Angebot verfügbarer Typen in ERPNext klassifizieren. Wählen Sie aus einem Satz vorgegebener Optionen wie Großhändler, Elekktro, Hardware, Regional, Pharma, Rohstoffe, Dienstleistungen, etc. aus.
diff --git a/erpnext/docs/user/manual/de/buying/supplier-quotation.md b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
index 93db6a7d6c..30487fcf64 100644
--- a/erpnext/docs/user/manual/de/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
@@ -7,7 +7,7 @@ Sie können ein Lieferantenangebot aus einer Materialanfrage heraus erstellen.
### Flußdiagramm zum Lieferantenangebot
-
+
Sie können ein Lieferantenangebot auch direkt erstellen über:
@@ -15,7 +15,7 @@ Sie können ein Lieferantenangebot auch direkt erstellen über:
### Ein Lieferantenangebot erstellen
-
+
Wenn Sie mehrere verschiedene Lieferanten, die Ihnen den selben Artikel liefern, haben, dann senden Sie normalerweise eine Nachricht (Lieferantenanfrage) an verschiedene Lieferanten. In vielen Fällen, besonders dann, wenn Sie den Einkauf zentralisiert haben, werden Sie alle diese Angebote aufzeichnen wollen, so dass
diff --git a/erpnext/docs/user/manual/de/buying/supplier.md b/erpnext/docs/user/manual/de/buying/supplier.md
index eadb4ce8fc..37eb37662d 100644
--- a/erpnext/docs/user/manual/de/buying/supplier.md
+++ b/erpnext/docs/user/manual/de/buying/supplier.md
@@ -7,7 +7,7 @@ So können Sie einen neuen Lieferanten erstellen:
> Einkauf > Dokumente > Lieferant > Neu
-
+
### Kontakte und Adressen
diff --git a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
index c74029b5be..ef40f4534b 100644
--- a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
+++ b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
@@ -4,18 +4,18 @@
Das Webportal von ERPNext gibt Ihren Kunden einen schnellen Zugriff auf Ihre Aufträge, Rechnungen und Sendungen.
Kunden können den Status Ihrer Bestellungen, Rechnungen und des Versandes nachprüfen, indem sie sich auf der Webseite einloggen.
-
+
Sobald eine Bestellung aufgegeben wurde, entweder über den Einkaufswagen oder aus ERPNext heraus, kann Ihr Kunde die Bestellung ansehen und den Abrechnungs- und Versandstatus nachverfolgen. Wenn die Rechnung und die Zahlung zu einer Bestellung übertragen wurden, kann der Kunde auch hier den aktuellen Stand auf einen Blick nachvollziehen.
-
+
### Rechnung mit Status "gezahlt"
-
+
### Rechnung mit Status "abgerechnet"
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/issues.md b/erpnext/docs/user/manual/de/customer-portal/issues.md
index 8f0c7d3b22..dee8eb1f61 100644
--- a/erpnext/docs/user/manual/de/customer-portal/issues.md
+++ b/erpnext/docs/user/manual/de/customer-portal/issues.md
@@ -5,17 +5,17 @@ Kunden können über das Kundenportal sehr einfach Fälle eröffnen. Eine einfac
### Ticketliste leeren
-
+
### Neuer Fall
-
+
### Fall öffnen
-
+
### Fall beantworten
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/portal-login.md b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
index 455dfac1da..5bff27599b 100644
--- a/erpnext/docs/user/manual/de/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
@@ -3,6 +3,6 @@
Um sich in ein Kundenkonto einzuloggen, muss der Kunde seine Email-ID und das Passwort angeben, welche ihm von ERPNext während des Registrierungsprozesses zugesendet wurden.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/sign-up.md b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
index 0a91145d58..35a660d552 100644
--- a/erpnext/docs/user/manual/de/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
@@ -6,11 +6,11 @@ Kunden müssen sich über die Webseite als Kunden registrieren.
### Schritt 1: Klicken Sie auf das Registrieren-Symbol
-
+
### Schritt 3: Geben Sie Ihren Kundennamen und Ihre ID ein
-
+
Wenn der Registrierungsprozess abgeschlossen ist, wird dem Kunden eine E-Mail mit dem Passwort zugeschickt.
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
index 01bfaa7b01..315e062064 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-doctype.md
@@ -17,7 +17,7 @@ Um einen neuen DocType zu erstellen, gehen Sie zu:
4. Ist einzeln: Wenn diese Option aktiviert ist, wird dieser DocType zu einem einzeln verwendeten Formular, wie die Vertriebseinstellungen, die nicht von Benutzern reproduziert werden können.
5. Benutzerdefiniert?: Dieses Feld ist standardmäßig aktiviert, wenn ein benutzerdefinierter DocType hinzugefügt wird.
-
+
### Felder
@@ -32,7 +32,7 @@ Felder sind viel mehr als Datenbankspalten; sie können sein:
5. Aktionen (Schaltflächen)
6. Anhänge oder Bilder
-
+
Wenn Sie Felder hinzufügen, müssen Sie den **Typ** angeben. Für eine Bereichs- oder Spaltentrennung ist die **Bezeichnung** optional. Der **Name** (Feldname) ist der Name der Spalte in der Datenbank.
@@ -42,19 +42,19 @@ Sie können auch weitere Einstellungen des Feldes eingeben, so z. B. ob es zwing
In diesem Abschnitt können Sie Kriterien definieren nach denen Dokumente dieses DocTypes benannt werden. Es gibt viele verschiedene Kriterien nach denen ein Dokument benannt werden kann, wie z. B. dem Wert in diesem spezifischen Feld, oder die Benamungsserie, oder der Wert der vom Benutzer an der Eingabeaufforderung eingegeben wird, die angezeit wird, wenn ein Dokument abgespeichert wird. Im folgenden Beispiel benennen wir auf Grundlage des Wertes im Feld **book_name**.
-
+
### Berechtigung
In dieser Tabelle können Sie Rollen und Berechtigungs-Rollen für diese für die betreffenden DocTypes auswählen.
-
+
### DocTypes abspeichern
Wenn Sie einen DocType abspeichern, erscheint ein Popup-Fenster über welches Sie den Namen des DocTypes eingeben können.
-
+
### Der DocType im System
@@ -62,12 +62,12 @@ Um den DocType zu aktivieren, öffnen Sie das Modul, welches Sie für den DocTyp
> Personalwesen > Dokumente > Buch
-
+
### Buchvorlage
Wenn Sie die Felder ausfüllen, schaut das ganze dann so aus.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
index 7d0f0faa10..e890f5ddee 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -12,11 +12,11 @@ Um ein benutzerdefiniertes Feld hinzuzufügen, gehen Sie zu:
> Einstellungen > Anpassen > Benutzerdefiniertes Feld > Neu
-Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpassen von Feldern]({{docs_base_url}}/user/manual/de/customize-erpnext/customize-form) einfügen.
+Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpassen von Feldern](/docs/user/manual/de/customize-erpnext/customize-form) einfügen.
In einem benutzerdefinierten Formular finden Sie für jedes Feld die Plus(+)-Option. Wenn Sie auf dieses Symbol klicken, wird eine neue Zeile oberhalb dieses Feldes eingefügt. Sie können die Einstellungen für Ihr Feld in der neu eingefügten leeren Zeile eingeben.
-
+
Im Folgenden sind die Schritte aufgeführt, wie man ein benutzerdefiniertes Feld in ein bestehendes Formular einfügt.
@@ -28,31 +28,31 @@ Wie bereits oben angesprochen, können Sie ein benutzerdefiniertes Feld über da
Wählen Sie die Transaktion oder die Vorlage, in die sie ein benutzerdefiniertes Feld einfügen wollen. Nehmen wir an, dass Sie ein benutzerdefiniertes Verknüpfungsfeld in ein Angebotsformular einfügen wollen; das Dokument soll "Angebot" heißen.
-
+
### Feldbezeichnung einstellen
Die Bezeichnung des benutzerdefinierten Feldes wird basierend auf seinem Namen eingestellt. Wenn Sie ein benutzerdefiniertes Feld mit einem bestimmten Namen erstellen wollen, aber mit einer sich davon unterscheidenden Bezeichnung, dann sollten Sie erst die Bezeichnung angeben, da Sie den Feldnamen noch einstellen wollen. Nach dem Speichern des benutzerdefinierten Feldes können Sie die Feldbezeichnung wieder ändern.
-
+
### Einstellen, nach welchem Element eingefügt werden soll ("Einfügen nach")
Diese Auswahl enthält alle bereits existierenden Felder des ausgewählten Formulars/des DocTypes. Ihr benutzerdefiniertes Feld wird nach dem Feld eingefügt, das Sie unter "Einfügen nach" auswählen.
-
+
### Feldtyp auswählen
Klicken Sie hier um weitere Informationen über Feldtypen, die Sie bei einem benutzerdefinierten Feld auswählen können, zu erhalten.
-
+
### Optionen einstellen
-Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
+Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier](/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
-
+
Wenn der Feldtyp als Auswahlfeld (Drop Down-Feld) angegeben ist, dann sollten alle möglichen Ergebnisse für dieses Feld im Optionen-Feld aufgelistet werden. Die möglichen Ergebnisse sollten alle in einer eigenen Zeile stehen.
@@ -69,7 +69,7 @@ Sie können weitere Eigenschaften auswählen wie:
5. Schreibgeschützt: Wenn diese Option aktiviert ist, kann das benutzerdefinierte Feld nicht geändert werden.
6. Beim Übertragen zulassen: Wenn diese Option ausgewählt wird, ist es erlaubt den Wert des Feldes zu ändern, wenn er in einer Transaktion übertragen wird.
-
+
### Benutzerdefiniertes Feld löschen
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
index c4e41eccda..347a8a8a43 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
@@ -15,6 +15,6 @@ Fügen Sie also im Skript Ausgangsrechnung Kunde Folgendes hinzu:
* * *
-Sehen Sie hierzu auch: [Wie man ein benutzerdefiniertes Skript erstellt]({{docs_base_url}}/user/manual/de/customize-erpnext/custom-scripts/).
+Sehen Sie hierzu auch: [Wie man ein benutzerdefiniertes Skript erstellt](/docs/user/manual/de/customize-erpnext/custom-scripts/).
{next}
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
index 8e2e842c8c..7c62ae5ade 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/index.md
@@ -5,7 +5,7 @@ Wenn Sie Formate von ERPNext-Formularen ändern wollen, können Sie das über be
> Einstellungen > Anpassen > Benutzerdefiniertes Skript
-
+
### Themen
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
index dbb9bc5798..4060f43c7b 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
@@ -13,13 +13,13 @@ Sie können zum benutzerdefinierten Formular folgendermaßen gelangen:
Der Systemmanager findet die Option "Benutzerdefiniertes Formular" auch in der Liste Kundenauftrag (bzw. jedes andere Formular für diesen Sachverhalt).
-
+
### Schritt 2: Wählen Sie den DocType/das Dokument
Wählen Sie jetzt den DocType/das Dokument aus, welcher/s das anzupassende Feld enthält.
-
+
### Schritt 3: Bearbeiten Sie die Eigenschaften
@@ -27,7 +27,7 @@ Wenn Sie den DocType/das Dokument ausgewählt haben, werden alle Felder als Zeil
Wenn Sie auf die Zeile "Projektname" klicken, werden Felder mit verschiedenen Eigenschaften für dieses Feld angezeigt. Um die Eigenschaft "Ist zwingend erforderlich" für ein Feld anzupassen gibt es ein Feld "Zwingend erfoderlich". Wenn Sie dieses Feld markieren, wird das Feld "Projektname" im Angebotsformular als zwingend erforderlich eingestellt.
-
+
Genauso können Sie folgende Eigenschaften eines Feldes anpassen.
@@ -40,7 +40,7 @@ Genauso können Sie folgende Eigenschaften eines Feldes anpassen.
### Schritt 4: Aktualisieren
-
+
Bevor Sie das Formular "Kundenauftrag" testen, sollten Sie den Cache leeren und den Inhalt des Browserfensters aktualiseren, um die Änderungen wirksam werden zu lassen.
@@ -71,7 +71,7 @@ Im Folgenden erhalten Sie eine Auflistung der Eigenschaften, die Sie für ein be
+ src="/docs/assets/img/customize/customize-title.gif">
### Fest eingestellte und bearbeitbare Bezeichnungen
Wenn Ihre Bezeichnung als Standard-Bezeichnung generiert wurde, kann sie vom Benutzer durch klicken auf den Kopf des Dokuments bearbeitet werden.
+ src="/docs/assets/img/customize/editable-title.gif">
Wenn Sie eine fest eingestellte Bezeichnung haben wollen, können Sie dies als Regel unter **Optionen** einstellen. Auf diese Weise wird die Bezeichnung jedesmal automatisch aktualisiert, wenn das Dokument aktualisiert wird.
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/de/customize-erpnext/hiding-modules-and-features.md
index 831540b02a..3e3ebe0942 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/hiding-modules-and-features.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/hiding-modules-and-features.md
@@ -7,7 +7,7 @@ Wie Sie aus dieser Anleitung ersehen können, beinhaltet ERPNext viele verschied
> Einstellungen > Werkzeuge > Funktionen verbergen/einblenden
-
+
Aktivieren/Deaktivieren Sie die Funktionen, die Sie verwenden möchten bzw. nicht verwenden wollen und laden Sie Ihre Seite neu, damit die Änderungen übernommen werden.
@@ -19,7 +19,7 @@ Um Module (Symbole) auf der Homepage zu verbergen, gehen Sie zu:
> Einstellungen > Werkzeuge > Moduleinstellungen
-
+
> Anmerkung: Module werden automatisch für Benutzer verborgen, die keine Berechtigungen für Dokumente dieses Moduls haben. Beispiel: Wenn ein Benutzer keine Berechtigungen für Lieferantenauftrag, Materialanfrage und Lieferant hat, dann wird das Modul "Einkauf" automatisch verborgen.
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
index 9448201ac0..b23335d69a 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/print-format.md
@@ -14,13 +14,13 @@ Um Ihre eigenen Versionen zu erstellen, öffnen Sie eine bereits vorhandene Vorl
> Einstellungen > Druck > Druckformate
-
+
Wählen Sie den Typ des Druckformats, welches Sie bearbeiten wollen, und klicken Sie auf die Schaltfläche "Kopieren" in der rechten Spalte. Es öffnet sich ein neues Druckformat mit der Einstellung NEIN für "für "Ist Standard" und Sie kännen das Druckformat bearbeiten.
Ein Druckformat zu bearbeiten ist eine langwierige Angelegenheit und Sie müssen etwas Grundwissen über HTML, CSS und Python mitbringen, um dies verstehen zu können. Wenn Sie Hilfe benötigen, erstellen Sie bitte im Forum eine Anfrage.
-Printformate werden auf der Serverseite über die [Programmiersprache Jinja Templating](http://jinja.pocoo.org/docs/templates/) erstellt. Alle Formulare haben Zugriff auf doc object, das Informationen über das Dokument enthält, welches formatiert wird. Sie können über das Frappe-Modul auch auf oft verwendete Hilfswerkzeuge zugreifen.
+Printformate werden auf der Serverseite über die [Programmiersprache Jinja Templating](http://jinja.pocoo.org/docs/templates/) erstellt. Alle Formulare haben Zugriff auf doc object, das Informationen über das Dokument enthält, welches formatiert wird. Sie können über das Frappé-Modul auch auf oft verwendete Hilfswerkzeuge zugreifen.
Zum Bearbeiten des Erscheinungsbildes bietet sich das [Bootstrap CSS Framework](http://getbootstrap.com/) an und Sie können die volle Bandbreite dieses Werkzeuges nutzen.
@@ -37,7 +37,7 @@ Um Ihre Druck- und PDF-Einstellungen zu bearbeiten/zu aktualisieren, gehen Sie z
> Einstellungen > Druck und Branding > Druckeinstellungen
-
+
### Beispiel
diff --git a/erpnext/docs/user/manual/de/human-resources/appraisal.md b/erpnext/docs/user/manual/de/human-resources/appraisal.md
index ccec5b2cdf..34a9217d33 100644
--- a/erpnext/docs/user/manual/de/human-resources/appraisal.md
+++ b/erpnext/docs/user/manual/de/human-resources/appraisal.md
@@ -7,13 +7,13 @@ In ERPNext können Sie Mitarbeiterbeurteilungen verwalten, in dem Sie für jede
#### Schritt 1: Wählen Sie eine Bewertungsvorlage aus
-
+
Wenn Sie eine Vorlage ausgewählt haben, erscheint der restliche Teil des Formulars.
#### Schritt 2: Geben Sie die Daten des Mitarbeiters ein
-
+
Wenn die Bewertungsvorlage fertig ist, können Sie für jeden Zeitraum Bewertungen aufzeichnen, über die Sie die Leistung nachverfolgen können. Sie können für jeden Paramter bis zu 5 Punkte vergeben und das System berechnet die Gesamtbeurteilung des Mitarbeiters.
diff --git a/erpnext/docs/user/manual/de/human-resources/attendance.md b/erpnext/docs/user/manual/de/human-resources/attendance.md
index 9dd45abfbe..9ec5f953cb 100644
--- a/erpnext/docs/user/manual/de/human-resources/attendance.md
+++ b/erpnext/docs/user/manual/de/human-resources/attendance.md
@@ -5,10 +5,10 @@ Ein Anwesenheitsdatensatz der wiedergibt, dass ein Mitarbeiter zu einem bestimmt
> Personalwesen > Dokumente > Anwesenheit > Neu
-
+
Sie können einen monatlichen Report über Ihre Anwesenheiten erhalten, indem Sie zum "Monatlichen Anwesenheitsbericht" gehen.
-Sie können auch ganz einfach Anwesenheiten über das [Werkzeug zum Hochladen von Anwesenheiten]({{docs_base_url}}/user/manual/de/human-resources/tools/upload-attendance.html) hochladen.
+Sie können auch ganz einfach Anwesenheiten über das [Werkzeug zum Hochladen von Anwesenheiten](/docs/user/manual/de/human-resources/tools/upload-attendance.html) hochladen.
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/employee.md b/erpnext/docs/user/manual/de/human-resources/employee.md
index 7d39f6a841..e5995695e3 100644
--- a/erpnext/docs/user/manual/de/human-resources/employee.md
+++ b/erpnext/docs/user/manual/de/human-resources/employee.md
@@ -7,6 +7,6 @@ Um einen neuen Mitarbeiter zu erstellen, gehen Sie zu:
> Personalwesen > Dokumente > Mitarbeiter > Neu
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/expense-claim.md b/erpnext/docs/user/manual/de/human-resources/expense-claim.md
index 3fda0494ee..12e69bfb3b 100644
--- a/erpnext/docs/user/manual/de/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/de/human-resources/expense-claim.md
@@ -7,7 +7,7 @@ Um eine neue Aufwandsabrechnung zu erstellen, gehen Sie zu:
> Personalwesen > Dokumente > Aufwandsabrechnung > Neu
-
+
Geben Sie die Mitarbeiter-ID, das Datum und die Auflistung der Ausgaben, die Sie zurückerstattet haben möchten, ein und "übertragen" Sie den Datensatz.
@@ -27,6 +27,6 @@ Die genehmigte Aufwandsabrechnung muss in eine Journalbuchung umgewandelt werden
* Um eine Aufwandsabrechnung mit einer Aufgabe oder einem Projekt zu verknüpfen, geben Sie die Aufgabe oder das Projekt an, während Sie eine Aufwandsabrechnung erstellen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
index bf0e195051..8cef87d712 100644
--- a/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
+++ b/erpnext/docs/user/manual/de/human-resources/human-resources-reports.md
@@ -5,30 +5,30 @@
Der Bericht zur Mitarbeiter-Urlaubsauswertung zeigt Mitarbeiter und deren Urlaubsverteilung nach den unterschiedlichen Urlaubstypen an. Der Bericht richtet sich nach der Anzahl des genehmigten Urlaubs.
-
+
### Mitarbeiter-Geburtstag
Dieser Bericht zeigt die Geburtstage der Mitarbeiter an.
-
+
### Mitarbeiterinformationen
Dieser Bericht wichtige Informationen über Mitarbeiter in den Mitarbeiterdatensätzen.
-
+
### Übersicht monatliche Gehälter
Dieser Bericht zeigt die Nettozahlungen der Mitarbeiter und deren einzelne Bestandteile im Überblick.
-
+
### Monatliche Anwesenheitsliste
Dieser Bericht zeit die monatlichen Anwesenheiten ausgewählter Mitarbeiter im Überblick.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/job-applicant.md b/erpnext/docs/user/manual/de/human-resources/job-applicant.md
index 51b0359c9b..62de8011a8 100644
--- a/erpnext/docs/user/manual/de/human-resources/job-applicant.md
+++ b/erpnext/docs/user/manual/de/human-resources/job-applicant.md
@@ -1,13 +1,13 @@
# Bewerber
Beigetragen von CWT Connector & Wire Technology GmbH
-Sie können eine Liste von Bewerbern auf [offene Stellen]({{docs_base_url}}/user/manual/de/human-resources/job-opening.html) verwalten.
+Sie können eine Liste von Bewerbern auf [offene Stellen](/docs/user/manual/de/human-resources/job-opening.html) verwalten.
Um einen neuen Bewerber anzulegen, gehen Sie zu:
> Personalwesen > Dokumente > Bewerber > Neu
-
+
### Verknüpfung mit einem E-Mail-Konto
@@ -20,6 +20,6 @@ Sie können die Bewerbersuche mit einem E-Mail-Konto verknüpfen. Wenn wir anneh
* Geben Sie die E-Mail-ID und das Passwort ein und aktivieren Sie "Eingehend aktivieren".
* Unter "Anhängen an" geben Sie "Bewerber" an.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/job-opening.md b/erpnext/docs/user/manual/de/human-resources/job-opening.md
index b14516eb14..0231df62c4 100644
--- a/erpnext/docs/user/manual/de/human-resources/job-opening.md
+++ b/erpnext/docs/user/manual/de/human-resources/job-opening.md
@@ -7,6 +7,6 @@ Um eine neue Offene Stelle anzulegen, gehen Sie zu:
> Personalwesen > Dokumente > Offene Stellen > Neu
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/leave-application.md b/erpnext/docs/user/manual/de/human-resources/leave-application.md
index fc16d83015..faf5b6efea 100644
--- a/erpnext/docs/user/manual/de/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/de/human-resources/leave-application.md
@@ -5,17 +5,17 @@ Wenn Ihre Firma ein formales System hat, wo Mitarbeiter einen Antrag für Ihren
> Personalwesen > Dokumente > Urlaubsantrag > Neu
-
+
### Urlaubsbewilliger einstellen
* Ein Urlaubsgenehmiger ist ein Benutzer der Urlaubsanträge eines Mitarbeiters bewilligen kann.
* Sie müssen eine Liste von Urlaubsbewilligern für einen Mitarbeiter in den Mitarbeiterstammdaten angeben.
-
+
-> Tipp: Wenn Sie möchten, dass alle Benutzer ihre Urlaubsanträge selbst erstellen, können Sie in den Einstellungen zur Urlaubsgenehmigung Ihre Mitarbeiter-IDs als so einstellen, dass sie für die Regel zutreffend sind. Für weiterführende Informationen kesen Sie hierzu die Diskussion zum Thema [Einstellungen zu Genehmigungen]({{docs_base_url}}/user/manual/de/setting-up/users-and-permissions/user-permissions.html).
+> Tipp: Wenn Sie möchten, dass alle Benutzer ihre Urlaubsanträge selbst erstellen, können Sie in den Einstellungen zur Urlaubsgenehmigung Ihre Mitarbeiter-IDs als so einstellen, dass sie für die Regel zutreffend sind. Für weiterführende Informationen kesen Sie hierzu die Diskussion zum Thema [Einstellungen zu Genehmigungen](/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.html).
-Um einem Mitarbeiter Urlaub zuzuteilen, kreuzen Sie [Urlaubszuteilung]({{docs_base_url}}/user/manual/de/human-resources/setup/leave-allocation.html) an.
+Um einem Mitarbeiter Urlaub zuzuteilen, kreuzen Sie [Urlaubszuteilung](/docs/user/manual/de/human-resources/setup/leave-allocation.html) an.
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/offer-letter.md b/erpnext/docs/user/manual/de/human-resources/offer-letter.md
index 5566071205..e5457748eb 100644
--- a/erpnext/docs/user/manual/de/human-resources/offer-letter.md
+++ b/erpnext/docs/user/manual/de/human-resources/offer-letter.md
@@ -7,12 +7,12 @@ Ein ERPNext können Sie einen Datensatz zu den Angebotsschreiben, die Sie an Bew
> Personalwesen > Dokumente > Angebotsschreiben > Neu
-
+
-> Anmerkung: Angebotsschreiben kann nur zu einem [Bewerber]({{docs_base_url}}/user/manual/de/human-resources/job-applicant.html) erstellt werden.
+> Anmerkung: Angebotsschreiben kann nur zu einem [Bewerber](/docs/user/manual/de/human-resources/job-applicant.html) erstellt werden.
Es gibt ein vordefiniertes Druckformat zum Angebotsschreiben.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
index a8eb33a7fa..f47dda24b2 100644
--- a/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/de/human-resources/salary-and-payroll.md
@@ -43,7 +43,7 @@ Um eine neue Gehaltsstruktur zu erstellen, gehen Sie zu:
#### Abbildung 1: Gehaltsstruktur
-
+
### In der Gehaltsstruktur
@@ -67,7 +67,7 @@ Um eine Gehaltsabrechnung über die Gehaltsstruktur zu erstellen, klicken Sie au
#### Abbildung 2: Gehaltsabrechnung
-
+
Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über "Gehaltsabrechnung bearbeiten" anlegen.
@@ -75,7 +75,7 @@ Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über
#### Abbildung 3: Gehaltsabrechnung durchführen
-
+
Beim Bearbeiten einer Gehaltsabrechnung
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/branch.md b/erpnext/docs/user/manual/de/human-resources/setup/branch.md
index f6913a7223..1328d7350c 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/branch.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/branch.md
@@ -3,6 +3,6 @@
Filialen Ihres Unternehmens
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md
index ddd3e9d2d3..e50b51f5bc 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/deduction-type.md
@@ -7,6 +7,6 @@ Um eine neue Abzugsart anzulegen, gehen Sie zu:
> Personalwesen > Einstellungen > Abzugsart > Neu
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/department.md b/erpnext/docs/user/manual/de/human-resources/setup/department.md
index c54928b652..532174f7cb 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/department.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/department.md
@@ -3,6 +3,6 @@
Abteilungen Ihres Unternehmens
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/designation.md b/erpnext/docs/user/manual/de/human-resources/setup/designation.md
index dee66582ef..0d01588e9b 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/designation.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/designation.md
@@ -3,6 +3,6 @@
Stellenbezeichnungen in Ihrem Unternehmen
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md
index d79e6bbb2f..51eb375cfe 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/earning-type.md
@@ -7,6 +7,6 @@ Um eine neue Eikommensart zu erstellen, gehen Sie zu:
> Personalwesen > Einstellungen > Einkommensart > Neu
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md
index 9c334cf2a7..c9d6ce2298 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/employment-type.md
@@ -3,6 +3,6 @@
Verschiedene Beschäftigungsverträge, die Sie mit Ihren Mitarbeitern abgeschlossen haben.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md b/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md
index cec5110c93..161a867584 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/holyday-list.md
@@ -3,6 +3,6 @@
Sie können Urlaub für ein bestimmtes Jahr über die Urlaubsübersicht planen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md
index c4545983e8..8e2e5e2fb5 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/hr-settings.md
@@ -3,6 +3,6 @@
Globale Einstellungen zu Dokumenten des Personalwesens
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
index 2e80ddf555..d49121b266 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/leave-allocation.md
@@ -3,8 +3,8 @@
Hilft Ihnen Urlaub bestimmten Mitarbeitern zuzuteilen
-
+
-Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug]({{docs_base_url}}/user/manual/de/human-resources/tools/leave-allocation-tool.html).
+Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug](/docs/user/manual/de/human-resources/tools/leave-allocation-tool.html).
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md
index ece1c58b19..97b5af8589 100644
--- a/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md
+++ b/erpnext/docs/user/manual/de/human-resources/setup/leave-type.md
@@ -3,7 +3,7 @@
Geben Sie den Urlaubstyp an, der Mitarbeitern zugeordnet werden kann.
-
+
* "Maximale zulässige Urlaubstage" gibt die Maximalanzahl von Tagen dieses Urlaubstyps an, die zusammen genommen werden können.
* "Ist unbezahlter Urlaub" gibt an, dass es sich um unbezahlten Urlaub handelt.
diff --git a/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
index de109f433b..a4a786250e 100644
--- a/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
+++ b/erpnext/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md
@@ -3,6 +3,6 @@
Das Urlaubszuordnungs-Werkzeug hilft Ihnen dabei eine bestimmte Menge an Urlaub einem Mitarbeiter zuzuteilen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md
index 3f94e83875..ba351b52fa 100644
--- a/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md
+++ b/erpnext/docs/user/manual/de/human-resources/tools/upload-attendance.md
@@ -7,6 +7,6 @@ Um eine Anwesenheit hochzuladen, gehen Sie zu:
> Personalwesen > Werkzeuge > Anwesenheit hochladen
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/de/introduction/getting-started-with-erpnext.md
index b23be11242..cba04425de 100644
--- a/erpnext/docs/user/manual/de/introduction/getting-started-with-erpnext.md
+++ b/erpnext/docs/user/manual/de/introduction/getting-started-with-erpnext.md
@@ -11,7 +11,7 @@ Wenn Sie die Benutzerschnittstelle ausprobieren wollen und wissen wollen, wie si
### 2\. Richten Sie sich ein kostenloses Konto bei ERPNext.com ein
-ERPNext.com wird von der Organisation (Frappe), die ERPNext veröffentlicht, verwaltet. Sie können sich ein eigenes Konto anlegen, indem Sie sich auf der [Internetseite registrieren](https://erpnext.com).
+ERPNext.com wird von der Organisation (Frappé), die ERPNext veröffentlicht, verwaltet. Sie können sich ein eigenes Konto anlegen, indem Sie sich auf der [Internetseite registrieren](https://erpnext.com).
Sie können Sich außerdem auch dazu entscheiden, Ihre Software auf ERPNext.com zu speichern, wenn Sie einen Hostingvertrag abschliessen. Das ist eine Möglichkeit, wie Sie die Organisation, die ERPNext entwickelt und verbessert, unterstützen können. In diesem Fall bekommen Sie zusätzlich direkten Support bei Hostingfragen.
@@ -23,6 +23,6 @@ Um Ärgernisse bei der Installation von Instanzen zu vermeiden, ist ERPNext als
### 4\. Installieren Sie ERPNext auf Ihrem Unix/Linux/Mac-Rechner
-Wenn Sie sich mit der Installation von Anwendungen auf *nix-Plattformen auskennen, lesen Sie die Anweisungen zur Installation des [Frappe Bench](https://github.com/frappe/bench).
+Wenn Sie sich mit der Installation von Anwendungen auf *nix-Plattformen auskennen, lesen Sie die Anweisungen zur Installation des [Frappé Bench](https://github.com/frappe/bench).
{next}
diff --git a/erpnext/docs/user/manual/de/introduction/key-workflows.md b/erpnext/docs/user/manual/de/introduction/key-workflows.md
index ac5392c243..18404794de 100644
--- a/erpnext/docs/user/manual/de/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/de/introduction/key-workflows.md
@@ -4,7 +4,7 @@
Dieses Diagramm stellt dar, wie ERPNext die Informationen und Vorgänge in Ihrem Unternehmen über Schlüsselfunktionen nachverfolgt. Dieses Diagramm gibt nicht alle Funktionalitäten von ERPNext wieder.
-
+
_Anmerkung: Nicht alle Schritte sind zwingend erforderlich. ERPNext erlaubt es Ihnen nach eigenem Gutdünken Schritte auszulassen, wenn Sie den Prozess vereinfachen wollen._
diff --git a/erpnext/docs/user/manual/de/introduction/the-champion.md b/erpnext/docs/user/manual/de/introduction/the-champion.md
index 912c25213b..b04de656ed 100644
--- a/erpnext/docs/user/manual/de/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/de/introduction/the-champion.md
@@ -1,7 +1,7 @@
# Der Champion
Beigetragen von CWT Connector & Wire Technology GmbH
-
+
Wir haben uns in den letzten Jahren dutzende von ERP-Umsetzungen angesehen, und wir haben erkannt, dass eine erfolgreiche Umsetzung viel mit schwer greifbaren Dingen und persönlichen Einstellungen zu tun hat.
diff --git a/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md
index 55501e6753..52ab420d22 100644
--- a/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/de/manufacturing/bill-of-materials.md
@@ -7,11 +7,11 @@ Um passende Einkaufsanfragen zu erstellen, müssen Sie Ihre Stücklisten immer a
>Fertigung > Dokumente > Stückliste > Neue Stückliste
-
+
Um Arbeitsgänge hinzuzufügen, wählen Sie "Mit Arbeitsgängen". Die Übersicht der Arbeitsgänge erscheint.
-
+
* Wählen Sie den Artikel für den Sie eine Stückliste erstellen wollen.
* Fügen Sie die Arbeitsgänge, die Sie durchlaufen müssen, um diesen Artikel zu fertigen, in der Tabelle der Arbeitsgänge hinzu. Für jeden Arbeitsgang werden Sie nach einem Arbeitsplatz gefragt. Wenn nötig, müssen Sie neue Arbeitsplätze anlegen.
@@ -23,16 +23,16 @@ Um Arbeitsgänge hinzuzufügen, wählen Sie "Mit Arbeitsgängen". Die Übersicht
* Der Bereich Kostenkalkulation der Stückliste gibt einen ungefähren Wert der Produktionskosten eines Artikels wieder
* Fügen Sie die Liste der Artikel, die Sie für jeden Arbeitsgang benötigen, mit der entsprechenden Menge hinzu. Bei dem Artikel kann es sich um einen Zukaufartikel oder um eine Unterfertigung mit eigener Stückliste handeln. Wenn der Artikel in der Zeile ein gefertigter Artikel ist und mehrere verschiedene Stücklisten hat, wählen Sie die passende Stückliste aus. Sie können auch festlegen, ob ein Teil des Artikels zu Ausschuss wird.
-
+
* Diese Kosten können über die Schaltfläche "Kosten aktualisieren" aktualisiert werden.
-
+
### Benötigtes Material (aufgelöst)
Diese Tabelle listet alles Material auf, welches benötigt wird um den Artikel zu fertigen. Sie zieht weiterhin Unterbaugruppen mit Menge an.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/manufacturing/operation.md b/erpnext/docs/user/manual/de/manufacturing/operation.md
index 07ca86060d..cc1637561b 100644
--- a/erpnext/docs/user/manual/de/manufacturing/operation.md
+++ b/erpnext/docs/user/manual/de/manufacturing/operation.md
@@ -9,6 +9,6 @@ Sie können einen Arbeitsgang anlegen über:
> Fertigung > Dokumente > Arbeitsgang > Neu
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/manufacturing/production-order.md b/erpnext/docs/user/manual/de/manufacturing/production-order.md
index e6ddd7b107..d93391abcf 100644
--- a/erpnext/docs/user/manual/de/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/de/manufacturing/production-order.md
@@ -7,7 +7,7 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
> Fertigung > Dokumente > Fertigungsauftrag > Neu
-
+
### Einen Fertigungsauftrag erstellen
@@ -23,11 +23,11 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
* Als Voreinstellung zieht das System Arbeitsplätze und die Dauer von Arbeitsgängen aus der gewählten Stückliste.
-
+
* Wenn Sie den Arbeitsplatz für einen bestimmten Arbeitsgang im Fertigungsauftrag neu zuordnen möchten, können Sie das tun, bevor Sie den Fertigungsauftrag übertragen.
-
+
* Wählen Sie den betreffenden Arbeitsgang aus und ändern Sie seinen Arbeitsplatz.
* Sie können auch die Dauer des Arbeitsgangs ändern.
@@ -42,28 +42,28 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
* Das erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um diesen Fertigungsauftrag abzuschliessen. Die Artikel werden an das Fertigungslager übertragen (dieser Prozess fügt basierend auf Ihren Einstellungen Unterbaugruppen mit Stückliste als EINEN Artikel hinzu oder löst die Unterpunkte auf).
* Klicken Sie auf "Material der Fertigung übergeben".
-
+
* Geben Sie die Menge des Materials an, das übertragen werden soll.
-
+
* Übertragen Sie die Lagerbuchung.
-
+
* Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Fertigungsauftrag aktualisiert.
-
+
### Zeitprotokoll erstellen
-* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]
mitprotokolliert werden.
+* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]
mitprotokolliert werden.
* Zeitprotokolle werden zu den Arbeitsgängen des Fertigungsauftrages erstellt.
* Vorlagen für Zeitprotokolle werden für die eingeplanten Arbeitsgänge zum Zeitpunkt des Übertragens des Fertigungsauftrages erstellt.
* Um weitere Zeitprotokolle zu einem Arbeitsgang zu erstellen, wählen Sie "Zeitprotokoll erstellen" im betreffenden Arbeitsgang aus.
-
+
### Fertige Erzeugnisse aktualisieren
@@ -71,11 +71,11 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
* Das erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager "Fertige Erzeugnisse" gutschreibt.
* Klicken Sie auf "Fertige Erzeugnisse aktualisieren".
-
+
* Geben Sie die Menge des übertragenen Materials an.
-
+
>Tipp: Sie können einen Fertigungsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren.
@@ -90,7 +90,7 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi
4. Fertigerzeugnisse aktualisieren: Dieser Schritt erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager Fertige Erzeugnisse hinzufügt.
5. Um die zum Fertigungsauftrag erstellten Zeitprotokolle anzusehen, klicken Sie auf "Zeitprotokolle anzeigen".
-
+
* Sie können auch einen angehaltenen Fertigungsauftrag wieder weiter laufen lassen.
diff --git a/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
index 8f77716abb..fdf60b61cf 100644
--- a/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
+++ b/erpnext/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md
@@ -5,7 +5,7 @@ Die Fertigungseinstellungen finden Sie unter
> Fertigung > Einstellungen > Fertigungseinstellungen
-
+
Überstunden zulassen: Hier können Sie angeben, ob an Arbeitsplätzen Überstunden erlaubt sind (wichtig zur Planung von Arbeitsgängen außerhalb der Betriebsstunden).
diff --git a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
index 2796610470..3c0e36f41d 100644
--- a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
@@ -11,7 +11,7 @@ Wenn Sie bei Ihrer Tätigkeit bestimmte Prozesse an eine Drittpartei, bei der Si
2. Erstellen Sie ein Lager für den Lieferanten, damit Sie die übergebenen Artikel nachverfolgen können (möglicherweise geben Sie ja Artikel im Wert einer Monatslieferung außer Haus).
3. Stellen Sie für den bearbeiteten Artikel und der Artikelvorlage den Punkt "Ist Fremdvergabe" auf JA ein.
-
+
**Schritt 1:** Erstellen Sie für den bearbeiteten Artikel eine Stückliste, die den unbearbeiteten Artikel als Unterartikel enthält. Beispiel: Wenn Sie einen Stift herstellen, wird der bearbeitete Stift mit der Stückliste benannt, wbei der Tintentank, der Knopf und andere Artikel, die in die Fertigung eingehen als Unterartikel verwaltet werden.
diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
index 922c32ac08..dbe772b94a 100644
--- a/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
+++ b/erpnext/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md
@@ -34,7 +34,7 @@ Wenn zur Stückliste der Zentraleinheit weitere Artikel hinzugefügt werden soll
Um die Stückliste, bei der die Zentraleinheit als Rohmaterial enthalten ist, in der Stückliste des fertigen Produktes zu aktualisieren, können Sie das Stücklisten-Austauschwerkzeug verwenden.
-
+
In diesem Werkzeug wählen Sie die aktuelle und die neue Stückliste aus. Wenn Sie auf die Schaltfläche "Austauschen" klicken, wird in der Stückliste des fertigen Produktes (Computer) die aktuelle Stückliste der Zentraleinheit durch die neue Stückliste ersetzt.
diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
index 63e51f8c48..b7ef2d0b97 100644
--- a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
+++ b/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md
@@ -12,30 +12,30 @@ Um das Werkzeug zur Fertigungsplanung zu nutzen, gehen Sie zu:
> Fertigung > Werkzeuge > Werkzeug zur Fertigungsplanung
-
+
### Schritt 1: Auswahl und Kundenauftrag
* Wählen Sie einen Kundenauftrag für die Materialanforderung über die Filterfunktion (Zeit, Artikel und Kunde) aus.
* Klicken Sie auf "Kundenaufträge aufrufen" um eine Übersicht zu erhalten.
-
+
### Schritt 2: Artikel aus Kundenaufträgen abrufen
Sie können Artikel hinzufügen, entfernen oder die Menge dieser Artikel verändern.
-
+
### Schritt 3: Fertigungsaufträge erstellen
-
+
### Schritt 4: Materialanfragen erstellen
Erstellen Sie für Artikel mit prognostiziertem Engpass Materialanfragen.
-
+
Das Werkzeug zur Fertigungsplanung wird auf zwei Ebenend verwendet:
diff --git a/erpnext/docs/user/manual/de/manufacturing/workstation.md b/erpnext/docs/user/manual/de/manufacturing/workstation.md
index 2405382c28..6584ebc221 100644
--- a/erpnext/docs/user/manual/de/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/de/manufacturing/workstation.md
@@ -9,10 +9,10 @@ Sie können einen Arbeitsplatz erstellen über:
> Fertigung > Dokumente > Arbeitsplatz > Neu
-
+
Geben Sie unter "Arbeitszeit" die Betriebszeiten des Arbeitsplatzes an. Sie können die Betriebszeiten auch mit Hilfe von Schichten angeben. Wenn Sie einen Fertigungauftrag einplanen, prüft das System die Verfügbarkeit des Arbeitsplatzes basierend auf den angegebenen Betrieszeiten.
-> Anmerkung: Sie können Überstunden für einen Arbeitsplatz über die [Fertigungseinstellungen]({{docs_base_url}}/user/manual/de/manufacturing/setup/manufacturing-settings.html) aktivieren.
+> Anmerkung: Sie können Überstunden für einen Arbeitsplatz über die [Fertigungseinstellungen](/docs/user/manual/de/manufacturing/setup/manufacturing-settings.html) aktivieren.
{next}
diff --git a/erpnext/docs/user/manual/de/projects/activity-cost.md b/erpnext/docs/user/manual/de/projects/activity-cost.md
index 705846b607..25e6452744 100644
--- a/erpnext/docs/user/manual/de/projects/activity-cost.md
+++ b/erpnext/docs/user/manual/de/projects/activity-cost.md
@@ -3,4 +3,4 @@
Die Aktivitätskosten erfassen den Stundensatz und die Kosten eines Mitarbeiters zu einer Aktivitätsart. Dieser Betrag wird beim Erstellen von Zeitprotokollen vom System angezogen. Er wird für die Aufwandsabrechnung des Projektes verwendet.
-
+
diff --git a/erpnext/docs/user/manual/de/projects/activity-type.md b/erpnext/docs/user/manual/de/projects/activity-type.md
index ff61a76870..1e8c534ad2 100644
--- a/erpnext/docs/user/manual/de/projects/activity-type.md
+++ b/erpnext/docs/user/manual/de/projects/activity-type.md
@@ -3,7 +3,7 @@
Unter dem Punkt "Aktivitätsart" wird eine Liste verschiedener Typen von Aktivitäten erstellt zu denen Zeitprotokolle erstellt werden können.
-
+
Standardmäßig sind die folgenden Aktivitätsarten angelegt:
diff --git a/erpnext/docs/user/manual/de/projects/project.md b/erpnext/docs/user/manual/de/projects/project.md
index 518443b205..e9ce1b874f 100644
--- a/erpnext/docs/user/manual/de/projects/project.md
+++ b/erpnext/docs/user/manual/de/projects/project.md
@@ -3,75 +3,75 @@
Das Projektmanagement in ERPNext ist aufgabengesteuert. Sie können ein Projekt erstellen und ihm mehrere unterschiedliche Aufgaben zuweisen.
-
+
### Aufgaben verwalten
Ein Projekt kann in mehrere verschiedene Aufgaben aufgeteilt werden.
-Eine Aufgabe kann über das Projektdokument selbst erstellt werden oder über die Schaltfläche [Aufgabe]({{docs_base_url}}/user/manual/de/projects/tasks.html).
+Eine Aufgabe kann über das Projektdokument selbst erstellt werden oder über die Schaltfläche [Aufgabe](/docs/user/manual/de/projects/tasks.html).
-
+
* Um eine Aufgabe, die zu einem Projekt erstellt wurde, anzusehen, klicken Sie auf "Aufgabe",
-
+
-
+
* Sie können Aufgaben auch über das Projektdokument selbst ansehen.
-
+
### Zeitmanagement
-ERPNext verwendet [Zeitprotokolle]({{docs_base_url}}/user/manual/de/projects/time-log.html) um den Fortschritt eines Projektes nachzuverfolgen. Sie können Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum wird dann zusammen mit der Kostenberechnung basierend auf dem Zeitprotokoll aktualisiert.
+ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html) um den Fortschritt eines Projektes nachzuverfolgen. Sie können Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum wird dann zusammen mit der Kostenberechnung basierend auf dem Zeitprotokoll aktualisiert.
* Um ein Zeitprotokoll zu einem Projekt anzusehen, klicken Sie auf "Zeitprotokolle"
-
+
-
+
* Sie können ein Zeitprotokoll auch direkt erstellen und mit dem Projekt verknüpfen.
-
+
### Aufwände verwalten
-Sie können [Aufwandsabrechnungen]({{docs_base_url}}/user/manual/de/human-resources/expense-claim.html) mit Projektaufgaben verbuchen. Das System aktualisiert die Gesamtsumme der Aufwände im Abschnitt Kostenabrechnung.
+Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense-claim.html) mit Projektaufgaben verbuchen. Das System aktualisiert die Gesamtsumme der Aufwände im Abschnitt Kostenabrechnung.
* Um die Aufwandsabrechnungen zu einem Projekt anzusehen, klicken Sie auf "Aufwandsabrechnung".
-
+
* Sie könne Aufwandsabrechnungen auch direkt erstellen und mit einem Projekt verknüpfen.
-
+
* Der Gesamtbetrag der mit einem Projekt verbuchten Aufwandsabrechnungen wird unter "Gesammtsumme der Aufwandsabrechnungen" im Abschnitt "Kostenabrechnung" angezeigt.
-
+
### Kostenstelle
-Sie können zu einem Projekt eine [Kostenstelle]({{docs_base_url}}/user/manual/de/accounts/setup/cost-center.html) erstellen oder Sie können eine existierende Kostenstelle verwenden um alle Aufwände die zu einem Projekt entstehen mitzuverfolgen.
+Sie können zu einem Projekt eine [Kostenstelle](/docs/user/manual/de/accounts/setup/cost-center.html) erstellen oder Sie können eine existierende Kostenstelle verwenden um alle Aufwände die zu einem Projekt entstehen mitzuverfolgen.
-
+
### Projektkostenabrechnung
Der Abschnitt Projektkostenabrechnung hilft Ihnen dabei, die Zeit und die AUfwände die in einem Projekt anfallen, nachzuverfolgen.
-
+
* Der Abschnitt Kostenabrechnung wird basierend auf den Zeitprotokollen aktualisiert.
* Die Bruttospanne ist die Differenz zwischen dem Betrag der gesamten Kosten und dem Gesamtbetrag der Rechnung.
### Abrechnung
-Sie können einen [Kundenauftrag]({{docs_base_url}}/user/manual/de/selling/sales-order.html) zu einem Projekt erstellen bzw. ihn mit dem Projekt verknüpfen. Wenn er einmal verlinkt ist, können Sie das Vertriebsmodul dazu nutzen, dass Projekt mit Ihrem Kunden abzurechnen.
+Sie können einen [Kundenauftrag](/docs/user/manual/de/selling/sales-order.html) zu einem Projekt erstellen bzw. ihn mit dem Projekt verknüpfen. Wenn er einmal verlinkt ist, können Sie das Vertriebsmodul dazu nutzen, dass Projekt mit Ihrem Kunden abzurechnen.
-
+
### Gantt-Diagramm
@@ -79,8 +79,8 @@ Ein Gantt-Diagramm illustriert einen Projektplan, ERPNext erstellt Ihnen eine il
* Um ein Gantt-Diagramm zu einem Projekt anzusehen, gehen Sie zu diesem Projekt und klicken Sie auf "Gantt-Diagramm".
-
+
-
+
[next]
diff --git a/erpnext/docs/user/manual/de/projects/tasks.md b/erpnext/docs/user/manual/de/projects/tasks.md
index 163fb68f5f..75fd594ec8 100644
--- a/erpnext/docs/user/manual/de/projects/tasks.md
+++ b/erpnext/docs/user/manual/de/projects/tasks.md
@@ -3,13 +3,13 @@
Ein Projekt wird in Aufgaben unterteilt. In ERPNext können Sie auch Abhängigkeiten zwischen Aufgaben erstellen.
-
+
### Status der Aufgabe
Ein Aufgabe kann folgende Stati haben: "Offen", "In Arbeit", "Wartet auf Überprüfung", "Geschlossen" und "Abgebrochen".
-
+
* Standardmäßig sollte jede neu erstellte Aufgabe den Status "Offen" haben.
* Wenn ein Zeitprotokoll für eine Aufgabe erstellt wird, sollte ihr Status "In Arbeit" sein.
@@ -18,40 +18,40 @@ Ein Aufgabe kann folgende Stati haben: "Offen", "In Arbeit", "Wartet auf Überpr
Sie können eine Liste von abhängigen Aufgaben im Bereich "Hängt ab von" erstellen.
-
+
* Sie können eine übergeordnete Aufgabe nicht abschliessen bis alle abhängigen Aufgaben abgeschlossen sind.
* Wenn sich die abhängige Aufgabe verzögert und sich mit dem voraussichtlichen Startdatum der übergeordneten Aufgabe überlappt, überarbeitet das System die übergeordnete Aufgabe.
### Zeitmanagement
-ERPNext verwendet [Zeitprotokolle]({{docs_base_url}}/user/manual/de/projects/time-log.html) um den Fortschritt einer Aufgabe mitzuprotokollieren. Sie können mehrere unterschiedliche Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum kann dann zusammen mit der auf dem Zeitprotokoll basierenden Kostenberechnung aktualisiert werden.
+ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html) um den Fortschritt einer Aufgabe mitzuprotokollieren. Sie können mehrere unterschiedliche Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum kann dann zusammen mit der auf dem Zeitprotokoll basierenden Kostenberechnung aktualisiert werden.
* Um ein zu einer Aufgabe erstelltes Zeitprotokoll anzuschauen, klicken Sie auf "Zeitprotokolle".
-
+
-
+
* Sie können ein Zeitprotokoll auch direkt erstellen und mit einer Aufgabe verknüpfen.
-
+
### Ausgabenmanagement
-Sie können [Aufwandsabrechnungen]({{docs_base_url}}/user/manual/de/human-resources/expense-claim.html) mit einer Aufgabe verbuchen. Das System aktualisiert den Gesamtbetrag der Aufwandsabrechnungen im Abschnitt Kostenberechnung.
+Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense-claim.html) mit einer Aufgabe verbuchen. Das System aktualisiert den Gesamtbetrag der Aufwandsabrechnungen im Abschnitt Kostenberechnung.
* Um eine Aufwandsabrechnung, die zu einer Aufgabe erstellt wurde, anzuschauen, klicken Sie auf "Aufwandsabrechnung".
-
+
* Sie können eine Aufwandsabrechnung auch direkt erstellen und sie mit einer Aufgabe verknüpfen.
-
+
* Der Gesamtbetrag der Aufwandsabrechnungen zu einer Aufgabe wird unter "Gesamtbetrag der Aufwandsabrechnungen" im Abschnitt Kostenabrechnung angezeigt.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/projects/time-log-batch.md b/erpnext/docs/user/manual/de/projects/time-log-batch.md
index 6aa85cbe73..4383e1c819 100644
--- a/erpnext/docs/user/manual/de/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/de/projects/time-log-batch.md
@@ -9,17 +9,17 @@ ODER
Öffnen Sie einfach Ihre Übersicht der Zeitprotokolle und kreuzen Sie die Artikel an, die Sie dem Zeitprotokollstapel hinzufügen möchten. Klicken Sie dann auf die Schaltfläche "Zeitprotokollstapel erstellen" und diese Zeitprotokolle werden ausgewählt.
-
+
### Ausgangsrechnungen erstellen
* Sobald Sie einen Zeitprotokollstapel übertragen haben, sollte die Schaltfläche "Rechnung erstellen" erscheinen.
-
+
* Klicken Sie auf diese Schaltfläche und erstellen Sie eine Ausgangsrechnung zu einem Zeitprotokollstapel.
-
+
* Wenn Sie die Ausgangsrechnung "übertragen", wird die Nummer der Ausgangsrechnung in den Zeitprotokollen und im Zeitprotokollstapel aktualisiert und ihr Status wird auf "abgerechnet" geändert.
diff --git a/erpnext/docs/user/manual/de/projects/time-log.md b/erpnext/docs/user/manual/de/projects/time-log.md
index d90e27a333..072837ee7f 100644
--- a/erpnext/docs/user/manual/de/projects/time-log.md
+++ b/erpnext/docs/user/manual/de/projects/time-log.md
@@ -9,7 +9,7 @@
* Projekte
* Interne Referenzen
-
+
### Zeitprotokolle erstellen
@@ -21,15 +21,15 @@
Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll" und wählen Sie "Kalender" aus.
-
+
* Um ein Zeitprotokoll für mehrere Tage zu erstellen, klicken Sie und ziehen Sie den Mauszeiger über die Tage.
-
+
* Sie können Zeitprotokolle auch aus der Wochen- oder Tagesansicht des Kalender heraus erstellen.
-
+
* Zeitprotokolle für Fertigungsprozesse müssen aus dem Fertigungsauftrag heraus erstellt werden.
* Um mehrere Zeitprotokolle zu Arbeitsgängen zu erstellen wählen Sie den entsprechenden Arbeitsgang und klicken Sie auf "Zeitprotokoll erstellen".
@@ -37,12 +37,12 @@ Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll"
### Abrechnung über Zeitprotokolle
* Wenn Sie ein Zeitprotokoll abrechnen wollen, müssem Sie die Option "Abrechenbar" anklicken.
-* Im Abschnitt Kostenberechnung erstellt das System den Rechungsbetrag über die [Aktivitätskosten]({{docs_base_url}}/user/manual/de/projects/activity-cost.html) basierend auf dem angegebenen Mitarbeiter und der angegebenen Aktivitätsart.
+* Im Abschnitt Kostenberechnung erstellt das System den Rechungsbetrag über die [Aktivitätskosten](/docs/user/manual/de/projects/activity-cost.html) basierend auf dem angegebenen Mitarbeiter und der angegebenen Aktivitätsart.
* Das System kalkuliert dann den Rechnungsbetrag basierend auf den im Zeitprotokoll angegebenen Stunden.
* Wenn "Abrechenbar" nicht markiert wurde, zeigt das System beim "Rechnungsbetrag" 0 an.
-
+
-* Nach dem Übertragen des Zeitprotokolls müssen Sie einen [Zeitprotokollstapel]({{docs_base_url}}/user/manual/de/projects/time-log-batch.html) erstellen um mit der Abrechnung fortfahren zu können.
+* Nach dem Übertragen des Zeitprotokolls müssen Sie einen [Zeitprotokollstapel](/docs/user/manual/de/projects/time-log-batch.html) erstellen um mit der Abrechnung fortfahren zu können.
{next}
diff --git a/erpnext/docs/user/manual/de/selling/quotation.md b/erpnext/docs/user/manual/de/selling/quotation.md
index 3434e26e28..94ff78b9a9 100644
--- a/erpnext/docs/user/manual/de/selling/quotation.md
+++ b/erpnext/docs/user/manual/de/selling/quotation.md
@@ -11,11 +11,11 @@ Um ein neues Angebot zu erstellen gehen Sie zu:
Sie können auch ein Angebot aus einer Opportunity heraus erstellen.
-
+
Oder Sie erstellen ein neues Angebot und übernehmen Details aus der Opportunity.
-
+
Ein Angebot enthält Informationen über:
@@ -34,12 +34,12 @@ Ein Angebot enthält Informationen über:
Die Preise, die sie abgeben, hängen von zwei Dingen ab:
-* Die Preisliste: Wenn Sie mehrere verschiedene Preislisten haben, können Sie eine Preisliste auswählen oder sie mit dem Kunden markieren (so dass sie automatisch vorselektiert wird). Ihre Artikelpreise werden automatisch über die Preisliste aktualisert. Für weitere Informationen bitte bei [Preisliste]({{docs_base_url}}/user/manual/de/setting-up/price-lists.html) weiterlesen.
+* Die Preisliste: Wenn Sie mehrere verschiedene Preislisten haben, können Sie eine Preisliste auswählen oder sie mit dem Kunden markieren (so dass sie automatisch vorselektiert wird). Ihre Artikelpreise werden automatisch über die Preisliste aktualisert. Für weitere Informationen bitte bei [Preisliste](/docs/user/manual/de/setting-up/price-lists.html) weiterlesen.
* Die Währung: Wenn Sie einem Kunden in einer anderen Währung anbieten, müssen Sie die Umrechnungsfaktoren aktualisieren um ERPNext in die Lage zu versetzen die Information in Ihrer Standardwährung zu speichern. Das hilft Ihnen dabei den Wert Ihres Angebots in der Standardwährung zu analysieren.
### Steuern
-Um Steuern zu Ihrem Angebot hinzu zu fügen, können Sie entweder eine Steuervorlage oder eine Verkaufssteuern- und Gebühren-Vorlage auswählen oder die Steuern selbst hinzufügen. Um Steuern im Einzelnen zu verstehen, lesen Sie bitte [Steuern]({{docs_base_url}}/user/manual/de/setting-up/setting-up-taxes.html).
+Um Steuern zu Ihrem Angebot hinzu zu fügen, können Sie entweder eine Steuervorlage oder eine Verkaufssteuern- und Gebühren-Vorlage auswählen oder die Steuern selbst hinzufügen. Um Steuern im Einzelnen zu verstehen, lesen Sie bitte [Steuern](/docs/user/manual/de/setting-up/setting-up-taxes.html).
Sie können Steuern auf die gleiche Art hinzufügen wie die Vorlage Verkaufssteuern und Gebühren.
diff --git a/erpnext/docs/user/manual/de/selling/sales-order.md b/erpnext/docs/user/manual/de/selling/sales-order.md
index 187aeab37e..d980518b20 100644
--- a/erpnext/docs/user/manual/de/selling/sales-order.md
+++ b/erpnext/docs/user/manual/de/selling/sales-order.md
@@ -9,7 +9,7 @@ Wenn Ihr Kunde das Angebot annimmt, können Sie das Angebot in einen Kundenauftr
### Flußdiagramm des Kundenauftrags
-
+
Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag
@@ -17,11 +17,11 @@ Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftr
Sie können einen Kundenauftrag auch aus einem übertragenen Angebot heraus erstellen.
-
+
Oder Sie erstellen einen neuen Kundenauftrag und entnehmen die Details aus dem Angebot.
-
+
Die meisten Informationen im Kundenauftrag sind dieselben wie im Angebot. Einige Dinge möchte der Kundenauftrag aber aktualisiert haben.
@@ -60,7 +60,7 @@ Wenn Sie den Kundenauftrag aktualisieren, wird eine wiederkehrende ID generiert,
ERPNext erstellt automatisch eine neue Bestellung und versendet eine E-Mail-Mitteilung an die E-Mail-Konten, die Sie im Feld "Benachrichtigungs-E-Mail-Adresse" eingestellt haben.
-
+
### Die nächsten Schritte
diff --git a/erpnext/docs/user/manual/de/selling/setup/product-bundle.md b/erpnext/docs/user/manual/de/selling/setup/product-bundle.md
index 30475eb8ca..d97b31d50c 100644
--- a/erpnext/docs/user/manual/de/selling/setup/product-bundle.md
+++ b/erpnext/docs/user/manual/de/selling/setup/product-bundle.md
@@ -11,7 +11,7 @@ Um ein neues Produkt-Bundle zu erstellen, gehen Sie zu:
> Vertrieb > Einstellungen > Produkt-Bundle > Neu
-
+
### Hauptartikel auswählen
@@ -27,7 +27,7 @@ Im Abschnitt Paketartikel listen Sie alle Unterartikel auf, die über das Lager
Wenn Vertriebstransaktionen erstellt werden, wie z. B. Ausgangsrechnung, Kundenauftrag und Lieferschein, dann wird der übergeordnete Artikel aus der Hauptartikelliste ausgewählt.
-
+
Beim Auswählen des übergeordneten Artikels aus der Hauptartikelliste werden die Unterartikel aus der Tabelle "Packliste" der Transaktion angezogen. Wenn der Unterartikel ein serialisierter Artikel ist, können Sie seine Seriennummer direkt in der Packlistentabelle angeben. Wenn die Transaktion versendet wird, reduziert das System den Lagerbestand der Unterartikel auf dem Lager der in der Packlistentabelle angegeben ist.
diff --git a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
index 66a95a0593..c4d096e80c 100644
--- a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
@@ -13,7 +13,7 @@ Um einen Vertriebspartner anzulegen, gehen Sie zu:
Vertriebspartner werden mit einem vom Benutzer vergebenen Namen abgespeichert.
-
+
Sie können die Adressen und Kontaktdaten von Vertriebsmitarbeitern erfassen und sie basierend auf Menge und Betrag jeder Artikelgruppe zuweisen.
@@ -21,13 +21,13 @@ Sie können die Adressen und Kontaktdaten von Vertriebsmitarbeitern erfassen und
Um die Namen Ihrer Partner auf Ihrer Webseite anzuzeigen, aktivieren Sie "Auf der Webseite anzeigen". Wenn Sie diese Option anklicken, erscheint ein Feld, über das Sie das Logo Ihres Partners und eine kurze Beschreibung eingeben können.
-
+
Um eine Übersicht Ihrer Partner zu erhalten, gehen Sie zu:
https://example.erpnext.com/Partners
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/selling/setup/selling-settings.md b/erpnext/docs/user/manual/de/selling/setup/selling-settings.md
index 0e71d418f5..08492a6a2c 100644
--- a/erpnext/docs/user/manual/de/selling/setup/selling-settings.md
+++ b/erpnext/docs/user/manual/de/selling/setup/selling-settings.md
@@ -3,7 +3,7 @@
In den Vertriebseinstellungen können Sie Eigenheiten angeben, die bei Ihren Vertriebstransaktionen mit berücksichtigt werden. Im Folgenden sprechen wir jeden einzelnen Punkt an.
-
+
### 1\. Benennung der Kunden nach
diff --git a/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md
index fc59f02daf..8bf609d121 100644
--- a/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md
+++ b/erpnext/docs/user/manual/de/selling/setup/shipping-rule.md
@@ -3,6 +3,6 @@
Wenn Sie eine Versandregel verwenden, können Sie die Kosten der Lieferung des Produktes an einen Kunden festlegen. Sie können für den gleichen Artikel für verschiedene Regionen verschiedene Versandregeln definieren.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/authorization-rule.md b/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
index 7b202f15d5..bcc5674fba 100644
--- a/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
+++ b/erpnext/docs/user/manual/de/setting-up/authorization-rule.md
@@ -37,7 +37,7 @@ Wählen Sie die Rolle des Genehmigers aus. Das könnte z. B. die Rolle des Vertr
Geben Sie "Autorisierter Wert" ein. Im Beispiel stellen wir das auf 10.000 Euro ein.
-
+
Wenn ein Benutzer aus dem Vertrieb versucht eine Kundenbestellung mit einem Wert über 10.000 Euro zu übertragen, dann bekommt er eine Fehlermeldung.
diff --git a/erpnext/docs/user/manual/de/setting-up/bar-code.md b/erpnext/docs/user/manual/de/setting-up/bar-code.md
index ec9ac4c666..e85c698c34 100644
--- a/erpnext/docs/user/manual/de/setting-up/bar-code.md
+++ b/erpnext/docs/user/manual/de/setting-up/bar-code.md
@@ -11,7 +11,7 @@ Ein Barcode-Lesegerät liest die Nummer des Aufklebers eines Artikels ein. Um mi
### Abbildung 1: Markieren Sie das Feld "Artikelbarcode"
-
+
Wenn Sie einen Barcode einlesen wollen, gehen Sie zu:
@@ -25,7 +25,7 @@ Gehen Sie dann zu "Rechnungswesen" und klicken Sie auf Ausgangsrechnung. Aktivie
### Abbildung 2: Aktivieren Sie das Feld "Ist POS"
-
+
Gehen Sie zu "Artikel" und klicken Sie auf "Neue Zeile einfügen".
diff --git a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
index c793463ae6..851424a84a 100644
--- a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
@@ -13,4 +13,4 @@ Dieses Werkzeug ermöglicht es Ihnen, gleichzeitig mehrere Datensätze umzubenen
Um mehrere Datensätze umzubenennen, laden Sie eine CSV-Datei mit den alten Namen in der ersten Spalte und den neuen Namen in der zweiten Spalte hoch indem Sie auf "Hochladen" klicken.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
index 90dc38c3c9..1ea4e48ae7 100644
--- a/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/de/setting-up/data/data-import-tool.md
@@ -5,7 +5,7 @@ Das Werkzeug zum Datenimport ist ein großartiger Weg um große Mengen an Daten,
Um das Werkzeug zum Datenimport zu öffnen, gehen Sie entweder zu den Einstellungen oder zur Transaktion, für die Sie importieren wollen. Wenn der Datenimport erlaubt ist, sehen Sie eine Importschaltfläche:
-
+
Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und einen zweiten um Daten hoch zu laden.
@@ -15,7 +15,7 @@ Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und e
Daten werden in ERPNext in Tabellen gespeichert, sehr ähnlich einer Tabellenkalkulation mit Spalten und Zeilen voller Daten. Jede Instanz in ERPNext kann mehrere verschiedene mit Ihr verbundene Untertabellen haben. Die Untertabellen sind mit Ihren übergeordneten Tabellen verknüpft und werden dort eingesetzt, wo es für eine Eigenschaft mehrere verschiedene Werte gibt. So kann z. B. ein Artikel mehrere verschiedene Preise haben, eine Rechnung hat mehrere verschiedene Artikel usw.
-
+
* Klicken Sie auf die Tabelle, die Sie herunter laden wollen, oder auf "Alle Tabellen".
* Für Massenbearbeitung klicken Sie auf "Mit Daten herunterladen".
@@ -24,17 +24,17 @@ Daten werden in ERPNext in Tabellen gespeichert, sehr ähnlich einer Tabellenkal
Öffnen Sie die Vorlage nach dem Herunterladen in einer Tabellenkalkulationsanwendung und fügen Sie die Daten unterhalb der Spaltenköpfe ein.
-
+
Exportieren Sie dann Ihre Vorlage oder speichern Sie sie im CSV-Format (**Comma Separated Values**).
-
+
### 3. Hochladen der CSV-Datei
Fügen Sie abschliessend die CSV-Datei im Abschnitt Import hinzu. Klicken Sie auf die Schaltfläche "Hochladen und Importieren".
-
+
#### Anmerkungen
diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-account.md b/erpnext/docs/user/manual/de/setting-up/email/email-account.md
index e2923f6127..1a315d2f96 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/email-account.md
@@ -11,7 +11,7 @@ ERPNext erstellt standardmäßig Vorlagen für einige E-Mail-Konten. Nicht alle
Es gibt zwei Arten von E-Mail-Konten, ausgehend und eingehend. E-Mail-Konten für ausgehende E-Mails verwenden einen SMTP-Service, eingehende E-Mails verwenden einen POP-Service. Die meisten E-Mail-Anbieter wie GMail, Outlook oder Yahoo bieten diese Seriveleistungen an.
-
+
### Konten zu ausgehenden E-Mails
@@ -19,13 +19,13 @@ Alle E-Mails, die vom System aus versendet werden, sei es von einem Benutzer zu
Um ein Konto für ausgehende E-Mails einzurichten, markieren Sie die Option **Ausgehend aktivieren** und geben Sie die Einstellungen zum SMTP-Server an. Wenn Sie einen bekannten E-Mail-Service nutzen, wird das vom System für Sie voreingestellt.
-
+
### Konten zu eingehenden E-Mails
Um ein Konto für eingehende E-Mails einzurichten, markieren Sie die Option **Eingehend aktivieren** und geben Sie die Einstellungen zum POP3-Server an. Wenn Sie einen bekannten E-Mail-Service nutzen, wird das vom System für Sie voreingestellt.
-
+
### Wie ERPNext Antworten handhabt
@@ -35,6 +35,6 @@ Wenn Sie aus ERPNext heraus eine E-Mail an einen Kontakt wie z. B. einen Kunden
Wenn Sie möchten, dass ERPNext Sie benachrichtigt, wenn eine E-Mail für eine bestimmte Zeit unbeantwortet bleibt, dann können Sie die Option **Benachrichtigen, wenn unbeantwortet** markieren. Hier können Sie die Anzahl der Minuten einstellen, die das System warten soll, bevor eine Benachrichtigung gesendet wird, und den Empfänger.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
index 58f6fe33e9..c965c9b466 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/email-alerts.md
@@ -32,7 +32,7 @@ Um eine E-Mail-Erinnerung einzustellen, gehen Sie wie folgt vor:
---
#### Beispiel
-1. [Kriterien definieren](
)
-2. [Empfänger und Nachrichtentext eingeben](
)
+1. [Kriterien definieren](
)
+2. [Empfänger und Nachrichtentext eingeben](
)
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/email/email-digest.md b/erpnext/docs/user/manual/de/setting-up/email/email-digest.md
index 18117a3ea2..9199ee21a4 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/email-digest.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/email-digest.md
@@ -13,6 +13,6 @@ Um einen E-Mail-Bericht einzurichten, gehen Sie zu:
Stellen Sie ein, wie oft Sie eine Benachrichtigung erhalten wollen, markieren Sie alle Artikel, über die Sie in Ihrer wöchentlichen Aktualisierung benachrichtig werden wollen und wählen Sie die Benutzer-IDs aus, an die die Zusammenfassung gesendet werden soll.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/email/sending-email.md b/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
index d2087cae4b..e1f23b9116 100644
--- a/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
+++ b/erpnext/docs/user/manual/de/setting-up/email/sending-email.md
@@ -3,8 +3,8 @@
In ERPNext können sie jedes beliebige Dokument per E-Mail versenden (als PDF-Anhang) indem Sie in einem beliebigen geöffneten Dokument auf `Menü > E-Mail` gehen.
-
+
-**Anmerkung:** Es müssen Konten zum [E-Mail-Versand]({{docs_base_url}}/user/manual/de/setting-up/email/email-account.html) eingerichtet sein.
+**Anmerkung:** Es müssen Konten zum [E-Mail-Versand](/docs/user/manual/de/setting-up/email/email-account.html) eingerichtet sein.
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/pos-setting.md b/erpnext/docs/user/manual/de/setting-up/pos-setting.md
index 1849911e8d..b75f96c347 100644
--- a/erpnext/docs/user/manual/de/setting-up/pos-setting.md
+++ b/erpnext/docs/user/manual/de/setting-up/pos-setting.md
@@ -9,7 +9,7 @@ Wenn Sie im Endkundengeschäft tätig sind, möchten Sie, dass Ihr POS so schnel
Setzen Sie die Standardeinstellungen wie definiert.
-
+
> Wichtig: Wenn Sie einen bestimmten Benutzer angeben, werden die POS-Einstellungen nur auf diesen Benutzer angewendet. Wenn diese Optin leer bleibt, werden die Einstellungen auf alle Benutzer angewendet. Um mehr über POS zu erfahren, gehen Sie zu POS.
diff --git a/erpnext/docs/user/manual/de/setting-up/price-lists.md b/erpnext/docs/user/manual/de/setting-up/price-lists.md
index b58e191cbc..6fc5f08c45 100644
--- a/erpnext/docs/user/manual/de/setting-up/price-lists.md
+++ b/erpnext/docs/user/manual/de/setting-up/price-lists.md
@@ -11,7 +11,7 @@ Sie können eine neue Preisliste erstellen über:
> Vertrieb/Einkauf/Lagerbestand > Einstellungen > Preisliste > Neu
-
+
* Diese Preislisten werden verwendet, wenn der Datensatz zum Artikelpreis erstellt wird, um den Verkaufs- oder Einkaufspreis eines Artikels nachvollziehen zu können. Klicken Sie hier, wenn Sie mehr über Artikelpreise erfahren wollen.
* Um eine bestimmte Preisliste zu deaktivieren, deaktivieren Sie das Feld "Aktiviert" im der Preisliste. Die deaktivierte Preisliste ist dann in der Auswahl nicht mehr in Verkaufs- oder Einkaufstransaktionen verfügbar.
diff --git a/erpnext/docs/user/manual/de/setting-up/print/address-template.md b/erpnext/docs/user/manual/de/setting-up/print/address-template.md
index b3f37f77a5..0622e0c7d2 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/address-template.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/address-template.md
@@ -28,6 +28,6 @@ Hier sehen Sie die Standardvorlage:
### Beispiel
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/print/letter-head.md b/erpnext/docs/user/manual/de/setting-up/print/letter-head.md
index cc05b85f3f..e08da2893a 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/letter-head.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/letter-head.md
@@ -15,10 +15,10 @@ Sie können Briefköpfe erstellen/verwalten über:
#### Beispiel
-
+
So sieht der Briefkopf eines Ausdruckes aus:
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md
index e4236aec38..14ba20092e 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/print-format-builder.md
@@ -11,19 +11,19 @@ Oder Sie öffnen das Dokument, für das Sie ein Druckformat erstellen wollen. Kl
### Schritt 1: Erstellen Sie ein neues Format
-
+
### Schritt 2: Ein neues Feld hinzufügen
Um ein Feld hinzuzufügen, nehmen Sie es auf der linken Seitenleiste mit der Maus auf und fügen Sie es Ihrem Layout hinzu. Sie können das Layout bearbeiten, indem Sie auf das Symbol für Einstellungen klicken.
-
+
### Schritt 3: Ein Feld entfernen
Um ein Feld zu entfernen, legen Sie es einfach zurück in die Seitenleiste.
-
+
### Schritt 4
@@ -31,7 +31,7 @@ Sie können benutzerdefinierten Text als HTML in Ihr Druckformat übernehmen. F
Klicken Sie dann auf **HTML bearbeiten** um den Inhalt zu bearbeiten.
-
+
Um Ihr Format abzuspeichern klicken Sie einfach auf die Schaltfläche **Speichern**.
diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-headings.md b/erpnext/docs/user/manual/de/setting-up/print/print-headings.md
index cf6b48a407..b695a3cfd2 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/print-headings.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/print-headings.md
@@ -9,10 +9,10 @@ Sie können Druckköpfe erstellen über:
#### Abbildung 1: Druckköpfe abspeichern
-
+
Hier ist ein Beispiel abgebildet, wie man einen Druckkopf auswechselt:
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/print/print-settings.md b/erpnext/docs/user/manual/de/setting-up/print/print-settings.md
index 7dc8067a4e..995edd62a6 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/print-settings.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/print-settings.md
@@ -7,6 +7,6 @@ Um die Druckeinstellungen zu bearbeiten, gehen Sie zu:
> Einstellungen > Druck > Druckeinstellungen
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md
index 718fcc2546..071d757d7d 100644
--- a/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md
+++ b/erpnext/docs/user/manual/de/setting-up/print/terms-and-conditions.md
@@ -9,13 +9,13 @@ Um die Vorlage für die Allgemeinen Geschäftsbedingungen zu erstellen, gehen Si
> Vertrieb > Einstellungen > Vorlage für Allgemeine Geschäftsbedingungen > Neu
-
+
### 2\. Bearbeitung in HTML
Der Inhalt der Allgemeinen Geschäftsbedingungen kann nach Ihren Vorstellungen formatiert werden und es können bei Bedarf auch Bilder eingefügt werden. Für diejenigen, die sich in HTML auskennen, findet Sich auch eine Möglichkeit den Inhalt der Allgemeinen Geschäftsbedingungen in HTML zu formatieren.
-
+
Dies erlaubt es Ihnen auch die Vorlage für die Allgemeinen Geschäftsbedingungen als Fußzeile zu verwenden, was sonst in ERPNext nicht als dedizierte Funktionalität zur Verfügung steht. Da die Inhalte der Allgemeinen Geschäftsbedingungen im Druckformat immer zuletzt erscheinen, sollten die Einzelheiten zur Fußzeile am Ende des Inhaltes eingefügt werden.
@@ -23,6 +23,6 @@ Dies erlaubt es Ihnen auch die Vorlage für die Allgemeinen Geschäftsbedingunge
In Transaktionen finden Sie den Abschnitt Allgemeine Geschäftsbedingungen, wo Sie nach einer Vorlage für die Allgemeinen Geschäftsbedingungen suchen und diese auswählen können.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md
index 612cf9a6da..4f45dfc678 100644
--- a/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/de/setting-up/setting-up-taxes.md
@@ -13,11 +13,11 @@ Wenn einige Ihrer Artikel einer anderen Besteuerung unterliegen als andere, gebe
Die Tabelle zu den Artikelsteuern ist ein Abschnitt in den Artikelstammdaten.
-
+
* **Inklusive oder Exklusive Steuer:** ERPNext erlaubt es Ihnen Artikelpreise inklusive Steuer einzugeben.
-
+
* **Ausnahme von der Regel:** Die Einstellungen zur Artikelsteuer werden nur dann benötigt, wenn sich der Steuersatz eines bestimmten Artikels von demjenigen, den Sie im Standard-Steuerkonto definiert haben, unterscheidet.
* **Die Artikelsteuer kann überschrieben werden:** Sie können den Artikelsteuersatz überschreiben oder ändern, wenn Sie in der Artikelsteuertabelle zu den Artikelstammdaten gehen.
@@ -34,7 +34,7 @@ Um eine neue Vorlage zu einer Verkaufssteuer z. B. mit dem Namen Vorlage für Ve
> Einstellungen > Rechnungswesen > Vorlage für Verkaufssteuern und -abgaben
-
+
Wenn Sie eine neue Vorlage erstellen, müssen Sie für jeden Steuertyp eine neue Zeile einfügen.
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md
index 44ec38eb24..ef9bc2278b 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/global-defaults.md
@@ -7,6 +7,6 @@ Sie können Standardwerte für Ihre Dokumente über die globalen Voreinstellunge
Immer dann, wenn ein neues Dokument erstellt wird, werden diese Werte als Standardeinstellungen verwendet.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md
index 996f3dce89..8aaf923edd 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/module-settings.md
@@ -11,6 +11,6 @@ Beispiel: Wenn Sie im Dienstleistungsbereich arbeiten, möchten Sie evtl. das Fe
Markieren oder demarkieren Sie die Elemente die angezeigt / ausgeblendet werden sollen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
index 1a6f336e0b..0c66c5e9d2 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/naming-series.md
@@ -33,6 +33,6 @@ Sie können auch den Startpunkt eines Nummernkreises auswählen, indem Sie den N
Sehen Sie hier, wie der Nummernkreis eingestellt wird.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md
index 856d01616f..d804901230 100644
--- a/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md
+++ b/erpnext/docs/user/manual/de/setting-up/settings/system-settings.md
@@ -7,6 +7,6 @@ Um die Systemeinstellungen zu öffnen, gehen Sie zu:
> Einstellungen > Einstellungen > Systemeinstellungen
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
index 0fc2a1f469..eb378364bd 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md
@@ -3,7 +3,7 @@
Wählen Sie Ihre Sprache. ERPNext gibt es in mehr als 20 Sprachen.
-
+
---
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
index 3b6d1ac3a8..6116247119 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md
@@ -4,7 +4,7 @@
In diesem letzten Schritt geben Sie bitte die Bezeichnungen der Artikel ein, die Sie kaufen oder verkaufen.
+
---
diff --git a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
index 2d1789d0d1..97b246d863 100644
--- a/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
+++ b/erpnext/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md
@@ -4,7 +4,7 @@
Geben Sie Details zum Benutzerprofil, wie Name, Benutzer-ID und das bevorzugte Passwort ein.
+
> Anmerkung: Die Zeichenfolge bis zum "?" ist die URL des SMS-Gateways.
@@ -23,7 +23,7 @@ Die oben angegebene URL verschickt SMS über das Konto "abcd" an Mobilnummern "9
Beachten Sie, dass einige Parameter in der URL statisch sind. Sie bekommen von Ihrem SMS-Anbieter statische Werte wie Benutzername, Passwort usw. Diese statischen Werte sollten in die Tabelle der statischen Parameter eingetragen werden.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
index 01f2281734..a1c8dbb892 100644
--- a/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
+++ b/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -23,18 +23,18 @@ Um einen Lagerabgleich durchzuführen, gehen Sie zu:
Sie sollten sich an eine spezielle Vorlage eines Tabellenblattes halten um den Bestand und den Wert eines Artikels zu importieren. Öffnen Sie ein neues Formular zum Bestandsabgleich um die Optionen für den Download zu sehen.
-
+
#### Schritt 2: Geben Sie Daten in die CSV-Datei ein.
-
+
Das CSV-Format beachtet Groß- und Kleinschreibung. Verändern Sie nicht die Kopfbezeichnungen, die in der Vorlage vordefiniert wurden. In den Spalten "Artikelnummer" und "Lager" geben Sie bitte die richtige Artikelnummer und das Lager ein, so wie es in ERPNext bezeichnet wird. Für die Menge geben Sie den Lagerbestand, den Sie für diesen Artikel erfassen wollen, in einem bestimmten Lager ein. Wenn Sie die Menge oder den wertmäßigen Betrag eines Artikels nicht ändern wollen, dann lassen Sie den Eintrag leer.
Anmerkung: Geben Sie keine "0" ein, wenn sie die Menge oder den wertmäßigen Betrag nicht ändern wollen. Sonst kalkuliert das System eine Menge von "0". Lassen Sie also das Feld leer!
#### Schritt 3: Laden Sie die Datei hoch und geben Sie in das Formular "Bestandsableich" Werte ein.
-
+
##### Buchungsdatum
@@ -52,11 +52,11 @@ Notiz: Wenn Sie die bewerteten Beträge eines Artikels eingeben, können Sie zum
#### Schritt 4: Überprüfen Sie die Daten zum Bestandsabgleich
-
+
### Bericht zum Lagerbuch
-
+
##### So arbeitet der Bestandsabgleich
diff --git a/erpnext/docs/user/manual/de/setting-up/territory.md b/erpnext/docs/user/manual/de/setting-up/territory.md
index 22743d0d9a..24ce34c691 100644
--- a/erpnext/docs/user/manual/de/setting-up/territory.md
+++ b/erpnext/docs/user/manual/de/setting-up/territory.md
@@ -3,6 +3,6 @@
Wenn sich Ihre Geschäftstätigkeit in verschiedenen Regionen abspielt (das können z. B. Länder, Bundesländer oder Städte sein), ist es normalerweise eine großartige Idee, diese Struktur auch im System abzubilden. Wenn Sie Ihre Kunden erst einmal nach Regionen eingeteilt haben, können für jede Artikelgruppe Ziele aufstellen und bekommen Berichte, die Ihnen Ihre aktuelle Leistung in einem Gebiet zeigen und auch das, was Sie geplant haben. Sie können zudem auch eine unterschiedliche Preispolitik für ein und dasselbe Produkt in unterschiedlichen Regionen einstellen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
index 8c4c91425c..ac4093bdae 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md
@@ -11,7 +11,7 @@ Für einen Benutzer können viele Informationen eingegeben werden. Im Sinne der
### 1. Übersicht der Benutzer
-
+
Um einen neuen Benutzer hinzuzufügen, klicken Sie auf "Neu".
@@ -28,18 +28,18 @@ Nach dem Hinzufügen dieser Details bitte den Benutzer abspeichern.
Nach dem Speichern sehen Sie eine Liste der Rollen und daneben jeweils eine Schaltfläche zum Anklicken. Markieren Sie alle Rollen, von denen Sie möchten, dass sie der Benutzer bekommt, und speichern Sie das Dokument ab. Um zu sehen, welche Berechtigungen die einzelnen Rollen haben, klicken Sie auf den Rollennamen.
-
+
### 4. Zugriff auf Module einstellen
Benutzer haben Zugriff auf alle Module, für die sie aufgrund Ihrer Rollen Berechtigungen haben. Wenn Sie bestimmte Module für den Zugriff sperren möchten, entfernen Sie die Markierung in der Liste.
-
+
### 5. Sicherheitseinstellungen
Wenn Sie dem Benutzer nur zu bestimmten Bürozeiten oder an Wochenenden Zugriff auf das System gewähren möchten, stellen Sie das unter den Sicherheitseinstellungen ein.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
index 6d8108a87c..1d121c8e3d 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md
@@ -7,7 +7,7 @@ Wenn Sie das tun wollen, gehen Sie zu:
> Einstellungen > Berechtigungen > Rollenberechtigungen-Manager
-
+
Berechtigungen werden angewandt auf einer Kombination von:
@@ -31,7 +31,7 @@ Wenn dieser Punkt aktiviert ist, kann ein Benutzer mit dieser Rolle nur auf best
Um Benutzerberechtigungen zu setzen, gehen Sie zu:
-> Einstellungen > Berechtigungen > [Benutzerrechte-Manager]({{docs_base_url}}/user/manual/de/setting-up/users-and-permissions/user-permissions.html)
+> Einstellungen > Berechtigungen > [Benutzerrechte-Manager](/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.html)
@@ -43,30 +43,30 @@ Um Benutzerberechtigungen zu setzen, gehen Sie zu:
Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechtigungssystems abdeckt.
-
+
1\. **Er sollte von einem "Mitarbeiter" erstellt werden.** Aus diesem Grund sollte die Rolle "Mitarbeiter" Berechtigungen zum Lesen, Schreiben und Erstellen haben.
-
+
2\. **Ein Mitarbeiter sollte nur auf seine/Ihre eigenen Urlaubsanträge zugreifen können.** Daher sollte der Punkt "Benutzerberechtigungen anwenden" für die Rolle "Mitarbeiter" aktiviert sein und es sollte ein Datensatz "Benutzerberechtigung" für jede Kombination von Benutzer und Mitarbeiter erstellt werden. (Dieser Aufwand reduziert sich für den Dokumententyp, indem über das Programm Datensätze für Benutzerberechtigungen erstellt werden.)
-
+
3\. **Der Personalmanager sollte alle Urlaubsanträge sehen können.** Erstellen Sie für den Personalmanager eine Berechtigungsregel auf der Ebene 0 mit Lese-Rechten. Die Option "Benutzerberechtigungen anwenden" sollte deaktiviert sein.
-
+
4\. **Der Urlaubsgenehmiger sollte die ihn betreffenden Urlaubsanträge lesen und aktualisieren können.** Der Urlaubsgenehmiger erhält Lese- und Schreibzugriff auf Ebene 0, und die Option "Benutzerberechtigungen anwenden" wird aktiviert. Zutreffende Mitarbeiter-Dokumente sollten in den Benutzerberechtigungen des Urlaubsgenehmigers aufgelistet sein. (Dieser Aufwand reduziert sich für Urlaubsgenehmiger, die in Mitarbeiterdokumenten aufgeführt werden, indem über das Programm Datensätze für Benutzerberechtigungen erstellt werden.)
-
+
5\. **Ein Urlaubsantrag sollte nur von einem Mitarbeiter der Personalverwaltung oder einem Urlaubsgenehmiger bestätigt oder abgelehnt werden können.** Das Statusfeld des Urlaubsantrags wird auf Ebene 1 gesetzt. Mitarbeiter der Personalverwaltung und Urlaubsgenehmiger bekommen Lese- und Schreibrechte für Ebene 1, während allen anderen Leserechte für Ebene 1 gegeben werden.
-
+
6\. **Der Mitarbeiter der Personalverwaltung sollte die Möglichkeit haben Urlaubsanträge an seine Untergebenen zu delegieren.** Er erhält die Erlaubis Benutzerberechtigungen einzustellen. Ein Nutzer mit der Rolle "Benutzer Personalverwaltung" wäre dann also in der Lage Benutzer-Berechtigungen und Urlaubsanträge für andere Benutzer zu definieren.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
index 2436439432..aea4770641 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/sharing.md
@@ -5,6 +5,6 @@ Zusätzlich zu Benutzer- und Rollenberechtigungen können Sie ein Dokument auch
Um ein Dokument zu teilen, öffnen Sie das Dokument, klicken Sie auf das "+"-Symbol im Abschnitt "Freigegeben für" und wählen Sie den Benutzer aus.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md
index a7516936e7..6499cc2a5d 100644
--- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md
@@ -1,45 +1,5 @@
# Benutzer-Berechtigungen
-Beigetragen von CWT Connector & Wire Technology GmbH
-Verwenden Sie den Benutzerberechtigungen-Manager um den Zugriff eines Benutzers auf eine Menge von Dokumenten einzuschränken.
+This document has been changed but not yet translated. Please see the English Version
-Rollenbasierte Berechtigungen definieren den Rahmen an Dokumententypen, innerhalb derer sich ein Benutzer mit einer Anzahl von Rollen bewegen darf. Sie können jedoch noch feinere Einstellungen treffen, wenn Sie für einen Benutzer Benutzerberechtigungen definieren. Wenn Sie bestimmte Dokumente in der Liste der Benutzerberechtigungen eintragen, dann können Sie den Zugriff dieses Benutzers auf bestimmte Dokumente eines bestimmten DocTypes begrenzen, unter der Bedingung, dass die Option "Benutzerberechtigungen anwenden" im Rollenberechtigungs-Manager aktiviert ist.
-
-Beginnen Sie wie folgt:
-
-> Einstellungen > Berechtigungen > Benutzerrechte-Manager
-
-
-Abbildung: Übersicht aus dem Benutzerberechtigungs-Manager die aufzeigt, wie Benutzer nur auf bestimmte Firmen zugreifen können
-
-#### Beispiel
-
-Der Benutzer "aromn@example.com" hat die Rolle "Nutzer Vertrieb" und wir möchten die Zugriffsrechte des Benutzers so einschränken, dass er nur auf Datensätze einer bestimmten Firma, nämlich der Wind Power LLC, zugreifen kann.
-
-1\. Wir fügen eine Benutzerberechtigungs-Zeile für die Firma hinzu.
-
-Abbildung: Hinzufügen einer Zeile "Benutzer-Berechtigung" für die Kombination aus dem Benutzer "aromn@example.com" und der Firma Wind Power LLC
-
-2\. Die Rolle "Alle" hat nur Leseberechtigungen für die Firma, "Benutzer-Berechtigungen anwenden" ist aktiviert.
-
-Abbildung: Leseberechtigung mit aktivierter Option "Benutzer-Berechtigungen anwenden" für den DocType Firma
-
-3\. Die oben abgebildete Kombination der zwei Regeln führt dazu, dass der Benutzer "aromn@example.com" für die Firma Wind Power LLC nur Leserechte hat.
-
-Abbildung: Der Zugriff wird auf die Firma Wind Power LLC beschränkt
-
-4\. Wir möchten nun diese Benutzer-Berechtigung für "Firma" auf andere Dokumente wie "Angebot", "Kundenauftrag" etc. übertragen. Diese Formulare haben **Verknüpfungsfelder zu "Firma"**. Als Ergebnis werden Benutzer-Berechtigungen von "Firma" auch auf diese Dokumente übertragen, was dazu führt, dass der Benutzer "aromn@example.com" auf diese Dokumente zugreifen kann, wenn Sie mit Wind Power LLC verbunden sind.
-
-Abbildung: Benutzer mit der Rolle "Nutzer Vertrieb" können, basierend auf Ihren Benutzer-Berechtigungen, Angebote lesen, schreiben, erstellen, übertragen und stornieren, wenn "Benutzer-Berechtigungen anwenden" aktiviert ist.
-
-Abbildung: Die Auflistung der Angebote enthält nur Ergebnisse für die Firma Wind Power LLC für den Benutzer "aromn@example.com"
-
-5\. Benutzer-Berechtigungen werden automatisch auf Basis von verknüpften Feldern angewandt, genauso wie wir es bei den Angeboten gesehen haben. Aber: Das Lead-Formular hat vier Verknüpfungsfelder: "Region", "Firma", "Eigentümer des Leads" und "Nächster Kontakt durch". Nehmen wir an, Sie möchten dass die Leads den Zugriff des Benutzers basierend auf Ihrer Region einschränken, obwohl Sie für die DocTypes "Benutzer", "Region" und "Firma" Benutzer-Berechtigungen angelegt haben. Dann gehen Sie wir folgt vor: Aktivieren Sie die Option "Benutzer-Berechtigungen ignorieren" für die Verknüpfungsfelder "Firma", "Eigentümer des Leads" und "Nächster Kontakt durch".
-
-Abbildung: Der Vertriebsmitarbeiter kann Leads lesen, schreiben und erstellen, eingeschränkt durch Benutzer-Berechtigungen.
-
-Abbildung: Markieren Sie "Benutzer-Berechtigungen ignorieren" für die Felder "Firma", "Lead-Inhaber" und "Nächster Kontakt durch" über Setup > Anpassen > Formular anpassen > Lead.
-
-Abbildung: Aufgrund der obigen Kombination kann der Benutzer "aromn@example.com" nur auf Leads der Region "United States" zugreifen.
-
-{next}
+User Permission
diff --git a/erpnext/docs/user/manual/de/setting-up/workflows.md b/erpnext/docs/user/manual/de/setting-up/workflows.md
index 7879a0abba..c53a2644c5 100644
--- a/erpnext/docs/user/manual/de/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/de/setting-up/workflows.md
@@ -7,7 +7,7 @@ Unten Sehen Sie ein Beispiel eines Worklflows.
Wenn ein Benutzer einen Urlaub beantragt, dann wird seine Anfrage an die Personalabteilung weiter geleitet. Die Personalabteilung, repräsentiert durch einen Mitarbeiter der Personalabteilung, wird diese Anfrage dann entweder genehmigen oder ablehnen. Wenn dieser Prozess abgeschlossen ist, dann bekommt der Vorgesetzte des Benutzers (der Urlaubsgenehmiger) eine Mitteilung, dass die Personalabteilung den Antrag genehmigt oder abgelehnt hat. Der Vorgesetzte, der die genehmigende Instanz ist, wird dann den Antrag entweder genehmigen oder ablehnen. Dementsprechend bekommt der Benutzer dann eine Genehmigung oder eine Ablehnung.
-
+
Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu:
@@ -15,11 +15,11 @@ Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu:
#### Schritt 1: Geben Sie die unterschiedlichen Zustände des Prozesses Urlaubsantrag ein.
-
+
#### Schritt 2: Geben Sie die Übergangsregeln ein.
-
+
Hinweise:
@@ -37,14 +37,14 @@ Gehen Sie in das Modul Personalwesen und klicken Sie auf Urlaubsantrag. Beantrag
Wenn ein Urlaubsantrag übertragen wird, steht der Status in der Ecke der rechten Seite auf "Beantragt".
-
+
Wenn sich ein Mitarbeiter der Personalabteilung anmeldet, dann kann er den Antrag genehmigen oder ablehnen. Wenn eine Genehmigung erfolgt, wechselt der Status in der rechten Ecke zu "Genehmigt". Es wird jedoch ein blaues Informationssymbol angezeigt, welches aussagt, dass der Urlaubsantrag noch anhängig ist.
-
+
Wenn der Urlaubsgenehmiger die Seite mit den Urlaubsanträgen öffnet, kann er den Status von "Genehmigt" auf "Abgelehnt" ändern.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md
index 1a17675c8d..fb427e1ae4 100644
--- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md
+++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md
@@ -9,7 +9,7 @@ Bei diesem Prozess bucht das System jede Lagertransaktion um Lagerbestand und Bu
Wenn Sie Artikel kaufen und erhalten, werden diese Artikel als Vermögen des Unternehmens gebucht (Warenbestand/Anlagevermögen). Wenn Sie diese Artikel wieder verkaufen und ausliefern, werden Kosten (Selbstkosten) in Höhe der Bezugskosten der Artikel verbucht. Nach jeder Lagertransaktion werden Buchungen im Hauptbuch erstellt. Dies hat zum Ergebnis, dass der Wert im Lagerbuch immer gleich dem Wert in der Bilanz bleibt. Das verbessert die Aussagekraft der Bilanz und der Gewinn- und Verlustrechnung.
-Um Buchungen für bestimmte Lagertransaktionen zu überprüfen, bitte unter [Beispiele]({{docs_base_url}}/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.html) nachlesen.
+Um Buchungen für bestimmte Lagertransaktionen zu überprüfen, bitte unter [Beispiele](/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.html) nachlesen.
#### Vorteile
@@ -33,6 +33,6 @@ Die Differenz aus dem Wert der Waren, die noch nicht verkauft wurden, und dem Wa
Dieser Gesamtprozess wird als Stichtagsinventur bezeichnet.
-Wenn Sie als bereits existierender Benutzer die Stichtagsinventur nutzen aber zur Ständigen Inventur wechseln möchten, müssen Sie der Migrationsanleitung folgen. Für weitere Details lesen Sie [Migration aus der Stichtagsinventur]({{docs_base_url}}/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
+Wenn Sie als bereits existierender Benutzer die Stichtagsinventur nutzen aber zur Ständigen Inventur wechseln möchten, müssen Sie der Migrationsanleitung folgen. Für weitere Details lesen Sie [Migration aus der Stichtagsinventur](/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
{next}
diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
index 742d24644a..62a91666b1 100644
--- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
+++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
@@ -21,7 +21,7 @@ Schritte:
> Einstellungen > Rechnungswesen > Konteneinstellungen > Eine Buchung für jede Lagerbewegung erstellen
-
+
* Erstellen Sie Lagerbuchungen (Materialübertrag) um verfügbare Lagerbestände von einem existierenden Lager auf ein neues Lager zu übertragen. Sobald im neuen Lager der Lagerbestand verfügbar wird, sollten Sie für zukünftige Transaktionen nur noch das neue Lager verwenden.
diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
index f0e1f7a688..639e140e93 100644
--- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -133,11 +133,11 @@ Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück
Lagerbuch
-
+
**Hauptbuch:**
-
+
Um ein System der doppelten Buchhaltung zu erhalten, werden dadurch, dass sich der Kontensaldo durch den Kaufbeleg erhöht, die Konten "In Verkaufsstellen" und "Anlagevermögen im Lager" belastet und das temporäre Konto "Lagerware erhalten aber noch nicht abgerechnet" entlastet. Zum selben Zeitpunkt wird eine negative Aufwendung auf das Konto "In der Bewertung enthaltene Kosten" verbucht, um die Bewertung hinzuzufügen und um eine doppelte Aufwandsverbuchung zu vermeiden.
@@ -149,7 +149,7 @@ Wenn eine Rechnung des Lieferanten für den oben angesprochenen Kaufbeleg eintri
#### Hauptbuch
-
+
Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und hebt den Effekt des Kaufbeleges auf.
@@ -206,11 +206,11 @@ Nehmen wir an, dass Sie eine Kundenbestellung von "Utah Automation Services" üb
**Lagerbuch**
-
+
**Hauptbuch**
-
+
Da der Artikel aus dem Lager "In Verkaufsstellen" geliefert wird, wird das Konto "In Verkaufsstellen" entlastet und ein Betrag in gleicher Höhe dem Aufwandskonto "Selbstkosten" belastet. Der belastete/entlastete Betrag ist gleich dem Gesamtwert (Einkaufskosten) des Verkaufsartikels. Und der Wert wird gemäß der bevorzugten Bewertungsmethode (FIFO/Gleitender Durchschnitt) oder den tatsächlichen Kosten eines serialisierten Artikels kalkuliert.
@@ -231,11 +231,11 @@ Nehmen wir an, dass Sie zur obigen Bestellung keinen Lieferschein erstellt haben
**Lagerbuch**
-
+
**Hauptbuch**
-
+
Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten "In Verkaufsstellen" und "Selbstkosten" basierend auf der Bewertung beeinflusst.
@@ -268,11 +268,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten
**Lagerbuch**
-
+
**Hauptbuch**
-
+
* * *
@@ -303,11 +303,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten
**Lagerbuch**
-
+
**Hauptbuch**
-
+
* * *
@@ -340,8 +340,8 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten
**Lagerbuch**
-
+
**Hauptbuch**
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/stock/articles/article-variants.md b/erpnext/docs/user/manual/de/stock/articles/article-variants.md
index afd5347311..a54ccd670c 100644
--- a/erpnext/docs/user/manual/de/stock/articles/article-variants.md
+++ b/erpnext/docs/user/manual/de/stock/articles/article-variants.md
@@ -1,3 +1,5 @@
+# Article Variants
+
Beigetragen von CWT Connector & Wire Technology GmbH
## 4.6.2 Artikelvarianten
diff --git a/erpnext/docs/user/manual/de/stock/batch.md b/erpnext/docs/user/manual/de/stock/batch.md
index 783e7e32e8..69171e11f8 100644
--- a/erpnext/docs/user/manual/de/stock/batch.md
+++ b/erpnext/docs/user/manual/de/stock/batch.md
@@ -13,7 +13,7 @@ Bei jeder für einen Chargenartikel generierten Lagertransaktion (Kaufbeleg, Lie
Die Chargenstammdaten werden vor der Ausfertigung des Kaufbelegs erstellt. Somit erstellen Sie immer dann, wenn für einen Chargenartikel ein Kaufbeleg oder ein Produktionsauftrag ausgegeben werden, zuerst die Chargennummer des Artikels und wählen diese dann im Kaufbeleg oder im Produktionsauftrag aus.
-
+
> Anmerkung: Bei Lagertransaktionen werden die Chargen-IDs basierend auf dem Code, dem Lager, dem Verfallsdatum der Charge (verglichen mit dem Veröffentlichungsdatum der Transaktion) und der aktuellen Menge im Lager gefiltert.
diff --git a/erpnext/docs/user/manual/de/stock/delivery-note.md b/erpnext/docs/user/manual/de/stock/delivery-note.md
index 00e66ca5e3..5ee2567325 100644
--- a/erpnext/docs/user/manual/de/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/de/stock/delivery-note.md
@@ -11,7 +11,7 @@ Die Buchung zum Lieferschein ist derjenigen zum Kaufbeleg sehr ähnlich. Sie kö
oder aber über eine "übertragene" Kundenbestellung (die noch nicht versandt wurde) indem Sie auf "Lieferschein erstellen" klicken.
-
+
Sie können die Details auch aus einer noch nicht gelieferten Kundenbestellung "herausziehen".
@@ -19,7 +19,7 @@ Sie werden bemerken, dass alle Informationen über nicht gelieferte Artikel und
### Pakete oder Artikel mit Produkt-Bundles versenden
-Wenn Sie Artikel, die ein [Produkt-Bundle]({{docs_base_url}}/user/manual/de/selling/setup/product-bundle.html), ERPNext will automatically beinhalten, versenden, erstellt Ihnen ERPNext automatisch eine Tabelle "Packliste" basierend auf den Unterartikeln dieses Artikels.
+Wenn Sie Artikel, die ein [Produkt-Bundle](/docs/user/manual/de/selling/setup/product-bundle.html), ERPNext will automatically beinhalten, versenden, erstellt Ihnen ERPNext automatisch eine Tabelle "Packliste" basierend auf den Unterartikeln dieses Artikels.
Wenn Ihre Artikel serialisiert sind, dann müssen Sie für Artikel vom Typ Produkt-Bundle die Seriennummer in der Tabelle "Packliste" aktualisieren.
diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md
index 5a47b13e4e..2a59ecb152 100644
--- a/erpnext/docs/user/manual/de/stock/material-request.md
+++ b/erpnext/docs/user/manual/de/stock/material-request.md
@@ -3,7 +3,7 @@
Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst.
-
+
Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu:
@@ -11,14 +11,14 @@ Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu:
### Materialanfrage erstellen
-
+
Eine Materialanfrage kann auf folgende Arten erstellt werden:
* Automatisch aus einem Kundenauftrag heraus.
* Automatisch, wenn die projizierte Menge eines Artikels in den Lagern einen bestimmten Bestand erreicht.
* Automatisch aus einer Stückliste heraus, wenn Sie das Modul "Produktionsplanung" benutzen, um Ihre Fertigungsaktivitäten zu planen.
-* Wenn Ihre Artikel Bestandsposten sind, müssen Sie überdies das Lager angeben, auf welches diese Artikel geliefert werden sollen. Das hilft dabei die [projizierte Menge]({{docs_base_url}}/user/manual/de/stock/projected-quantity.html) für diesen Artikel im Auge zu behalten.
+* Wenn Ihre Artikel Bestandsposten sind, müssen Sie überdies das Lager angeben, auf welches diese Artikel geliefert werden sollen. Das hilft dabei die [projizierte Menge](/docs/user/manual/de/stock/projected-quantity.html) für diesen Artikel im Auge zu behalten.
Es gibt folgende Typen von Materialanfragen:
diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md
index 2b3d9e7d19..2f6e001af7 100644
--- a/erpnext/docs/user/manual/de/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/de/stock/projected-quantity.md
@@ -7,7 +7,7 @@ Der projizierte Lagerbestand wird vom Planungssystem verwendet um den Nachbestel
Eine strikte Kontrolle des projizierten Lagerbestandes ist entscheidend um Engpässe vorherzusagen und die richtige Bestellmenge kalkulieren zu können.
-
+
> Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge
diff --git a/erpnext/docs/user/manual/de/stock/purchase-receipt.md b/erpnext/docs/user/manual/de/stock/purchase-receipt.md
index f78600d293..5303895092 100644
--- a/erpnext/docs/user/manual/de/stock/purchase-receipt.md
+++ b/erpnext/docs/user/manual/de/stock/purchase-receipt.md
@@ -11,7 +11,7 @@ Sie können einen Kaufbeleg direkt erstellen über:
oder aus einer "übertragenen" Einkaufsbestellung heraus, in dem Sie auf die Schaltfläche "Kaufbeleg erstellen" klicken.
-
+
### Ausschuss
diff --git a/erpnext/docs/user/manual/de/stock/purchase-return.md b/erpnext/docs/user/manual/de/stock/purchase-return.md
index 1da0bc4691..0805d75fc8 100644
--- a/erpnext/docs/user/manual/de/stock/purchase-return.md
+++ b/erpnext/docs/user/manual/de/stock/purchase-return.md
@@ -7,18 +7,18 @@ Sie können eine Lieferantenreklamation erstellen indem Sie ganz einfach einen K
Öffnen Sie hierzu zuerst die ursprüngliche Eingangsrechnung zu der der Lieferant die Artikel geliefert hat.
-
+
Klicken Sie dann auf "Lieferantenreklamation erstellen", dies öffnet einen neuen Kaufbeleg bei dem "Ist Reklamation" markiert ist, und bei dem die Artikel mit negativer Menge aufgeführt sind.
-
+
Bei der Ausgabe eines Reklamations-Kaufbelegs vermindert das System die Menge des Artikels auf dem entsprechenden Lager. Um einen korrekten Lagerwert zu erhalten, verändert sich der Lagersaldo entsprechend dem Einkaufspreis des zurückgesendeten Artikels.
-
+
Wenn die Ständige Inventur aktiviert wurde, verbucht das System weiterhin Buchungssätze zum Lagerkonto um den Lagersaldo mit dem Lagerbestand des Lagerbuchs zu synchronisieren.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/stock/sales-return.md b/erpnext/docs/user/manual/de/stock/sales-return.md
index 2b4fbb47d1..0daef5cafb 100644
--- a/erpnext/docs/user/manual/de/stock/sales-return.md
+++ b/erpnext/docs/user/manual/de/stock/sales-return.md
@@ -7,22 +7,22 @@ In ERPNext können Sie eine Kundenreklamation erstellen, indem Sie ganz einfach
Öffnen Sie dazu zuerst den Lieferschein/die Ausgangsrechnung zu dem/der der Kunde einen Artikel zurück sendet.
-
+
Klicken Sie dann auf "Kundenreklamation erstellen", das öffnet einen neuen Lieferschein, bei dem "Ist Reklamation" aktiviert ist, und die Artikel und Steuern mit negativem Betrag angezeigt werden.
Sie können die Reklamation auch über die Originalausgangsrechnung erstellen. Um Material mit einer Gutschrift zurück zu geben, markieren Sie die Option "Lager aktualisieren" in der Reklamationsrechnung.
-
+
Bei der Ausgabe eines Rücksendelieferscheins / einer Reklamationsrechnung erhöht das System den Lagerbestand im entsprechenden Lager. Um den richtigen Lagerwert zu erhalten erhöht sich der Lagerbestand um den Wert des ursprünglichen Einkaufspreises des zurückgeschickten Artikels.
-
+
Für den Fall einer Reklamationsrechnung erhält das Kundenkonto eine Gutschrift und die damit verknüpften Konten für Erträge und Steuern werden belastet.
Wenn die ständige Inventur aktiviert ist, erstellt das System auch Buchungen für das Lagerkonto um den Kontostand des Lagers mit dem Lagerbuch zu synchronisieren.
-
+
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/stock/serial-no.md b/erpnext/docs/user/manual/de/stock/serial-no.md
index 1fb8bd8aca..883a45e3fb 100644
--- a/erpnext/docs/user/manual/de/stock/serial-no.md
+++ b/erpnext/docs/user/manual/de/stock/serial-no.md
@@ -13,7 +13,7 @@ Wenn Ihr Artikel serialisiert ist, müssen Sie die Seriennummern in der entsprec
Der Lagerbestand eines Artikels kann nur dann beeinflusst werden, wenn die Seriennummer mit Hilfe einer Lagertransaktion (Lagerbuchung, Kaufbeleg, Lieferschein, Ausgangsrechnung) übertragen wird. Wenn eine neue Seriennummer direkt erstellt wird, kann der Lagerort nicht eingestellt werden.
-
+
* Der Status wird aufgrund der Lagerbuchung eingestellt.
* Nur Seriennummern mit dem Status "Verfügbar" können geliefert werden.
diff --git a/erpnext/docs/user/manual/de/stock/setup/item-attribute.md b/erpnext/docs/user/manual/de/stock/setup/item-attribute.md
index 6deabb38ac..d61c6fcfd9 100644
--- a/erpnext/docs/user/manual/de/stock/setup/item-attribute.md
+++ b/erpnext/docs/user/manual/de/stock/setup/item-attribute.md
@@ -3,18 +3,18 @@
Sie können Attribute und Attributwerte für Ihre Artikelvarianten hier auswählen.
-
+
### Nicht-numerische Attribute
* Für nicht-numerische Attribute definieren Sie Attributwerte und deren Abkürzungen in der Tabelle Attributwerte.
-
+
### Numerische Attribute
* Wenn Ihr Attribut numerisch ist, wählen Sie numerische Werte.
* Geben Sie den Bereich an und die Schrittweite.
-
+
diff --git a/erpnext/docs/user/manual/de/stock/setup/item-group.md b/erpnext/docs/user/manual/de/stock/setup/item-group.md
index 8be1a60bff..c911c6ccbb 100644
--- a/erpnext/docs/user/manual/de/stock/setup/item-group.md
+++ b/erpnext/docs/user/manual/de/stock/setup/item-group.md
@@ -3,19 +3,19 @@
Die Artikelgruppe ist die Klassifikationskategorie. Ordnen Sie ein Produkt abhängig von seiner Art in einen entsprechenden Bereich ein. Wenn das Produkt dienstleistungsorientiert ist, ordnen Sie es unter dem Hauptpunkt Dienstleistung ein. Wenn das Produkt als Rohmaterial verwendet wird, müssen Sie es in der Kategorie Rohmaterial einordnen. Für den Fall, dass es sich bei dem Produkt um reine Handelsware handelt, können Sie es im Bereich Handelsware einordnen.
-
+
### Eine Artikelgruppe erstellen
* Wählen Sie eine Artikelgruppe aus unter der Sie eine Artikelgruppe erstellen wollen.
* Klicken Sie auf "Unterpunkt hinzufügen".
-
+
### Eine Artikelgruppe löschen
* Wählen Sie die zu löschende Artikelgruppe aus.
* Klicken Sie auf "Löschen"
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/stock/setup/stock-settings.md b/erpnext/docs/user/manual/de/stock/setup/stock-settings.md
index c7237b0e51..2eb84ebe34 100644
--- a/erpnext/docs/user/manual/de/stock/setup/stock-settings.md
+++ b/erpnext/docs/user/manual/de/stock/setup/stock-settings.md
@@ -3,6 +3,6 @@
Sie können Standardeinstellungen für Ihre mit dem Lager verbundenen Transaktionen hier voreinstellen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/stock/stock-entry.md b/erpnext/docs/user/manual/de/stock/stock-entry.md
index 4b9fe08373..442c42d4ad 100644
--- a/erpnext/docs/user/manual/de/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/de/stock/stock-entry.md
@@ -7,7 +7,7 @@ Wenn Sie eine Lagerbuchung erstellen möchten, gehen Sie zu:
> Lagerbestand > Dokumente > Lagerbuchung > Neu
-
+
Lagerbuchungen können aus folgenden Gründen erstellt werden:
@@ -27,15 +27,15 @@ Wenn die Lagerbuchung eine Eingangsbuchung ist, d. h. wenn ein beliebiger Artike
Um Zusatzkosten hinzuzufügen, geben Sie die Beschreibung und den Betrag der Kosten in die Tabelle Zusatzkosten ein.
-
+
Die hinzugefügten Zusatzkosten werden basierend auf dem Grundwert der Artikel proportional auf die erhaltenen Artikel verteilt. Dann werden die verteilten Zusatzkosten zum Grundpreis hinzugerechnet, um den Wert neu zu berechnen.
-
+
Wenn die laufende Inventur aktiviert ist, werden Zusatzkosten auf das Konto "Aufwendungen im Wert beinhaltet" gebucht.
-
+
> Hinweis: Um den Lagerbestand über eine Tabellenkalkulation zu aktualisieren, bitte unter Lagerabgleich nachlesen.
{next}
diff --git a/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
index 340e104384..0cb6ea19e0 100644
--- a/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
+++ b/erpnext/docs/user/manual/de/stock/tools/landed-cost-voucher.md
@@ -23,7 +23,7 @@ Sie können die Einstandskosten an jedem zukünftigen Zeitpunkt über einen Eins
Im Dokument können Sie verschiedene Kaufbelege auswählen und alle Artikel daraus abrufen. Dann sollten Sie zutreffende Abgaben aus der Tabelle "Steuern und Abgaben" hinzufügen. Die hinzugefügten Abgaben werden proportional auf die Artikel aufgeteilt, basierend auf ihrem Wert.
-
+
### Was passiert bei der Ausgabe?
diff --git a/erpnext/docs/user/manual/de/stock/tools/packing-slip.md b/erpnext/docs/user/manual/de/stock/tools/packing-slip.md
index 93752be863..474f2d5159 100644
--- a/erpnext/docs/user/manual/de/stock/tools/packing-slip.md
+++ b/erpnext/docs/user/manual/de/stock/tools/packing-slip.md
@@ -3,6 +3,6 @@
Ein Packzettel ist ein Dokument, welches die Artikel einer Sendung auflistet. Normalerweise wird er den gelieferten Waren beigelegt. Beim Versand eines Produktes wird ein Entwurf für einen Lieferschein erstellt. Sie können aus diesem Lieferschein (Entwurf) einen Packzettel erstellen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md
index 9c375dfad7..76ef650930 100644
--- a/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md
+++ b/erpnext/docs/user/manual/de/stock/tools/quality-inspection.md
@@ -5,6 +5,6 @@ In ERPNext können Sie eingehende und ausgehende Produkte für eine Qualitätspr
> Lagerbestand > Werkzeuge > Qualitätsprüfung > Neu
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/stock/warehouse.md b/erpnext/docs/user/manual/de/stock/warehouse.md
index a2e6c43fac..56c5913f62 100644
--- a/erpnext/docs/user/manual/de/stock/warehouse.md
+++ b/erpnext/docs/user/manual/de/stock/warehouse.md
@@ -7,7 +7,7 @@ Um zum Bereich "Lager" zu gelangen, klicken Sie auf "Lagerbestand" und gehen Sie
> Lagerbestand > Einstellungen > Lager > Neu
-
+
In ERPNext muss jedes Lager einer festen Firma zugeordnet sein, um einen unternehmensbezogenen Lagerbestand zu erhalten. Die Lager werden mit den ihnen zugeordneten Firmenkürzeln abgespeichert. Dies erleichtert es auf einen Blick herauszufinden, welches Lager zu welcher Firma gehört.
diff --git a/erpnext/docs/user/manual/de/support/issue.md b/erpnext/docs/user/manual/de/support/issue.md
index 37a1b84fbb..7b8e9113c1 100644
--- a/erpnext/docs/user/manual/de/support/issue.md
+++ b/erpnext/docs/user/manual/de/support/issue.md
@@ -3,11 +3,11 @@
Bei einem Fall handelt es ich um eine eingehende Nachricht vom Kunden, normalerweise per Email oder aus der Kontaktschnittstelle Ihrer Webseite (Um das Supportticket vollständig in Ihre Emails einzubinden, lesen Sie bitte bei "Email-Einstellungen" nach).
-> Tipp: Eine eigens eingerichtete Email-Adresse für Supportanfragen ist eine gute Möglichkeit um per Email eingehende Anfragen zu handhaben. Beispiel: Sie können Supportanfragen über support@erpnext.com an ERPNext senden und es werden automatisch im Frappe-System Einträge erstellt.
+> Tipp: Eine eigens eingerichtete Email-Adresse für Supportanfragen ist eine gute Möglichkeit um per Email eingehende Anfragen zu handhaben. Beispiel: Sie können Supportanfragen über support@erpnext.com an ERPNext senden und es werden automatisch im Frappé-System Einträge erstellt.
> Support > Dokumente > Anfrage > Neu
-
+
### Gesprächsaufzeichnung
diff --git a/erpnext/docs/user/manual/de/support/maintenance-schedule.md b/erpnext/docs/user/manual/de/support/maintenance-schedule.md
index dcc88ae4a5..df08375cdd 100644
--- a/erpnext/docs/user/manual/de/support/maintenance-schedule.md
+++ b/erpnext/docs/user/manual/de/support/maintenance-schedule.md
@@ -9,7 +9,7 @@ Um einen neuen Wartungsplan zu erstellen, gehen Sie zu:
> Support > Dokumente > Wartungsplan > Neu
-
+
Im Wartungsplan gibt es zwei Abschnitte:
diff --git a/erpnext/docs/user/manual/de/support/maintenance-visit.md b/erpnext/docs/user/manual/de/support/maintenance-visit.md
index d215c737fa..86ed897efc 100644
--- a/erpnext/docs/user/manual/de/support/maintenance-visit.md
+++ b/erpnext/docs/user/manual/de/support/maintenance-visit.md
@@ -5,7 +5,7 @@ Ein Wartungsbesuch ist ein Datensatz über einen Besuch eines Technikers bei ein
> Support > Dokumente > Wartungsbesuch > Neu
-
+
Der Wartungsbesuch inhält Informationen über:
diff --git a/erpnext/docs/user/manual/de/support/warranty-claim.md b/erpnext/docs/user/manual/de/support/warranty-claim.md
index 42ae52d9cc..a54aac82bb 100644
--- a/erpnext/docs/user/manual/de/support/warranty-claim.md
+++ b/erpnext/docs/user/manual/de/support/warranty-claim.md
@@ -11,7 +11,7 @@ Um einen neuen **Garantiefall** zu erstellen, gehen Sie zu:
> Support > Dokukumente > Garantieantrag > Neu
-
+
Wenn für die Lösung des Problems ein Besuch beim Kunden notwendig ist, können Sie einen neuen Wartungsbesuch erstellen.
diff --git a/erpnext/docs/user/manual/de/using-erpnext/assignment.md b/erpnext/docs/user/manual/de/using-erpnext/assignment.md
index 6631491a9f..e24d1326bc 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/assignment.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/assignment.md
@@ -11,9 +11,9 @@ Einschränkende Berechtigungen können nicht über "Zuweisen zu" erstellt werden
Die Option "Zuweisen zu" befindet sich in der Fußzeile des Dokuments. Wenn Sie auf das Zuteilungs-Symbol in der Werkzeugleiste klicken, werden Sie schnell zur Fußzeile des selben Dokuments weiter geleitet.
-
+
-
+
### Schritt 2: Zu einem Benutzer zuweisen
@@ -21,19 +21,19 @@ Im Abschnitt "Zuweisen zu" können Sie einen Benutzer auswählen, dem das Dokume
Bei der Zuordnung können Sie auch einen Kommentar für denjenigen hinterlassen, dem das Dokument zugeordnet wird.
-
+
### Aufgabenliste des Empfängers
Diese Transaktion erscheint in der Aufgabenliste des Empfängers.
-
+
Zuordnung entfernen
Ein Benutzer kann eine Zuordnung entfernen, indem im Dokument die Schaltfläche "Zuordnung abgeschlossen" angeklickt wird.
-
+
Wenn die Zuordnung einmal als abgeschlossen markiert wurde, wird der Status des zugehörigen Eintrages in der Aufgabenliste auf "Abgeschlossen" gesetzt.
diff --git a/erpnext/docs/user/manual/de/using-erpnext/calendar.md b/erpnext/docs/user/manual/de/using-erpnext/calendar.md
index 42d884b64e..8be16098b7 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/calendar.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/calendar.md
@@ -5,7 +5,7 @@ Der Kalender ist ein Werkzeug, mit dem Sie Ereignisse erstellen und teilen könn
Sie können die Kalenderansicht umschalten zwischen Monatsansicht, Wochenansicht und Tagesansicht.
-
+
### Ereignisse im Kalender erstellen
@@ -15,7 +15,7 @@ Um ein Ereignis manuell zu erstellen, sollten Sie zuerst die Kalenderansicht fes
Diese Ansicht zeigt die 24 Stunden des Tages aufgeteilt in verschiedene Zeitfenster an. Klicken Sie für den Startzeitpunkt auf ein Zeitfenster und ziehen Sie den Rahmen auf bis Sie den Endzeitpunkt erreichen.
-
+
Auf Grundlage der Auswahl des Zeitfensters werden Start- und Endzeitpunkt in die Ereignisvorlage übernommen. Sie können dann noch die Bezeichnung des Ereignisses angeben und speichern.
@@ -23,7 +23,7 @@ Auf Grundlage der Auswahl des Zeitfensters werden Start- und Endzeitpunkt in die
Im Leadformular finden Sie die Felder "Nächster Kontakt durch" und "Nächstes Kontaktdatum". Wenn Sie in diesen Feldern einen Termin und eine Kontaktperson eintragen, wird automatisch ein Ereignis erstellt.
-
+
#### Geburtstag
@@ -33,7 +33,7 @@ Auf Basis der in den Mitarbeiterstammdaten eingetragenen Geburtstage werden Gebu
Sie können Ereignisse als wiederkehrend in bestimmten Intervallen markieren, indem Sie "Dieses Ereignis wiederholen" aktivieren.
-
+
### Erinnerungen an Ereignisse
@@ -43,7 +43,7 @@ Es gibt zwei Arten, wie Sie eine Erinnerung zu einem Ereignis per E-Mail erhalte
Wenn Sie in der Ereignisvorlage den Punkt "E-Mail-Erinnerung am Morgen senden" anklicken, erhalten alle Teilnehmer an diesem Ereignis eine Benachrichtungs-E-Mail.
-
+
#### Einen täglichen E-Mail-Bericht erstellen
@@ -53,6 +53,6 @@ Der tägliche E-Mail-Bericht kann eingestellt werden über:
> Einstellungen > E-Mail > Täglicher E-Mail-Bericht
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/de/using-erpnext/collaborating-around-forms.md
index 3107a2b0de..956a7744dd 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/collaborating-around-forms.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/collaborating-around-forms.md
@@ -5,7 +5,7 @@
Sie können jedwede Transaktion aus dem System versenden, indem Sie auf die Schaltfläche "Zugeordnet zu" klicken. Im Menü "Kommunikation" wird ein Protokoll aller von Ihnen versendeter E-Mails gepflegt.
-
+
### Kommentar
@@ -13,6 +13,6 @@ Kommentare sind ein großartiger Weg Informationen über eine Transaktion, die a
### Schlagworte
-Lesen Sie hier mehr über [Schlagworte]({{docs_base_url}}/user/manual/de/using-erpnext/tags.html)
+Lesen Sie hier mehr über [Schlagworte](/docs/user/manual/de/using-erpnext/tags.html)
{next}
diff --git a/erpnext/docs/user/manual/de/using-erpnext/messages.md b/erpnext/docs/user/manual/de/using-erpnext/messages.md
index 11722a6b55..f9d1796717 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/messages.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/messages.md
@@ -3,10 +3,10 @@
Sie können mithilfe des Nachrichtenwerkzeuges Mitteilungen über das System versenden und empfangen. Wenn Sie einem Benutzer eine Mitteilung senden, und der Benutzer angemeldet ist, öffnet sich ein Mitteilungsfenster und der Zähler für ungelesene Mitteilungen in der Kopfleiste wird angepasst.
-
+
Sie können Mitteilungen an alle Benutzer oder nur an bestimmte versenden.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/using-erpnext/notes.md b/erpnext/docs/user/manual/de/using-erpnext/notes.md
index a791352797..cb79771280 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/notes.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/notes.md
@@ -11,13 +11,13 @@ In diesem Bereich können Sie lange Anmerkungen abspeichern. Diese können z. B.
Geben Sie Titel und Inhalt ein.
-
+
## Berechtigungen für ausgewählte Benutzer setzen
Damit alle auf eine Anmerkung zugreifen können, aktivieren Sie "Öffentlich" unter dem Abschnitt Verknüpfungen. Damit ein Benutzer auf eine bestimmte Anmerkung zugreifen kann, können diese in der Tabelle "Teilen mit" ausgewählt werden.
-
+
Anmerkungen können intern auch als Wissensdatenbank genutzt werden. Sie können an die Anmerkungen auch Dateien anhängen und diese einer bestimmten Auswahl an Benutzern zugänglich machen.
diff --git a/erpnext/docs/user/manual/de/using-erpnext/tags.md b/erpnext/docs/user/manual/de/using-erpnext/tags.md
index 68282b8403..e61a59855f 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/tags.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/tags.md
@@ -3,6 +3,6 @@
Genauso wie Zuordnungen und Kommentare können Sie auch Ihre eigenen Schlagworte zu jeder Art von Transaktionen hinzufügen. Diese Schlagworte helfen Ihnen bei der Suche nach einem Dokument und klassifizieren dieses. ERPNext zeigt Ihnen die wichtigen Schlagworte in der Dokumentenliste an.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/using-erpnext/to-do.md b/erpnext/docs/user/manual/de/using-erpnext/to-do.md
index 70e718803b..54b6cf4d2d 100644
--- a/erpnext/docs/user/manual/de/using-erpnext/to-do.md
+++ b/erpnext/docs/user/manual/de/using-erpnext/to-do.md
@@ -3,10 +3,10 @@
"Aufgaben" ist ein einfaches Werkzeug, welches alle Aktivitäten, die Ihnen [zugeordnet](https://erpnext.com/collaboration-tools/assignment) wurden, und die Sie zugeordnet haben, auflistet. Sie können zudem Ihre eigenen ToDos der Liste hinzufügen.
-
+
Wenn eine Aufgabe abgeschlossen wurde, können Sie einfach die Zuweisung vom Dokument entfernen. Dabei wird die Aufgabe von der ToDo-Liste entfernt. Bei Aufgaben, die nicht über ein Dokument zugeordnet wurden, können Sie den Status über den ToDo-Datensatz selbst auf "abgeschlossen" setzen.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/website/blog-post.md b/erpnext/docs/user/manual/de/website/blog-post.md
index 1641ea9a1a..c316577171 100644
--- a/erpnext/docs/user/manual/de/website/blog-post.md
+++ b/erpnext/docs/user/manual/de/website/blog-post.md
@@ -9,12 +9,12 @@ Um einen neuen Blog zu erstellen, gehen Sie zu:
> Webseite > Blog-Eintrag > Neu
-
+
Sie können einen Blog mit Hilfe des Markdown-Formats formatieren. Sie können auf Ihren Blog auch zugreifen, indem Sie zur Seite "blog.html" gehen.
#### Ein Beispiel für einen Blog.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/website/blogger.md b/erpnext/docs/user/manual/de/website/blogger.md
index 8d81b39d0b..6332fb6b2d 100644
--- a/erpnext/docs/user/manual/de/website/blogger.md
+++ b/erpnext/docs/user/manual/de/website/blogger.md
@@ -3,6 +3,6 @@
Ein Blogger ist ein Benutzer, der Blog-Einträge erstellen kann. Sie können eine Kurzbiografie des Bloggers angeben und dazu einen Avatar.
-
+
{next}
diff --git a/erpnext/docs/user/manual/de/website/setup/website-settings.md b/erpnext/docs/user/manual/de/website/setup/website-settings.md
index 45a44984ab..20824559df 100644
--- a/erpnext/docs/user/manual/de/website/setup/website-settings.md
+++ b/erpnext/docs/user/manual/de/website/setup/website-settings.md
@@ -3,11 +3,11 @@
Die meisten der Einstellungen, die Ihre Webseite betreffen, können hier eingestellt werden.
-
+
### Zielseite
-* Homepage: Sie können angeben, welche [Webseite]({{docs_base_url}}/user/manual/de/website/web-page.html) die Startseite der Homepage ist.
+* Homepage: Sie können angeben, welche [Webseite](/docs/user/manual/de/website/web-page.html) die Startseite der Homepage ist.
* Startseite ist "Products": Wenn diese Option markiert ist, ist die Standard-Artikelgruppe die Startseite der Webseite.
* Titel-Präfix: Stellt den Browser-Titel ein.
@@ -15,7 +15,7 @@ Die meisten der Einstellungen, die Ihre Webseite betreffen, können hier eingest
Wählen Sie das Thema für Ihre Webseite aus. Sie können auch neue Themen für Ihre Webseite erstellen.
-
+
* Wählen "Neues Webseiten-Thema erstellen" wenn Sie das Standars-Thema der Webseite anpassen wollen.
@@ -23,13 +23,13 @@ Wählen Sie das Thema für Ihre Webseite aus. Sie können auch neue Themen für
Hier können Sie ein Banner/Logo auf Ihrer Webseite hinzufügen. Hängen Sie das Bild an und klicken Sie auf "Banner aus Bild einrichten". Das System erstellt einen HTML-Kode unter Banner HTML.
-
+
### Kopfleiste
Hier können Sie die Menüeinträge in der Kopfleiste einstellen.
-
+
* In ähnlicher Art und Weise können Sie auch die Verknüpfungen auf der Seitenleiste und in der Fußzeile einstellen.
@@ -37,7 +37,7 @@ Hier können Sie die Menüeinträge in der Kopfleiste einstellen.
Sie können Google Analytics und soziale Netzwerke in Ihre Webseite mit einbinden und Einträge auf der Webseite teilen.
-
+
* Sie können ein öffentliches Anmelden auf Ihr ERPNext-Konto unterbinden indem Sie auf "Anmelden deaktivieren" klicken.
diff --git a/erpnext/docs/user/manual/de/website/web-form.md b/erpnext/docs/user/manual/de/website/web-form.md
index 473f2c73e7..e8c98506e8 100644
--- a/erpnext/docs/user/manual/de/website/web-form.md
+++ b/erpnext/docs/user/manual/de/website/web-form.md
@@ -18,7 +18,7 @@ Um ein neues **Webformular** zu erstellen, gehen Sie zu:
3. Geben Sie an, ob sich der Benutzer einloggen muss, Daten ändern muss, mehrere verschiedene Datensätze verwalten soll, etc.
4. Fügen Sie die Felder, die Sie in den Datensätzen haben wollen, hinzu.
-
+
* * *
@@ -26,7 +26,7 @@ Um ein neues **Webformular** zu erstellen, gehen Sie zu:
Wenn Sie das Web-Formular erstellt haben, können Sie es unter der URL ansehen und ausprobieren!
-
+
* * *
diff --git a/erpnext/docs/user/manual/de/website/web-page.md b/erpnext/docs/user/manual/de/website/web-page.md
index 91bd7d548b..96f917f47a 100644
--- a/erpnext/docs/user/manual/de/website/web-page.md
+++ b/erpnext/docs/user/manual/de/website/web-page.md
@@ -7,7 +7,7 @@ Um eine neue Webseite zu erstellen, gehen Sie zu:
> Webseite > Webseite > Neu
-
+
### Bezeichnung
diff --git a/erpnext/docs/user/manual/en/CRM/contact.md b/erpnext/docs/user/manual/en/CRM/contact.md
index f87f82c40f..dcc8e17a39 100644
--- a/erpnext/docs/user/manual/en/CRM/contact.md
+++ b/erpnext/docs/user/manual/en/CRM/contact.md
@@ -18,12 +18,12 @@ To create a new Contact go to,
> CRM > Contact > New
-
+
Or you can add a Contact or Address directly from the Customer record, click on “New
Contact” or “New Address”.
-
+
> 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/manual/en/CRM/crm_reports.md b/erpnext/docs/user/manual/en/CRM/crm_reports.md
index 4ff9aa598d..4ac90bb171 100644
--- a/erpnext/docs/user/manual/en/CRM/crm_reports.md
+++ b/erpnext/docs/user/manual/en/CRM/crm_reports.md
@@ -1,9 +1,11 @@
+# Crm Reports
+
CRM module's reports helps users to get the information about the prospects. Using Following reports, user can analyze the data about prospect's history with a company and will helps user to build strong relationships with them.
###Lead Details
It has data about the leads and their contact and address details.
+ src="/docs/assets/img/crm/report/lead.png">
###Sales Funnel
By using the sales funnel report, and by quantifying the number of prospects at each stage of the process, you can get an idea of your potential customers.
@@ -13,28 +15,28 @@ More than this, by looking at the way these numbers change over time, you can id
For example, if you notice that very few communications with the prospects has taken place in a month which might indicate a decrease in the sales. From the next month, organization should make sure that more communications has to take place with the prospects.
+ src="/docs/assets/img/crm/report/sales_funnel.png">
###Prospects Engaged But Not Converted
Using this report, user gets the information about the leads who has shown interest in the business with you but due to some reason they were not converted into the customers.
+ src="/docs/assets/img/crm/report/prospects_engaged_but_not_converted.png">
###Minutes to First Response for Opportunity
Immediacy is so important – and so valued
In this internet area, we all expect a quicker response time to any of our query. This report gives you the information about the first response time given to an opportunities or issues. Using this report, the organization can improve their first response time to the prospects which can help to the better sales in the future.
+ src="/docs/assets/img/crm/report/minutes_to_first_response.png">
###Customer Addresses And Contacts
It has data about the customers and their contact and address details.
+ src="/docs/assets/img/crm/report/customer_address_and_contact.png">
###Inactive Customers
This report shows the list of customers who has not purchased since long time.
+ src="/docs/assets/img/crm/report/inactive_customers.png">
diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
index 24971bf653..5924665d81 100644
--- a/erpnext/docs/user/manual/en/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -1,3 +1,5 @@
+# Customer
+
A customer, who is sometimes known as a client, buyer, or purchaser is the one
who receives goods, services, products, or ideas, from a seller for a monetary
consideration. A customer can also receive goods or services from a vendor or
@@ -9,20 +11,20 @@ You can either directly create your Customers via
> Selling > Customer
-
+
-or upload it via the [Data Import Tool]({{docs_base_url}}/user/manual/en/setting-up/data/data-import-tool.html).
+or upload it via the [Data Import Tool](/docs/user/manual/en/setting-up/data/data-import-tool.html).
A Customer can avail the features (operations) in the selling process. The general flow can be summarised as:
-
+
> Note: Customers are separate from Contacts and Addresses. A Customer can
have multiple Contacts and Addresses.
### Contacts and Addresses
-[Contacts and Addresses]({{docs_base_url}}/user/manual/en/CRM/contact.html) in ERPNext are stored separately so that you can
+[Contacts and Addresses](/docs/user/manual/en/CRM/contact.html) in ERPNext are stored separately so that you can
attach multiple Contacts or Addresses to Customers and Suppliers
Thus we may have identical Customer Names that are uniquely identified by the ID. Since the email address is not part of the
@@ -45,7 +47,7 @@ to create an Account in another Company, just change the Company value and
By default, the system does not generate an account for every customer. All
Customers can be booked in one account called Debtors. In order to manage a
separate account for each customer, you have to first create the account under
-Accounts Receivable in the [Chart of Accounts]({{docs_base_url}}/user/manual/en/accounts/chart-of-accounts.html) and then add it on the customer's
+Accounts Receivable in the [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.html) and then add it on the customer's
form accounts table.
### Customer Settings
@@ -60,12 +62,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]({{docs_base_url}}/user/manual/en/CRM/setup/customer-group.html)
-and also divide them into [Territories]({{docs_base_url}}/user/manual/en/setting-up/territory.html)
+ERPNext allows you to group your Customers using [Customer Group](/docs/user/manual/en/CRM/setup/customer-group.html)
+and also divide them into [Territories](/docs/user/manual/en/setting-up/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]({{docs_base_url}}/user/manual/en/CRM/setup/sales-person.html) against a customer.
+You can also mention [Sales Person](/docs/user/manual/en/CRM/setup/sales-person.html) against a customer.
### Sales Partner
diff --git a/erpnext/docs/user/manual/en/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md
index 52fa2cc8a7..15b1159d8d 100644
--- a/erpnext/docs/user/manual/en/CRM/lead.md
+++ b/erpnext/docs/user/manual/en/CRM/lead.md
@@ -1,3 +1,5 @@
+# Lead
+
To get the customer through the door, you may be doing all or any of the
following:
@@ -24,7 +26,7 @@ To create a Lead, go to:
> CRM > Lead > New 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
@@ -46,7 +48,7 @@ dropdown. Once the Customer is created, the Lead becomes “Converted” and any
further Opportunities from the same source can be created against this
Customer.
-
+
---
diff --git a/erpnext/docs/user/manual/en/CRM/newsletter.md b/erpnext/docs/user/manual/en/CRM/newsletter.md
index 9749e17ee6..2aac1b2808 100644
--- a/erpnext/docs/user/manual/en/CRM/newsletter.md
+++ b/erpnext/docs/user/manual/en/CRM/newsletter.md
@@ -1,3 +1,5 @@
+# Newsletter
+
A newsletter is a short written report that tells about the recent activities
of an organization. It is generally sent to members of the organization,
potential clients customers or potential leads.
@@ -12,8 +14,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 Address. You can
send the email to all the intended receipients by clicking on the send button.
-
+
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
index 4651a756b0..94338f9326 100644
--- a/erpnext/docs/user/manual/en/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -1,3 +1,5 @@
+# Opportunity
+
When you know a Lead is looking for some products or services to buy, you can
track that as an Opportunity. Also opportunity document helps user to collect the requirement of a customer/lead.
@@ -7,17 +9,17 @@ You can create an Opportunity from:
#### Figure 1: Create Opportunity
-
+
You can also go to an “Open” Lead and select “Opportunity” from the **Make** dropdown.
#### Figure 2: Create Opportunity from an open Lead
-
+
#### Figure 3: Create Opportunity for Customer to Collect their Requirement
-
+
An Opportunity can also come from an existing Customer. You can create
multiple Opportunities against the same Lead. In Opportunity, apart from the
@@ -27,7 +29,7 @@ looking for.
#### Make Supplier Quotation
In some businesses, users collect the rates from their supplier against the customer requirement and based on the supplier rates they prepare the quotation for the customer. With ERPNext, you can make a supplier quotation from the opportunity itself.
-
+
> Best Practice: Leads and Opportunities are often referred as your “Sales
Pipeline” this is what you need to track if you want to be able to predict how
diff --git a/erpnext/docs/user/manual/en/CRM/setup/campaign.md b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
index 9714350bfe..17b06f18fe 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/campaign.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
@@ -1,20 +1,22 @@
+# Campaign
+
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.
-
+
-You can track [Lead]({{docs_base_url}}/user/manual/en/CRM/lead.html), [Opportunity]({{docs_base_url}}/user/manual/en/CRM/opportunity.html), [Quotation]({{docs_base_url}}/user/manual/en/selling/quotation.html) against a campaign.
+You can track [Lead](/docs/user/manual/en/CRM/lead.html), [Opportunity](/docs/user/manual/en/CRM/opportunity.html), [Quotation](/docs/user/manual/en/selling/quotation.html) against a campaign.
###Track Leads against Campaign
* To track a 'Lead' against a campaign select 'View Leads'.
-
+
* You shall get a filtered list of all leads made against that campaign.
* You can also create new leads by clicking 'New'
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
index 505c4fbf7a..628057a0dd 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
@@ -1,14 +1,16 @@
+# Customer Group
+
Customer groups allow you to organize your customers. You can also have discounts based on customer groups.
You can also get trend analysis for each
group. Typically Customers are grouped by market segment (that is usually
based on your domain).
-
+
> 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:
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/setup/index.md b/erpnext/docs/user/manual/en/CRM/setup/index.md
index 259b5ebc42..2d85ad2e74 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/index.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/index.md
@@ -1,3 +1,5 @@
+# Setup
+
### Topics
diff --git a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
index ce5ed934f5..b96020ed10 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
@@ -1,14 +1,16 @@
+# Sales Person
+
Sales Persons behave exactly like Territories. You can create an organization
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 in Transactions
You can use this Sales Person in Customer and sales transactions like Sales Order, Delivery Note and Sales Invoice.
-Click [here]({{docs_base_url}}/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions) to learn more
+Click [here](/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions) to learn more
about how Sales Persons are used in the transactions of Sales Cycle.
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/accounting-entries.md b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
index 7aeff24a4a..abd2322707 100644
--- a/erpnext/docs/user/manual/en/accounts/accounting-entries.md
+++ b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
@@ -1,10 +1,12 @@
+# Accounting Entries
+
The concept of accounting is explained with an example given below: We will
take a "Tea Stall" as a company and see how to book accounting entries for the
business.
* Mama (The Tea-stall owner) invests Rs 25000 to start the business.
-
+
__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 +16,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.
-
+
__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 +27,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.
-
+
__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 +38,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.
-
+
### Booking Profit
@@ -47,7 +49,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:
-
+
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/manual/en/accounts/accounting-reports.md b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
index 61470b1579..99d7029b59 100644
--- a/erpnext/docs/user/manual/en/accounts/accounting-reports.md
+++ b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
@@ -1,3 +1,5 @@
+# Accounting Reports
+
Some of the major accounting reports are:
### General Ledger
@@ -7,7 +9,7 @@ and between a period. This will help you to get a full update for all entries
done in that period for that Account.
+ src="/docs/assets/img/accounts/general-ledger.png">
### Trial Balance
@@ -20,7 +22,7 @@ the:
* Credits
* Closing
-
+
The sum of all closing balances in a Trial Balance must be zero.
@@ -30,7 +32,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.
-
+
### Sales and Purchase Register
@@ -38,6 +40,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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
index 010d8977ee..9627ff27b0 100644
--- a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
@@ -1,3 +1,5 @@
+# Advance Payment Entry
+
Payment done by the customer before accepting delivery of the product is an
Advance Payment. For Orders of high value, the business houses expect to
receive advance.
@@ -22,7 +24,7 @@ the row "Is Advance" click 'Yes'.
#### Figure 1 : Journal Entry -Advance Entry
-
+
### Double Entry Accounting
@@ -39,7 +41,7 @@ will be credited because it has given value.
#### Figure 2: Transaction and Difference Entry
-
+
Save and submit the Journal Entry. If this document is not saved it will not be pulled in
other accounting documents.
@@ -53,7 +55,7 @@ advance in the advances table. The accounting will be adjusted accordingly.
#### Figure 3: Receive Advance
-
+
Save and submit the Sales Invoice.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md b/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
index d469b2883e..01f6ef53d2 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md
@@ -1,3 +1,5 @@
+# Adjust Withhold Amount Payment Entry
+
#Adjust Withhold Amount in the Payment Entry
###Question
@@ -22,7 +24,7 @@ To create Payment Entry, go to unpaid Sales Invoice and create click on Make Pay
Enter Payment Amount as 19,600.
-
+
#####Step 2.2: Allocate Against Sales Invoice
@@ -32,6 +34,6 @@ Against Sales Invoice, allocate 20,000 (explained in GIF below).
You can notice that there is a difference of 400 in the Payment Amount and the Amount Allocated against Sales Invoice. You can book this difference account under Withhold Account.
-
+
Following same steps, you can also manage difference availed due to Currency Exchange Gain/Loss.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/c-form.md b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
index 3c6e09113f..78d15acd02 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/c-form.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
@@ -1,3 +1,5 @@
+# C Form
+
#C-Form
C-Form functionality is only applicable for Indian customers.
@@ -14,7 +16,7 @@ Following are step to manage C-Form related sales in ERPNext.
While creating Sales invoice for the customer, set C-Form applicability in Sales Invoice. In More Info section of Sales Invoice, set field called **Is C-Form Applicable** as **Yes**. Bydefault, this field will have No for a value.
-
+
Updating this field as Yes will allow you to pull this Sales Invoice in the C-Form Tool, and update C-Form No. as received from the Customer.
@@ -26,22 +28,22 @@ Go to `Accounts > Setup > C-Form > New`
Enter details like C-Form No, Received Date, State and Amount etc. Select Customer and pull related Sales Invoices under provided table.
-
+
####Save & Submit C-Form
After entering details, save and submit C-Form record. On save system will generate C-Form record and on submission update that C-Form No. in the Sales Invoice.
-
+
C-Form serial no will be updated in related invoice under the field 'C-Form No'.
-
+
####Tracking Pending Invoice for C-Form
To track invoices for which C-Form has not yet been received from Customer, you can create custom report on Sales Invoice. In this report, you can filter invoices which doesn't have C-Form updated in them yet, and followup with the customer accordingly.
-
+
diff --git a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
index e4a33e040f..1b6c0fba19 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
@@ -1,3 +1,5 @@
+# Changing Parent Account
+
#Changing Parent Account
Chart of Account has hierarchical structure. Each account has a parent it is listed under.
@@ -14,22 +16,22 @@ Click on Account for which Parent Account is to be changed.
####2. Edit Account
-
+
####3. Change Parent Account
Search and select preferred Parent Account and save.
-
+
Refresh system from Help menu to experience the change.
-
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md
index acac407fa3..06a4479f53 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.md
@@ -1,14 +1,16 @@
+# Difference Entry Button
+
#Difference Entry
As per accounting standards, debit in a accounting entry must be equal to credit. If not, system does allow submission of accounting transaction, thereby stops ledger posting. In ERPNext, on saving accounting entry, system validates if debit and credit is tallying.
-
+
To have entry balanced, you should one more row, select another account, and update different amount in it. Or you can add difference amount in one of the Account's row itself.
On clicking 'Make Difference Entry' button, new Row will be added under Journal Entry Accounts table, with difference amount. You can edit that row to select appropriate Account.
-
+
On selecting account under new row, debit and credit an entry will be tallying, and you should be able to submit Journal Entri correctly.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
index 003ad31437..4a1b54b484 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
@@ -12,19 +12,19 @@ Only User with System Manager's Role Assigned has permission to create new Fisca
`Accounts > Setup > Fiscal Year`
-Click [here]({{docs_base_url}}/user/manual/en/accounts/setup/fiscal-year.html) to learn more about Fiscal Year.
+Click [here](/docs/user/manual/en/accounts/setup/fiscal-year.html) to learn more about Fiscal Year.
#### Set Fiscal Year as Default
After Fiscal Year is saved, you will find option to set that Fiscal year as Default.
-
+
Default Fiscal Year will be updated in the Global Default setting as well. You can manually update Default Fiscal Year from:
`Setup > Settings > Global Default`
-
+
Save Global Default, and Reload your ERPNext account. Then, default Fiscal Year will be auto-updated in your transactions.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
index 9d5f6143d0..677bb81076 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
@@ -1,3 +1,5 @@
+# Freeze Accounting Entries
+
#Freeze Accounting Entries
To freeze accounting entries upto a certain date, follow below given steps.
@@ -10,12 +12,12 @@ To freeze accounting entries upto a certain date, follow below given steps.
Set date in the **Accounts Frozen Upto** field.
-
+
Now, the system will not allow to make any accounting entries before set date. If at all someone tries creating entries, system will show error message as below.
-
+
You can still allow user with certain role to create/edit entries within accounts frozen date. You can set that Role in the Account Settings itself.
-
+
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
index 80aed6d40e..9ddee07189 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
@@ -1,3 +1,5 @@
+# How To Freeze Accounting Ledger
+
#How To Freeze Accounting Ledger?
If you want to discontinue using specific Account, you can freeze it.
@@ -12,7 +14,7 @@ To edit an Account, go to Chart of Accounts:
`Explore > Accounts > Chart of Accounts`
-
+
Click on Account in which Frozen Date is to be updated.
@@ -20,7 +22,7 @@ Click on Account in which Frozen Date is to be updated.
In the Account form, you will find a field called **Frozen**. Set value in this field as 'Yes'
-
+
####Step 3: Save
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.md b/erpnext/docs/user/manual/en/accounts/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/index.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
index a9a9fefb1f..643636b4d4 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
@@ -6,7 +6,7 @@ In ERPNext, you can create transactions in the foriegn currency as well. When cr
To mange currency difference, create Account **Foreign Exchange Gain/Loss**. This account is generally created on the Expense side of P&L statement. However, you can place it under another group as per your accounting requirement.
-
+
#### Book Payment Entry
@@ -16,7 +16,7 @@ In the below scenario, Sales Invoice was made EUR, at the exchange rate of 1.090
One receipt of payment, exchange rate changed. As per the new exchange rate, payment received in the base currency was $1080. This means gain of $80 due to change in exchange rate. Following is how Foreign Exchange Gain will be booked in this scenerio.
-
+
In case you incur loss due to change foriegn exchnage rate, then different amount about be updated in the debit of Foreign Exchange Gain/Loss account. Also you can add another row to update another expenses like bank charges, remittance charges etc.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
index d89c199358..46b9e4ec93 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
@@ -1,3 +1,5 @@
+# Managing Transactions In Multiple Currency
+
#Managing Transactions In Multiple Currency
In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. If transaction is created in the parties currency, their currency symbol is updated in the print format as well.
@@ -16,7 +18,7 @@ Select Customer from the Customer master. If default Currency is updated in the
Currency Exchange between base currency and customer currency will auto-fetch.
-
+
#### Step 4: Update Details
@@ -26,7 +28,7 @@ Update other details like Item, Taxes, Terms. In the Taxes and other Charges tab
Save Sales Invoice and then check Print Format. For all the Currency field (rate, amount, totals) Customer's Currency symbol will be updated as well.
-
+
#### Currency Exchange Masters
diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
index 0b61000686..a2436f3274 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
@@ -1,3 +1,5 @@
+# Post Dated Cheque Entry
+
#Post Dated Cheque Entry
Post Dated Cheque is a cheque dated on future date. Party generally give post dated cheque, as advance payment. This cheque would be cleared only when cheque date arrives.
@@ -14,7 +16,7 @@ To open new journal voucher go to
Assuming your Cheque Date is 31st December, 2016 (or any future date). As a result, this posting in your bank ledger will appear on Posting Date updated.
-
+
Note: Payment Entry Reference Date should equal to or less than Posting Date.
@@ -24,9 +26,9 @@ After entering required details, Save and Submit the Payment Entry.
####Adjusting Post Dated Cheque Entry
-You can adjust Post Dated Payment Entry against an invoice via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html).
+You can adjust Post Dated Payment Entry against an invoice via [Payment Reconciliation Tool](/docs/user/manual/en/accounts/tools/payment-reconciliation.html).
-When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/bank-reconciliation.html).
+When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool](/docs/user/manual/en/accounts/tools/bank-reconciliation.html).
In the Chart of Accounts, you might find value of this Payment Entry already reflecting against bank Account. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in the bank's statement.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
index b8310adf3e..921a7fa452 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md
@@ -1,3 +1,5 @@
+# Tracking Project Profitability Using Cost Center
+
#Tracking Project Profibitability using Cost Center
To track expenses and profibility for a project, you can use Cost Centers. You should create separate Cost Center for each Project. This will allow you to.
@@ -15,7 +17,7 @@ To create new Project, go to:
`Projects > Project > New`
-
+
#### 1.2 Create Cost Center
@@ -25,13 +27,13 @@ To create new Cost Center, go to:
`Accounts > Setup > Cost Center`
-[Click here to learn how to manage Cost Centers.]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center.html)
+[Click here to learn how to manage Cost Centers.](/docs/user/manual/en/accounts/setup/cost-center.html)
#### 1.3 Update Cost Center in the Project
Update Cost Center in the Project master.
-
+
In the sales and purchase transactions, if Project is selected, then Cost Center will fetched from the Project master.
@@ -43,7 +45,7 @@ Let's check how this setting will affect your sales and purchase entries.
In the sales transactions (which are Sales Order, Delivery Note and Sales Invoice), Project will be selected in the More Info section. On selection of a Project, respective Cost Center will be updated for all the items in that transaction. Cost Center will be updated on in the transactions which has Cost Center field.
-
+
#### 2.2 Project in the Purchase Transactions
@@ -51,7 +53,7 @@ In the purchase transactions, Project is define for each line item. This is beca
As per perpetual inventory valuation system, expense for the purchased item will be booked when raw-materials are consumed. On consumption of goods, if you are creating Material Issue (stock) entry, then Expense Cost (says Cost of Goods Sold) and Project's Cost Center should be updated in that entry.
-
+
### 3. Accounting Report for a Project
@@ -61,11 +63,11 @@ Since Project's Cost Center is updated in both sales and purchase entries, you c
**Monthly Project Analysis**
-
+
**Overall Profitability**
-
+
#### 3.2 Projectwise Budgeting
@@ -75,6 +77,6 @@ To check Budget Variance report, go to:
`Accounts > Budget and Cost Center > Budget Variance Report`
-[Click here to learn how to do budgeting from Cost Center]({{docs_base_url}}/user/manual/en/accounts/budgeting.html).
+[Click here to learn how to do budgeting from Cost Center](/docs/user/manual/en/accounts/budgeting.html).
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
index 4c6c659cd1..6fb7915090 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md
@@ -1,8 +1,10 @@
+# Update Stock Option In Sales Invoice
+
#Delivery from Sales Invoice
If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invoice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse.
-
+
On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
index a23b6e7553..0273f5c7dd 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md
@@ -1,3 +1,5 @@
+# What Is The Differences Of Total And Valuation In Tax And Charges
+
#Purchase Tax or Charges Categories
Consider Tax or Charge field in Purchase Taxes and Charges master has three values.
@@ -6,7 +8,7 @@ Consider Tax or Charge field in Purchase Taxes and Charges master has three valu
- Valuation
- Total and Valuation
-
+
Let's consider an example to understand an effect of each charge type. We purchase ten units of item, at the rate of 800. total purchase amount is 800. Purchased item has 4% VAT applied on it, and INR 100 was incurred in transportation.
@@ -24,7 +26,7 @@ Tax or charge categorized as **Valuation** will be added in the value of purchas
Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, this charge will be not be added to the total of purchase transaction, because it your expense, and should not be reflected to the supplier.
-Check [here]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) to learn general posting done for expense categorized as Valuation.
+Check [here](/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) to learn general posting done for expense categorized as Valuation.
####Total and Valuation:
diff --git a/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
index 1e7a993586..ab84396988 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
@@ -1,3 +1,5 @@
+# Withdrawing Salary From Owners Equity Account
+
#Withdrawing Salary from Owner's Equity Account
### Question
diff --git a/erpnext/docs/user/manual/en/accounts/bank-guarantee.md b/erpnext/docs/user/manual/en/accounts/bank-guarantee.md
index db60300e86..c0c6d7ad3d 100644
--- a/erpnext/docs/user/manual/en/accounts/bank-guarantee.md
+++ b/erpnext/docs/user/manual/en/accounts/bank-guarantee.md
@@ -1,9 +1,11 @@
+# Bank Guarantee
+
A Bank Guarantee is a guarantee from a lending institution such as a bank ensuring the liabilities of a debtor will be met. In other words, if the debtor fails to settle a debt, the bank covers it. A Bank Guarantee enables the customer, or debtor, to acquire goods, buy equipment or draw down loans, and thereby expand business activity.
A client may ask you to provide a Bank Guarantee from a third party such as a bank. This guarantee is for a specified amount, which is usually a percentage of the total value of the contract. The Bank Guarantee is valid for a specified duration after which it expires and must be returned to you by the client.
This document allows you to track Bank Guarantees given to clients. You can set Email Alerts as the Bank Guarantee expiry date approaches to remind yourself to get the Bank Guarantee back from your client.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/budgeting.md b/erpnext/docs/user/manual/en/accounts/budgeting.md
index fad128c390..3e7db196e9 100644
--- a/erpnext/docs/user/manual/en/accounts/budgeting.md
+++ b/erpnext/docs/user/manual/en/accounts/budgeting.md
@@ -1,3 +1,5 @@
+# Budgeting
+
In ERPNext, you can set and manage Budgets against a specific Account. This is useful when, for example, you are doing online sales. You have a budget for search ads, and you want ERPNext to stop or warn you from over spending, based on that budget.
Budgets are also great for planning purposes. When you are making plans for the next financial year, you would typically target a revenue based on which you would set your expenses. Setting a budget will ensure that your expenses do not get out of hand, at any point, as per your plans.
@@ -10,7 +12,7 @@ To create new Cost Center, go to:
> Accounts > Budget and Cost Center > Chart of Cost Center > Add New Cost Center
-
+
###Budgeting
@@ -28,20 +30,20 @@ In the Budget form, select a Cost Center. Budgets can be defined against any Cos
In the Budgets table, select Income / Expense account for which Budget is to be defined.
-
+
####Step 4: Monthly Distribution
If you have seasonal business, you can also define a Monthly Distribution record, to distribute the budget between months. If you don't set the monthly distribution, ERPNext will calculate the budget on yearly
basis or in equal proportion for every month.
-
+
####Step 5: Alert on Budget
While setting budget, you can also define the actions when expenses will exceed the allocated budget for a period. You can set separate action for monthly and annual budgets. There are 3 types of actions: Stop, Warn and Ignore. If Stop, system will not allow to book expenses more than allocated budget. In Case of Warn, it will just warn the user that expenses has been exceeded from the allocated budget. And Ignore will do nothing.
-
+
####Budget Variance Report
@@ -51,6 +53,6 @@ To check Budget Variance report, go to:
Accounts > Budget and Cost Center > Budget Variance Report
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
index ae6847e665..f2208b4736 100644
--- a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
@@ -1,3 +1,5 @@
+# Chart Of Accounts
+
The Chart of Accounts forms the blueprint of your organization. The overall
structure of your Chart of Accounts is based on a system of double entry
accounting that has become a standard all over the world to quantify how a
@@ -25,13 +27,13 @@ such as Balance Sheet, Profit and Loss statement and Cash flow statement.
An Example of various financial statement are given below:
#### Cash Flow Report
-
+
#### Profit and Loss Report
-
+
#### Balance Sheet Report
-
+
To edit your Chart of Accounts in ERPNext go to:
@@ -46,7 +48,7 @@ based on statutory (tax, compliance to government regulations) requirements.
Let us understand the main groups of the Chart of Accounts.
-
+
### Balance Sheet Accounts
@@ -84,7 +86,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:
-
+
(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
@@ -104,7 +106,7 @@ Supplier).
> Note: An Account “Ledger” is also sometimes called as Account “Head”.
-
+
### Other Account Types
@@ -119,7 +121,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.
-
+
Option to create will only appear if you click on a Group (folder) type
Account.
diff --git a/erpnext/docs/user/manual/en/accounts/credit-limit.md b/erpnext/docs/user/manual/en/accounts/credit-limit.md
index 299e67057d..8f92f90951 100644
--- a/erpnext/docs/user/manual/en/accounts/credit-limit.md
+++ b/erpnext/docs/user/manual/en/accounts/credit-limit.md
@@ -1,3 +1,5 @@
+# Credit Limit
+
A credit limit is the maximum amount of credit that a financial institution or
@@ -12,7 +14,7 @@ To set credit limit go to Customer - Master
#### Figure 1: Credit Limit
-
+
Go to the 'More Info section' and enter the amount in the field Credit Limit.
@@ -27,7 +29,7 @@ accept orders or raise credit limits of customers.
#### Figure 2: Credit Controller
-
+
Save the changes.
diff --git a/erpnext/docs/user/manual/en/accounts/index.md b/erpnext/docs/user/manual/en/accounts/index.md
index 84c901d660..d9e94c0d84 100644
--- a/erpnext/docs/user/manual/en/accounts/index.md
+++ b/erpnext/docs/user/manual/en/accounts/index.md
@@ -1,3 +1,5 @@
+# Accounts
+
At the end of sales and purchase cycle comes billing and payments. You may have
an accountant in your team, or you may be doing accounting yourself, or you may
have outsourced your accounting. In all the cases financial accounting forms the core of any business management system like an ERP.
diff --git a/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md b/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md
index 1750f41ea0..a2aefc303a 100644
--- a/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md
+++ b/erpnext/docs/user/manual/en/accounts/item-wise-taxation.md
@@ -1,3 +1,5 @@
+# Item Wise Taxation
+
In the sales and purchase transactions, you can apply taxes and other charges on the items. For the ease of applying taxes, you can fetch values from the [Sales Taxes and Charges master](/contents//setting-up/setting-up-taxes). Taxes and charges are applied equally on all the items. For example, if tax GST 16% is added in the tax table, then it will be applied on all the items. However, if you need to have different tax rate applied on some of the items, following is how you should setup Items and Sales Taxes and Other Charges master in your ERPNext account.
Let's assume that we are creating a Sales Order. We have Sales Taxes and Charges master for GST 16%. Out of all the Sales Items, on one item, only 12% GST will be applied, while one more item is exempted from the tax.
@@ -10,17 +12,17 @@ Items on which differential tax rate is applied, you should mention tax rate for
Here is the example of Item on which 12% GST is applied only.
-
+
For the item which is exempted from GST totally, mention 0% as tax rate in the Item master.
-
+
####Step 2: Setup Taxes and Other Charges
In Sales Taxes and Other Charges master, select GST 16% account and mention Tax Rate as 16. This tax rate will be applied on all the Items selected in the Sales Order, unless specific Tax Rate is defined in the Item master.
-
+
+
Please note that item's tax rate will be pulled from the item master only if you have update same tax account (GST 16% in this case) in both Item master and tax master.
diff --git a/erpnext/docs/user/manual/en/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md
index 061bd62289..ebfc9f59a1 100644
--- a/erpnext/docs/user/manual/en/accounts/journal-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md
@@ -1,3 +1,5 @@
+# Journal Entry
+
All types of accounting entries other than **Sales Invoice** and **Purchase
Invoice** are made using the **Journal Entry**. A **Journal Entry**
is a standard accounting transaction that affects
@@ -7,7 +9,7 @@ To create a Journal Entry go to:
> Accounts > Documents > Journal Entry > New
-
+
In a Journal Entry, you must select.
diff --git a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
index e82ec92772..45bd2278e5 100644
--- a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
+++ b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
@@ -1,10 +1,12 @@
+# Managing Fixed Assets
+
In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Cars, etc. and manage depreciations, sale or disposal of those assets.
## Asset Category
Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
-
+
> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master.
@@ -12,13 +14,13 @@ Based on the type of assets, create Asset Category. For example, all your deskto
Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master.
-
+
Explanation of the fields:
1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked.
- 
+ 
2. Asset Category: The category of assets it belongs to.
3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
@@ -40,24 +42,24 @@ Explanation of the fields:
The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record.
-
+
On the scheduled date, system creates depreciation entry by creating a Journal Entry and the same Journal Entry is updated in the depreciation table for reference. Next Depreciation Date and Current Value are also updated on submission of depreciation entry.
-
+
In the depreciation entry, the "Accumulated Depreciation Account" is credited and "Depreciation Expense Account" is debited. The related accounts can be set in the Asset Category or Company.
For better visibility, net value of the asset on different depreciation dates are shown in a line graph.
-
+
## Purchase an Asset
For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
-
+
On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
@@ -71,23 +73,23 @@ To sell an asset, open the asset record and create a Sales Invoice by clicking o
- "Accumulated Depreciation Account" will be debited by the total depreciated amount till now.
- "Gain/Loss Account on Asset Disposal" will be credited/debited based on gain/loss amount. The Gain/Loss account can be set in Company record.
-
+
## Scrap an Asset
You can scrap an asset anytime using the "Scrap Asset" button in the Asset record. The "Gain/Loss Account on Asset Disposal" mentioned in the Company is debited by the Current Value (After Depreciation) of the asset. After scrapping, you can also restore the asset using "Restore Asset" button.
-
+
## Asset Movement
The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form.
-
+
There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
index 4e444905e1..598aa0e7f6 100644
--- a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -1,18 +1,20 @@
+# Multi Currency Accounting
+
In ERPNext, you can make accounting entries in multiple currency. For example, if you have a bank account in foreign currency, you can make transactions in that currency and system will show bank balance in that specific currency only.
## Setup
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.
-
+
You can also assign / modify the currency by opening specific Account record for existing Accounts.
-
+
For Customer / Supplier (Party), you can also define it's billing currency in the Party record. If the Party's accounting currency is different from Company Currency, you should mention Default Receivable / Payable Account in that currency.
-
+
Once you defined Currency in the Account and selected relevant accounts in the Party record , you are ready to make transactions against them. If Party account currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If account 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 Account Currency.
@@ -31,7 +33,7 @@ Now, in POS, Paid Amount will be entered in transaction currency, instead of ear
Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency.
-
+
### Purchase Invoice
@@ -41,12 +43,12 @@ 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.
-
+
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. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically.
-
+
#### Example 1: Payment Entry Against Customer With Alternate Currency
@@ -54,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.
-
+
#### Example 2: Inter-bank Transfer (USD -> INR)
@@ -100,7 +102,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:
-
+
## Reports
@@ -109,12 +111,12 @@ 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.
-
+
### Accounts Receivable / Payable
In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
index 11e4acb80a..1ad90904a8 100644
--- a/erpnext/docs/user/manual/en/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
@@ -1,3 +1,5 @@
+# Opening Accounts
+
#Updating Opening Balance in Accounts
If you are a new company you can start using ERPNext accounting module by going to chart of accounts. However, if you are migrating from a legacy accounting system like Tally or a Fox Pro based software
@@ -8,7 +10,7 @@ We recommend that you start using accounting in a new financial year, but you co
* List of outstanding sales and purchase invoices (Payables and Receivables).
-If you were using another accounting software before, firstly you should close financial statements in that software. The closing balance of the accounts should be updated as an opening balance in the ERPNext. Before starting to update opening balance, ensure that your [Chart of Accounts]({{docs_base_url}}/user/manual/en/accounts/chart-of-accounts.html) has all the Accounts required.
+If you were using another accounting software before, firstly you should close financial statements in that software. The closing balance of the accounts should be updated as an opening balance in the ERPNext. Before starting to update opening balance, ensure that your [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.html) has all the Accounts required.
> Opening entry is only for Balance Sheet accounts and not for the Accounts in the Profit and Loss statement.
@@ -28,7 +30,7 @@ To open new Journal Entry, go to:
If Entry Type is selected as Opening Entry, all the Balance Sheet Accounts will be auto-fetched in the Journal Entry.
-
+
####Step 3: Posting Date
@@ -38,13 +40,13 @@ Select Posting Date on which Accounts Opening Balance will be updated.
For each Account, enter opening value in the Debit or Credit column. As per the double entry valuation system, Total Debit value in a entry must be equal to Total Credit value.
-
+
####Step 5: Is Opening
Set field `Is Opening` as `Yes`.
-
+
####Step 6: Save and Submit
@@ -56,13 +58,13 @@ If your Balance Sheet has many Accounts, then updating Account Opening balance f
If you are updating account opening balance in few accounts at a time, you can use **Temporary Opening** account for balancing purpose. In the standard chart of accounts, a Temporary Opening Account is auto-created under Assets.
-
+
In the Journal Entry, manually select an Account for which opening balance is to be updated. For each Account, enter opening balance value in the Debit or Credit column, based on it's Account Type (Asset or Liability).
For example, if you want to update balance in bank accounts, create Journal Entry as following.
-
+
Once all your invoices are entered, your **Temporary Opening** account will have a balance of zero!
@@ -70,7 +72,7 @@ Once all your invoices are entered, your **Temporary Opening** account will have
After completing the accounting entries, the trial balance report will look like the one given below:
-
+
###Stock Opening
@@ -78,13 +80,13 @@ To track stock balance in the Chart of Account, an Account is created for each W
`Chart of Accounts > Assets > Current Asset > StocK Assets > (Warehouse Account)`
-
+
-To update stock opening balance, create [Stock Reconciliation entry]({{docs_base_url}}/user/manual/en/stock/opening-stock.html). Based on the valuation of items's update in the Warehouse, balance will be updated in the Warehouse account.
+To update stock opening balance, create [Stock Reconciliation entry](/docs/user/manual/en/stock/opening-stock.html). Based on the valuation of items's update in the Warehouse, balance will be updated in the Warehouse account.
###Fixed Asset Opening
-Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master]({{docs_base_url}}/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field.
+Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master](/docs/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field.
### Outstanding Invoices
diff --git a/erpnext/docs/user/manual/en/accounts/payment-entry.md b/erpnext/docs/user/manual/en/accounts/payment-entry.md
index 62dd9b4769..ae82eb21f4 100644
--- a/erpnext/docs/user/manual/en/accounts/payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/payment-entry.md
@@ -1,33 +1,36 @@
+# Payment Entry
+
Payment Entry can be made against following transactions.
1. Sales Invoice.
2. Purchase Invoice.
3. Sales Order (Advance Payment)
4. Purchase Order (Advance Payment)
+ 5. Expense Claim
####Step 1: Make Payment
On submitting a document against which Payment Entry can be made, you will find Make Payment button.
-
+
####Step 2: Mode of Payment
In the Payment Entry, select Mode of Payment (eg: Bank, Cash, Wire Transfer). In the Mode of Payment master, default Account can be set. This default payment Account will fetch into Payment Entry.
-
+
####Step 3: Payment Amount
-Enter actual payment amount received from the Customer or paid to the Supplier.
+Enter actual payment amount received from the Customer or paid to the Supplier or Employee.
-
+
####Step 4: Allocate Amount
If creating Payment Entry for the Customer, Payment Amount will be allocated against Sales Invoice.
-
+
On the same lines, when creating Payment Entry for a Supplier, Payment Amount will be allocated against Purchase Invoice.
@@ -37,13 +40,13 @@ You Entry can be created directly from `Account > Payment Entry > New`. In the n
When making payment entry, there could be some difference in the actual payment amount and the invoice outstanding. This difference could be due to rounding error, or change in the currency exchange rate. You can set an Account here where this difference amount will be booked.
-
+
####Step 6: Submit
Save and Submit Payment Entry. On submission, outstanding will be updated in the Invoices.
-
+
If payment entry was created against Sales Order or Purchase Order, field Advance Paid will be updated in them. when creating Payment invoice against those transactions, Payment Entry will auto-update in that Invoice, so that you can allocate invoice amount against advance payment entry.
@@ -59,13 +62,13 @@ For outgoing payment:
###Multi Currency Payment Entry
-ERPNext allows you maintain accounts and invoicing in the [multiple currency]({{docs_base_url}}/user/manual/en/accounts/multi-currency-accounting.html). If invoice is made in the party currency, Currency Exchange Rate between companies base currency and party currency is also entered in the invoice. When creating Payment Entry against that invoice, you will again have to mention the Currency Exchange Rate at the time of payment.
+ERPNext allows you maintain accounts and invoicing in the [multiple currency](/docs/user/manual/en/accounts/multi-currency-accounting.html). If invoice is made in the party currency, Currency Exchange Rate between companies base currency and party currency is also entered in the invoice. When creating Payment Entry against that invoice, you will again have to mention the Currency Exchange Rate at the time of payment.
-
+
Since Currency Exchange Rate is fluctuating all the time, it can lead to difference in the payment amount against invoice total. This difference amount can be booked in the Currency Exchange Gain/Loss Amount.
-
+
Payments can also be made independent of invoices by creating a new Payment Entry.
@@ -78,7 +81,7 @@ Following internal transfers can be managed from the Payment Entry.
3. Cash - Cash
4. Bank - Bank
-
+
###Difference between Payment Entry and Journal Entry?
@@ -88,7 +91,7 @@ Following internal transfers can be managed from the Payment Entry.
- Updating opening balance in an Accounts.
- Fixed Asset Depreciation entry.
- For adjusting Credit Note against Sales Invoice and Debit Note against Purchase Invoice, incase there is no payment happening at all.
-
+ 4. Payment Entries are used if a cheque is printed.
* * *
## Managing Outstanding Payments
diff --git a/erpnext/docs/user/manual/en/accounts/payment-request.md b/erpnext/docs/user/manual/en/accounts/payment-request.md
index 30f5b1bfe8..7ee397e3ad 100644
--- a/erpnext/docs/user/manual/en/accounts/payment-request.md
+++ b/erpnext/docs/user/manual/en/accounts/payment-request.md
@@ -1,10 +1,12 @@
+# Payment Request
+
Payment Request is sent via Email and will contain a link to a Payment Gateway if setup. You can create payment request via Sales Order or Sales Invoice.
- Create Payment Request via Sales Order
-
+
- Create payment Request via Sales Invoice
-
+
---
@@ -13,16 +15,16 @@ considered to create journal entry.
Note: Invoice/Order currency and Payment Gateway Account currency should be same.
-
+
---
##### Notify Customer
You can notify customer from Payment Request with print format. If customer contact email is mentioned, it will automatically fetch email. If not so you can set Email Address on Payment Request.
-
+
##### Request Mail
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/payments.md b/erpnext/docs/user/manual/en/accounts/payments.md
index 74da05440f..e2d8adeba7 100644
--- a/erpnext/docs/user/manual/en/accounts/payments.md
+++ b/erpnext/docs/user/manual/en/accounts/payments.md
@@ -1,3 +1,5 @@
+# Payments
+
Payment can be made against following transactions.
1. Sales Invoice.
@@ -16,13 +18,13 @@ In ERPNext, there is two options through which user can capture the payment
On submitting a document against which Payment Entry can be made, you will find Make Payment button.
-
+
####Step 2: Payment Entry
-
+
-For more details about payment entry [check here.]({{docs_base_url}}/user/manual/en/accounts/payment-entry)
+For more details about payment entry [check here.](/docs/user/manual/en/accounts/payment-entry)
## Journal Entry
@@ -32,19 +34,19 @@ To make paymant using journal entry, check below steps
Goto Accounts Settings > checked Make Payment via Journal Entry
-
+
####Step 2: Make Payment
On submitting a document against which Journal Entry can be made, you will find Make Payment button.
-
+
####Step 3: Journal Entry
Save and submit the journal entry to record the payament against the invoice
-
+
-For more details about journal entry [check here.]({{docs_base_url}}/user/manual/en/accounts/journal-entry)
+For more details about journal entry [check here.](/docs/user/manual/en/accounts/journal-entry)
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index 78d2226361..7458f0da78 100644
--- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -15,7 +15,7 @@ POS Invoices created in the offline mode will be saved locally in the browser. I
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]({{docs_base_url}}/user/manual/en/setting-up/pos-setting.html) record
+2. Create a [POS Profile](/docs/user/manual/en/setting-up/pos-setting.html) record
#### Different sections of the POS
@@ -29,7 +29,7 @@ In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, S
In POS, user can select the existing customer during making an order or create the new customer. This features works in the offline mode also. User can also add the customer details like contact number, address details etc on the form. The customer which has been created from the POS will be synced when the internet connection is active.
-
+
### Adding an Item
@@ -39,7 +39,7 @@ At the billing counter, the retailer needs to select Items which the consumer bu
**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.
-
+
> 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.
@@ -51,7 +51,7 @@ in Search box.
1. Select row in the cart and clik on delete button in the numeric keypad
-
+
2. Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item.
@@ -69,7 +69,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.
-
+
Submit the document to finalise the record. After the document is submitted,
you can either print or email it directly to the customer.
@@ -78,7 +78,7 @@ you can either print or email it directly to the customer.
Outstanding amount can be write off from the POS, user has to enter the amount under write off field on the payment screen.
-
+
System books the write off amount into the ledger which has selected on the POS Profile.
@@ -86,12 +86,12 @@ System books the write off amount into the ledger which has selected on the POS
POS calculate the extra amount paid by the customer, which user can return from the cash account. User has to set the account for the change amount on the POS profile.
-
+
### Offline Records
All the records from the POS stores into the browser's local storegae and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records
-
+
#### Accounting entries (GL Entry) for a Point of Sale:
@@ -112,7 +112,7 @@ To see entries after “Submit”, click on “View Ledger”.
### Email
User can send email from the POS, after submission of an order, user has to click on menu > email
-
+
After sync of an order, email sent to the customer with the print of the bill in the attachment
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
index bd3c51a834..c2a273ad94 100644
--- a/erpnext/docs/user/manual/en/accounts/pricing-rule.md
+++ b/erpnext/docs/user/manual/en/accounts/pricing-rule.md
@@ -1,3 +1,5 @@
+# Pricing Rule
+
#Pricing Rule
Pricing Rule is a master where you can define rules based on which discount is applied to specific Customer or Supplier.
@@ -25,7 +27,7 @@ In this section, conditions are set for the application of Pricing Rule. When tr
####1.1 Applicable On:
-
+
If you want Pricing Rule to be applied on all the items, select based on Item Group. For value, select **All Item Group** (parent Item Group).
@@ -33,31 +35,31 @@ If you want Pricing Rule to be applied on all the items, select based on Item Gr
Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
-
+
####1.3 Quantity:
Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
-
+
###2. Application:
Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
-
+
####2.1 Price
Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
-
+
#### 2.2 Discount Percentage
Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
-
+
If %Discount is to be applied on all Price Lists, then leave Price List field blank.
@@ -65,19 +67,19 @@ If %Discount is to be applied on all Price Lists, then leave Price List field bl
Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
-
+
#### Priority
If two or more Pricing Rules are found based on same conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.
-
+
#### Disable
Check to Disable Pricing Rule.
-
+
### Add Margin
@@ -89,21 +91,21 @@ For example : User want to add 10% margin on the supplier price list at the tim
Create price list for supllier and create item price against the price list.
-
+
####2. Make Pricing Rule
Create pricing rule for the item against which supplier rate has created
-
+
####2. Make Invoice
System apply the margin rate on the item price on selection of an item.
-
+
-For more details about pricing rule [Click Here]({{docs_base_url}}/user/manual/en/selling/articles/adding-margin.html)
+For more details about pricing rule [Click Here](/docs/user/manual/en/selling/articles/adding-margin.html)
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
index 3ffd93041a..c6b2050e53 100644
--- a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
@@ -1,3 +1,5 @@
+# Purchase Invoice
+
Purchase Invoice is the exact opposite of your Sales Invoice. It is the bill
that your Supplier sends you for products or services delivered. Here you
accrue expenses to your Supplier. Making a Purchase Invoice is very similar to
@@ -12,7 +14,7 @@ or click on “Make Purchase Invoice” in Purchase Order or Purchase Receipt.
You can also create a Purchase Invoice from:
> Accounts > Billing > Purchase Invoice > New 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/manual/en/accounts/recurring-orders-and-invoices.md b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
index 713fb60c9e..067b63371a 100644
--- a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
+++ b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
@@ -1,3 +1,5 @@
+# Recurring Orders And Invoices
+
#Recurring Orders and Invoices
If you have a contract with a **Customer** where you bill the Customer on a monthly, quarterly, half-yearly or annual basis, you should use recurring feature in orders and invoices.
@@ -10,7 +12,7 @@ Feature of setting document as recurring is available in Sales Order, Sales Invo
Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check **Is Recurring** to set document as recurring.
-
+
**From Date and To Date:** This defines contract period with the customer.
diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
index aa7f3a692e..f4c4143504 100644
--- a/erpnext/docs/user/manual/en/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -1,3 +1,5 @@
+# Sales Invoice
+
A Sales Invoice is a bill that you send to your customers, against which the customer processes the payment. Sales Invoice is an accounting transaction. On submission of Sales Invoice, the system updates the receivable and books income against a Customer Account.
You can create a Sales Invoice directly from
@@ -6,7 +8,7 @@ You can create a Sales Invoice directly from
or you can Make a new Sales Invoice after you submit the Delivery Note.
-
+
#### Accounting Impact
@@ -62,7 +64,7 @@ into the Sales Invoice and you can easily make payments.
Also, if you check the **Update Stock** the stock will also update automatically,
without the need of a Delivery Note.
-
+
#### Billing Timesheet with Project
@@ -71,7 +73,7 @@ they can fill out Timesheets which consists their billing rate. When you make a
Sales Invoice, select the Project for which the billing is to be made, and the
corresponding Timesheet entries for that Project will be fetched.
-
+
* * *
@@ -88,5 +90,5 @@ not ideal as your Customer may or may not decide to pay up. But since your
Customer wants an “Invoice”, you could give the Customer a Quotation (in
ERPNext) titled as “Pro Forma Invoice”. This way everyone is happy.
-This is a fairly common practice. We follow this at Frappe too.
+This is a fairly common practice. We follow this at Frappé too.
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
index 3b7a686c6f..3bada56ffd 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
@@ -1,5 +1,7 @@
+# Accounts Settings
-
+
+
* Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role.
diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
index 5ed3802873..0eabce7a29 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -1,3 +1,5 @@
+# Cost Center
+
Your Chart of Accounts is mainly designed to provide reports to the government
and tax authorities. Most businesses have multiple activities like different
product lines, market segments, areas of business, etc that share some common
@@ -32,6 +34,6 @@ To setup your Chart of Cost Centers go to:
> Accounts > Setup > Chart of Cost Centers
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
index 4a1195ade0..a211ee3528 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
@@ -1,3 +1,5 @@
+# Fiscal Year
+
A fiscal year is also known as a financial year or a budget year. It is used
for calculating financial statements in businesses and other organisations.
The fiscal year may or may not be the same as a calendar year. For tax
@@ -23,6 +25,6 @@ To set the Fiscal Year as default, click on the 'Default' button.
In case you have multiple companies sharing the same Fiscal Year, you can add
it into the grid as shown below.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/setup/index.md b/erpnext/docs/user/manual/en/accounts/setup/index.md
index 7b4504405b..c328cc01a8 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/index.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/index.md
@@ -1,3 +1,5 @@
+# Setup
+
### Topics
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
index bfcf6f0721..a7dee0842a 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
@@ -1,6 +1,8 @@
-You can define which [Tax Template]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule.
+# Tax Rule
-
+You can define which [Tax Template](/docs/user/manual/en/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using 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 +12,9 @@ Let us consider a senario to understand Tax Rule Better.
Suppose we define 2 Tax Rules as below.
-
+
-
+
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/manual/en/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
index 87348eebbd..77d27ef99a 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
@@ -1,3 +1,5 @@
+# Bank Reconciliation
+
### Bank Reconciliation Statement
If you are receiving payments or making payments via cheques, the bank statements will not accurately match the dates of your entry, this is because the bank usually takes time to “clear” these payments. Also you may have mailed a cheque to your Supplier and it may be a few days before it is received and deposited by the Supplier. In ERPNext you can synchronise your bank statements and your Journal Entries using the “Bank Reconciliation” tool.
@@ -6,7 +8,7 @@ The Bank Reconciliation Report provide the difference between the bank balance s
####Bank Reconciliation Statement
-
+
In the report, check whether the field 'Balance as per bank' matches the Bank Account Statement. If it is matching, it means that Clearance Date is correctly updated for all the bank entries. If there is a mismatch, Its because of bank entries for which Cleanrane Date is not yet updated.
@@ -34,7 +36,7 @@ All the entries in the specified date range will be shown in a table below.
__Step 4:__ Click on the JV from the table and update clearance date.
-
+
__Step 5:__ Click on the button 'Update Clearance Date'.
diff --git a/erpnext/docs/user/manual/en/accounts/tools/index.md b/erpnext/docs/user/manual/en/accounts/tools/index.md
index 7b4504405b..c938dde5a4 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/index.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/index.md
@@ -1,3 +1,5 @@
+# Tools
+
### Topics
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
index bac6f655f1..329d789704 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
@@ -1,3 +1,5 @@
+# Payment Reconciliation
+
In complex scenarios, especially in the capital goods industry, sometimes there is no direct link between payments and invoices. You send invoices to your Customers and your Customer sends you block payments or payments based on some schedule that is not linked to your invoices.
In such cases, you can use the Payment to Invoice Matching Tool.
@@ -8,7 +10,7 @@ In this tool, you can select an account (your Customer’s account) and click on
To cancel off some payments and invoices, select the Invoices and Journal Vouchers and click on “Reconcile”.
-
+
__Step 1:__ Select the Account against whom the payments need to be reconciled.
diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
index d0e765a0c8..32a539b0df 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
@@ -1,3 +1,5 @@
+# Payment Tool
+
###Payment Tool
The Payment Tool Feature allows non-accounting personnel to generate Journal Entries by populating relevant fields in the Journal Entry with account and payment details.
@@ -11,14 +13,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.
-
+
7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher
-
+
8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
index 418ea84c6a..e48055d4d3 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
@@ -1,3 +1,5 @@
+# Period Closing Voucher
+
At the end of every year or (quarterly or maybe even monthly), after completing auditing, you can close your books of accounts. This means that you make all your special entries like:
* Depreciation
@@ -19,7 +21,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.
-
+
This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account.
diff --git a/erpnext/docs/user/manual/en/buying/articles/index.md b/erpnext/docs/user/manual/en/buying/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/buying/articles/index.md
+++ b/erpnext/docs/user/manual/en/buying/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
index 2a925813b7..db42fc3511 100644
--- a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
+++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
@@ -1,3 +1,5 @@
+# Maintaining Suppliers Part No In Item
+
#Maintaining Supplier's Item Code in the Item master
For each item, code assigned might differ from the code your supplier has given to that same item. ERPNext allows you to track Supplier's Item Code in the item master. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code.
@@ -6,15 +8,15 @@ For each item, code assigned might differ from the code your supplier has given
In the Item master, under Supplier Details section, enter Item Code as given by the Supplier to this item.
-
+
#### 2. Supplier's Item Code in Transactions
-Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form.]({{docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html)
+Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form.](/docs/user/manual/en/customize-erpnext/customize-form.html)
Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
index 80f52833f1..1e9c04254f 100644
--- a/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
+++ b/erpnext/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md
@@ -1,3 +1,5 @@
+# Pull Items In Purchase Order Based On Supplier
+
#Pull Items in Purchase Order based on Supplier
**Question:**
@@ -12,7 +14,7 @@ To pull items from Material Request for specific Supplier only, follow below giv
Update Default Supplier in the Item master.
-
+
####Step 2: New Purchase Order
@@ -22,13 +24,13 @@ Update Default Supplier in the Item master.
From the options available to pull data in the Purchase Order, click on `For Supplier`.
-
+
####Step 4: Get Items
Select Supplier name and click on `Get`.
-
+
####Step 5: Edit Items
diff --git a/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
index 81b1aab345..2f8a673a91 100644
--- a/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
+++ b/erpnext/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md
@@ -1,3 +1,5 @@
+# Purchasing In Different Unit
+
#Purchasing in Different Unit (UoM)
Each item has stock unit of measument (UoM) associated to it. For example UoM of pen could be numbers (Nos) and sand could be stocked kgs. However, when we place an order with Supplier, UoM for an item could change. Like we can order 1 set/box of Pen, or one truck of sand to our Supplier. When creating purchase transacton, you can change Purchase UoM for an item.
@@ -15,28 +17,28 @@ In the Purchase Order, you will find two UoM fied.
In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Purchase UoM (Box in this case). Updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM.
-
+
#### Step 2: Update UoM Conversion Factors
In one Box, if you get 20 Nos. of Pen, UoM Conversion Factor would be 20.
-
+
Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one Box, then Qty in the stock UoM will be set as 20.
-
+
### Stock Ledger Posting
Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM.
-
+
### Set Conversion Factor in Item
In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/purchase-order.md b/erpnext/docs/user/manual/en/buying/purchase-order.md
index 89bb6d9d5f..cdfd0f9829 100644
--- a/erpnext/docs/user/manual/en/buying/purchase-order.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-order.md
@@ -1,3 +1,5 @@
+# Purchase Order
+
A Purchase Order is analogous to a Sales Order. It is usually a binding
contract with your Supplier that you promise to buy a set of Items under the
given conditions.
@@ -7,7 +9,7 @@ Supplier Quotation.
#### Purchase Order Flow Chart
-
+
In ERPNext, you can also make a Purchase Order directly by going to:
@@ -15,7 +17,7 @@ In ERPNext, you can also make a Purchase Order directly by going to:
#### Create Purchase Order
-
+
Entering a Purchase Order is very similar to a Purchase Request, additionally
you will have to set:
@@ -40,10 +42,10 @@ government is only the difference between what you collect from your Customer
and what you pay to your Supplier. This is called Value Added Tax (VAT).
#### Add Taxes in Purchase Order
-
+
#### Show Tax break-up
-
+
For example you buy Items worth X and sell them for 1.3X. So your Customer
pays 1.3 times the tax you pay your Supplier. Since you have already paid tax
@@ -79,7 +81,7 @@ Nos (from the Item form)
#### Figure 3: Conversion of Purchase UOM to stock UOM
-
+
__Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has
100 pieces.
diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
index f3be64dddb..b04949ffee 100644
--- a/erpnext/docs/user/manual/en/buying/purchase-taxes.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
@@ -1,3 +1,5 @@
+# Purchase Taxes
+
For Tax Accounts that you want to use in the tax templates, you must mention
them as type “Tax” in your Chart of Accounts.
@@ -8,7 +10,7 @@ Orders and Purchase Invoices.
> Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
Master
-
+
You can specify if the tax / charge is only for valuation (not a part of
diff --git a/erpnext/docs/user/manual/en/buying/request-for-quotation.md b/erpnext/docs/user/manual/en/buying/request-for-quotation.md
index 07b0d3fd64..182c89d4e6 100644
--- a/erpnext/docs/user/manual/en/buying/request-for-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/request-for-quotation.md
@@ -1,10 +1,12 @@
+# Request For Quotation
+
A Request for Quotation is a document that an organization submits to one or more suppliers eliciting quotation for items.
In ERPNext, You can create request for quotation directly by going to:
> Buying > Documents > Request for Quotation > New Request for Quotation
-
+
After creation of request for quotation, there are two ways to generate supplier quotation from request for quotation.
@@ -12,41 +14,41 @@ After creation of request for quotation, there are two ways to generate supplier
__Step 1:__ Open request for quotation and click on make supplier quotation.
-
+
__Step 2:__ Select supplier and click on make supplier quotation.
-
+
__Step 3:__ System will open the supplier quotation, user has to enter the rate and submit it.
-
+
#### For Supplier
__Step 1:__ User has to create contact or enter Email Address against the supplier on request for quotation.
-
+
__Step 2:__ User has to click on send supplier emails button.
-
+
* If supplier's user not available: system will create supplier's user and send details to the supplier, supplier will need to click on the link(Password Update) present in the email. After password update supplier can access his portal with the request for quotation form.
-
+
* If supplier's user available: system will send request for quotation link to supplier, supplier has to login using his credentials to view request for quotation form on portal.
-
+
__Step 3:__ Supplier has to enter amount and notes(payment terms) on the form and click on submit
-
+
__Step 4:__ On submission, system will create supplier quotation(draft mode) against the supplier. User has to review the supplier quotation
and submit it.
More details:-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/setup/buying-settings.md b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
index 3d5dbb92ad..197a18ebb6 100644
--- a/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
+++ b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
@@ -1,6 +1,8 @@
+# Buying Settings
+
Buying Settings is where you can define properties which will be applied in the Buying module's transactions.
-
+
Let us look at the various options that can be configured:
@@ -14,7 +16,7 @@ You can define or select the Naming Series pattern from:
`Setup > Data > Naming Series`
-[Click here to know more about defining a Naming Series.]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html)
+[Click here to know more about defining a Naming Series.](/docs/user/manual/en/setting-up/settings/naming-series.html)
### 2. Default Supplier Type
diff --git a/erpnext/docs/user/manual/en/buying/setup/index.md b/erpnext/docs/user/manual/en/buying/setup/index.md
index 259b5ebc42..2d85ad2e74 100644
--- a/erpnext/docs/user/manual/en/buying/setup/index.md
+++ b/erpnext/docs/user/manual/en/buying/setup/index.md
@@ -1,3 +1,5 @@
+# Setup
+
### Topics
diff --git a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
index 2e88601beb..16d5445fb9 100644
--- a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
@@ -1,3 +1,5 @@
+# Supplier Type
+
A supplier may be distinguished from a contractor or subcontractor, who
commonly adds specialized input to deliverables. A supplier is also known as a
vendor. There are different types of suppliers based on their goods and
@@ -14,7 +16,7 @@ You can create your own category of Supplier Type.
> Buying > Setup > Supplier Type > New 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/manual/en/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
index 868a2977e9..5935477949 100644
--- a/erpnext/docs/user/manual/en/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
@@ -1,3 +1,5 @@
+# Supplier Quotation
+
A Supplier Quotation is a formal statement of promise by potential supplier to
supply the goods or services required by a buyer, at specified prices, and
within a specified period. A quotation may also contain terms of sale and
@@ -8,7 +10,7 @@ You can make a supplier quotation from a Material Request
#### Supplier Quotation Flow-Chart
-
+
You can also make a Supplier Quotation directly from:
@@ -16,7 +18,7 @@ You can also make a Supplier Quotation directly from:
#### Create 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
@@ -35,10 +37,10 @@ If your Supplier is going to charge you additional taxes or charge like a shippi
You can select relevant tax by going to "Taxes and Charges" section and adding an entry to the table as shown below,
-
+
Besides, in case of multiple items you can keep track of taxes on each by clicking "Show tax break-up"
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/buying/supplier-scorecard.md b/erpnext/docs/user/manual/en/buying/supplier-scorecard.md
index cecdf9cd21..eb330302af 100644
--- a/erpnext/docs/user/manual/en/buying/supplier-scorecard.md
+++ b/erpnext/docs/user/manual/en/buying/supplier-scorecard.md
@@ -1,3 +1,5 @@
+# Supplier Scorecard
+
A Supplier Scorecard is an evaluation tool used to assess the performance of
suppliers. Supplier scorecards can be used to keep track of item quality,
delivery and responsiveness of suppliers across long periods of time. This data
@@ -12,24 +14,24 @@ In ERPNext, you can create a supplier scorecard by going to:
### Create Supplier Scorecard
A supplier scorecard is created for each supplier individually. Only one supplier scorecard can be created for each
supplier.
-
+
#### Final Score and Standings
The supplier scorecard consists of a set evaluation periods, during which the performance of a supplier is
evaluated. This period can be daily, monthly or yearly. The current score is calculated from the score of each evaluation
period based on the weighting function. The default formula is linearly weight over the previous 12 scoring periods.
-
+
This formula is customizable.
The supplier standing is used to quickly sort suppliers based on their performance. These are customizable for each supplier.
The scorecard standing of a supplier can also be used to restrict suppliers from being included in Request for Quotations or
being issued Purchase Orders.
-
+
#### Evaluation Criteria and Variables
A supplier can be evaluated on several individual evaluation criteria, including (but not limited to) quotation response time,
delivered item quality, and delivery timeliness. These criteria are weighed to determine the final period score.
-
+
The method for calculating each criteria is determined through the criteria formula field, which can use a number of pre-established variables.
The value of each of these variables is calculated over the scoring period for each supplier. Examples of such variables include:
- The total number of items received from the supplier
diff --git a/erpnext/docs/user/manual/en/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md
index 89107db841..217d8b79b1 100644
--- a/erpnext/docs/user/manual/en/buying/supplier.md
+++ b/erpnext/docs/user/manual/en/buying/supplier.md
@@ -1,16 +1,18 @@
+# Supplier
+
Suppliers are companies or individuals who provide you with products or services.
You can create a new Supplier from:
`Explore > Supplier > New Supplier`
-
+
### Contacts and Addresses
Contacts and Addresses in ERPNext are stored separately so that you can create multiple Contacts and Addresses for a Suppliers. Once Supplier is saved, you will find option to create Contact and Address for that Supplier.
-
+
> Tip: When you select a Supplier in any transaction, Contact for which "Is Primary" field id checked, it will auto-fetch with the Supplier details.
@@ -20,7 +22,7 @@ For all the Supplier, "Creditor" account is set as default payable Account. When
If you want to customize payable account for the Supplier, you should first add a payable Account in the Chart of Account, and then select that Payable Account in the Supplier master.
-
+
If you don't want to customize payable account, and proceed with default payable account "Creditor", then do not update any value in the Default Supplier Account's table.
diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index b94ac01225..6facabf0bb 100644
--- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -1,17 +1,19 @@
+# Customer Orders Invoices And Shipping Status
+
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.
-
+
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.
-
+
#### Outstanding Sales Invoice
-
+
#### Paid Sales Invoice
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customer-portal/index.md b/erpnext/docs/user/manual/en/customer-portal/index.md
index ddac7d2771..1dbb140504 100644
--- a/erpnext/docs/user/manual/en/customer-portal/index.md
+++ b/erpnext/docs/user/manual/en/customer-portal/index.md
@@ -1,3 +1,5 @@
+# Customer Portal
+
Customer Portal is designed to give easy accesibility to customers of a
company.
diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
index 0088de6b07..17b74e49cc 100644
--- a/erpnext/docs/user/manual/en/customer-portal/issues.md
+++ b/erpnext/docs/user/manual/en/customer-portal/issues.md
@@ -1,3 +1,5 @@
+# Issues
+
The customer portal makes it very easy for a customer to raise concerns. A
simple and intuitive interface facilitates your customer to report their
concerns as Issues. They can view the complete thread of their
@@ -5,18 +7,18 @@ conversation.
#### Empty Issue List
-
+
#### New Issue
-
+
#### Open Issue
-
+
#### Reply on Issue
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/portal-login.md b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
index 62a9b6ffb6..efa70a2a95 100644
--- a/erpnext/docs/user/manual/en/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
@@ -1,6 +1,8 @@
+# Portal Login
+
To login into the customer account, the customer has to use his Email Address and
the password sent by ERPNext; generated through the sign-up process.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
index 554285c19d..36e1b2cbdf 100644
--- a/erpnext/docs/user/manual/en/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -1,14 +1,16 @@
+# Sign Up
+
Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
#### Step 1: Signup
On the Login Page, you will find option to Signup.
-
+
#### Step 2: Enter Customer Name and ID
-
+
After the sign up process, an email will be sent to the customers Email Address with the password details.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
index 902ada8717..42b0fc62b0 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
@@ -1,3 +1,5 @@
+# Allow Fields To Be Changed After Submit
+
#Editing Value in Submitted Document
Once document is submitted, fields are frozen, and no editing is allowd. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted.
@@ -12,17 +14,17 @@ Once document is submitted, fields are frozen, and no editing is allowd. Still t
In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.)
-
+
#### Step 3: Edit Field Property
In the fields section, click on the Custom field and check the **Allow On Submit**.
-
+
#### Step 3: Update Customize Form
-
+
After updating Customize Form, you should reload your ERPNext account. Then check form, and field to confirm its editable in submitted form as well.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
index 834617e584..21cc433c1a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md
@@ -1,3 +1,5 @@
+# Creating Custom Link Field
+
#Creating Custom Link Fields
Links field are the ones linked to another document type. For example, customer field is a link field in Sales Order. This field is linked to the Customer master.
@@ -13,7 +15,7 @@ You can insert Custom Link Field by following steps below.
In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.). Once field are updated in table, open field before which you wish to insert Custom Field. Then click on "Insert Above" to insert new Custom Field.
-
+
####Step 4: Custom Field Values
@@ -24,6 +26,6 @@ To set field as Link, enter values as below.
1. Name: Desired name for the field
1. Options: Enter the name of the Doctype to which the field is linked
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
index d8e5319b94..a842085f8f 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
@@ -1,3 +1,5 @@
+# Customizing Sorting Order In The List View
+
#Customizing Sorting Order in the List View
**Question:** I want records in my Item List sorted based on Desc Order of Item Code.
@@ -12,13 +14,13 @@
Select document type for which Sort Order is to be customized.
-
+
####Step 3: Update Sort Details
In the Customize Form, you will find these fields.
-
+
1. Sort Field: Select field based on which sorting will be done. It will be "Item_Code" field in scenario.
2. Sort Order: Sort Order will be two possible options, **Asc** for ascending, and **Desc** for descending.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
index ae5b06183c..9d3c0e1ff5 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
@@ -1,6 +1,8 @@
+# Deleting Custom Reports
+
#Deleting Custom Reports
-ERPNext has several [types of reports]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement.
+ERPNext has several [types of reports](/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement.
If there is a report custom report which needs to be deleted, it can be achieved by following steps. Please note that its applicable only for the Custom Reports, and not for the standard reports.
@@ -8,16 +10,16 @@ If there is a report custom report which needs to be deleted, it can be achieved
In the Awesome Bar, type and select "Report List" for an option.
-
+
####Selecting and Deleting Report
The Report List will have all the standard and custom reports of your account. You can select Custom Report to be deleted from the list itself, and click on Delete icon.
-
+
Or you can open that report, and delete it from File menu option.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
index e47692fcfd..ffcb37630d 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
@@ -1,8 +1,10 @@
+# Disable Rounded Total
+
#Disable Rounded Total
All the sales transactions like Sales Order, Sales Invoice has Rounded Total in it. It calculated based on the value of Grand Total. Also Rounded Total is also visible in the Standard Print Formats.
-
+
Follow steps given below to hide rounded total from Standard Print Formats, for all the sales transactions.
@@ -14,7 +16,7 @@ Follow steps given below to hide rounded total from Standard Print Formats, for
Check Disable Rounded Total, and Save Global Defaults.
-
+
For system to take effect of this setting, you should clear cache and refresh your ERPNext account. Then your print formats shall not render value for the Rounded Total in the print formats.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md
index 813a7a71ae..9d239c4909 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.md
@@ -1,3 +1,5 @@
+# Field Types
+
#Field Types
Following are the types of fields you can define while creating new ones, or while amend standard ones.
@@ -32,7 +34,7 @@ This field will give you date and time picker. Current date and time (as provide
- Dynamic Link
-Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.html) to learn how Dynamic Link Field function.
+Click [here](/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.html) to learn how Dynamic Link Field function.
- Float
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md
index 2b7459c748..b3f9a98196 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md
@@ -1,3 +1,5 @@
+# Increase Max Attachments
+
#Increase Max Attachments
In ERPNext, you can limit how many files can be attached to specific Document. Using Custmize Form, you can set **Max(imum) Attachments** which can be added to a particular documents.
@@ -10,13 +12,13 @@ Let's assume we need to update Max Attachment for Quotation to five.
#### Step 2: Select Document Type
-
+
#### Step 3: Set Limit
Set Maximum Attachments as five.
-
+
After update Max Attachments, Update Customization Form. Reload your ERPNext account and then check specific Quotation to confirm if Max Attachment limit is applied.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
index 62cc3f9e6b..5abd291e23 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md
@@ -1,3 +1,5 @@
+# Make Field Visible In Print Format
+
#Make Fields Visible In Print Format
Each transaction has Standard Print Format. In the Standard format, only certain fields are displayed by default. If user needs field in the Standard format to be visible, it can be customized by using Customize Form tool.
@@ -14,13 +16,13 @@ Go to:
As per our scenario, Sales Order will be selected as Document Type.
field-visible-2.gif
-
+
#### Step 3: Uncheck Print Hide
click to open field to be made visible in the Standard Print Format. Uncheck **Print Hide** field.
-
+
#### Step 4: Update
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
index 7bc965b656..bcc5c6ff78 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
@@ -1,3 +1,5 @@
+# Making Custom Reports In Erpnext
+
#Reports in ERPNext
There are three kind of reports in ERPNext.
@@ -12,12 +14,12 @@ Report Builder is an in-built report customization tool in ERPNext. This allows
Query Report is written in SQL which pull values from account's database and fetch in the report. Though SQL queries can be written from front end, like HTML, its restricted in hosted users. Because it will allow users with no access to specific report to query data directly from the database.
-Check Purchase Order Item to be Received report in Stock module for example of Query report. Click [here](https://frappe.github.io/frappe/user/en/guides/reports-and-printing/how-to-make-query-report.html) to learn how to create Query Report.
+Check Purchase Order Item to be Received report in Stock module for example of Query report. Click [here](https://frappe.io/docs/user/en/guides/reports-and-printing/how-to-make-query-report.html) to learn how to create Query Report.
### 3. Script Report
Script Reports are written in Python and stored on server side. These are complex reports which involves logic and calculation. Since these reports are written on server side, customizing it from hosted account is not possible.
-Check Financial Analytics report in Accounts module for example of Script Report. Click [here](https://frappe.github.io/frappe/user/en/guides/reports-and-printing/how-to-make-script-reports.html) to learn how to create Script Report.
+Check Financial Analytics report in Accounts module for example of Script Report. Click [here](https://frappe.io/docs/user/en/guides/reports-and-printing/how-to-make-script-reports.html) to learn how to create Script Report.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
index c72004d64c..f3621a521f 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
@@ -1,3 +1,5 @@
+# Managing Dynamic Link Fields
+
#Managing Dynamic Link Fields
Dynamic Link field is one which can search and hold value of any document/doctype. Let's consider an example to learn how Dynamic Link field works.
@@ -12,7 +14,7 @@ Below are the steps to insert Custom Dynamic Field. For an instance, we will ins
Firstly we will create a link field which will be linked to the Doctype.
-
+
By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just like Quotation is one Doctype, which has multiple Quotation under it. Same way, Doctype is also a Doctype which has Sales Order, Purchase Order and other doctypes created as Doctype records.
@@ -27,17 +29,17 @@ By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just l
So linking this field with parent Doctype will list all the Doctype records.
-
+
#### Step 2: Insert Dynamic Link Field
This custom field's type will be "Dynamic Link". In the Option field, name of Doctype link field will be mentioned.
-
+
This field will allow selecting document id, based on value selected in the Doctype link field. For example, if we select Sales Order in the prior field, Dynamic Link field will list all the Sales Orders ids.
-
+
+
If Website is checked in All Application, but still not visible for the User, check if is hidden by System Manager. In the Setup module, feature called Show/Hide Modules allows System Manager to hide specific module from all the Users.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md
index 2562740127..8c099ccca7 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md
@@ -1,6 +1,8 @@
+# Perm Level Error In Permission Manager
+
#Perm Level Error in Permission Manager
-While customizing rules in the [Permission Manager]({{docs_base_url}}/user/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions), you might receive an error message saying:
+While customizing rules in the [Permission Manager](/docs/user/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions), you might receive an error message saying:
`For System Manager _(or other role)_ at level 2 _(or other level)_ in Customer _(or other document)_ in row 8: Permission at level 0 must be set before higher levels are set.`
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
index 3dd6c68e55..b5aa07c2a3 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
@@ -1,3 +1,5 @@
+# Search Record By Specific Field
+
#Search Record by Specific Field
While creating any document (say Sales Invoice), you have to select other document id in it (say Serial No). For ease in selection, you can also make value of other field of that visible in the search result. Search By functionality enables to define field whos value will be visible in the search result.
@@ -16,12 +18,12 @@ Let's assume that while creating Sales Invoice, you wish to see Serial No result
Update Warehouse field name in the Search By field.
-
+
#### Searching in Another Record.
While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier.
-
+
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
index ede54f24e9..f3204dc6ae 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
@@ -1,3 +1,5 @@
+# Set Language
+
#Change the Language
ERPNext is an multi-lingual application. It allows each user to select preferred lannguage. Following is how User can customize language in one's account.
@@ -8,13 +10,13 @@ Following are the steps to set language in your ERPNext account.
#### 1.1 Go to My Setting
-
+
#### 1.2 Select Language
-
+
-
+
#### 1.3 Save User
@@ -30,13 +32,13 @@ Being a System Manager, you can set language in other user's master as well.
#### Set Language
-
+
#### Save
Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference.
-
+
Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://translate.erpnext.com).
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md
index 4ed070fcd7..67899e0d91 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision.md
@@ -1,3 +1,5 @@
+# Set Precision
+
#Set Precision
In ERPNext, default precision for `Float`, `Currency` and `Percent` field is three. It allows you to enter value having value upto three decimal places.
@@ -8,11 +10,11 @@ To change the precision globally, go to:
`Setup > Settings > System Settings`.
-
+
You can also set field specific precision. To do that go to `Setup > Customize > Customize Form` and select the DocType there. Then go to the specific field row and change precision. Precision field is only visible if field-type is one of the Float, Currency and Percent.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
index 586814175b..29eef88dcc 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.md
@@ -10,10 +10,10 @@ Following are the steps to restrict User to a document based on Owner/creator.
Select Document Type for which you want to set user permission. After permissions are loaded for selected document, scroll to role for which you want to set restriction.
-
+
#### Step 3: Apply User Permission
For Role to be restricted (Sales User in this case), check "If Owner".
-
+
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
index 433db2de1a..33a5857b5b 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
@@ -1,3 +1,5 @@
+# Custom Doctype
+
DocType or a Document Type is a tool to insert form in ERPNext. The forms like Sales Order,
Sales Invoices, Production Order are added as Doctype in the backend. Let's assume we are
creating a Custom Doctype for a Book.
@@ -19,7 +21,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.
-
+
#### Fields
@@ -34,7 +36,7 @@ Fields are much more than database columns, they can be:
1. Actions (button)
1. Attachments or Images
-
+
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 +46,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**.
-
+
#### Permission
In this table, you should select roles and define permission roles for them for this Doctype.
-
+
#### Save DocType
On saving doctype, you will get pop-up to provide name for this Doctype.
-
+
#### DocType in System
@@ -65,12 +67,12 @@ Human Resource module, to access this doctype, go to:
`Human Resource > Document > Book`
-
+
#### Book master
Using the fields entered, following is the master one book.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
index 92c5224c9a..2c11e0dc32 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
@@ -1,3 +1,5 @@
+# Custom Field
+
Every form in the ERPNext has standard set of fields. If you need to capture some information, but there is no standard field available for it, you can insert Custom Field in a form as per your requirement.
Following are the steps to insert Custom Field in the existing form.
@@ -12,37 +14,37 @@ To add a Custom Field, go to:
In the Customize Form, select Document Type in which you want to insert Custom Field. Let's assume we are inserting Custom Field in the Employee master.
-
+
#### Insert Row for the Custom Field
In Customize Form, open the field above which you want to insert a Custom Field. Click on Insert Above.
-
+
####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.
-
+
####Select Field Type
There are various types of Field like Data, Date, Link, Select, Text and so on. Select Field Type for the Custom Field.
-
+
-Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/field-types.html) to learn more about types of field you can set for your Custom Field.
+Click [here](/docs/user/manual/en/customize-erpnext/articles/field-types.html) to learn more about types of field you can set for your Custom Field.
####Set Option
Based on the Field Type, value will be entered in the Options field.
-If you are creating a Link field, then in the Options, enter Doctype name with which this field will be linked. Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html) to learn more about creating custom link field.
+If you are creating a Link field, then in the Options, enter Doctype name with which this field will be linked. Click [here](/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html) to learn more about creating custom link field.
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.
-
+
For Data field, Option can be set to "Email" or "Phone" and the field will be validated accordingly.
@@ -63,7 +65,7 @@ You can set properties as:
After inserting required details for the Custom Field, Update Customize Form. On update, Custom Field will be inserting in the form, Employee master in this case. Before checking Employee form, reload your ERPNext account. After reload, check Employee form to see Custom Field in a form.
-
+
####Deleting Custom Field
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
index bbfbe45e39..54f264222b 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
@@ -1,3 +1,5 @@
+# Custom Script Fetch Values From Master
+
To pull a value of a link on selection, use the `add_fetch` method.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
index 960aa89c6a..ff6958b3d3 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
@@ -1,3 +1,5 @@
+# Generate Item Code Based On Custom Logic
+
Add this in the Custom Script of **Item**, so that the new Item Code is
generated just before the a new Item is saved.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md
index 78edcfcfcb..e8649e805f 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md
@@ -1,3 +1,5 @@
+# Custom Script Examples
+
### How to Create a Custom Script
Create a Custom Script (you must have System Manager role for this):
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
index 4fda1bd6f9..e665a1c37a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
@@ -1,3 +1,5 @@
+# Make Read Only After Saving
+
Use the method `cur_frm.set_df_property` to update the field's display.
In this script we also use the `__islocal` property of the doc to check if the
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
index 79fe9a5b07..cd32c81bd0 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
@@ -1,3 +1,5 @@
+# Restrict Cancel Rights
+
Add a handler to `custom_before_cancel` event:
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
index f3efd9813a..97cd8f0765 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
@@ -1,3 +1,5 @@
+# Restrict Purpose Of Stock Entry
+
frappe.ui.form.on("Material Request", "validate", function(frm) {
if(frappe.user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
index 849e68681a..ccc21805c0 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
@@ -1,3 +1,5 @@
+# Restrict User Based On Child Record
+
// restrict certain warehouse to Material Manager
cur_frm.cscript.custom_validate = function(doc) {
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
index 72dbb6dc9d..7dd663345f 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
@@ -1,3 +1,5 @@
+# Sales Invoice Id Based On Sales Order Id
+
Below script allows you to get naming series in Sales Invoice, same as of corresponding Sales Order.
Invoice uses a prefix M- but the number duplicates the SO doc name (number).
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
index b7a5e1ce36..d45f5f6216 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
@@ -1,3 +1,5 @@
+# Update Date Field Based On Value In Other Date Field
+
Below script would auto-set value for the date field, based on the value in another date field.
Example: Production Due Date must be set as two days before Delivery Date. If you have Production Due Date field already, with field type as Date, as per the below given script, date will be auto-updated in it, two days prior Deliver Date.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
index 1a54e8c826..f5519c239d 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
@@ -1,10 +1,12 @@
+# Custom Scripts
+
If you wish to change any ERPNext form formats, you can do so by using Custom
Scripts. For example, if you wish to add a submit button after saving, to a
Lead form, you can do so by creating your own script.
`Setup > Customization > Custom Script`
-
+
### Topics
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
index f52cee1aab..5f590bb35b 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
@@ -1,7 +1,9 @@
-
-Before we venture to learn form customization tool, click [here](https://frappe.github.io/frappe/user/en/tutorial/doctypes.html) to understand the architecture of forms in ERPNext. It shall help you in using Customize Form tool more efficiently.
+# Customize Form
-Customize Form is the tool which allows user to customize property of the standard fields, and insert [custom fields]({{docs_base_url}}/user/manual/en/customize-erpnext/custom-field.html) as per the requirement. Let's assume we need to set Project Name field as a mandatory field in the Sales Order form. Following are the steps which shall be followed to achieve this.
+
+Before we venture to learn form customization tool, click [here](https://frappe.io/docs/user/en/tutorial/doctypes.html) to understand the architecture of forms in ERPNext. It shall help you in using Customize Form tool more efficiently.
+
+Customize Form is the tool which allows user to customize property of the standard fields, and insert [custom fields](/docs/user/manual/en/customize-erpnext/custom-field.html) as per the requirement. Let's assume we need to set Project Name field as a mandatory field in the Sales Order form. Following are the steps which shall be followed to achieve this.
####Step 1: Go to Customize Form
@@ -11,7 +13,7 @@ Go to Customize Form from:
You can also reach the Customize Form tool from the List Views.
-
+
####Step 2: Select Document Type
@@ -19,7 +21,7 @@ If navigate from the list view, Document Type will be automatically set in the C
If you reach customize form from the Setup module, or from awesome bar, then you will have to manually select Document Type in which customization needs to be made.
-
+
####Step 3: Edit Property
@@ -27,11 +29,11 @@ On selecting Document Type, all the fields of the Document Type will updated as
To customized Project field, click on the respective row, and check "Mandatory". With this, Project field will become mandatory in the Sales Order.
-
+
Like setting setting field Mandatory, following are the other customization options in the Customize Form tool.
-* Change [Field Type]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/field-types.html).
+* Change [Field Type](/docs/user/manual/en/customize-erpnext/articles/field-types.html).
* Edit Field Labels to suit your industry/language.
* Set field precision for the Currency field.
* To hide field, check Hidden.
@@ -47,9 +49,9 @@ To have customizations take effect, reload your ERPNext account once.
From Customize Form, you can also do following customizations:
-* Max Attachment Limit: Define [maximum no. of files]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) which can attached on a document.
+* Max Attachment Limit: Define [maximum no. of files](/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) which can attached on a document.
* Default Print Format: For one document type, you can have multiple print formats. In the Customize Form, you can also set default Print Format for a document.
-* Set [Title Field]({{docs_base_url}}/user/manual/en/customize-erpnext/document-title.html)
+* Set [Title Field](/docs/user/manual/en/customize-erpnext/document-title.html)
* Sort Field and Sort Order: Define field based on which documents in the list view will be sorted.
>Note: Though we want you to do everything you can to customize your ERP based on your business needs, we recommend that you do not make “wild” changes to the forms. This is because, these changes may affect certain operations and may mess up your forms. Make small changes and see its effect before doing some more.
@@ -92,7 +94,7 @@ table, th, td {
+ src="/docs/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.
+ src="/docs/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/manual/en/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
index ce8a1c3e74..ad4b00e2f9 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
@@ -4,9 +4,9 @@ To hide modules (icons) from the home page, go to:
`Setup > Permissions > Show / Hide Modules`
-
+
-Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/module-visibility.html) to learn about other features from where icons from the desktop can be hidden.
+Click [here](/docs/user/manual/en/customize-erpnext/articles/module-visibility.html) to learn about other features from where icons from the desktop can be hidden.
> 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 Purchase Order, Purchase Request, Supplier, the “Buying” module will automatically hidden for that User.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
index ccfa63a93a..1936c569ff 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
@@ -1,3 +1,5 @@
+# Kanban Board
+
#Kanban Board
Kanban is a Japanese manufacturing system in which the supply of components is regulated through the use of an instruction card sent along the production line.
@@ -8,35 +10,35 @@ In ERPNext Kanban board can be an alternative for the list views. It helps you i
To create a Kanban board in ERPNext click the Kanban dropdown on the sidebar, and select New Kanban Board.
-
+
###Add new Card/Document
To add Cards on Kanban Board click Add Tasks. You can Edit a card details by click on the card and it will take you to the Task Doctype where you can further add and edit card details.
-
+
###Update Cards/Document Status
Based on the Task status you can drag and drop the Cards in the respective column. For example if the task is work in progress you can move the card for the task from the status Open to Working.
-
+
###Manage Columns
To add more columns in the Kanban board click Add columns.
-
+
To move columns based on the priority drag and drop the columns as per requirement.
-
+
To set Colors to a Card click drop down menu on the card and assign color to it.
-
+
You can also Archive and Restore the columns added in a Kanban board. To do so click Archive in drop down menu on the card. Once archived you can restore the column from the list of the archived columns in the Kanban board.
-
+
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
index 123a613298..993f92ad58 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
@@ -1,3 +1,5 @@
+# Print Format
+
Print Formats are the layouts that are generated when you want to Print or
Email a transaction like a Sales Invoice. There are two types of Print
Formats,
@@ -16,7 +18,7 @@ To create your own versions, open an existing template from:
`Setup > Printing > Print Formats`
-
+
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”
@@ -43,7 +45,7 @@ To edit / update your print and PDF settings, go to:
`Setup > Printing and Branding > Print Settings`
-
+
#### Example
diff --git a/erpnext/docs/user/manual/en/fleet_management/index.md b/erpnext/docs/user/manual/en/fleet_management/index.md
index 8ae3b7cc5a..4582716cf9 100644
--- a/erpnext/docs/user/manual/en/fleet_management/index.md
+++ b/erpnext/docs/user/manual/en/fleet_management/index.md
@@ -1,3 +1,5 @@
+# Fleet Management
+
Fleet Management module helps your Organization manage their fleet of vehicles and track their expenses.
To use Fleet Management in ERPNext,
@@ -17,15 +19,15 @@ ERPNext > Vehicle
* Enter License Plate,Make,Model,Odometer Value,Fuel Type and Fuel UOM for a quick entry.
- 
+ 
* Enter details like Insurance,Chassis,Vehicle Value,Location and Employee.
- 
+ 
* Enter Vehicle attributes like color,wheels,doors and last carbon check
- 
+ 
### Vehicle Log
@@ -37,17 +39,17 @@ ERPNext > Vehicle Log
* Enter License Plate,Employee,Date,Odometer reading for a quick entry.
- 
+ 
* Enter Refuelling details,Service details if applicable.
- 
+ 
### Make Expense Claim
* Click on Make Expense Claim button .This button appears only in case of Submitted Vehicle Logs.
- 
+ 
When you click on 'Make Expense Claim',
@@ -55,10 +57,10 @@ When you click on 'Make Expense Claim',
2. The sum of Fuel Expenses and Service Expenses is copied over to Expense Claim Amount.
3. Employee can submit the Expense Claim for further processing.
- 
+ 
### Vehicle Expenses Report
* To track and monitor Vehicle Expenses you can use the Vehicle Expenses report.This report gives a one stop view of all your vehicle expenses month wise.
- 
+ 
diff --git a/erpnext/docs/user/manual/en/human-resources/appraisal.md b/erpnext/docs/user/manual/en/human-resources/appraisal.md
index d3ec301311..6ecb89806c 100644
--- a/erpnext/docs/user/manual/en/human-resources/appraisal.md
+++ b/erpnext/docs/user/manual/en/human-resources/appraisal.md
@@ -1,3 +1,5 @@
+# Appraisal
+
In ERPNext, you can manage Employee Appraisals by creating an Appraisal
Template for each role with the parameters that define the performance by
giving appropriate weightage to each parameter.
@@ -6,13 +8,13 @@ giving appropriate weightage to each parameter.
#### Step 1: Select an Appraisal Template
-
+
After you select the template, the remaining form appears.
#### Step 2: Enter Employee Details
-
+
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/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
index d5c4d00715..a24ca93f02 100644
--- a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
@@ -10,15 +10,15 @@ Create following Groups and Ledgers in Chart of Accounts if not there.
#### 1.1 Employee Loan Account
-Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters)
+Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters)
-
+
#### 1.2 Salaries Account
Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it.
-
+
#### 1.3 Interest Account
@@ -28,7 +28,7 @@ Create Ledger as 'Interest on Loan' under Indirect Income.
Once loan amount is finalized, make journal voucher to book loan payment entry. You should Credit Loan amount to Bank/Cash account and Debit Loan amount employee loan account.
-
+
### 3. Book Loan Recovery and Interest
@@ -36,13 +36,13 @@ Once loan amount is finalized, make journal voucher to book loan payment entry.
If your employee pays separately for his/her loan installment and loan interest, then create journal voucher.
-
+
#### 3.2 Loan Adjustment in Salary
And if you deduct loan installment and interest from employees salary, then book journal entry for the same.
-
+
In the Salary Slip of an employee, then create two Deduction Types in Salary Structure. One as 'Loan Installment' and other one as 'Loan Interest'. So that you can update those values under this deduction heads.
@@ -50,6 +50,6 @@ In the Salary Slip of an employee, then create two Deduction Types in Salary Str
After recovering loan and loan interest, General Ledger report will show the loan account details as follows.
-
+
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/index.md b/erpnext/docs/user/manual/en/human-resources/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/human-resources/articles/index.md
+++ b/erpnext/docs/user/manual/en/human-resources/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
index 715370838a..7fb045c738 100644
--- a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
+++ b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
@@ -27,7 +27,7 @@ a scenario to understand how leaves impact employees Salary Slip.
When creating Salary Slip for an Employee, following is what you will see:
-
+
+
You can get a monthly report of your Attendance data by going to the “Monthly
Attendance Details” report.
-You can easily set attendance for Employees using the [Employee Attendance Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/employee-attendance-tool.html)
+You can easily set attendance for Employees using the [Employee Attendance Tool](/docs/user/manual/en/human-resources/tools/employee-attendance-tool.html)
-You can also bulk upload attendence using the [Upload Attendence Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/upload-attendance.html)
+You can also bulk upload attendence using the [Upload Attendence Tool](/docs/user/manual/en/human-resources/tools/upload-attendance.html)
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
index d3ba22a828..6ae15e0acc 100644
--- a/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
+++ b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
@@ -12,4 +12,4 @@ Go to "Daily Work Summary Settings" via HR module or search bar and set the comp
You can also choose to Customize the Message you send to your employees:
-
+
diff --git a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
index b76a2260c7..28d28b5dc2 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
@@ -10,7 +10,7 @@ To create a new Loan Type go to:
Configure Loan limit and Rate of interest.
-
+
### Employee Loan Application
@@ -18,7 +18,7 @@ Employee can apply for loan by going to:
> Human Resources > Employee Loan Management > Employee Loan Application > New Employee Loan Application
-
+
#### In the Employee Loan Application,
@@ -27,7 +27,7 @@ Employee can apply for loan by going to:
On save, Employee can see Repayment Information and make changes if required before submitting.
-
+
### Employee Loan
@@ -35,7 +35,7 @@ Once the Loan is approved, Manager can create Employee Loan record for the Emplo
> Human Resources > Employee Loan Management > Employee Loan > New Employee Loan
-
+
#### In the Employee Loan,
@@ -44,13 +44,13 @@ Once the Loan is approved, Manager can create Employee Loan record for the Emplo
* Enter Disbursement Date and Account Info
* As soon as you hit save, the repayment schedule is generated.
-
+
#### Loan repayment deduction from Salary
To auto deduct the Loan repayment from Salary, check "Repay from Salary" in Employee Loan. It will appear as Loan repayment in Salary Slip.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
index fd14aa90d3..99cc687828 100644
--- a/erpnext/docs/user/manual/en/human-resources/employee.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md
@@ -1,9 +1,11 @@
+# Employee
+
There are many fields you can add in your Employee records.
To create new Employee go to:
> Human Resources > Employee > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
index 1d4996dabc..2d7432f639 100644
--- a/erpnext/docs/user/manual/en/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
@@ -1,23 +1,25 @@
+# Expense Claim
+
Expense Claim is made when Employee’s make expenses out of their pocket on behalf of the company. For example, if they take a customer out for lunch, they can make a request for reimbursement via the Expense Claim form.
To make a new Expense Claim, go to:
> HR > Expense Claim > New Expense Claim
-
+
Set the Employee ID, date and the list of expenses that are to be claimed and
“Submit” the record.
### Set Account for Employee
Set employee's expense account on the employee form, system books an expense amount of an employee under this account.
-
+
### Approving Expenses
Approver for the Expense Claim is selected by an Employee himself. Users to whom `Expense Approver` role is assigned will shown in the Expense Claim Approver field.
-After saving Expense Claim, Employee should [Assign document to Approver]({{docs_base_url}}/user/manual/en/using-eprnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert]({{docs_base_url}}/user/manual/en/setting-up/email/email-alerts.html).
+After saving Expense Claim, Employee should [Assign document to Approver](/docs/user/manual/en/using-eprnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert](/docs/user/manual/en/setting-up/email/email-alerts.html).
Expense Claim Approver can update the “Sanctioned Amounts” against Claimed Amount of an Employee. If submitting, Approval Status should be submitted to Approved or Rejected. If Approved, then Expense Claim gets submitted. If rejected, then Expen
Comments can be added in the Comments section explaining why the claim was approved or rejected.
@@ -25,27 +27,34 @@ Comments can be added in the Comments section explaining why the claim was appro
### Booking the Expense
On submission of Expense Claim, system books an expense against the expense account and the employee account
-
+
User can view unpaid expense claim using report "Unclaimed Expense Claims"
-
+
### Payment for Expense Claim
To make payment against the expense claim, user has to click on Make > Bank Entry
#### Expense Claim
-
+
#### Payment Entry
-
Note: This amount should not be clubbed with Salary because the amount will then be taxable to the Employee.
+Alternatively, a Payment Entry can be made for an employee and all outstanding Expense Claims will be pulled in.
+
+> Accounts > Payment Entry > New Payment Entry
+
+Set the Payment Type to "Pay", the Party Type to Employee, the Party to the employee being paid and the account being paid
+from. All outstanding expense claims will be pulled in and payments amounts can be allocated to each expense.
+
+
### Linking with Task & Project
* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/fleet-management.md b/erpnext/docs/user/manual/en/human-resources/fleet-management.md
index e55caa551d..d7c4564481 100644
--- a/erpnext/docs/user/manual/en/human-resources/fleet-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/fleet-management.md
@@ -1,3 +1,5 @@
+# Fleet Management
+
Fleet Management section of Human Resources helps your Organization manage their fleet of vehicles and track their expenses.
To use Fleet Management in ERPNext,
@@ -17,15 +19,15 @@ Human Resources > Fleet Management > Vehicle
* Enter License Plate, Make, Model, Odometer Value, Fuel Type and Fuel UOM for a quick entry.
- 
+ 
* Enter details like Insurance, Chassis, Vehicle Value, Location and Employee.
- 
+ 
* Enter Vehicle attributes like color, wheels, doors and last carbon check
- 
+ 
### Vehicle Log
@@ -37,17 +39,17 @@ Human Resources > Fleet Management > Vehicle Log
* Enter License Plate, Employee, Date, Odometer reading for a quick entry.
- 
+ 
* Enter Refueling details, Service details if applicable.
- 
+ 
### Make Expense Claim
* Click on Make Expense Claim button. This button appears only in case of Submitted Vehicle Logs.
- 
+ 
When you click on 'Make Expense Claim',
@@ -55,10 +57,10 @@ When you click on 'Make Expense Claim',
2. The sum of Fuel Expenses and Service Expenses is copied over to Expense Claim Amount.
3. Employee can submit the Expense Claim for further processing.
- 
+ 
### Vehicle Expenses Report
* To track and monitor Vehicle Expenses you can use the Vehicle Expenses report.This report gives a one stop view of all your vehicle expenses month wise.
- 
+ 
diff --git a/erpnext/docs/user/manual/en/human-resources/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
index c1e76f1924..0c0463d5ae 100644
--- a/erpnext/docs/user/manual/en/human-resources/holiday-list.md
+++ b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
@@ -1,3 +1,5 @@
+# Holiday List
+
#Holiday List
Holiday List is a list which contains the dates of holidays.
@@ -14,22 +16,22 @@ Click on New to add new Holiday List.
Give a name to Holiday List. It can be based in Fiscal Year or location or department as application. Also select From and To Date for the Holiday List.
-
+
You can quickly add Weekly Off in the Holiday List as following.
-
+
After that, you can also add specific days (like festival holidays) manually.
-
+
### Holiday List in Employee
If you have created multiple Holiday List, then select specific Holiday List for an Employee in the respective master.
-
+
When an Employee applies for the Leave, then days mentioned in the Holiday List will not be counted, as they are holiday already. For more configuration option in Holiday List, check `HR > HR Settings`.
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md b/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
index 8f29974206..88b2d288f0 100644
--- a/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
+++ b/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
@@ -1,3 +1,5 @@
+# Human Resource Setup
+
The HR module has a setup process where you create the masters for all the
major activities.
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
index 248a49a33a..406dbdaca8 100644
--- a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
+++ b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
@@ -4,37 +4,37 @@
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 Birthday
Employee Birthday Report shows Birthdays of your employees.
-
+
### Employee Information
Employee Information Report shows Report View of important information recorded in Employee master.
-
+
### Employee Holiday Attendance
Employee Holiday Attendance shows the list of Employees who attended on Holidays.
-
+
### Monthly Salary Register
Monthly Salary Register shows net pay and its components of employee(s) at a glance.
-
+
### Monthly Attendance Sheet
Monthly Attendance Sheet shows monthly attendance of selected employee at a glance.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/index.md b/erpnext/docs/user/manual/en/human-resources/index.md
index 02fcfc6334..5191505a85 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.md
+++ b/erpnext/docs/user/manual/en/human-resources/index.md
@@ -1,3 +1,5 @@
+# Human Resources
+
The Human Resources (HR) Module covers the processes linked to managing a team
of co-workers. Most important feature here is processing the payroll by using
Process Payroll to generate Salary Slips. Most countries have complex tax
diff --git a/erpnext/docs/user/manual/en/human-resources/job-applicant.md b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
index 767780fe0a..d13cf19f46 100644
--- a/erpnext/docs/user/manual/en/human-resources/job-applicant.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
@@ -1,10 +1,12 @@
-You can mantain a list of People who have applied for a [Job Opening]({{docs_base_url}}/user/manual/en/human-resources/job-opening.html).
+# Job Applicant
+
+You can mantain a list of People who have applied for a [Job Opening](/docs/user/manual/en/human-resources/job-opening.html).
To create a new Job Applicant go to
> Human Resource > Job Applicant > New
-
+
### Linking with an Email Account
@@ -20,6 +22,6 @@ system shall create a New Job Applicant against each email received on the mailb
* In 'Append To' select 'Job Applicant'
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/job-opening.md b/erpnext/docs/user/manual/en/human-resources/job-opening.md
index 7e4f0c313d..e198cafc1c 100644
--- a/erpnext/docs/user/manual/en/human-resources/job-opening.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-opening.md
@@ -1,10 +1,12 @@
+# Job Opening
+
You can make a record of the open vacancies in your company using Job Opening.
To create a new Job Opening go to
> Human Resource > Job Opening > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
index 824cd047e7..438dbba428 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -1,3 +1,5 @@
+# Leave Application
+
If your company has a formal system where Employees have to apply for leaves
to be able to qualify as paid leaveas, you can create Leave Application to
track approval and usage of leaves. You have to mention the Employee, Leave
@@ -5,7 +7,7 @@ Type and the period for which the leave is taken.
> Human Resources > Leave Application > New Leave Application
-
+
###Setting Leave Approver
@@ -13,12 +15,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.
-
+
> 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]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
+settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
for more info.
-You assign Leaves aginast an Employee check [Leave Allocation]({{docs_base_url}}/user/manual/en/human-resources/leave.html)
+You assign Leaves aginast an Employee check [Leave Allocation](/docs/user/manual/en/human-resources/leave.html)
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/leave.md b/erpnext/docs/user/manual/en/human-resources/leave.md
index 5b32a2b34d..cd81269896 100644
--- a/erpnext/docs/user/manual/en/human-resources/leave.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave.md
@@ -1,3 +1,5 @@
+# Leave
+
#Overview
This section enables you to manage leave schedule of your organization. It also explains the way employees can apply for leaves.
Employees create leave request and manager (leave approver) approves or rejects the request. You can select from a number of leave types such as sick leave, casual leave, privilege leave and so on. You can also allocate leaves to your employees and generate reports to track leaves record.
@@ -12,7 +14,7 @@ Leave Type refers to types of leave allotted to an employee by a company. An emp
requirement.
+ src="/docs/assets/img/human-resources/new-leave-type.png">
**Max Days Leave Allowed:** It refers to maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days under a particular Leave Type, his/her extended leave may be considered as ‘Leave Without Pay’ and this may affect his/her salary calculation.
@@ -45,7 +47,7 @@ Leave Allocation enables you to allot a specific number of leaves to a particula
To allocate leaves to an Employee, select the period and the number of leaves you want to allocate. You can also add unused leaves from previous allocation period.
+ src="/docs/assets/img/human-resources/manual-leave-allocation.png">
###Via Leave Allocation Tool
> Human Resources > Tools > Leave Allocation Tool
@@ -53,7 +55,7 @@ To allocate leaves to an Employee, select the period and the number of leaves yo
This tool enables you to allocate leaves for a category of employees, instead of individual ones. You can allocate leaves based on Employee Type, Branch, Department and Designation. Leave Allocation Tool is also known as Leave Control Panel.
+ src="/docs/assets/img/human-resources/leave-allocation-tool.png">
---
@@ -71,7 +73,7 @@ Leave Application section enables an employee to apply for leaves. Employee can
- Employee gets notification on the status of his/her Leave Application
+ src="/docs/assets/img/human-resources/new-leave-application.png">
**Notes:**
@@ -89,4 +91,4 @@ Leave Application section enables an employee to apply for leaves. Employee can
Leave Block List is a list of dates in a year, on which employees can not apply for leave. You can define a list of users who can approve Leave Application on blocked days, in case of urgency. You can also define whether the list will applied on entire company or any specific departments.
\ No newline at end of file
+ src="/docs/assets/img/human-resources/leave-block-list.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/offer-letter.md b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
index 9e8c96622d..1df1a38c54 100644
--- a/erpnext/docs/user/manual/en/human-resources/offer-letter.md
+++ b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
@@ -1,3 +1,5 @@
+# Offer Letter
+
Offer Letter is given to candidate after Interview & selection which states the offered salary package,
designation, grade, department working, no of days entitled for leave.
@@ -5,12 +7,12 @@ In ERPNext you can make a record of the Offer Letters that you can given to cand
> Human Resource > Offer Letter > New
-
+
-> Note: An offer letter can be made only against a [Job Applicant]({{docs_base_url}}/user/manual/en/human-resources/job-applicant.html)
+> Note: An offer letter can be made only against a [Job Applicant](/docs/user/manual/en/human-resources/job-applicant.html)
There is a pre-designed print format to print you offer letter.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
index 48ff96b405..e902617db5 100644
--- a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -1,3 +1,5 @@
+# Salary And Payroll
+
Salary is a fixed amount of money or compensation paid to an employee by an employer in return for the work performed .
Payroll is the administration of financial records of employees' salaries, wages, bonuses, net pay, and deductions.
@@ -44,7 +46,7 @@ To create a new Salary Structure go to:
#### Figure 1.1:Salary Structure
-
+
### In the Salary Structure,
@@ -53,7 +55,7 @@ To create a new Salary Structure go to:
#### Figure 1.2:Salary Structure for Salary Slip based on Timesheet
-
+
### Salary Slip Based on Timesheet
@@ -70,20 +72,20 @@ In the “Earnings” and “Deductions” tables, you can calculate the values
#### Figure 1.3:Condition and Formula
-
+
* Condition and Amount
#### Figure 1.4:Condition and Amount
-
+
* Only Formula
* Only Amount
#### Figure 1.5:Account Details
-
+
* Select Mode of Payment and Payment Account for the Salary Slips which will be generated using this Salary Structure
@@ -121,7 +123,7 @@ To create a new Salary Slip go to:
#### Figure 2: Salary Slip
-
+
You can also create salary slip for multiple employees using Process Payroll:
@@ -129,7 +131,7 @@ You can also create salary slip for multiple employees using Process Payroll:
#### Figure 3: Process Payroll
-
+
In Process Payroll,
@@ -164,7 +166,7 @@ created.
#### Figure 3.1: Make Bank Entry
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/branch.md b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
index 8116ca4c11..75c0c43082 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/branch.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
@@ -1,5 +1,7 @@
+# Branch
+
Branches of your organization
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
index 4371b624ed..39e7e2a32e 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
@@ -1,10 +1,12 @@
+# Deduction Type
+
You can make a record of the tax and other salary deductions and describe it as Deduction Type
To create a new Deduction Type
> Human Resource > Setup > Deduction Type > New
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/department.md b/erpnext/docs/user/manual/en/human-resources/setup/department.md
index 1b088b158f..9eb4245175 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/department.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/department.md
@@ -1,5 +1,7 @@
+# Department
+
Departments in your organization
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/designation.md b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
index 1de779e7b3..5ac771f8ff 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/designation.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
@@ -1,5 +1,7 @@
+# Designation
+
Designations in your organization
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
index e5c35c6e1c..17586631e9 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
@@ -1,10 +1,12 @@
+# Earning Type
+
You can make a record of the Salary Components and describe it as Earning Type
To create a new Earning Type
> Human Resource > Setup > Earning Type > New
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
index 37d0fd3973..de07ac9fc8 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
@@ -1,5 +1,7 @@
+# Employment Type
+
Various employment contracts you have with your employees.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
index 1741df4a5f..a12bcdbd8f 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
@@ -2,6 +2,6 @@
GLobal settings for HR related documents
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.md b/erpnext/docs/user/manual/en/human-resources/setup/index.md
index 0dff60b400..59ddddf515 100644
--- a/erpnext/docs/user/manual/en/human-resources/setup/index.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.md
@@ -1 +1,3 @@
+# Setup
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md
index f0d6e5f9e8..dfc350e17a 100644
--- a/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md
+++ b/erpnext/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md
@@ -1,9 +1,11 @@
+# Employee Attendance Tool
+
To go the attendance tool, go to:
> Human Resources > Tools > Employee Attendance Tool
This tool allows you to add attendance records for multiple employees quickly.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.md b/erpnext/docs/user/manual/en/human-resources/tools/index.md
index 0dff60b400..79547ee555 100644
--- a/erpnext/docs/user/manual/en/human-resources/tools/index.md
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.md
@@ -1 +1,3 @@
+# Tools
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
index adfc66d116..7a45002fa6 100644
--- a/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
+++ b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
@@ -1,9 +1,11 @@
+# Upload Attendance
+
This tool helps you to upload bulk attendence from a csv file.
To upload the attendance go to:
> Human Resources > Upload Attendance
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/training.md b/erpnext/docs/user/manual/en/human-resources/training.md
index 5d55b6c7aa..39b9790246 100644
--- a/erpnext/docs/user/manual/en/human-resources/training.md
+++ b/erpnext/docs/user/manual/en/human-resources/training.md
@@ -1,8 +1,10 @@
+# Training
+
### Training Event
Schedule seminars, workshops, conferences etc using Training Event. You can also invite your employees to attend the event using this feature.
-
+
### Inviting Employees for Event
@@ -12,17 +14,17 @@ The system shall notify the employee with status 'Open' by sending a email to th
The status is changed to 'Invited' when an invitation email is sent to the employee by the system.
When an Employee confirms his/her presence for the event you can change the status to 'Confirmed'.
-
+
### Training Result
After compleation of the training Employee Wise training results can be stored based on the Feedback received from the Trainer.
-
+
### Trainig Feedback
Collect feedback regarding the event from your Employees using Training Feedback.
-
+
diff --git a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
index 7e261b85e6..3a51286542 100644
--- a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
@@ -1,3 +1,5 @@
+# Concepts And Terms
+
Before you start implementation, lets get familiar with the terminology that
is used and some basic concepts in ERPNext.
diff --git a/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md b/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
index 0c2a0a5e48..278804d4a1 100644
--- a/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
+++ b/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
@@ -1,3 +1,5 @@
+# Do I Need An Erp
+
ERPNext is a modern tool that covers not only accounting but also all other
business functions, on an integrated platform. It has many benefits over both
traditional accounting as well as ERP applications.
diff --git a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
index 7e783f679b..4aae00ed05 100644
--- a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
+++ b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
@@ -1,3 +1,9 @@
+# Getting Started With Erpnext
+
+
+
+# Getting Started with ERPNext
+
There are many ways to get started with ERPNext.
### 1\. See the Demo
@@ -10,7 +16,7 @@ see the demo at:
### 2\. Start a Free Account at ERPNext.com
-ERPNext.com is managed by the organization (Frappe) that publishes ERPNext.
+ERPNext.com is managed by the organization (Frappé) that publishes ERPNext.
You can start with your own account by [signing up on the
website](https://erpnext.com).
@@ -30,6 +36,6 @@ Image](https://erpnext.com/download)
### 4\. Install ERPNext on your Unix/Linux/Mac machine
-If you are familiar with installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/bench).
+If you are familiar with installing applications on *nix platforms, read the instructions on how to install using [Frappé Bench](https://github.com/frappe/bench).
{next}
diff --git a/erpnext/docs/user/manual/en/introduction/implementation-strategy.md b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
index bc494ca1f0..0a108716de 100644
--- a/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
+++ b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
@@ -1,3 +1,5 @@
+# Implementation Strategy
+
Before you start managing your Operations in EPRNext, you must first become
familiar with the system and the terms used. For this we recommend
implementation should happen in two phases.
diff --git a/erpnext/docs/user/manual/en/introduction/index.md b/erpnext/docs/user/manual/en/introduction/index.md
index f1bcb49366..fcaf43e82a 100644
--- a/erpnext/docs/user/manual/en/introduction/index.md
+++ b/erpnext/docs/user/manual/en/introduction/index.md
@@ -1,3 +1,5 @@
+# Introduction
+
## What is an ERP and why should I care?
(If you are already convinced you need an all-in-one system for your
diff --git a/erpnext/docs/user/manual/en/introduction/key-workflows.md b/erpnext/docs/user/manual/en/introduction/key-workflows.md
index bb032696d5..91960143e2 100644
--- a/erpnext/docs/user/manual/en/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/en/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.
-
+
-
+
_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/manual/en/introduction/open-source.md b/erpnext/docs/user/manual/en/introduction/open-source.md
index 0089ba8e12..18d61defa3 100644
--- a/erpnext/docs/user/manual/en/introduction/open-source.md
+++ b/erpnext/docs/user/manual/en/introduction/open-source.md
@@ -1,3 +1,5 @@
+# Open Source
+
The source code is an Open Source software. It is open for anyone to
understand, extend or improve. And it is free!
diff --git a/erpnext/docs/user/manual/en/introduction/the-champion.md b/erpnext/docs/user/manual/en/introduction/the-champion.md
index 4d75abb6e6..57086cb9fb 100644
--- a/erpnext/docs/user/manual/en/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/en/introduction/the-champion.md
@@ -1,8 +1,10 @@
+# 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/manual/en/manufacturing/articles/index.md b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/index.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
index 3f507afd35..1e8b2bdb25 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
@@ -1,3 +1,5 @@
+# Nested Bom Structure
+
#Nested BOM Structure
**Question:** Our manufacturing process involves producing sub-assembly items before final product. How should we manage BOM master in this scenario?
@@ -8,7 +10,7 @@ A computer assembler is creating a BOM for PC. They also manufacture Hard Disk a
BOM of PC will have all the raw-material items selected in it. Hard Disk and DVD Drive (sub-assemblies) will also be selected as raw-material items. For the sib-assembly items, respective BOM no. will be fetched as well.
-
+
Following is how the structure of nested BOM will look:
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md
index c17b923ceb..050706cf80 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md
@@ -1,3 +1,5 @@
+# Production Planning Subassembly
+
#Production Planning & Subassembly
if you need Production Planning Tool to consider raw-materials required for the manufacturing of sub-assembly items selected in the BOM, please check following instructions to achieve the same.
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
index 29803ee363..b07366c73e 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md
@@ -1,16 +1,18 @@
+# Valuation Based On Field In Bom
+
#Valuation Based On in BOM
**Question:** What are for various options in `Valuation Based On` in the Bill Of Materials (BOM)?
**Answer:** There are 3 available options in the Valuation Based On field:
-
+
**Valuation Rate:** Item valuation rate is defined based on it's purchase or manufacture value.
For Purchase Item, it is defined based on charges entered in the Purchase Receipt. If you don't have any Purchase Receipt
made for an item or a Stock Reconciliation, then there won't be any Valuation Rate for that item.
-**Price List Rate:** This option allows to pull item rates from [Price List.]({{docs_base_url}}/user/manual/en/stock/item/item-price.html)
+**Price List Rate:** This option allows to pull item rates from [Price List.](/docs/user/manual/en/stock/item/item-price.html)
**Last Purchase Rate:** It will be the last Purchase (Order) Rate of an item.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
index 91bf7edf45..112efab7ea 100644
--- a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -1,3 +1,5 @@
+# Bill Of Materials
+
At the heart of the Manufacturing system is the **Bill of Materials** (BOM).
The **BOM** is a list of all materials (either bought or made) and operations
that go into a finished product or sub-Item. In ERPNext, the component could
@@ -8,11 +10,11 @@ To make a new BOM:
> Manufacturing > Bill of Materials > New BOM
-
+
* To add Operations select 'With Operation'. The Operations table shall appear.
-
+
* 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,22 +27,22 @@ 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.
-
+
* This cost can be updated on by using the 'Update Cost' button.
-
+
* User can select the currency in the BOM
* System calculates the costing based on the price list currency
-
+
### 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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/introduction.md b/erpnext/docs/user/manual/en/manufacturing/introduction.md
index f9d827c6d1..b7f0a991b8 100644
--- a/erpnext/docs/user/manual/en/manufacturing/introduction.md
+++ b/erpnext/docs/user/manual/en/manufacturing/introduction.md
@@ -1,4 +1,6 @@
-
+# Introduction
+
+
### Types of Production Planning
diff --git a/erpnext/docs/user/manual/en/manufacturing/operation.md b/erpnext/docs/user/manual/en/manufacturing/operation.md
index b21304e432..8d495f199b 100644
--- a/erpnext/docs/user/manual/en/manufacturing/operation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/operation.md
@@ -1,3 +1,5 @@
+# Operation
+
### Operation
Stores a list of all Manufacturing Operations, its description and the Default Workstation for the Operation.
@@ -6,6 +8,6 @@ You can also create a Operation by:
> Manufacturing > Documents > Operation > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
index a19c510c26..430ef8a172 100644
--- a/erpnext/docs/user/manual/en/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -1,4 +1,6 @@
-
+# Production Order
+
+
A Production Order (also known as a Work Order) is a document that is given to
the manufacturing shop floor by the Production Planner as a signal to produce
a certain quantity of a certain Item. The Production Order also helps to generate
@@ -11,7 +13,7 @@ by:
> Manufacturing > Documents > Production Order > New
-
+
### Creating Production Orders
@@ -33,11 +35,11 @@ by:
* By default the system fetchs workstation and duration for Production Order Operations from the selected BOM.
-
+
* If you wish to reassign the workstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order.
-
+
* Select the respective operation, and change its workstation.
* You can also change the Operating Time for that operation
@@ -54,19 +56,19 @@ by:
* Click on 'Start'.
-
+
* Mention the quantity of materials to be transfered.
-
+
* Submit the Stock Entry
-
+
* Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry.
-
+
#### Material Transfer through Stock Entry
Use cases for this option are:
@@ -77,12 +79,12 @@ If this is the case, you can select the Skip Material Transfer check box, which
### Making Time Logs
-* Progress in the Production Order can be tracked using [Timesheet]({{docs_base_url}}/user/manual/en/projects/timesheet/timesheet-against-production-order.html)
+* Progress in the Production Order can be tracked using [Timesheet](/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.html)
* Timesheet's time slots are created against Production Order Operations.
* Drafts of Timesheet are created based on the scheduled operations when an Production Order is Submitted.
* To create more Timesheets against an operation click 'Make Timesheet' button.
-
+
###Updating Finished Goods
@@ -90,11 +92,11 @@ If this is the case, you can select the Skip Material Transfer check box, which
* 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 'Finish'.
-
+
* Mention the quantity of materials to be transfered.
-
+
> Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry.
@@ -109,7 +111,7 @@ If this is the case, you can select the Skip Material Transfer check box, which
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'
-
+
* You can also re-start a stopped Production Order.
diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/index.md b/erpnext/docs/user/manual/en/manufacturing/setup/index.md
index ec22505469..ac54772e60 100644
--- a/erpnext/docs/user/manual/en/manufacturing/setup/index.md
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/index.md
@@ -1,3 +1,5 @@
+# Setup
+
Global settings for manufacturing Processes
### Topics
diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
index 1912a55cbd..2c09f52e5f 100644
--- a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
@@ -1,10 +1,12 @@
+# Manufacturing Settings
+
#Manufacturing Settings
Manufacturing Settings can be found at:
`Manufacturing > Setup > Manufacturing Settings`
-
+
####Disable Capacity Planning and Time Tracking
@@ -16,15 +18,15 @@ If you don't track actual operations time, and want to disable creation of Time
In the Workstation master, actual working hours are defined (say 101m to 6pm). As per the Capacity Planning, Time Logs are created against Workstation, for tracking actual operations hour. It also considers working hours of a Workstation when scheduling job (via Time Log).
-
+
As per the standard validation, if Operation cannot be completed within working hours of Workstation, then user is asked to divide an Operation into multiple and smaller Operations. However, if `Allow Overtime` field is checked, while creating Time Logs for Operation, working hours of Workstation will not be validated. In this case, Time Logs for Operation will be created beyond working hours of Workstation as well.
####Allow Production on Holidays
-Holiday of a company can be recorded in the [Holiday List]({{docs_base_url}}/user/manual/en/human-resources/) master. While scheduling production job on workstation, system doesn't consider a day listed in the Holiday list. If you want production job to be scheduled on holidays as well, `Allow Production on Holidays` field should be checked.
+Holiday of a company can be recorded in the [Holiday List](/docs/user/manual/en/human-resources/) master. While scheduling production job on workstation, system doesn't consider a day listed in the Holiday list. If you want production job to be scheduled on holidays as well, `Allow Production on Holidays` field should be checked.
-
+
####Over Production Allowance Percentage
@@ -34,7 +36,7 @@ While making Production Orders against a Sales Order, the system will only allow
When creating Manufacture Entry, raw-material items are back-flush based on BOM of production item. If you want raw-material items to be back-flushed based on Material Transfer entry made against that Production Order instead, then you should set Back-flush Raw Materials Based On "Material Transferred for Manufacture".
-
+
####Capacity Planning For (Days)
diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
index 1589d1b7f0..925afe323d 100644
--- a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
@@ -1,3 +1,5 @@
+# Subcontracting
+
Subcontracting is a type of job contract that seeks to outsource certain types
of work to other companies. It allows work on more than one phase of the
project to be done at once, often leading to a quicker completion.
@@ -15,7 +17,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”.
-
+
__Step 1:__ Make a Bill of Materials for the processed Item, with the unprocessed
@@ -23,20 +25,20 @@ Items as sub-items. For example, If you are manufacturing a pen, the processed
pen will be named under Bill of Materials(BOM), whereas, the refill, knob, and
other items which go into the making of pen, will be categorized as sub-items.
-
+
__Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials.
-
+
__Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier.
-
+
__Step 4:__ Receive the Items from your Supplier via Purchase Receipt. Make sure to check the “Consumed Quantity” in the “Raw Materials” table so that the
correct stock is maintained at the Supplier’s end.
-
+
> Note 1: Make sure that the “Rate” of processed Item is the processing rate
(excluding the raw material rate).
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
index 794d982c72..98d1f3b985 100644
--- a/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
+++ b/erpnext/docs/user/manual/en/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.
-
+
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/manual/en/manufacturing/tools/index.md b/erpnext/docs/user/manual/en/manufacturing/tools/index.md
index 259b5ebc42..25a46a7ac4 100644
--- a/erpnext/docs/user/manual/en/manufacturing/tools/index.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/index.md
@@ -1,3 +1,5 @@
+# Tools
+
### Topics
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
index 4bdc48767b..e9ba2a570f 100644
--- a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
@@ -1,3 +1,5 @@
+# Production Planning Tool
+
Production Planning Tool helps you plan production and purchase of Items for a
period (usually a week or a month).
@@ -11,7 +13,7 @@ To use the Production Planning Tool, go to:
> Manufacturing > Tools > Production Planning Tool
-
+
#### Step 1: Specify source to get Production Items
@@ -25,7 +27,7 @@ To use the Production Planning Tool, go to:
* Use filters to get the Sales Order / Material Request
* Click on Get Sales Order / Get Material Requests to generate a list.
-
+
@@ -34,11 +36,11 @@ To use the Production Planning Tool, go to:
* Get the items for the Sales Order / Material request list
* You can add/remove or change quantity of these Items.
-
+
#### Step 4: Create Production Orders
-
+
@@ -46,7 +48,7 @@ To use the Production Planning Tool, go to:
Create Material Request for Items with projected shortfall.
-
+
diff --git a/erpnext/docs/user/manual/en/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md
index 0ff2a6bba7..5670893d91 100644
--- a/erpnext/docs/user/manual/en/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md
@@ -1,3 +1,5 @@
+# Workstation
+
### Workstation
Workstation stores information regarding the place where the workstation operations is carried out.
@@ -8,12 +10,12 @@ You can also create a Workstation by:
> Manufacturing > Documents > Workstation > New
-
+
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]({{docs_base_url}}/user/manual/en/manufacturing/setup/manufacturing-settings.html)
+> Note : You can enable overtime for your workstation in [Manufacturing Settings](/docs/user/manual/en/manufacturing/setup/manufacturing-settings.html)
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/activity-cost.md b/erpnext/docs/user/manual/en/projects/activity-cost.md
index d4e2106a88..88d4f0a5da 100644
--- a/erpnext/docs/user/manual/en/projects/activity-cost.md
+++ b/erpnext/docs/user/manual/en/projects/activity-cost.md
@@ -1,4 +1,6 @@
+# Activity Cost
+
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.
-
+
diff --git a/erpnext/docs/user/manual/en/projects/activity-type.md b/erpnext/docs/user/manual/en/projects/activity-type.md
index 7f37f51e54..4e968a6b57 100644
--- a/erpnext/docs/user/manual/en/projects/activity-type.md
+++ b/erpnext/docs/user/manual/en/projects/activity-type.md
@@ -1,6 +1,8 @@
+# Activity Type
+
Activity Type makes a list of the different types of activities against which a Time Log can be made.
-
+
By default the following Activity Types are created.
diff --git a/erpnext/docs/user/manual/en/projects/articles/index.md b/erpnext/docs/user/manual/en/projects/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/projects/articles/index.md
+++ b/erpnext/docs/user/manual/en/projects/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/articles/project-costing.md b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
index e5c59400f1..dad849ea9d 100644
--- a/erpnext/docs/user/manual/en/projects/articles/project-costing.md
+++ b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
@@ -12,17 +12,17 @@ Activity Type is a master of service offered by your personnel. You can add new
Activity Cost is a master where you can track billing and costing rate for each Employee, and for each Activity Type.
-
+
#### Time Log
Based on Actual Time spent on the Project-Task, Employee will create a time log.
-
+
On selection of Activity Type in the Time Log, Billing and Costing Rate will fetched for that Employee from respective Activity Cost master.
-
+
Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log.
@@ -30,10 +30,10 @@ Multiplying these rates with total no. of Hours in the Time Log gives Costing Am
Based on total Time Logs created for a specific Task, its costing will be updated in the respective Task master.
-
+
Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/index.md b/erpnext/docs/user/manual/en/projects/index.md
index 220c67fa84..95af437f24 100644
--- a/erpnext/docs/user/manual/en/projects/index.md
+++ b/erpnext/docs/user/manual/en/projects/index.md
@@ -1,3 +1,5 @@
+# Projects
+
ERPNext helps you manage your Projects by breaking them into Tasks and
allocating them to different people.
diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
index 75223962c6..d835295f2c 100644
--- a/erpnext/docs/user/manual/en/projects/project.md
+++ b/erpnext/docs/user/manual/en/projects/project.md
@@ -1,6 +1,8 @@
+# Project
+
Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
-
+
You can also track % Completion of a Project using different methods.
@@ -8,80 +10,80 @@ You can also track % Completion of a Project using different methods.
2. Task Progress
3. Task Weight
-
+
Some examples of how the % Completion is calculated based on Tasks.
-
+
-
+
### Managing tasks
Project can be divided into multiple Tasks.
-Task can be created via Project document itself or can be created via [Task]({{docs_base_url}}/user/manual/en/projects/tasks.html)
+Task can be created via Project document itself or can be created via [Task](/docs/user/manual/en/projects/tasks.html)
-
+
* To view Task made against a Project click on 'Tasks'
-
+
-
+
* You can also view the Tasks from the Project document itself
-
+
* To add Weights to Tasks you can follow the below steps
-
-
+
+
### Managing time
-ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Project.
+ERPNext uses [Time Log](/docs/user/manual/en/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'
-
+
-
+
* You can also create a Time Log directlly and link it to the Project.
-
+
### Managing expenses
-You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resources/expense-claim.html) against a project task.
+You can book [Expense Claim](/docs/user/manual/en/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'
-
+
* You can also create a Expense Claims directlly and link it to the Project.
-
+
* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
-
+
### Cost Center
-You can make a [Cost Center]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
+You can make a [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
-
+
###Project Costing
The Project Costing section helps you track the time and expenses incurred against the project.
-
+
* The Costing Section is updated based on Time Logs made.
@@ -89,9 +91,9 @@ The Project Costing section helps you track the time and expenses incurred again
###Billing
-You can make/link a [Sales Order]({{docs_base_url}}/user/manual/en/selling/sales-order.html) 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](/docs/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project.
-
+
###Gantt Chart
@@ -100,8 +102,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'
-
+
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
index ef597485ab..9447a2ed48 100644
--- a/erpnext/docs/user/manual/en/projects/tasks.md
+++ b/erpnext/docs/user/manual/en/projects/tasks.md
@@ -1,13 +1,15 @@
+# Tasks
+
Project is divided into Tasks.
In ERPNext, you can also create a Task independently.
-
+
### Status of the Task
A Task can have one of the following statuses - Open, Working, Pending Review, Closed, or Cancelled.
-
+
* By default each new Task created has the status set to 'Open'.
@@ -17,7 +19,7 @@ A Task can have one of the following statuses - Open, Working, Pending Review, C
You can specify a list of dependent tasks under the 'Depends On' section.
-
+
* You cannot close the parent task until all dependent tasks are closed.
@@ -25,35 +27,35 @@ You can specify a list of dependent tasks under the 'Depends On' section.
### Managing Time
-ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Task.
+ERPNext uses [Time Log](/docs/user/manual/en/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 is updated based on the Time Log.
* To view Time Log made against a Task click on 'Time Logs'
-
+
-
+
* You can also create a Time Log directly and link it to the Task.
-
+
### Managing Expenses
-You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resources/expense-claim.html) against a task.
+You can book [Expense Claim](/docs/user/manual/en/human-resources/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'
-
+
* You can also create a Expense Claims directly and link it to the Task.
-
+
* Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
index f4f76dc16b..b307f6a147 100644
--- a/erpnext/docs/user/manual/en/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md
@@ -1,3 +1,5 @@
+# Time Log Batch
+
You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Sheet, go to
> Projects > Time Sheet > New Time Sheet
@@ -6,17 +8,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 Sheet" button and these Time Logs will be selected.
-
+
###Making Sales Invoice
* After submitting the Time Sheet, "Make Invoice" button shall appear.
-
+
* Click on that button to raise a Sales Invoice against the Time Sheet.
-
+
* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Sheet and their status will change to "Billed".
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/index.md b/erpnext/docs/user/manual/en/projects/timesheet/index.md
index 7a80ab7a42..8fd30c4125 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/index.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/index.md
@@ -1,3 +1,5 @@
+# Timesheet
+
Timesheet can be used for track actual hours worked. It can be used for multiple purposes like:
* Billable work to Customers
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md b/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md
index 32faf039ae..5069247097 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md
@@ -1,3 +1,5 @@
+# Salary Slip From Timesheet
+
#Salary Slip from Timesheet
If salary / wages for your employees are calculated based on number of hours worked, you can use Timesheet to track actual hours worked, and for creating Salary Slip.
@@ -6,7 +8,7 @@ If salary / wages for your employees are calculated based on number of hours wor
To track actual hours employee has worked for, create Timesheet for each Employee. We suggest you to create Timesheet based on a payment period. For example, if you paying employee on a weekly bases, create one Timesheet for an Employee for one week. However, you can create multiple Timesheets, and create one Salary Slip for the multiple Timesheets.
-
+
####Salary Structure for the Employee
@@ -16,17 +18,17 @@ In the Salary Structure of the Employee, check field "Salary Slip Based on Times
Amount directly for other Salary Components (eg: House Rent Allowance, Phone Allowance) can be define directly. When creating Salary Slip, Amount for these Salary Component will be fetched as it is.
-
+
####Create Salary Slip from Timesheet
To create Salary Slip against Timesheet, open Timesheet and click on "Salary Slip".
-
+
In the Salary Slip, Timesheet ID will be updated. You can select more Timesheet to be paid via this Salary Slip. Based on the Timesheets selected, Total Working Hours will be calculated.
-
+
Hour Rate will be fetched from the Salary Structure of an Employee. Based on Total Working Hours and Hour Rate, Amount will be calculated for the Salary Component is to be calculated based on actual hours worked.
@@ -34,7 +36,7 @@ Hour Rate will be fetched from the Salary Structure of an Employee. Based on Tot
On Submission of Salary Slip, Timesheet's status will be updated to "Payslip".
-
+
+
#### Step 3:Activity Type
Employee will have to select an Activity Type (like planning, site visit, repairing etc. ). Costing and Billing Rate for each Activity can be different for each Employee. These cost can be tracked in the Activity Cost. On selection of Activity Type, Activity Cost is fetched from that Employee. Based on total Activity Cost and total no. of hours, Total Billing Amount (to the Customer) is calculated.
-To learn more on how to setup Activity Type and Activity Cost, click [here]({{docs_base_url}}/user/manual/en/projects/articles/project-costing).
+To learn more on how to setup Activity Type and Activity Cost, click [here](/docs/user/manual/en/projects/articles/project-costing).
-
+
#### Step 4: Enter Actual Time
@@ -30,7 +32,7 @@ In the Timesheet Details table, enter actual hours an Employee has worked for. O
To be able to create Sales Invoice from the Time Sheet, ensure 'Is Billable' field is checked.
-
+
Based on the actual hours worked and Activity Cost of an Employee, Total Billing Amount will be calculated for Timesheet.
@@ -38,7 +40,7 @@ Based on the actual hours worked and Activity Cost of an Employee, Total Billing
After submitting Timesheet, you will find buttons to create Sales Invoice and Salary Slip against this Timesheet.
-
+
###Create Sales Invoice from Timesheet
@@ -46,13 +48,13 @@ After submitting Timesheet, you will find buttons to create Sales Invoice and Sa
In the Timesheet, if "Is Billable" is checked, you will find option to create Sales Invoice against it.
-
+
####Sales Invoice
Sales Invoice has dedicated table for the Timesheet table where Timesheet details will be updated. You can select more Timesheets in this table.
-
+
####Select Customer and Item
@@ -65,4 +67,4 @@ After enter all required details in the Sales Invoice, Save and Submit it.
On submitting Sales Invoice, status of the Timesheets linked to the Sales Invoice will be updated as Billed.
-
+
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
index 6e108b3f7d..da7bf2f67e 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
@@ -1,10 +1,12 @@
+# Timesheet Against Production Order
+
#Timesheet based on Production Order
Creating Timesheet for Production Order helps in capacity planning for the Workstations. Also it helps in tracking actual time consumed the Workstation for completing specific operation.
When a Production Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet.
-
+
Let's assume we are manufacturing a mobile phone. As per the Bill of Material, time required for the assembly of components could be one hour. However the actual time taken for it's completion could be more than planned. The actual time tracking provides actual operation cost, hence helps in determining accurate valuation of the manufacturing item.
@@ -12,28 +14,28 @@ Let's assume we are manufacturing a mobile phone. As per the Bill of Material, t
As per the Bill of Materials of manufacturing item, following are the Operations and Workstation through which raw-material items are processed.
-
+
On submission on Production Order, Timesheet will be created automatically.
-
+
####Time Sheet created from Production Order
In the Timesheet, unique row will be added for each Operation - Workstation. This allows operator/supervisor at the workstation to enter actual From Time and To Time taken for each Operation.
-
+
After enter From Time and To Time for all the Operations, Total Hours will be calculated.
-
+
With updating actual time, you can also enter "Completed Qty". If all the items are not processed in the same Timesheet, you can create another Timesheet from the Production Order.
-
+
####Save and Submit Timesheet
On the submission of Timesheet, Total Hours is calculated. Also, in the Production Order, for each Operation, actual Start and End Time is updated.
-
+
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
index a8b2a6bf18..0a9f32fdc9 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-project.md
@@ -1,12 +1,14 @@
+# Timesheet Against Project
+
#Timesheet against Project and Task
Timesheets can be tracked against Project and Tasks so that you can get reports on how much time was spent on each Task or Project.
-
+
####Billable Timesheet
-To bill Customer based on Timesheet, check "Is Billable" in the Timesheet created against Project and Task. To learn more about billing Customer from Timesheet, click [here]({{docs_base_url}}/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.html).
+To bill Customer based on Timesheet, check "Is Billable" in the Timesheet created against Project and Task. To learn more about billing Customer from Timesheet, click [here](/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.html).
User can also make invoice against timesheet by selecting the project on the invoice. System will fetch the records from the timesheet based on selected project, for mode detail check below video
@@ -17,4 +19,4 @@ When creating Timesheet, Employee will have to select an Activity Type. For each
In the Timesheet, costing will be done based on Activity Cost multiplied with number of hours. Based the Timesheet Cost, total costing will be doen for the Task and Project as well.
-To learn about setup of Activity Type and Activity Cost, click [here]({{docs_base_url}}/user/manual/en/projects/articles/project-costing).
\ No newline at end of file
+To learn about setup of Activity Type and Activity Cost, click [here](/docs/user/manual/en/projects/articles/project-costing).
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/regional/index.md b/erpnext/docs/user/manual/en/regional/index.md
index 5798860528..2598110d9c 100644
--- a/erpnext/docs/user/manual/en/regional/index.md
+++ b/erpnext/docs/user/manual/en/regional/index.md
@@ -1,3 +1,5 @@
+# Regional
+
ERPNext aims to support local regulation for all the regions in the world. In most cases ERPNext is very flexible so you can easily add Custom Fields and make Custom Reports to support the regluation of your region.
As of mid-2017, ERPNext aims to pre-set additional fields and forms required for companies to easily submit reports to the relevant authorities.
diff --git a/erpnext/docs/user/manual/en/regional/india/gst-remimders.md b/erpnext/docs/user/manual/en/regional/india/gst-remimders.md
index 97f016d234..b1061e4c5d 100644
--- a/erpnext/docs/user/manual/en/regional/india/gst-remimders.md
+++ b/erpnext/docs/user/manual/en/regional/india/gst-remimders.md
@@ -4,7 +4,7 @@ You can send email reminders to your Customers and Suppliers so that they can di
To send GSTIN Reminders, you can either open the Customer / Supplier record or **GST Settings**
-
+
Here you can click on the "Send GSTIN Update Reminders" button to send email reminders to all your customers
@@ -12,10 +12,10 @@ Here you can click on the "Send GSTIN Update Reminders" button to send email rem
Your customers will receive an email asking them to update their GSTIN and that email will link them to a portal page:
-
+
Here they can update their GSTIN and it will automatically be added to your customer GSTIN record.
#### Sample GSTIN Reminder Email
-
+
diff --git a/erpnext/docs/user/manual/en/regional/india/gst-setup.md b/erpnext/docs/user/manual/en/regional/india/gst-setup.md
index 49d75b1939..b89be539c1 100644
--- a/erpnext/docs/user/manual/en/regional/india/gst-setup.md
+++ b/erpnext/docs/user/manual/en/regional/india/gst-setup.md
@@ -4,7 +4,7 @@
GST Law requires that you maintain the GSTIN number for all your suppliers and vendors. In ERPNext, GSTIN is linked to the **Address**
-
+
**GST for your Company Address**
@@ -12,20 +12,20 @@ You also need to set the Address for your own Company and your Company's GST Num
Go to the Company master and add the GSTIN to your default address.
-
+
**Include GSTIN number in the Address Template**
Open Address Template record for India, add GSTIN number and State Code there if not exists.
-
+
### 2. Setting up HSN Codes
According to the GST Law, your itemised invoices must contain the HSN Code related to that Item. ERPNext comes pre-installed with all 12,000+ HSN Codes so that you can easily select the relevant HSN Code in your Item
-
+
### 3. Making Tax Masters
@@ -35,7 +35,7 @@ Go to your **Chart of Accounts**, under the Duties and Taxes head of your accoun
**Note:** Usually the rate in CGST and SGST is half of IGST. For example if most of your items are billed at 18%, then create IGST at 18%, CGST and SGST at 9% each.
-
+
### 4. Make Tax Templates
@@ -43,7 +43,7 @@ You will have have to make two tax templates for both your sales and purchase, o
In your **In State GST** template, select 2 accounts, SGST and CGST
-
+
In your **Out of State GST** template, select IGST
@@ -59,22 +59,22 @@ For **Sales Invoice**,
4. Select the the **In State GST** or **Out of State GST** template that you have created based on the type of transaction
5. Save and Submit the Invoice
-
+
### 6. Print GST Tax Invoice
To print Tax Invoice as per GSTN guidelines, please select **GST Tax Invoice** print format. This print format includes company address, GSTIN numbers, HSN/SAC Code and item-wise tax breakup. And while printing select correct value of Invoice Copy field, to mention whether it is for the Customer, Supplier or Transporter.
-
+
### Reports
ERPNext comes with most of your reports you need to prepare your GST Returns. Go to Accounts > GST India head for the list.
-
+
You can check the impact of your invoice in the **GST Sales Register** and **GST Itemised Sales Register**
-
+
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md
index 1538463b8d..fbaa70ff3f 100644
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md
@@ -1,13 +1,15 @@
+# Assessment Criteria
+
#Assessment Criteria
Assessment Criteria is the parameter based on which you assess the Student.
-
+
After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md
index ae67dba414..53e95a9548 100644
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md
@@ -1,13 +1,15 @@
+# Assessment Group
+
#Assessment Group
Assessment Group tree is a master where you can define the hierarchy for examination conducted in your education institute.
For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
-
+
On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md
index 85b03bfef0..8a3d42790d 100644
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md
@@ -1,3 +1,5 @@
+# Assessment Plan
+
#Assessment Plan
To schedule an assessment/examination for a Student Group, for specific Course, create Assessment Plan. In the Assessment Plan, you can also capture details like:
@@ -10,10 +12,10 @@ To schedule an assessment/examination for a Student Group, for specific Course,
4. Examiner and Supervisor
-
+
5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md
index 68d17e1d32..766f5d8119 100644
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md
@@ -1,7 +1,9 @@
+# Assessment Result
+
#Assessment Result
-Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool]({{docs_base_url}}/user/manual/en/schools/assessment/assessment_result_tool.html).
+Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/schools/assessment/assessment_result_tool.html).
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
index a1111ebf5a..3e608356d6 100644
--- a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
@@ -1,8 +1,10 @@
+# Assessment Result Tool
+
#Assessment Result Tool
Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student.
-
+
As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md
index c0a39cb6a5..11858dd4c5 100644
--- a/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md
+++ b/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md
@@ -1,7 +1,9 @@
+# Grading Scale
+
#Grading Scale
In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.md b/erpnext/docs/user/manual/en/schools/Assessment/index.md
index 3dab62a61e..2bbab8e713 100644
--- a/erpnext/docs/user/manual/en/schools/Assessment/index.md
+++ b/erpnext/docs/user/manual/en/schools/Assessment/index.md
@@ -1,3 +1,5 @@
+# Assessment
+
#Assessment
Every education institute organizes assessment / examination to evaluates progress of their Students. In ERPNext, you can manage complete assessment processing for your ERPNext account.
diff --git a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
index 060033cba0..2dcc6cb2ce 100644
--- a/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
+++ b/erpnext/docs/user/manual/en/schools/admission/program-enrollment.md
@@ -1,5 +1,7 @@
+# Program Enrollment
+
This form allows you to enroll a student to a program. A student can be enrolled to multiple programs.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
index 2b33cf957f..e67c1dc79e 100644
--- a/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
+++ b/erpnext/docs/user/manual/en/schools/admission/student-applicant.md
@@ -3,7 +3,7 @@
A Student Applicant record needs to be created when a student applies for a program at your institute.
You can Approve or Reject a student applicant. By accepting a student applicant you can add them to the student master.
-
+
### Application Status
@@ -21,8 +21,8 @@ You can Approve or Reject a student applicant. By accepting a student applicant
Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom,
-the system shall create a student against that applicant and redirect you to the [Program Enrollment form]({{docs_base_url}}/user/manual/en/schools/student/program-enrollment.html).
+the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html).
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/schools/fees/fee-category.md b/erpnext/docs/user/manual/en/schools/fees/fee-category.md
index d6694b503d..fbf43e6f23 100644
--- a/erpnext/docs/user/manual/en/schools/fees/fee-category.md
+++ b/erpnext/docs/user/manual/en/schools/fees/fee-category.md
@@ -2,6 +2,6 @@
List of all different type of fees collected.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/fee-structure.md b/erpnext/docs/user/manual/en/schools/fees/fee-structure.md
index 08d09e545e..a1dd9be6ad 100644
--- a/erpnext/docs/user/manual/en/schools/fees/fee-structure.md
+++ b/erpnext/docs/user/manual/en/schools/fees/fee-structure.md
@@ -2,6 +2,6 @@
A Fee Structure is a template that can be used while making fee records.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/fees.md b/erpnext/docs/user/manual/en/schools/fees/fees.md
index 242abf8797..f17720ce85 100644
--- a/erpnext/docs/user/manual/en/schools/fees/fees.md
+++ b/erpnext/docs/user/manual/en/schools/fees/fees.md
@@ -1,8 +1,8 @@
# Fees
Maintain a record of fees collected from students.
-The [Fee Structure]({{docs_base_url}}/user/manual/en/schools/fees/fee-structure.html) is fetched based on the selected Program and Academic Term.
+The [Fee Structure](/docs/user/manual/en/schools/fees/fee-structure.html) is fetched based on the selected Program and Academic Term.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/fees/index.md b/erpnext/docs/user/manual/en/schools/fees/index.md
index f75c53774f..c5be5f6810 100644
--- a/erpnext/docs/user/manual/en/schools/fees/index.md
+++ b/erpnext/docs/user/manual/en/schools/fees/index.md
@@ -2,7 +2,7 @@
This section contains 'Fee' related documents.
-
+
### Topics
diff --git a/erpnext/docs/user/manual/en/schools/index.md b/erpnext/docs/user/manual/en/schools/index.md
index e2172ff916..8c766d6db4 100644
--- a/erpnext/docs/user/manual/en/schools/index.md
+++ b/erpnext/docs/user/manual/en/schools/index.md
@@ -1,6 +1,8 @@
+# Schools
+
The School Modules is designed to meet requirements of Schools, Colleges & Educational Institutes.
-
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md b/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md
index 9c27f61ac7..9f7d980998 100644
--- a/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md
+++ b/erpnext/docs/user/manual/en/schools/schedule/course-schedule.md
@@ -3,13 +3,13 @@
Course Schedule is the schedule of a session conducted by an Instructor for a particular Course.
You can see the overall course schedule in the Calendar view.
-
+
### Marking Attendance
You can mark attendance for a Student Group against a Course Schedule.
-
+
- To make attendance, expand the attendance section.
- Check the students who were present for that session.
@@ -20,6 +20,6 @@ You can mark attendance for a Student Group against a Course Schedule.
Once you have marked Attendance against a Course Schedule the Attendance section in the Course Schedule shall be hidden.
A View Attendance button shall appear. Click on that button to view all attendance records created against that Course Schedule.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/examination.md b/erpnext/docs/user/manual/en/schools/schedule/examination.md
index cd5d8386b6..d167e9c56d 100644
--- a/erpnext/docs/user/manual/en/schools/schedule/examination.md
+++ b/erpnext/docs/user/manual/en/schools/schedule/examination.md
@@ -2,7 +2,7 @@
The Examination record can be used to track the exam schedule and the results of that exam.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/schedule/index.md b/erpnext/docs/user/manual/en/schools/schedule/index.md
index 3fd993ed03..57e578bd98 100644
--- a/erpnext/docs/user/manual/en/schools/schedule/index.md
+++ b/erpnext/docs/user/manual/en/schools/schedule/index.md
@@ -1,6 +1,6 @@
# Schedule
-
+
### Topics
diff --git a/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md b/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md
index 84b3908b17..9e13d6d0a6 100644
--- a/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md
+++ b/erpnext/docs/user/manual/en/schools/schedule/scheduling-tool.md
@@ -2,7 +2,7 @@
This tool can be used to create 'Course Schedules'.
-
+
### Creating Course Schedules
diff --git a/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md b/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md
index 474b543b50..84e1ea8669 100644
--- a/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md
+++ b/erpnext/docs/user/manual/en/schools/schedule/student-attendance.md
@@ -2,6 +2,6 @@
Maintains attendance record of the student. Attendance Records can be created against Course Schedules.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-term.md b/erpnext/docs/user/manual/en/schools/setup/academic-term.md
index dbce6d92ea..6306444b61 100644
--- a/erpnext/docs/user/manual/en/schools/setup/academic-term.md
+++ b/erpnext/docs/user/manual/en/schools/setup/academic-term.md
@@ -1,6 +1,6 @@
# Academic Term
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/academic-year.md b/erpnext/docs/user/manual/en/schools/setup/academic-year.md
index 4a153932bc..3913eb634b 100644
--- a/erpnext/docs/user/manual/en/schools/setup/academic-year.md
+++ b/erpnext/docs/user/manual/en/schools/setup/academic-year.md
@@ -1,5 +1,5 @@
# Academic Year
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/course.md b/erpnext/docs/user/manual/en/schools/setup/course.md
index da5fa379be..140131dccd 100644
--- a/erpnext/docs/user/manual/en/schools/setup/course.md
+++ b/erpnext/docs/user/manual/en/schools/setup/course.md
@@ -1,5 +1,5 @@
# Course
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/index.md b/erpnext/docs/user/manual/en/schools/setup/index.md
index 5a360ddecc..9de753614c 100644
--- a/erpnext/docs/user/manual/en/schools/setup/index.md
+++ b/erpnext/docs/user/manual/en/schools/setup/index.md
@@ -1,6 +1,6 @@
# Setup
-
+
### Topics
diff --git a/erpnext/docs/user/manual/en/schools/setup/instructor.md b/erpnext/docs/user/manual/en/schools/setup/instructor.md
index adbfe2a2f8..1a4d35161c 100644
--- a/erpnext/docs/user/manual/en/schools/setup/instructor.md
+++ b/erpnext/docs/user/manual/en/schools/setup/instructor.md
@@ -1,5 +1,5 @@
# Instructor
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/program.md b/erpnext/docs/user/manual/en/schools/setup/program.md
index 813019bfce..64513e20b0 100644
--- a/erpnext/docs/user/manual/en/schools/setup/program.md
+++ b/erpnext/docs/user/manual/en/schools/setup/program.md
@@ -1,5 +1,5 @@
# Program
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/setup/room.md b/erpnext/docs/user/manual/en/schools/setup/room.md
index 052e96204a..bb265e3ea2 100644
--- a/erpnext/docs/user/manual/en/schools/setup/room.md
+++ b/erpnext/docs/user/manual/en/schools/setup/room.md
@@ -1,6 +1,6 @@
# Room
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-batch.md b/erpnext/docs/user/manual/en/schools/student/student-batch.md
index 0f29d46031..4987c0313f 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-batch.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-batch.md
@@ -2,6 +2,6 @@
Student batch is a collection of students from Student Groups.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md b/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
index 1fcd87c745..130c94491e 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-group-creation-tool.md
@@ -1,6 +1,8 @@
+# Student Group Creation Tool
+
This tool allows you to create student groups in bulk. You can specify multiple parameters to create them.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-group.md b/erpnext/docs/user/manual/en/schools/student/student-group.md
index eaa60f78b0..191e917a8b 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-group.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-group.md
@@ -3,6 +3,6 @@
A student group is a collection of students taking a same course. You can create Course Schedules and Examinations against a Student Group.
A student group needs to be created for every course in a particular academic term and academic year.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/student/student-log.md b/erpnext/docs/user/manual/en/schools/student/student-log.md
index 787dacb471..a037a231ac 100644
--- a/erpnext/docs/user/manual/en/schools/student/student-log.md
+++ b/erpnext/docs/user/manual/en/schools/student/student-log.md
@@ -3,6 +3,6 @@
You can make a note of student activities using student log.
Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement'
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/schools/student/student.md b/erpnext/docs/user/manual/en/schools/student/student.md
index a86d36e8cc..dd99a80d2f 100644
--- a/erpnext/docs/user/manual/en/schools/student/student.md
+++ b/erpnext/docs/user/manual/en/schools/student/student.md
@@ -5,6 +5,6 @@ The student doctype maintains personal details of the student.
You can view everything related to a particular student on this page. Eg : Fees, Student Group, etc
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
index 1efed7592f..2589133ec0 100644
--- a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
+++ b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
@@ -1,3 +1,5 @@
+# Selling In Different Uom
+
#Selling in Different Unit (UoM)
A sell price unit of measure (UOM) is the UOM with which you price items. You can have multiple sell price UOMs for any inventory item. However, when Customer places, UoM for an item could change.
@@ -7,7 +9,7 @@ For example an Item Pen is stocked in Nos, but sold in Box. Hence we will make S
###Step 1: In the Item master, under Unit of Measure section, you can list all the possible UoM of an item, with its UoM Conversion Factor. Update UoM Conversion Factors
In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10.
-
+
###Setp 2: In the Sale Order, you will find two UoM fields
@@ -17,7 +19,7 @@ In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10.
In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Sale UoM (Box in this case). Updating Sales UoM is mainly for the reference of the Customer. In the print format, you will see item quantity in the Sales UoM.
-
+
Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you sell just one Box, then Qty as per stock UoM will be set as 10.
@@ -26,4 +28,4 @@ Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM
Irrespective of the Sales UoM selected in the Sale Order, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while selling item in different UoM.
-
+
diff --git a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
index 2725feefbe..fd96d466a4 100644
--- a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
+++ b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
@@ -1,3 +1,5 @@
+# Adding Margin
+
#Adding Margin
User Can apply the margin on Quotation Item and Sales Order Item using following two options.
@@ -9,7 +11,7 @@ To setup Pricing Rule, go to:
####Adding Margin in Pricing Rule
-
+
Total Margin is calculated as follows:
`Rate = Price List Rate + Margin Rate`
@@ -22,7 +24,7 @@ To add Price List, go to:
####Adding Item Price
-
+
2) Apply margin direct on Item: If user wants to apply the margin without pricing rule, they can use this option. In Quotation Item and Sales Order Item, user can select the margin type and rate or amount. The system will calculate the margin and apply it on price list rate to calculate the rate of the product.
@@ -34,4 +36,4 @@ add item and scroll down to section where you can find the Margin Type
####Adding Margin in Quotation
-
+
diff --git a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
index ad66ccc97c..a2a62a4f7a 100644
--- a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
+++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
@@ -1,3 +1,5 @@
+# Applying Discount
+
#Applying Discount
There are several ways Discount can be applied on an item in the sales transactions.
@@ -6,28 +8,28 @@ There are several ways Discount can be applied on an item in the sales transacti
You can find the Discount (%) field in the Item table. Discount (%) is applied on the Price List Rate to get the selling Rate of the Item.
-
+
The feature of Discount (%) is available in all sales and purchase transactions.
-You can use Pricing Rule for auto-application of Discount (%). [Click here to learn how Pricing Rule functions.]({{docs_base_url}}/user/manual/en/accounts/pricing-rule.html)
+You can use Pricing Rule for auto-application of Discount (%). [Click here to learn how Pricing Rule functions.](/docs/user/manual/en/accounts/pricing-rule.html)
#### 2. Discount on Net Total and Grand Total
In the "Additional Discount" section, you can apply discount as amount or as percentage.
-
+
##### Discount on Net Total
If Discount Amount is applied on **Net Total**, then item's Net Rate and Net Amount is calculated as per the Discount Amount. Net Rate and Amount field will be visible only if Discount is applied using this feature.
-
+
##### Discount on Grand Total
If Discount Amount is applied based on the **Grand Total**, then with item's Net Rate, Net Amount as well as taxes are also re-calculated as per Discount Amount.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md b/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
index 3990e7d309..0b41a64a4c 100644
--- a/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
@@ -1,8 +1,10 @@
+# Close Sales Order
+
#Close Sales Order
In the submitted Sales Orders, you will find **Stop** option. Stopping Sales Order will restrict user from creating Delivery Note and Sales Invoice against it.
-
+
####Scenario
@@ -10,7 +12,7 @@ An order is received for ten Wind Turbines. Sales Order is also created for ten
In this case, create Delivery Note and Sales Invoice will be created only for the seven units. And the Sales Order should be set as stopped.
-
+
Once Sales Order is set as stopped, you will not have pending quantities (three in this case) reflecting in Pending to Deliver and Pending to Invoice reports. To make further transactions against Stopped Sales Order, you should first Unstop it.
diff --git a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
index 2d12ff4a21..fd39d4804e 100644
--- a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -1,3 +1,5 @@
+# Drop Shipping
+
#Drop Ship
**Drop shipping** is a supply chain management technique in which the retailer does not keep goods in stock. Instead they transfer customer orders and shipment details to either the manufacturer, another retailer, or a wholesaler, who then ships the goods directly to the customer
@@ -10,19 +12,19 @@ In ERPNext, you can create a Drop Shipping by creating Purchase Order against Sa
Set **_Delivered by Supplier (Drop Ship)_** and **_Default Supplier_** in Item Master.
-
+
#### Setup on Sales Order
If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Sales Order Item.
You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
-
+
#### Create Purchase Order
After submitting a Sales Order, create Puchase Order.
-
+
From Sales Order, all items, having **Supplier delivers to Customer** checked or **Supplier**(matching with supplier selected on For Supplier popup) mentioned, will get mapped onto Purchase Order.
@@ -30,16 +32,16 @@ It will automatically set Customer, Customer Address and Contact Person.
After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order.
-
+
**_Close_**, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment.
-
+
###Drop Shipping Print Format
You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format.
-
+
###Video Help on Drop Ship
diff --git a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
index f905dfd511..09d071f302 100644
--- a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
+++ b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
@@ -1,3 +1,5 @@
+# Erpnext For Services Organization
+
#ERPNext for Service Organization
**Question:** ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by companies offering servies?
@@ -14,7 +16,7 @@ The setup for a Service company differs primarily for Items. They don't maintain
To create a Service (non-stock) Item, in the item master, uncheck "Maintain Stock" field.
-
+
When creating Sales Order for the services, select Order Type as **Maintenance**. Sales Order of Maintenance Type needs lesser details compared to stock item's order like Delivery Note, item warehouse etc.
@@ -32,11 +34,11 @@ Modules unchecked here will be hidden from all the User.
Within the form, there are many fields only needed for companies into trading and manufacturing businesses. These fields can be hidden for the service company. Feature Setup is a tool where you can enable/disable specific feature. If a feature is disabled, then fields relevant to that feature is hidden from all the forms. For example, if Serial No. feature is disabled, then Serial. No. field from Item as well as from all the sales and purchase transaction will be hidden.
-[To learn more about Feature Setup, click here.]({{docs_base_url}}/user/manual/en/customize-erpnext/hiding-modules-and-features.html).
+[To learn more about Feature Setup, click here.](/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.html).
####Permissions
-ERPNext is the permission controlled system. Users access system based on permissions assigned to them. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from that User. [Click here to learn more about permission management.]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions.html).
+ERPNext is the permission controlled system. Users access system based on permissions assigned to them. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from that User. [Click here to learn more about permission management.](/docs/user/manual/en/setting-up/users-and-permissions.html).
You can also refer to help video on User and Permissions setting in ERPNext.
diff --git a/erpnext/docs/user/manual/en/selling/articles/index.md b/erpnext/docs/user/manual/en/selling/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/selling/articles/index.md
+++ b/erpnext/docs/user/manual/en/selling/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
index 781d2ceece..8cbfd1f1d4 100644
--- a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
+++ b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
@@ -1,16 +1,18 @@
+# Sales Persons In The Sales Transactions
+
#Sales Persons in the Sales Transactions
-In ERPNext, Sales Person master is maintained in [tree structure]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters.html). Sales Person is selectable in all the sales transactions.
+In ERPNext, Sales Person master is maintained in [tree structure](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.html). Sales Person is selectable in all the sales transactions.
Sales Persons can be updated in the Customer master as well. On selection of Customer in the transactions, Sales Persons as updated in the Customer will fetch into sales transaction.
-
+
####Sales Person Contribution
If more than one sales persons are working together on an order, then contribution (%) should be set for each Sales Person.
-
+
On saving transaction, based on the Net Total and Contriution (%), `Contribution to Net Total` will be calculated for each Sales Person.
@@ -24,7 +26,7 @@ Check Sales Person's Transaction report from:
This report can be generated based on Sales Order, Delivery Note and Sales Invoice. It will give you total amount of sale made by an employe.
-
+
####Sales Person wise Commission
diff --git a/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md b/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
index d87ba36c4c..fc82ba4381 100644
--- a/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
+++ b/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
@@ -1,3 +1,5 @@
+# Shipping Rule
+
#Shipping Rule
Shipping Rule master helps in defining a rule based on which shipping charge is applied on a sales transactions.
@@ -10,7 +12,7 @@ To setup Shipping Rule, go to:
####Shipping Rule Conditions
-
+
Referring above, you will notice that shipping charges are reducing as valye is increasing. This shipping charge will only be applied if transaction total falls under one of the above range.
@@ -18,16 +20,16 @@ Referring above, you will notice that shipping charges are reducing as valye is
You can set Shipping Charges valid for all the countries, or specify specific Country. If specific countries mentioned, then Shipping Charges will be applied only if Customer's country matches Country mentioned in the Shipping Rule.
-
+
####Shipping Account
If shipping charges are applied based on Shipping Rule, then more values like Shipping Account, Cost Center will be needed as well to add row in the Taxes and Other Charges table of transaction. Hence these details are tracked as well in the Shipping Rule.
-
+
####Shipping Rule Application
Following is an example of how shipping charges is auto-applied on Sales Order based on Shipping Rule.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
index 1f7b06c45e..80af009ec8 100644
--- a/erpnext/docs/user/manual/en/selling/quotation.md
+++ b/erpnext/docs/user/manual/en/selling/quotation.md
@@ -1,3 +1,5 @@
+# Quotation
+
During a sale, the customer may request for a written note about the products
or services you are planning to offer, along with the prices and other terms
of engagement. This is called a “Proposal” or an “Estimate” or a “Pro Forma
@@ -5,7 +7,7 @@ Invoice”or a **Quotation**.
A typical Selling flow looks like:
-
+
To create a new Quotation navigate to:
@@ -15,7 +17,7 @@ To create a new Quotation navigate to:
You can also create a Quotation from an Opportunity.
-
+
A Quotation contains details about:
@@ -34,7 +36,7 @@ A Quotation contains details about:
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]({{docs_base_url}}/user/manual/en/setting-up/price-lists.html)
+ * 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](/docs/user/manual/en/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.
@@ -44,9 +46,9 @@ To add taxes to your Quotation, you can select a **Sales Taxes and Charges Templ
For e.g
-
+
-To understand taxes in detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
+To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html).
### Terms and Conditions
@@ -83,6 +85,6 @@ Print Heading.
While making your sales transactions like a Quotation (or Sales Order) you
can also give discounts to your customers. In the Discount section, add
-the discount in percentage or fixed amount. Read [Discount](https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount) for more explanation.
+the discount in percentage or fixed amount. Read [Discount](https://erpnext.org/docs/user/manual/en/selling/articles/applying-discount) for more explanation.
{next}
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index b103038036..05f178b154 100644
--- a/erpnext/docs/user/manual/en/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -11,7 +11,7 @@ a Sales Order.
### Sales Order Flow-Chart
-
+
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.
-
+
Or you can create a new Sales Order and pull details from an 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
@@ -56,9 +56,9 @@ To add taxes to your Quotation, you can select a **Sales Taxes and Charges Templ
For e.g
-
+
-To understand taxes in detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
+To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html).
### Sales Team
@@ -82,7 +82,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 Addresses you set in the 'Notification Email Address'field.
-
+
### Next Steps
diff --git a/erpnext/docs/user/manual/en/selling/setup/index.md b/erpnext/docs/user/manual/en/selling/setup/index.md
index 0ab4b5ab0b..48add3e986 100644
--- a/erpnext/docs/user/manual/en/selling/setup/index.md
+++ b/erpnext/docs/user/manual/en/selling/setup/index.md
@@ -1,3 +1,5 @@
+# Setup
+
This section includes information on how to setup customer groups, sales partners, sales persons and terms and conditions.
It has instructions on how to configure selling settings, in order to enable default fields.
diff --git a/erpnext/docs/user/manual/en/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
index 92b41fb185..7e352b9a15 100644
--- a/erpnext/docs/user/manual/en/selling/setup/item-price.md
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md
@@ -1,3 +1,5 @@
+# Item Price
+
Item Price is the record in which you can log sellig and buying rate of an item.
There are two ways to reach to new Item Price form.
@@ -14,7 +16,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.
-+
++
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -24,13 +26,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.
-+
++
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-+
++
Step 4: Save Item Price
diff --git a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
index 123eeaf963..b587374ed1 100644
--- a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
+++ b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
@@ -1,3 +1,5 @@
+# Product Bundle
+
#Product Bundle
Product Bundle can be seen as something like a "Bill-of-Material" on the Sales side. It's a master where you can list existing items which are bundled together and sold as a set (or bundle). For instance, when you sell a laptop, you need to ensure that charger, mouse and laptop bag are delivered with it and stock levels of these items get affected.
@@ -11,7 +13,7 @@ To create new Product Bundle, Go to:
Selling > Setup > Product Bundle > New
-
+
###Select Parent Item
@@ -33,7 +35,7 @@ Remember: The "Parent Item" is just virtual, so your main product (a laptop in o
When making Sales transactions (Sales Invoice, Sales Order, Delivery Note)
the Parent Item will be selected in the main item table.
-
+
On selection of a 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/manual/en/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
index 728218fc90..d8bf0d0377 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
@@ -1,3 +1,5 @@
+# Sales Partner
+
People who assist you in getting business are termed as Sales Partners. Sales Partners can be represented by different names in ERPNext. You can call them Channel Partner, Distributor, Dealer, Agent, Retailer, Implementation Partner, Reseller etc.
For each Sales Partner, you can define commission offer to them. When Sales Partner is selected in transactions, their commission is calculated over Net Total of Sales Order/Invoice or Delivery Note.
@@ -10,7 +12,7 @@ To create a sales partner go to:
Sales Partners are saved with Sales Partner name provided by user.
-
+
You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount.
@@ -19,13 +21,13 @@ 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.
-
+
To see listing of partner, you should go to:
https://example.erpnext.com/partners
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index 08bbd78236..874a95e8df 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -1,3 +1,5 @@
+# Sales Person Target Allocation
+
With management of Sales Person, ERPNext also allow you to assign target to Sales Persons based on Item Group and Territory. Based on target allocated and actual sales booked by Sales Person, you will get target variance report for the Sales Person.
###1. Sales Person - Item Groupwise Target Allocation
@@ -12,7 +14,7 @@ To allocate target, you should open specific Sales Person master.
In the Sales Person master, you will find table called Sales Person Target.
-
+
In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
@@ -23,7 +25,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 should setup Monthly 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).
-
+
####Report - Sales Person Target Variance Item Groupwise
@@ -34,7 +36,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.
-
+
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.
@@ -50,7 +52,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.
-
+
####2.2 Allocating Target
@@ -64,7 +66,7 @@ Using this Monthly Distribution document, you can divide target Qty or Amount ac
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.
-
+
---
@@ -76,13 +78,13 @@ To create new Monthly Distriibution, go to:
`Accounts > Monthly Distributon`
-
+
You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.
###See Also
-1. [Sales Person Target Allocation]({{docs_base_url}}/user/manual/en/selling/setup/sales-person-target-allocation)
-2. [Using Sales Person in transactions]({{docs_base_url}}/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions)
+1. [Sales Person Target Allocation](/docs/user/manual/en/selling/setup/sales-person-target-allocation)
+2. [Using Sales Person in transactions](/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions)
{next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/selling-settings.md b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
index d5d71173f2..96dbc29508 100644
--- a/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
+++ b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
@@ -1,7 +1,9 @@
+# Selling Settings
+
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.
-
+
####1. Customer Naming By
diff --git a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
index c4369cbf20..0d8c269fc2 100644
--- a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
+++ b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
@@ -1,6 +1,8 @@
+# Shipping Rule
+
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.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
index 505d6f3ab3..1a36d8a147 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
@@ -1,3 +1,5 @@
+# Change Password
+
#Change User Password
Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password.
@@ -5,11 +7,11 @@ Each ERPNext user can customize password for his/her ERPNext account. Also user
####Step 1: Go to My Setting
-
+
####Step 2: Set New Password
-
+
Enter the new password and save the form to save changes.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
index fa7614f491..66db2ecac4 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
@@ -1,3 +1,5 @@
+# Delete A Company And All Related Transactions
+
#Delete All Related Transactions for a Company
Often, users setup all the master data and then create a few dummy records. Then they want to delete the dummy records and the company and start over again, keeping the other master data like Customers, Items, BOMs intact.
@@ -12,7 +14,7 @@ In Company master, click on the **Delete Company Transactions** button right at
This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful
-
+
**Note:** If you want to delete the company record itself, use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
index 7148611edf..09f1f6b74b 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.md
@@ -1,3 +1,5 @@
+# Edit Submitted Document
+
#Edit Submitted Document
To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
@@ -6,19 +8,19 @@ To edit submitted document, you need to cancel it first. Followings are steps to
You will find Cancel button on upper right corner of submitted document.
-
+
####Step 2: Amend the document
On cancellation of submitted document, Amend button will be became visible.
-
+
####Step 3: Save and Submit the document
On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
-
+
+
Also, you can define other properties for new company like:
@@ -28,13 +30,13 @@ Also, you can define other properties for new company like:
Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement.
-
+
####Chart of Account for New Company
A separate Chart of Account master will be set for each company in the ERPNext. This allows you managing Accounts/Ledger master separately for each company. Also it allows you avail financial statement and reports like Balance Sheet and Profit and Loss Statement separately for each company.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
index f79229bb78..9923645d33 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -1,10 +1,12 @@
+# Managing Perm Level
+
#Managing Perm Level in Permission Manager
In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.
-Perm Level for a field can be defined in the [Customize Form]({{docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html).
+Perm Level for a field can be defined in the [Customize Form](/docs/user/manual/en/customize-erpnext/customize-form.html).
-
+
If you need to assign different permission of particular field to different users, you can achieve it via Perm Level. Let's consider an example for better understanding.
@@ -14,11 +16,11 @@ For the amount related fields, you should set Perm Level as (say) 2.
For Stock Manager, they will have permission on fields on Delivery Note as Perm Level 2 whereas a Stock User will not have any permission on Perm Level 2 for Delivery Note.
-
+
Considering the same scenario, if you want a Stock User to access a field at Perm Level 2, but not edit it, the Stock User will be assigned permission on Perm Level 2, but only for read, and not for write/edit.
-
+
Perm Level (1, 2, 3) not need be in order. Perm Level is primarily for grouping number of fields together, and then assigning permission to Roles for that group. Hence, you can set any perm level for an item, and then do permission setting for it.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
index 98e67c672e..021f36a100 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
@@ -1,3 +1,5 @@
+# Managing Tree Structure Masters
+
#Managing Tree Structure Masters
Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent master, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy.
@@ -24,7 +26,7 @@ Following are the steps to manage and create record in the tree structured maste
####Step 2 : Parent Territory
-
+
When click on Parent territory, you will see option to add child territory under it. All default Territory groups will be listed under Parent group called "All Territories". You can add further Parent or child Territory Groups under it.
@@ -42,11 +44,11 @@ If Group Node selected as Yes, then this Territory will be created as Parent, wh
+
Following is how Child Territories will be listed under a Parent Territory.
-
+
Following this steps, you can manage other tree masters as well in ERPNext.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
index 2e7145d85e..c6b6abe4ab 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
@@ -1,6 +1,8 @@
+# Naming Series Current Value
+
#Setting the Current Value for Naming Series
-Naming Series feature allows you to define prefix for naming of a documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO-00001, SO-00002... and so on. Click [here]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html) to learn how you can customize Number Series for a transaction/master in ERPNext.
+Naming Series feature allows you to define prefix for naming of a documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO-00001, SO-00002... and so on. Click [here](/docs/user/manual/en/setting-up/settings/naming-series.html) to learn how you can customize Number Series for a transaction/master in ERPNext.
### 1. Setting the Current Value
@@ -14,19 +16,19 @@ For example, you have 322 Sales Orders created in your old system with SO00322 a
#### Update Series Section
-
+
#### Select Prefix
Considering our scenario, prefix for Sales Order will be "SO".
-
+
#### Current Value
If you have currently 12 Sales Orders created in your account, then current value updated will be 12. You can edit Current Value to 322, and then click on Update Series Number.
-
+
With this setting, you will have numbering for the New Sales Orders starting with #323.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
index dafac3b7ea..4632af40a1 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md
@@ -1,3 +1,5 @@
+# Overwriting Data From Data Import Tool
+
#Overwriting Data from Data Import Tool
Data Import Tool allows importing documents (like customers, Suppliers, Orders, Invoices etc.) from spreadsheet file into ERPNext. The very same tool can also be used for overwrite values in the existing documents.
@@ -14,7 +16,7 @@ Template Used for overwriting data will be same as one used for importing new it
Since items to be over-written will be already available in the system, while downloading template, click on "Download with data" to get all the existing items in the template.
-
+
####Step 2: Prepare Data
@@ -22,7 +24,7 @@ In the template, we can only keep rows of the items to be overwritten and delete
Enter new value in the Item Group column for an item. Since Item Group is a master in itself, ensure Item Group entered in the spreadsheet file is already added in the Item Group master.
-
+
Since we are overwriting only Item Group, only following columns will be mandatory.
@@ -36,13 +38,13 @@ Columns of other field which won't have any impact can be removed, even if they
After updating Item Groups in spreadheet, come back to Data Import Tool in ERPNext. Browse and select the File/template which has data to be overwritten.
-
+
####Step 4: Upload
On clicking Import, Item Group will be over-written.
-
+
If validation of values fails, then it will indicate row no. of spreadsheet for which validation failed and needs correction. In that case, you should corrected value in that row of spreadsheet, and then import same file again. If validation fails even for one row, none of the records are imported/overwritten.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
index 643d243d27..71f7b8bf06 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
@@ -1,3 +1,5 @@
+# Rename User
+
#Rename User
Renaming functionality allows you to edit id of specific record. User is saved with person's Email Address. Only User with System Manager's role will be able to rename User IDs.
@@ -14,13 +16,13 @@ Open User to be renamed.
From Menu, select Rename.
-
+
#### Step 3: Update
Enter valid Email Address and click on Rename.
-
+
After successful renaming, User will be able login using updated user id.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md b/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
index ff631b1fc7..2d82a5337e 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
@@ -1,3 +1,5 @@
+# Using Custom Domain On Erpnext
+
If you have subscribed to any of the plans at [ERPNext](https://erpnext.com), you can have us serve your site on your custom domain (for example at http://example.com). This enables your website to be served on a custom domain.
diff --git a/erpnext/docs/user/manual/en/setting-up/authorization-rule.md b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
index f6daa1972e..822136696f 100644
--- a/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
+++ b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
@@ -1,3 +1,5 @@
+# Authorization Rule
+
Authorization Rule is a tool to define rule for conditional authorization.
If you sales and purchase transactions of higher value or discount requires an authorization from senior manager, you can set authorization rule for it.
@@ -34,7 +36,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.
-
+
If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message.
diff --git a/erpnext/docs/user/manual/en/setting-up/bar-code.md b/erpnext/docs/user/manual/en/setting-up/bar-code.md
index 2077842379..e317628af5 100644
--- a/erpnext/docs/user/manual/en/setting-up/bar-code.md
+++ b/erpnext/docs/user/manual/en/setting-up/bar-code.md
@@ -1,3 +1,5 @@
+# Bar Code
+
A Barcode is a machine-readable code in the form of numbers and a pattern of
parallel lines of varying widths, printed on a commodity and used especially
for stock control.
@@ -18,7 +20,7 @@ setup, check the box that says Item Barcode.
#### Figure 1: Check the box 'Item Barcode'
-
+
To start scanning with a bar-code, go to
@@ -39,7 +41,7 @@ Then go to Accounts and click on Sales Invoice. Check the box 'Is POS'
#### Figure 2: Check the box 'Is POS'
-
+
Go to Item and click on Add new row.
diff --git a/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md b/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
index 72f36c04b0..d591f4082e 100644
--- a/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
+++ b/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
@@ -1,3 +1,5 @@
+# Calculate Incentive For Sales Team
+
Can be used in any Sales Transaction with **Sales Team** Table:
diff --git a/erpnext/docs/user/manual/en/setting-up/company-setup.md b/erpnext/docs/user/manual/en/setting-up/company-setup.md
index 1a07b86b43..429e201d94 100644
--- a/erpnext/docs/user/manual/en/setting-up/company-setup.md
+++ b/erpnext/docs/user/manual/en/setting-up/company-setup.md
@@ -1,3 +1,5 @@
+# Company Setup
+
Enter your company details to complete Company Setup. Mention the type of
business, under Domain. You can enter manufacturing, retail, or services
depending on the nature of your business activity. If you have more than one
diff --git a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
index e1c8b135fd..57db1a5f36 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
@@ -12,4 +12,4 @@ 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**.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index a5dd9399a2..b9c6ccc1d2 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -1,8 +1,10 @@
+# Data Import Tool
+
The Data Import Tool is a great way to upload (or edit) bulk data, specially 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:
-
+
The tool has two sections, one to download a template and the second to upload
the data.
@@ -23,33 +25,33 @@ Item can have multiple prices, An Invoice has multiple Items and so on.
* Click on "Download Blank Template".
* For bulk editing, you can click on "Download With Data".
-
+
### 2\. Fill in the Template
After downloading the template, open it in a spreadsheet application and fill
in the data below the column headings.
-
+
Then export your template or save it as a Excel or Comma Separated Values (CSV)
file. To export the document in Excel tick the checkbox for Download in Excel File Format
-
+
### Download in Excel
-
+
### 3\. Upload the File ethier in .xlsx or .csv
Finally attach the file in the section. Click on the "Upload". Once the upload is successfull click Import"
button.
-
+
-
+
#### Notes:
diff --git a/erpnext/docs/user/manual/en/setting-up/email/.md b/erpnext/docs/user/manual/en/setting-up/email/.md
index 5e024b020b..5f85a8079d 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/.md
@@ -1,3 +1,5 @@
+#
+
Emails are the nervous system of business communication and ERPNext has been
designed to make good use of this.
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
index d5aca1a006..7e9b8a767b 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/en/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 IMAP or POP service. Most email providers such as GMail, Outlook or Yahoo provide these services.
-
+
### Outgoing Email Accounts
@@ -18,19 +18,19 @@ 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.
-
+
### 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.
-
+
### Setting Import Conditions for Email Import
Email Accounts allows you to set conditions according to the data of the incoming emails. The email will be imported to ERPNext only if the all conditions are true. For example if you want to import an email if the subject is "Some important email", you put doc.subject == "Some important email" in the conditions textbox. You can also set more complex conditions by combining them, as shown on the following screenshot.
-
+
### How ERPNext handles replies
@@ -40,6 +40,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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
index 8d239ea9bb..2b89d7d49e 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
@@ -32,13 +32,13 @@ To setup an Email Alert:
### Setting a Subject
You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject / message, you have to surround it with `{% raw %}{{ }}{% endraw %}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example to get the name of a document, you use `{% raw %}{{ doc.name }}{% endraw %}`. The below example sends an email on saving a Task with the Subject, "TASK##### has been created"
-
+
### Setting Conditions
Email alerts allow you to set conditions according to the field data in your documents. For example, if you want to recieve an Email if a Lead has been saved as "Interested" as it's status, you put `doc.status == "Interested"` in the conditions textbox. You can also set more complex conditions by combining them.
-
+
The above example will send an Email Alert when a Task is saved with the status "Open" and the Expected End Date for the Task is the date on or before the date on which it was saved on.
@@ -74,14 +74,14 @@ field.
Then you can use that as a condition in the **Condition** rules to ensure emails are not sent multiple times
-
+
### Example
1. Defining the Criteria
-
+
1. Setting the Recipients and Message
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-digest.md b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
index 5fa836e604..bceba37a95 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
+++ b/erpnext/docs/user/manual/en/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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
index d098d0c224..14dad78502 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
@@ -12,7 +12,7 @@ To add new User, go to:
`Setup > User > New User`
-
+
#### Step 2: Create Email Domain
@@ -22,7 +22,7 @@ To add new Email Domain, go to:
`Setup > Emails > Email Domain > New`
-
+
Once you have configured an Email Domain for your Email Service, it will be used for creating Email Accounts for all the Users in your ERPNext account.
@@ -43,44 +43,44 @@ Create an Email Account based on the Email ID of the User. For each User who's e
If you are creating an Email Account for your colleague who's Email Password is unknown to you, then check field "Awaiting Password". As per this setting, a User (for whom Email Account is created) will get a prompt to enter email password when accessing his/her ERPNext Account.
-
+
In the Email Account, select Email Domain only if you are using Email Service other than Email Services listed above. Else, you can just select Email Service, leave Email Domain blank and proceed forward.
-
+
>If you are creating an Email Account for Email Inbox of a User, then leave Append To field as blank.
-For more details on how to setup Email Account, [click here]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html").
+For more details on how to setup Email Account, [click here](/docs/user/manual/en/setting-up/email/email-account.html").
#### Step 4: Linking Email Account in User master
Once an Email Account is created for an User, select that Email Account in the User. This will ensure that emails pulled from the said Email ID will accessible only to this User in your ERPNext account.
-
+
## Email Inbox
If you have correctly configured Email Inbox as instructed above, then on the login of a User, Email Inbox icon will be visible. This will navigate user to Email Inbox view within the ERPNext account. All the Emails received on that email will be fetch and listed in the Email Inbox view. User will be able to open emails and take various actions against it.
-
+
#### Folders
In ERPNext, you can link multiple Email Accounts with the single User. To switch to Inbox of different email account and access other folders like Sent Emails, Spam, Trash, check Email Inbox option in the left bar.
-
+
#### Actions
On the emails in your inbox, you can take various actions like Reply, Forward, Mark as Spam or Trash.
-
+
#### Make Options
The Email Inbox within ERPNext also allow you to quickly create ERPNext transaction based on email received. From an Email itself, you can a Issue, Lead or Opportunity based on the context of the email.
-
+
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
index a27a2dcbdb..95db8bacc5 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
@@ -14,7 +14,7 @@ Or just type "Auto Email Report" on the Search bar.
Select the Report, the user for which you want to create this report (permissions will apply for this user), the Email Addresses where you want this report emailed and the frequency of the report.
-
+
#### Step 2
@@ -22,11 +22,11 @@ If your report has filters, you will see a table with the filters
Step 1. Select the Report, the user for which you want to create this report. Permissions will apply for this user
-
+
Click on the table to edit the table
-
+
#### Test
@@ -34,4 +34,4 @@ You can also test the report by clicking on "Download" or "Send Now"
Here is an example of the email you will receive for a report
-
+
diff --git a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
index 504c76d8fb..b4566de0ba 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
+++ b/erpnext/docs/user/manual/en/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.
-
+
-**Note:** You must have outgoing [email accounts]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html) setup for this.
+**Note:** You must have outgoing [email accounts](/docs/user/manual/en/setting-up/email/email-account.html) setup for this.
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md b/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md
index 4afaee1fed..7f873cee2f 100644
--- a/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md
@@ -6,12 +6,12 @@ Feedback Trigger.
To request a feedback manually go to respective document e.g. Sales Order, Issue etc.
and click on Ask a Feedback option in Menu.
-
+
Then, user can enter the feedback request details like email id, message and send the
feedback request mail.
-
+
Note. If Feedback Trigger is already configured for the document then system will fetch
Feedback Request details (email id, message)
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md b/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
index 0dbb3b7340..641d0a0b8d 100644
--- a/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
@@ -2,15 +2,15 @@
We can also Resend the Feedback Request to the Customer/User.
-
+
To resend the Feedback Request we will need to navigate the Communication by clicking the `Details` link on Timeline Feedback.
-
+
On Resend Button click a dialog with the Feedback Request message will appear user can either send the
Feedback Request with same message or he/she can make the changes in the Feedback Request message.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md b/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
index 373d703275..441e78eff0 100644
--- a/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
@@ -19,13 +19,13 @@ To Setup an Feedback:
### Setting a Subject
You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject/message, you have to surround it with `{% raw %}{{ }}{% endraw %}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example, to get the name of a document, you use `{% raw %}{{ doc.name }}{% endraw %}`. The below example sends an feedback request whenever Issue is Closed with the Subject, "ISS-##### Issue is Resolved"
-
+
### Setting Conditions
Feedback Trigger allows you to set conditions according to the field data in your documents. The feedback request email will be sent on document save only if the all conditions are true For example if you want to trigger the feedback request mail to a customer if an Issue is has been saved as "Closed" as it's status, you put `doc.status == "Closed"` in the conditions textbox. You can also set more complex conditions by combining them.
-
+
### Setting a Message
@@ -45,9 +45,9 @@ You can use both Jinja Tags (`{% raw %}{{ doc.[field_name] }}{% endraw %}`) and
### Example
1. Setting up Feedback Trigger
- 
+ 
1. Setting the Recipients and Message
- 
+ 
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md b/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md
index 9069f3721b..663aae1cfd 100644
--- a/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md
@@ -3,17 +3,17 @@
Once feedback request mail is sent the user/customer. He/She can visit the URL to submit the feedback
as well as rating for the document.
-
+
Once Feedback is submitted the feedback details message and ratings will be recorded and will be shown on Document sidebar and timeline. Also once the Feedback is successfully submitted by the user the link shared to the user will be expired and can not be used to submit the Feedback again.
On Document sidebar the latest feedback ratings will displayed.
-
+
Also, The Feedback details such as Feedback message and ratings will be shown in the Document's Timeline along
with Comment, Email.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md b/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md
index 0839072b45..37f74a2c85 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/dropbox-backup.md
@@ -1,3 +1,5 @@
+# Dropbox Backup
+
#Setting Up Dropbox Backups
We always recommend customers to maintain backup of their data in ERPNext. The database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well.
@@ -11,7 +13,7 @@ To setup Dropbox Backup,
Set Frequency to download backup in your Dropbox account.
-
+
####Step 2: Allow Dropbox Access
@@ -21,13 +23,13 @@ After setting frequency and updating other details, click on `Allow Dropbox acce
Login to your Dropbox account by entering login credentials.
-
+
####Step 4: Allow
On successful login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
-
+
With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
@@ -39,18 +41,18 @@ With this, a folder called "ERPNext" will be created in your Dropbox account, an
####Step 2:Create a new app
-
+
####Step 3: Fill in details for the app
-
+
-
-
+
####Step 4: Setup Redirect URL in app
-
+
####Step 5: Settings in Site Config
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/index.md b/erpnext/docs/user/manual/en/setting-up/integrations/index.md
index e7b5a61d16..ed5a56eb76 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/index.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/index.md
@@ -1,3 +1,5 @@
+# Integrations
+
Integration Services is platform to configure 3rd Party Services.
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md
index ec6e8487b1..759077a289 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/ldap-integration.md
@@ -1,3 +1,5 @@
+# Ldap Integration
+
#Setting up LDAP
Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations.
@@ -11,9 +13,9 @@ To setup LDAP,
To enable ldap service, you need to configure parameters like LDAP Server Url, Organizational Unit, UID, Base Distinguished Name (DN) and Password for Base DN
-
+
After setting up LDAP parameters, on login screen, the system enables **Login Via LDAP** option.
-
+
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md
index 314eb64a9d..8b309e806f 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/paypal-integration.md
@@ -1,3 +1,5 @@
+# Paypal Integration
+
#Setting up PayPal
A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
@@ -11,17 +13,17 @@ To setup PayPal ,
To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature.
-
+
You also can set test payment environment, by settings `Use Sandbox`
On enabling service, the system will create Payment Gateway record and Account head in chart of accounts having account type as Bank.
-
+
Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-
+
After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
@@ -33,20 +35,20 @@ AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, TWD, NZD, NOK, PHP,
#### Paypal Sanbox API Signature
- Login to paypal developer account, PayPal Developer Account
- From **Accounts** tab. create a new business account.
-
+
- From this account profile you will get your sandbox api credentials
-
+
---
#### PayPal Account API Signature
- Login to PayPal Account and go to profile
-
+
- From **My Selling Tools** go to **api Access**
-
+
- On API Access Page, choose option 2 to generate API credentials
-
+
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
index 09cd9114c4..ac8bfd7f4e 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/razorpay-integration.md
@@ -1,3 +1,5 @@
+# Razorpay Integration
+
#Setting up Razorpay
A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
@@ -10,15 +12,15 @@ To setup Razorpay,
#### Setup Razorpay
To enable Razorpay payment service, you need to configure parameters like API Key, API Secret
-
+
On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
-
+
Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-
+
After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
diff --git a/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md b/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md
index 05f70f0d4a..6915a9c86b 100644
--- a/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md
+++ b/erpnext/docs/user/manual/en/setting-up/integrations/stripe-integration.md
@@ -1,3 +1,5 @@
+# Stripe Integration
+
#Setting up Stripe
To setup Stripe,
@@ -6,15 +8,15 @@ To setup Stripe,
#### Setup Stripe
To enable Stripe payment service, you need to configure parameters like Publishable Key, Secret Key
-
+
On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
-
+
Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
-
+
After configuring Payment Gateway Account your system is able to accept online payments.
diff --git a/erpnext/docs/user/manual/en/setting-up/pos-setting.md b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
index 9bfd8198f2..375c251b5c 100644
--- a/erpnext/docs/user/manual/en/setting-up/pos-setting.md
+++ b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
@@ -1,4 +1,4 @@
-# Point of Sale Setting
+# Point of Sale Profile
POS includes advanced features to cater to different functionality, such as
inventory management, CRM, financials, warehousing, etc., all built into the
@@ -10,14 +10,20 @@ If you are in retail operations, you want your Point of Sale to be as quick
and efficient as possible. To do this, you can create a POS Setting for a user
from:
-> Accounts > Setup > Point-of-Sale Setting
+> Accounts > Setup > Point-of-Sale Profile
Set default values as defined.
-
+
+
+To set the default mode of payment, enabled the option default in the mode of payments table
+
+
+User can sale the particular products to the particular customers from the POS by adding item groups, customer groups in the POS Profile.
+
> 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]({{docs_base_url}}/user/manual/en/accounts/point-of-sale-pos-invoice.html)
+be set for all users. To understand POS in detail visit [Point of Sale](/docs/user/manual/en/accounts/point-of-sale-pos-invoice.html)
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/price-lists.md b/erpnext/docs/user/manual/en/setting-up/price-lists.md
index a42afb964a..a9655817a3 100644
--- a/erpnext/docs/user/manual/en/setting-up/price-lists.md
+++ b/erpnext/docs/user/manual/en/setting-up/price-lists.md
@@ -1,3 +1,5 @@
+# Price Lists
+
ERPNext lets you maintain multiple selling and buying prices for an Item using Price Lists. A PriceList is a name you can give to a set of Item prices.
Why would you want Price Lists? You have different prices for different zones (based on the shipping costs), for different currencies etc.
@@ -8,7 +10,7 @@ You can create new Price List
> Selling/Buying/Stock > Setup > Price List >> New
-
+
* 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/manual/en/setting-up/print/address-template.md b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
index 53dfef1bfe..34df11c69d 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/address-template.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
@@ -26,6 +26,6 @@ Here is the default template:
### Example
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
index 44dd412f12..3a4566a72e 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
@@ -1,8 +1,10 @@
+# Cheque Print Template
+
#Cheque Print Template
Business involves making payment to various parties like suppliers and employees. Payment can be made in various modes like cash, NEFT or cheque. If you are making a payment via cheque, you can also create a Print Format for printing Cheque from ERPNext based on the Payment Entry.
-
+
Using the Cheque Print Template you can generate a new Print Format based. It will be created based the cheque format provided by your bank.
@@ -14,13 +16,13 @@ To create a new Print Format based on the specific cheque’s format, go to:
In the Cheque Print Template, for each value (say Payee, Date), exact co-ordinates are provided based on where that value should be printed on a cheque. Co-ordinates are provided in centi-meter.
-
+
####New Format via Scanning
To speed up creation of a new cheque printing format, you can upload scanned image of the cheque. Considering the scanned image for the cheque, system automatically updates co-ordinates for each value like party name, amount, date, amount in words etc.
-
+
####New format by manual entry
You can manually provide the co-ordinate for each value based on where you want to to be printed on the cheque.
@@ -28,18 +30,18 @@ You can manually provide the co-ordinate for each value based on where you want
####Preview
Based on co-ordinates provided for all the values, a preview be shown as to how the values will be printed on the cheque.
-
+
####New Print Format
If the preview looks promising, click on the button to create a new Print Format for printing cheque. Based on the values provided in the Cheque Print Template, the system will auto-generate an HTML script for the cheque’s Print Format.
-
+
####Printing Cheque
New print format generated for the cheque will be visible in the Payment Entry form. After creating the payment entry, you will be able to print transaction details on the cheque.
-
+
diff --git a/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
index 1dab1c1547..fe5a0d19af 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
@@ -1,3 +1,5 @@
+# Custom Translations
+
#Custom Translations
User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature.
@@ -6,11 +8,11 @@ User can print the customer's and supplier's document in their local language. F
In the Customer master, select default Language. Say default language for the Customer is deutsch.
-
+
Same way, you can also set default language in the Supplier master.
-
+
####Print Preview in the Party's Language
@@ -18,17 +20,17 @@ In the Print Preview of a transaction, values will be translated into party's la
Customer Quotation print preview in customer's default language.
-
+
Supplier Quotation print preview in supplier's default language.
-
+
####What to do if want to print with another language?
User can have option to select alternate language on print view.
-
+
####Custom Translation
@@ -36,11 +38,11 @@ User can set their custom translations using translation form. For example user
`Setup > Settings > Translation List > New`
-
+
The translation is applied when user select language as Italiano on supplier quotation's print preview.
-
+
diff --git a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
index 72b79e1ad9..1243903444 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
@@ -1,3 +1,5 @@
+# Letter Head
+
#Letter Head
Each company has default Letter Head for their company. This Letter Head values are generally set as Header and Footer in the documents. In ERPNext, you can capture the these details in the Letter Head master.
@@ -19,7 +21,7 @@ Following is how you can enter details in the Letter Head.
* Logo Image: You can insert the image in your Letter Head record by clicking on image icon. Once image is inserted, HTML for it will be generated automatically.
* Other information (like Address, tax ID etc.) that you want to put on your letter head.
-
+
> If you want to make this the default letter head, click on “Is Default”.
@@ -31,7 +33,7 @@ After enter values in the Header and Footer section, Save Letter Head.
This is how the letter head looks in a document's print.
-
+
> Please note that Footer will be visible only when document's print is seen in the PDF. Footer will not be visible in the HTML based print preview.
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
index f9799279af..4e94045924 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
+++ b/erpnext/docs/user/manual/en/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
-
+
### 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.
-
+
### Step 3
To remove a field, just drag it back into the fields sidebar.
-
+
### 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.
-
+
To save your format, just click on the **Save** button on the top.
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
index 98fbf53df0..de3395bca3 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
@@ -1,3 +1,5 @@
+# Print Headings
+
Print Headings are the names which you can give to your sales invoices,
supplier quotations etc. You can create a list of names for different business
communications.
@@ -8,10 +10,10 @@ You can create print headings from :
#### Figure 1: Save Print Heading
-
+
Example of a change in print heading is shown below:
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-settings.md b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
index cdf3c54a37..220b467501 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
@@ -6,6 +6,6 @@ To edit print settings, go to:
> Setup > Printing and Branding > Print Settings
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
index 7340f17f38..28e803da99 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
@@ -1,3 +1,5 @@
+# Terms And Conditions
+
Terms and conditions are the general and special arrangements, provisions, requirements, rules, specifications, and standards that a company follows. These specifications are an integral part of an agreement or contract that the company gets into with its customers, suppliers or partners.
### 1. Make a new Terms and Conditions
@@ -6,13 +8,13 @@ To setup Terms and Condition master, go to:
`Selling > Terms and Condition > New`
-
+
### 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.
-
+
This also allows you to use Terms and Condition master for footer, which otherwise is not available 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 +22,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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md b/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md
index e18ad053bf..ca0c32a4a0 100644
--- a/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-company-sales-goal.md
@@ -2,14 +2,14 @@
Monthly sales targets can be set for a company via the Company master. By default, the Company master dashboard features past sales stats.
-
+
You can set the **Sales Target** field to track progress to track progress with respect to it.
-
+
The target progress is also shown in notifications:
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
index a3c11ab2f0..18f2f015a5 100644
--- a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -1,3 +1,5 @@
+# Setting Up Taxes
+
One of the primary motivator for compulsory use of accounting tools is
calculation of Taxes. You may or may not make money but your government will
(to help your country be safe and prosperous). And if you don’t calculate your
@@ -22,11 +24,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.
-
+
* **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive.
-
+
* **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 +51,7 @@ have to go to:
> Setup > Accounts > Sales Taxes and Charge Master
-
+
When you create a new master, you will have to add a row for each tax type.
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
index 412572a820..87ebcba06a 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
+++ b/erpnext/docs/user/manual/en/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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
index 3e2a109dad..f6ede50fec 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
+++ b/erpnext/docs/user/manual/en/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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
index 086a272821..71029bcbe3 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/en/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
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
index b436b46dee..43f47f1301 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
@@ -8,6 +8,6 @@ To open System Settings, go to:
> Setup > Settings > System Settings
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
index 00219fd6a0..c8fba43408 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
@@ -2,7 +2,7 @@
Select your language. ERPNext is available in more than 20 languages.
-
+
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
index bc71b9859b..837c3335c4 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
+++ b/erpnext/docs/user/manual/en/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.
+
---
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
index b9eff18025..5d6002aef0 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
@@ -3,7 +3,7 @@
Enter Users Profile Details like Name, User ID and preferred password.
+
> Note: the string up to the "?" is the SMS Gateway URL
@@ -36,6 +36,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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
index 743f398f4d..36ad65a7c8 100644
--- a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
+++ b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -1,3 +1,5 @@
+# Stock Reconciliation For Non Serialized Item
+
Stock Reconciliation is the process of counting and evaluating stock-in-trade,
usually at an organisations year end in order to value the total stock for
preparation of the accounts. In this process actual physical stocks are
@@ -27,17 +29,17 @@ 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.
-
+
#### Step 2: Enter Data in csv file.
-
+
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.
#### Step 3: Upload file and Enter Values in Stock Reconciliation Form
-
+
**Posting Date**
@@ -59,11 +61,11 @@ report. The report will show you all types of rates.
#### Step 4: Review the reconciliation data
-
+
### Stock Ledger Report
-
+
**How Stock Reconciliation Works**
diff --git a/erpnext/docs/user/manual/en/setting-up/territory.md b/erpnext/docs/user/manual/en/setting-up/territory.md
index 3a1abfdfdd..c82bfe4a1f 100644
--- a/erpnext/docs/user/manual/en/setting-up/territory.md
+++ b/erpnext/docs/user/manual/en/setting-up/territory.md
@@ -1,3 +1,5 @@
+# Territory
+
If your business operates in multiple Territories (could be countries, states
or cities) it is usually a great idea to build your structure in the system.
Once you group your Customers by Territories, you can set annual targets for
@@ -5,6 +7,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.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
index 6fb64df37e..16bf19e826 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
@@ -11,7 +11,7 @@ Important is to realize that the email address is the unique key (ID) identifyin
### 1. List of Users
-
+
To add a new user, click on "New"
@@ -22,8 +22,8 @@ Add user details such as First Name, Last Name, Email etc.
The user's Email will become the user id. Mobile No can also be used to log in if you check the Allow Login using Mobile No checkbox under the Security section in System Settings. While Mobile No will be unique, it will not be treated as a user id.
-
-
+
+
After adding these details, save the user.
@@ -32,19 +32,19 @@ After adding these details, save the user.
After saving, you will see a list of roles and a checkbox next to it. Just check the roles you want the user to have and save the document. To click on what permissions translate into roles, click on the role
name.
-
+
### 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.
-
+
### 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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
index 05ad06012d..dcfd77649c 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
@@ -1,3 +1,5 @@
+# Users And Permissions
+
In ERPNext, you can create multiple users and assign them different roles. There are some users which can only access the public facing part of ERPNext (i.e. the website). Such users are called "Website Users".
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
index 0c4042c154..6f11ecb563 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
+++ b/erpnext/docs/user/manual/en/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
-
+
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]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
+ > Setup > Permissions > [User Permissions Manager](/docs/user/manual/en/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.
-
+
1. **It should be created by an Employee.**
For this, Employee Role should be given Read, Write, Create permissions.
-
+
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.)
-
+
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.
-
+
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.)
-
+
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.
-
+
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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md
index 3a26a328f6..5483af7246 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md
@@ -5,10 +5,10 @@ In ERPNext, user can make his custom user interface using Page and the custom re
If user has enabled the developer mode, then they can add the roles directly in the page and report record. But in that case, the permissions will also be reflected in the json file for the page / report.
### For Page
-
+
### For Report
-
+
## Tool for custom roles assignment
@@ -16,10 +16,10 @@ If developer mode is disabled, then user can assign the roles to the page and re
To access, goto Setup > Permissions > Role Permission for Page and Report
-
+
### Reset to defaults
Using "Reset to Default" button, user can remove the custom permissions applied on a page or report. Then default permissions will be applicable on that page or report.
-
+
diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
index a939e656fe..23e5b32cb8 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
+++ b/erpnext/docs/user/manual/en/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/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
index 7fae95cbe7..896fd85479 100644
--- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -1,60 +1,52 @@
# User Permissions
-Role Base Permissions define the periphery of document types within which a user with a set of Roles can move around in. However, you can have an even finer control by defining User Permissions for a User. By setting specific documents in User Permissions list, you can limit access for that User to specific documents of a particular DocType, on the condition that "Apply User Permissions" is checked in Role Permissions Manager.
+Along with Role based permissions, you can also set user level permissions that are based on rules that are evaluated against the data containted in the document being accessed. This is particularly useful when you want to restrict based on:
-To start with, go to:
+1. Allow user to access data belonging to one Company
+1. Allow user to access data related to a specific Customer or Territory
-> Setup > Permissions > User Permissions Manager
+### Creating User Permissions
-User Permissions Manager displaying how users can access only a specific Company.
+To create a User Permission, go to Setup > Permission > User Permissions
-#### Example
+When you create a new record you will have to specify
-User 'tom.hagen@riosolutions.com' has Sales User role and we want to limit the user to access records for only a specific Company 'Rio Solutions'.
+1. The user for which the rule has to be applied
+1. The type of document which will be allowed (for example "Company")
+1. The specific item that you want to allow (the name of the "Company)
- 1. We add a User Permissions row for Company.
-
- 
+
- Add User Permissions row for a combination of User 'tom.hagen@riosolutions.com' and Company 'Rio Solutions'.
+If you want to apply the permissions to all Roles for that user, keep the "Apply Permissions for all Roles of this User" checked. If you check this, it will automatically setup the rules for Roles to check for User Permissions.
- 1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked.
-
- 
+### Choosing Which Roles to Apply
- Read Permission with Apply User Permissions checked for DocType Company.
+You can also manually edit the the roles for which you want the user permissions to apply. To do that go the the **Role Permission Manager** and select the role for which you want to Edit the User Permissions.
- 1. The combined effect of the above two rules lead to User 'tom.hagen@riosolutions.com' having only Read access to Company 'Rio Solutions'.
-
- 
-
- Access is limited to Company 'Rio Solutions'.
+Note that the "Apply User Permissions" is already checked for this role. Then click on "Select Document Types"
- 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 'tom.hagen@riosolutions' to acces these documents having Company 'Rio Solutions'.
+
- 
-
- Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked.
+Here you will see that Company has already been checked. If you want user permissions not be applied for that particular rule, you can un check it.
- 
+
- Quotation List is limited to results for Company 'Rio Solutions' for User 'tom.hagen@riosolutions.com'.
+### Ignoring User Permissions on Certain Fields
- 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.
-
-
+Another way of allowing documents to be seen that have been restricited by User Permissions is to check "Ignore User Permissions" on a particular field by going to **Customize Form**
-Sales User can Read, Write and Create Leads limited by User Permissions.
+For example you don't want Assets to be restricited for any user, then select **Asset** in **Customize Form** and in the Company field, check on "Ignore User Permissions"
-
+
-Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.
+### Strict Permisssions
-
+Since User Permissions are applied via Roles, there may be many users belonging to a particular Role. Suppose you have three users belonging to Role "Accounts User" and you have applied **User Permissions** to only one user, then the permissions will only be restricted to that user.
-Due to the effect of the above combination, User 'tom.hagen@riosolutions.com' can only access Leads with Territory 'United States'.
+You can change this setting incase you want the user permissions to be assigned to all users, even if they are not assigned any user permissions by going to **System Settings** and checking "Apply Strict User Permissions"
-{next}
+### Checking How User Permissions are Applied
+Finally once you have created your air-tight permission model, and you want to check how it applies to various users, you can see it via the **Permitted Documents for User** report. Using this report, you can select the **User** and document type and check how user permissions get applied.
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
index bedb6db05e..4b2cabbba7 100644
--- a/erpnext/docs/user/manual/en/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md
@@ -1,3 +1,5 @@
+# Workflows
+
In order to allow multiple people to submit multiple requests, for approvals,
by multiple users, ERPNext requires you to fill the workflow conditions.
ERPNext tracks the multiple permissions before submission.
@@ -11,7 +13,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.
-
+
To make this Workflow and transition rules go to :
@@ -19,11 +21,11 @@ To make this Workflow and transition rules go to :
#### Step 1: Enter the different states of Leave Approval Process.
-
+
#### Step 2: Enter Transition Rules.
-
+
#### Notes:
@@ -46,15 +48,15 @@ workflow transition step that says from submitted you can cancel.
When a Leave Application is saved by Employee, the status of the document changes to "Applied"
-
+
When the HR User logs in, he can either Approve or Reject. If approved the
status of the document changes to "Approved by HR". However, it is yet to be approved by Leave Approver.
-
+
When the Leave Approver opens the Leave Application page, he can finally "Approve" or "Reject" the Leave Application.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
index b758ff7f0e..96b792db72 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
@@ -1,3 +1,5 @@
+# Accounting Of Inventory Stock
+
The value of available inventory is treated as an Asset in company's Chart of
Accounts. Depending on the type of items, it can be treated as Fixed Asset or
Current Asset. To prepare Balance Sheet, you should make the accounting
@@ -19,7 +21,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]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html)
+[examples](/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html)
#### **Advantages**
@@ -64,6 +66,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]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
+[Migration From Periodic Inventory](/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
{next}
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
index 38ae8974da..0e4d2d7be5 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
@@ -1,3 +1,5 @@
+# Migrate To Perpetual Inventory
+
Perpetual Inventory Valuation is activated by default in the system.
For the users who are currently following periodic inventory valuation system, and wish to migrate to perpetual inventory valuation system, please follow the steps explained below.
@@ -20,7 +22,7 @@ Steps:
`Explore > Accounts > Accounts Settings`
- 
+ 
* 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/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
index 343e3f4769..90bdbbf5e3 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -1,3 +1,5 @@
+# Perpetual Inventory
+
As per the perpetual inventory system, accounts posting is done for every stock transaction.
On creating new Warehouse, the system will automatically create an Account in the Chart of Account, with the same name as Warehouse Name.
@@ -10,7 +12,7 @@ On receipt of items in a particular warehouse, the balance in the Warehouse Acco
> Setup > Company > Stock Settings > "Enable Perpetual Inventory"
-
+
* Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts.
@@ -131,11 +133,11 @@ Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of it
**Stock Ledger**
-
+
**General Ledger**
-
+
As stock balance increases through Purchase Receipt, "Store" accounts are debited and a temporary account "Stock Receipt But Not Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
@@ -147,7 +149,7 @@ On receiving Bill from supplier, for the above Purchase Receipt, you will make P
**General Ledger**
-
+
Here "Stock Received But Not Billed" account is debited and nullified the
effect of Purchase Receipt.
@@ -205,11 +207,11 @@ at $300. Following are the details of Delivery Note:
**Stock Ledger**
-
+
**General Ledger**
-
+
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
@@ -238,11 +240,11 @@ of the Sales Invoice are same as the above Delivery Note.
**Stock Ledger**
-
+
**General Ledger**
-
+
Here, apart from normal account entries for invoice, "Stores" and "Cost of
Goods Sold" accounts are also affected based on the valuation amount.
@@ -276,11 +278,11 @@ Goods Sold" accounts are also affected based on the valuation amount.
**Stock Ledger**
-
+
**General Ledger**
-
+
* * *
@@ -311,11 +313,11 @@ Goods Sold" accounts are also affected based on the valuation amount.
**Stock Ledger**
-
+
**General Ledger**
-
+
* * *
@@ -348,10 +350,10 @@ Goods Sold" accounts are also affected based on the valuation amount.
**Stock Ledger**
-
+
**General Ledger**
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
index 9b140a64a9..58384326d4 100644
--- a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
+++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
@@ -1,8 +1,10 @@
+# Allow Over Delivery Billing Against Sales Order Upto Certain Limit
+
#Allow Over Delivery/Billing
While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master.
-
+
Item's and Rate is also validated when creating Sales Invoice from Sales Order. Also when creating Purchase Receipt and Purchaes Invoice from Purchase Order. Updating "Allow over delivery or receipt upto this percent" will be affective in all sales and purchase transactions.
@@ -16,7 +18,7 @@ Update global value for "Allow over delivery or receipt upto this percent" from
3. Save Stock Settings.
-
+
diff --git a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
index 02d88d8d3f..2d5e935219 100644
--- a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
+++ b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
@@ -1,20 +1,22 @@
+# Auto Creation Of Material Request
+
#Auto Creation of Material Request
To prevent stockouts, you can track item's reorder level. When stock level goes below reorder level, purchase manager is notified and instructed to initiate purchase process for the item.
In ERPNext, you can update item's Reorder Level and Reorder Qty in the Item master. If same item has different reorder level, you can also update warehouse-wise reorder level and reorder qty.
-
+
With reorder level, you can also define what should be the next action. Either new purchase or transfer from another warehouse. Based on setting in Item master, purpose will be updated in the Material Request as well.
-
+
When item's stock reaches reorder level, Material Request is auto-created automatically. You can enable this feature from:
`Stock > Setup > Stock Settings`
-
+
A separate Material Request will be created for each item. User with Purchase Manager's role will receive email alert about these Material Requests.
@@ -23,5 +25,5 @@ If auto creation of Material Request is failed, User with Purchase Manager role
**An error occurred for certain Items while creating Material Requests based on Re-order level.**
**Date 01-04-2016 not in any Fiscal Year.**
-One of the reason of error could be Fiscal Year as well. Click [here]({{docs_base_url}}/user/manual/en/accounts/articles/fiscal-year-error.html) to learn more about it.
+One of the reason of error could be Fiscal Year as well. Click [here](/docs/user/manual/en/accounts/articles/fiscal-year-error.html) to learn more about it.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
index 491427c3f2..fbe00cb6a8 100644
--- a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md
@@ -1,8 +1,10 @@
+# Creating Depreciation For Item
+
#Depreciation Entry
**Question:** A Fixed Asset Item has been purchased and stored in a warehouse. How to create a depreciation for a Fixed Asset Item?
-**Answer:**You can post asset depreciation entry for the fixed asset item via [Stock Reconciliation]({{docs_base_url}}/user/manual/en/stock/opening-stock.html) Entry.
+**Answer:**You can post asset depreciation entry for the fixed asset item via [Stock Reconciliation](/docs/user/manual/en/stock/opening-stock.html) Entry.
####Step 1:
@@ -13,7 +15,7 @@ In the Attachment file, fill in the appropriate columns;
- **Qty (Quantity)** Leave this column blank.
- **Valuation Rate** will be item's value after depreciation.
-
+
After updating Valuation Rate for an item, come back to Stock Reconciliation and upload save .csv file.
@@ -21,7 +23,7 @@ After updating Valuation Rate for an item, come back to Stock Reconciliation and
Select Expense account for depreciation in **Difference Account**. Value booked in the depreciation account will be the difference of old and next valuation rate of the fixed asset item, which will be actually the depreciation amount.
-
+
####Stock Reconciliation Help Video
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.md b/erpnext/docs/user/manual/en/stock/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/stock/articles/index.md
+++ b/erpnext/docs/user/manual/en/stock/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
index f93e66862b..e1fe2953c8 100644
--- a/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
+++ b/erpnext/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md
@@ -1,3 +1,5 @@
+# Maintain Stock Field Frozen In Item Master
+
#Maintain Stock field Frozen in the Item master
In the item master, you might witness values in the following fields to be frozen.
@@ -6,7 +8,7 @@ In the item master, you might witness values in the following fields to be froze
1. Has Batch No.
1. Has Serial No.
-
+
For an item, once stock ledger entry is created, values in these fields will be froze. This is to prevent user from changing value which can lead to mis-match of actual stock, and stock level in the system of an item.
diff --git a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
index 2d57d6442e..b0d33eb4ff 100644
--- a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
+++ b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
@@ -1,3 +1,5 @@
+# Manage Rejected Finished Goods Items
+
#Manage Rejected Finished Goods Items
There could be manufactured Items which would not pass quality test, hence rejected.
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
index ccf39c1a40..85fc00feff 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md
@@ -1,16 +1,18 @@
+# Managing Batch Wise Inventory
+
#Managing Batch wise Inventory
Set of items which has same properties and attributes can be group in a single Batch. For example, pharmaceuticals items are batch, so that it's manufacturing and expiry date can be tracked together.
To maintain batches against an Item you need to mention 'Has Batch No' as yes in the Item Master.
-
+
You can create a new Batch from:
`Stock > Documents > Batch > New`
-To learn more about batch, click [here.]({{docs_base_url}}/user/manual/en/stock/batch.html)
+To learn more about batch, click [here.](/docs/user/manual/en/stock/batch.html)
For the Batch item, updating Batch No. in the stock transactions (Purchase Receipt & Delivery Note) is mandatory.
@@ -18,13 +20,13 @@ For the Batch item, updating Batch No. in the stock transactions (Purchase Recei
When creating Purchase Receipt, you should create new Batch, or select one of the existing Batch master. One Batch can be associated with one Batch Item.
-
+
#### Delivery Note
Define Batch in Delivery Note Item table. If Batch item is added under Product Bundle, you can update it's Batch No. in the Packing List table sa well.
-
+
#### Batch-wise Stock Balance Report
@@ -32,4 +34,4 @@ To check batch-wise stock balance report, go to:
Stock > Standard Reports > Batch-wise Balance History
-
+
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
index 12447e006d..904abd9d41 100644
--- a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
@@ -1,3 +1,5 @@
+# Managing Fractions In Uom
+
#Managing Fractions in UoM
UoM stands for Unit of Measurement. Few examples of UoM are Numbers (Nos), Kgs, Litre, Meter, Box, Carton etc.
@@ -18,7 +20,7 @@ From the list of UoM, select UoM for which value in decimal place is to be restr
In the UoM master, you will find a field called "Must be whole number". Check this field to restrict user from enter value in decimal places in quantity field, for item having this UoM.
-
+
####Validation
@@ -26,7 +28,7 @@ While creating transaction, if you enter value in fraction for item whos UoM has
`Quantity cannot be a fraction at row #`
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
index 9b8684a1c4..169fe9f97d 100644
--- a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
@@ -1,6 +1,8 @@
+# Opening Stock Balance Entry For The Serialized And Batch Item
+
#Opening Stock Balance Entry for the Serialized and Batch Item
-Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them is update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext]({{docs_base_url}}/user/manual/en/stock/serial-no.html).
+Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them is update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](/docs/user/manual/en/stock/serial-no.html).
**Question:** Why Opening Balance entry for the Serialized and Batch Item cannot be updated via Stock Reconciliation?
@@ -34,13 +36,13 @@ Select Items for which opening balance is to be updated.
For the serialized item, update quantity as many Serial Nos are their.
-For the serialized item, mention Serial Nos. equivalent to it's Qty. Or if Serial Nos. are configured to be created based on Prefix, then no need to mention Serial Nos. manually. Click [here]({{docs_base_url}}/user/manual/en/stock/articles/serial-no-naming.html) to learn more about Serial No. naming.
+For the serialized item, mention Serial Nos. equivalent to it's Qty. Or if Serial Nos. are configured to be created based on Prefix, then no need to mention Serial Nos. manually. Click [here](/docs/user/manual/en/stock/articles/serial-no-naming.html) to learn more about Serial No. naming.
For a batch item, provide Batch ID in which opening balance will be updated. Keep batch master ready, and updated it for the Batch Item. To create new Batch, go to:
`Stock > Setup > Batch > New`
-[Click here to learn how Batchwise inventory is managed in ERPNext.]({{docs_base_url}}/user/manual/en/stock/articles/managing-batch-wise-inventory.html)
+[Click here to learn how Batchwise inventory is managed in ERPNext.](/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html)
#### Step 7: Update Valuation Rate an Item
@@ -50,7 +52,7 @@ Update valuation rate, which will be per unit value of item. If different units
As per perpetual inventory valuation system, accounting entry is created for every stock transaction. Double entry accounting system requires Total Debit matching with Total Credit in an entry. On the submission of Stock Entry, system debits Warehouse account by total value of items. To balance the same, we use Temporary Opening account as a Difference Account.
-
+
#### Step 9: Save and Submit Stock Entry
diff --git a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
index 1d758c8a04..3011bad19e 100644
--- a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
+++ b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
@@ -1,3 +1,5 @@
+# Repack Entry
+
#Repack Entry
Repack Entry is created for item bought in bulk, which is being packed into smaller packages. For example, item bought in tons can be repacked into Kgs.
@@ -22,7 +24,7 @@ For raw-material/input item, only Source Warehouse will be provided.
For repacked/output items, only Target Warehouse will be provided. You will have to provide valuation for the repack items.
-
+
Update Qty for all the items selected.
@@ -30,6 +32,6 @@ Update Qty for all the items selected.
On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repack/output item will be added in the Target Warehouse.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
index 4f2425ffb3..3ed608e4cf 100644
--- a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
+++ b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
@@ -1,3 +1,5 @@
+# Serial No Naming
+
#Serial No. Naming
Serial Nos. is unique value assigned on each unit of an item. Serial no. helps in tracking item's warranty and expiry details. Generally high value items like machines, computers, costly equipments are serialized.
@@ -14,11 +16,11 @@ If received items already has its Serial No. barcoded, you can simply scan that
On submission of Purchase Receipt or Stock entry for the serialized item, Serial Nos. will be auto-generated.
-
+
Generated Serial numbers will be updated for each item.
-
+
###2. Serializing Manufacturing Item
@@ -28,12 +30,12 @@ To Serialize Manufacturing Item, you can define Series for Serial No. Generation
When Item is set as serialized, it will allow you to mentioned Series for it.
-
+
####2.2 Production Entry for Serialized Item
On submission of production entry for manufacturing item, system will automatically generate Serial Nos. following Series as specified in the Item master.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
index 426328ecf7..be5a962e25 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
@@ -1,3 +1,5 @@
+# Stock Entry Purpose
+
#Stock Entry Purpose
Stock Entry is a stock transaction, which can be used for multiple purposes. Let's learn about each Stock Entry Purpose below.
@@ -8,7 +10,7 @@ Material Issue entry create to issue item(s) from a warehouse. On submission of
Material Issue is generally made for the low value consumable items like office stationary, product consumables etc. Also you can create Material Issue to reconcile serialized and batched item's stock.
-
+
#### 2.Purpose: Material Receipt
@@ -16,34 +18,34 @@ Material Receipt entry is created to inward stock of item(s) in a warehouse. Thi
For the stock valuation purpose, provided Item Valuation becomes a mandatory field in the Material Receipt entry.
-
+
#### 3.Purpose: Material Transfer
Material Transfer entry is created for the inter-warehouse Material Transfer.
-
+
#### 4.Purpose: Material Transfer for Manufacture
In the manufacturing process, raw-materials are issued from the stores to the production department (generally WIP warehouse). This Material Transfer entry is created from Production Order. Items in this entry are fetched from the BOM of production Item, as selected in Production Order.
-
+
#### 4.Purpose: Manufacture
Manufacture is created from Production Order. In this entry, both raw-material item as well as production item are fetched from the BOM, selected in the Production Order. For the raw-material items, only Source Warehouse (generally WIP warehouse) is mentioned. For the production item, only target warehouse as mentioned in the Production Order is updated. On submission, stock of raw-material items are deducted from Source Warehouse, which indicates that raw-material items were consumed in the manufacturing process. Production Item is added to the Target Warehouse marking the completion of production cycle.
-
+
#### 5.Purpose: Repack
-Repack Entry is created when items purchases in bulk is repacked under smaller packs. 
+Repack Entry is created when items purchases in bulk is repacked under smaller packs. 
#### 6.Purpose: Subcontract
-Subcontracting transaction involves company transfer raw-material items to the sub-contractors warehouse. This requires adding a warehouse for the sub-contractor as well. Sub-contract entry transfers stock from the companies warehouse to the sub-contractors warehouse..
+Subcontracting transaction involves company transfer raw-material items to the sub-contractors warehouse. This requires adding a warehouse for the sub-contractor as well. Sub-contract entry transfers stock from the companies warehouse to the sub-contractors warehouse..
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
index b674470156..de71a916da 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
@@ -1,3 +1,5 @@
+# Stock Level Report
+
#Stock Level Report
Stock Level report list stock item's quantity available in a particular warehouse.
diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
index 6d8fcb6297..bafa0358b0 100644
--- a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
+++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
@@ -1,3 +1,5 @@
+# Track Items Using Barcode
+
#Track Items Using Barcode
A barcode is a value decoded into vertical spaced lines. Barcode scanners are the input medium, like Keyboard. When it scans a barcode, the data appears in the computer screens at the point of a cursor.
@@ -6,10 +8,10 @@ A barcode is a value decoded into vertical spaced lines. Barcode scanners are th
To set the barcode of a particular item, you will have to open the Item record. You can also enter barcode while creating a new item.
-
+
Once barcode field is updated in item master, items can be fetched using barcode. This feature will be availble in Delivery Note, Sales Invoice and Purchase Receipt transactions only.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/batch.md b/erpnext/docs/user/manual/en/stock/batch.md
index 73309f491e..a97be920ee 100644
--- a/erpnext/docs/user/manual/en/stock/batch.md
+++ b/erpnext/docs/user/manual/en/stock/batch.md
@@ -1,3 +1,5 @@
+# Batch
+
Batch feature in ERPNext allows you to group multiple units of an item,
and assign them a unique value/number/tag called Batch No.
@@ -9,7 +11,7 @@ To set item as a batch item, "Has Batch No" field should be checked in the Item
If you want automatic batch creation at the time of Purchase Receipt, you must check "Create New Batches Automatically"
-
+
### Creating Batches
@@ -23,7 +25,7 @@ To create new Batch No. master for an item, go to:
When you open a batch, you will see all the quantities relating this that batch on the page.
-
+
To move the batch from one warehouse to another, you can click on the move button.
diff --git a/erpnext/docs/user/manual/en/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md
index ad5f2c8f16..a59ac35bd1 100644
--- a/erpnext/docs/user/manual/en/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/en/stock/delivery-note.md
@@ -1,3 +1,5 @@
+# Delivery Note
+
A Delivery Note is made when a shipment is shipped from the company’s
Warehouse.
@@ -13,7 +15,7 @@ create a new Delivery Note from:
or from a “Submitted” Sales Order (that is not already shipped) by clicking on
“Make Delivery Note”.
-
+
You can also “fetch” the details from an unshipped Sales Order.
@@ -22,7 +24,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]({{docs_base_url}}/user/manual/en/selling/setup/product-bundle.html), ERPNext will automatically
+If you are shipping Items that have a [Product Bundle](/docs/user/manual/en/selling/setup/product-bundle.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/manual/en/stock/index.md b/erpnext/docs/user/manual/en/stock/index.md
index 971c33c5b1..75872eeb0d 100644
--- a/erpnext/docs/user/manual/en/stock/index.md
+++ b/erpnext/docs/user/manual/en/stock/index.md
@@ -1,3 +1,5 @@
+# Stock
+
For most small business that deal in physical goods, a large part of their net
worth is invested in the stock in hand.
diff --git a/erpnext/docs/user/manual/en/stock/installation-note.md b/erpnext/docs/user/manual/en/stock/installation-note.md
index 05196529a9..a75e15fac6 100644
--- a/erpnext/docs/user/manual/en/stock/installation-note.md
+++ b/erpnext/docs/user/manual/en/stock/installation-note.md
@@ -1,5 +1,7 @@
+# Installation Note
+
You can use installation note to record the instalation of a product having a serial number.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
index aea38f5258..3e2bdd35bb 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.md
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -1,3 +1,5 @@
+# Item
+
An Item is your companys' product or a service. The term Item is applicable to things (products or services) you sell as well as raw materials or components of products yet to be produced (before they can be sold to customers). An Item can be a physical product or a service that you buy/sell from your customers/suppliers. ERPNext allows you to manage all sorts of items like raw-materials, sub-assemblies, finished goods, item variants and service items.
ERPNext is optimised for itemised management of your sales and purchase. If you are in services, you can create an Item for each services that your offer. Completing the Item Master is very essential for successful implementation of ERPNext.
@@ -5,11 +7,11 @@ ERPNext is optimised for itemised 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]({{docs_base_url}}/user/manual/en/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]({{docs_base_url}}/user/manual/en/stock/setup/item-group.html)
+ * **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](/docs/user/manual/en/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](/docs/user/manual/en/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 variants see [Item Variants]({{docs_base_url}}/user/manual/en/stock/item/item-variants.html)
+ * **Variant:** A Item Variant is a different version of a Item.To learn more about managing variants see [Item Variants](/docs/user/manual/en/stock/item/item-variants.html)
### Upload an Image
@@ -29,11 +31,11 @@ In ERPNext, you can select different type of Warehouses to stock your different
These numbers help to track individual units or batches of Items which you sell. It also tracks warranty and returns. In case any individual Item is recalled by the supplier the number system helps to track individual Item. The numbering system also manages expiry dates. Please note that if you sell your items in thousands, and if the items are very small like pens or erasers, you need not serialize them. In ERPNext, you will have to mention the serial number in some accounting entries. To create serial numbers you will have to manually create all the numbers in your entries. If your product is not a big consumer durable Item, if it has no warranty and has no chances of being recalled, avoid giving serial numbers.
> Tip: While entering an item code in an items table, if the table requires inventory details, then depending on whether the entered item is batched or serialized, you can enter serial or batch numbers right away in a pop-up dialog.
-
+
> 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]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
+ * [Discussion on Serialized Inventory](/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
### Re Ordering
@@ -45,7 +47,7 @@ These numbers help to track individual units or batches of Items which you sell.
These settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account. For example, If you have a tax Account, “VAT 10%” and this particular Item is exempted from tax, then you select “VAT 10%” in the first column, and set “0” as the tax rate in the second column.
-Go to [Setting Up Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) to understand this topic in detail.
+Go to [Setting Up Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html) to understand this topic in detail.
### Inspection
@@ -55,9 +57,9 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
### Purchase Details
-
+
-
+
* **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse.
@@ -67,7 +69,7 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
###Supplier Details
-
+
* **Default Supplier:** Supplier from whom you generally purchase this item.
@@ -77,25 +79,25 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi
### Sales Details
-
+
* **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
-)
+)
-
+
***Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.
***Customer Codes:** Track Item Code assigned by the Customers for this Item. This will help you in searching item while creating Sales Order based on the Item Code in the Customer's Purchase Order.
-
+
### Manufacturing And Website
-
+
-Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.
+Visit [Manufacturing](/docs/user/manual/en/manufacturing.html) and [Website ](/docs/user/manual/en/website.html)to understand these topics in detail.
### Learn more about Item
diff --git a/erpnext/docs/user/manual/en/stock/item/item-codification.md b/erpnext/docs/user/manual/en/stock/item/item-codification.md
index eeb4f49a2b..82ed3072bf 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-codification.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-codification.md
@@ -1,3 +1,5 @@
+# Item Codification
+
If you already have a full-fledged business with a number of physical items,
you would have probably coded your items. If you have not, you have a choice.
We recommend that you should codify if you have lot of products with long or
diff --git a/erpnext/docs/user/manual/en/stock/item/item-price.md b/erpnext/docs/user/manual/en/stock/item/item-price.md
index 342e41989c..52850c2822 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-price.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-price.md
@@ -1,3 +1,5 @@
+# Item Price
+
Item Price is the record in which you can log selling and buying rate of an item.
There are two ways to reach to new Item Price form.
@@ -14,7 +16,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.
-
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -24,13 +26,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.
-
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-
+
Step 4: Save Item Price
diff --git a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
index d1456eef34..cc59618467 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
@@ -1,3 +1,5 @@
+# Item Valuation Fifo And Moving Average
+
### How are Items Valued?
One of the major features of any inventory system is that you can find out the
@@ -19,7 +21,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.
-
+
* **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/manual/en/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
index 7514404a6d..8b6da16baa 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-variants.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md
@@ -19,33 +19,33 @@ To use Item Variants in ERPNext, create an Item and check 'Has Variants'.
* The Item shall then be referred to as a so called 'Template'. Such a Template is not identical to a regular 'Item' any longer. For example it (the Template) can not be used directly in any Transactions (Sales Order, Delivery Note, Purchase Invoice) itself. Only the Variants of an Item (_blue_ t-shirt in size _small)_ can be practically used in such. Therefore it would be ideal to decide whether an item 'Has Variants' or not directly when creating it.
-
+
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.
-
+
> Note: You cannot make Transactions against a 'Template'
To create 'Item Variants' against a 'Template' select 'Make Variants'
-
+
-
+
-To learn more about setting Attributes Master check [Item Attributes]({{docs_base_url}}/user/manual/en/stock/setup/item-attribute.html)
+To learn more about setting Attributes Master check [Item Attributes](/docs/user/manual/en/stock/setup/item-attribute.html)
### Variants Based on Manufacturers
To setup variants based on Manufactueres, in your Item template, set "Variants Based On" as "Manufacturers"
+ src='/docs/assets/img/stock/select-mfg-for-variant.png'>
When you make a new Variant, the system will prompt you to select a Manufacturer. You can also optionally put in a Manufacturer Part Number
+ src='/docs/assets/img/stock/set-variant-by-mfg.png'>
The naming of the variant will be the name (ID) of the template Item with a number suffix. e.g. "ITEM000" will have variant "ITEM000-1"
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/purchase-details.md b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
index 134d551d46..3de1724923 100644
--- a/erpnext/docs/user/manual/en/stock/item/purchase-details.md
+++ b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
@@ -4,4 +4,4 @@ To track a warranty period, it is necessary that the Item is a serialized Item.
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.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md
index 548a8a9ad0..06caa2c075 100644
--- a/erpnext/docs/user/manual/en/stock/item/reorder.md
+++ b/erpnext/docs/user/manual/en/stock/item/reorder.md
@@ -10,4 +10,4 @@ For example, you can set your reorder level of Motherboard at 10. When there are
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.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
index 8e4caea23e..c3ba13ceb6 100644
--- a/erpnext/docs/user/manual/en/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -1,7 +1,9 @@
+# Material Request
+
A Material Request is a simple document identifying a requirement of a set of
Items (products or services) for a particular reason.
-
+
To generate a Material Request manually go to:
@@ -9,14 +11,14 @@ To generate a Material Request manually go to:
#### Creating 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]({{docs_base_url}}/user/manual/en/stock/projected-quantity.html) 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](/docs/user/manual/en/stock/projected-quantity.html) for this Item.
A Material Request can be of type:
@@ -25,7 +27,7 @@ A Material Request can be of type:
* Material Issue - If the requested material is to be Issued.
* Manufacture - If the requested material is to be Produced.
-The User can also raise a [Request For Quotation]({{docs_base_url}}/user/manual/en/buying/request-for-quotation.html) against a Material Request. To create a Request For Quotation the user can click on 'Make'.
+The User can also raise a [Request For Quotation](/docs/user/manual/en/buying/request-for-quotation.html) against a Material Request. To create a Request For Quotation the user can click on 'Make'.
> Info: Material Request is not mandatory. It is ideal if you have centralized
buying so that you can collect this information from various departments.
diff --git a/erpnext/docs/user/manual/en/stock/opening-stock.md b/erpnext/docs/user/manual/en/stock/opening-stock.md
index e59fb42378..ea77999fe0 100644
--- a/erpnext/docs/user/manual/en/stock/opening-stock.md
+++ b/erpnext/docs/user/manual/en/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 serialized Items visit [Stock Reconciliation]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
+To understand Opening Stock for serialized Items visit [Stock Reconciliation](/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
{next}
diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
index 0e7b742768..e02b2c3010 100644
--- a/erpnext/docs/user/manual/en/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md
@@ -1,3 +1,5 @@
+# Projected Quantity
+
Projected Quantity is the level of stock that is predicted for a particular
Item, based on the current stock levels and other requirements. It is the
quantity of gross inventory that includes supply and demand in the past which
@@ -11,7 +13,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 Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
diff --git a/erpnext/docs/user/manual/en/stock/purchase-receipt.md b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
index 0f43b5884e..523b0fa9a0 100644
--- a/erpnext/docs/user/manual/en/stock/purchase-receipt.md
+++ b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
@@ -1,3 +1,5 @@
+# Purchase Receipt
+
Purchase Receipts are made when you accept material from your Supplier usually
against a Purchase Order.
@@ -10,7 +12,7 @@ You can make a Purchase Receipt directly from:
or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”.
-
+
### Rejections
diff --git a/erpnext/docs/user/manual/en/stock/purchase-return.md b/erpnext/docs/user/manual/en/stock/purchase-return.md
index 328ed08257..2b630341d9 100644
--- a/erpnext/docs/user/manual/en/stock/purchase-return.md
+++ b/erpnext/docs/user/manual/en/stock/purchase-return.md
@@ -1,3 +1,5 @@
+# Purchase Return
+
ERPNext has an option for products that are need to be returned to the
supplier. This may be on account of a number of reasons like defects in goods,
quality not matching, the buyer not needing the stock, etc.
@@ -6,16 +8,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.
-
+
Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount.
-
+
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.
-
+
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.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/sales-return.md b/erpnext/docs/user/manual/en/stock/sales-return.md
index 1ce922d5c6..1ba17c2709 100644
--- a/erpnext/docs/user/manual/en/stock/sales-return.md
+++ b/erpnext/docs/user/manual/en/stock/sales-return.md
@@ -1,3 +1,5 @@
+# Sales Return
+
Goods sold being returned is quite a common practice in business. They could
be returned by the customer on quality issues, non-delivery on agreed date, or
any other reason.
@@ -6,22 +8,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.
-
+
Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount.
-
+
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.
-
+
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.
-
+
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.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/serial-no.md b/erpnext/docs/user/manual/en/stock/serial-no.md
index fbbfb1ae3f..cb766ba044 100644
--- a/erpnext/docs/user/manual/en/stock/serial-no.md
+++ b/erpnext/docs/user/manual/en/stock/serial-no.md
@@ -1,3 +1,5 @@
+# Serial No
+
As we discussed in the **Item** section, if an **Item** is _serialized_, a
**Serial Number** (Serial No) record is maintained for each quantity of that
**Item**. This information is helpful in tracking the location of the Serial
@@ -20,7 +22,7 @@ Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales
Invoice). When a new Serial No is created directly, its warehouse cannot be
set.
-
+
* The Status is set based on Stock Entry.
diff --git a/erpnext/docs/user/manual/en/stock/setup/index.md b/erpnext/docs/user/manual/en/stock/setup/index.md
index 6f3f1cb6f0..72547856d1 100644
--- a/erpnext/docs/user/manual/en/stock/setup/index.md
+++ b/erpnext/docs/user/manual/en/stock/setup/index.md
@@ -1,3 +1,5 @@
+# Setup
+
### Topics
{index}
diff --git a/erpnext/docs/user/manual/en/stock/setup/item-attribute.md b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
index 0b2ab748a0..a6e0eecb2f 100644
--- a/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
+++ b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
@@ -1,16 +1,18 @@
+# Item Attribute
+
You can define Attributes and attribute values for your Item Variants here.
-
+
#### Non Numeric Attributes
* For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table.
-
+
#### Numeric Attributes
* If your attribute is Numeric, select Numeric Values
* Specify the Range and the Increment Value
-
+
diff --git a/erpnext/docs/user/manual/en/stock/setup/item-group.md b/erpnext/docs/user/manual/en/stock/setup/item-group.md
index cf6a75a166..a2800901ac 100644
--- a/erpnext/docs/user/manual/en/stock/setup/item-group.md
+++ b/erpnext/docs/user/manual/en/stock/setup/item-group.md
@@ -1,3 +1,5 @@
+# Item Group
+
Item Group is the classification category. Depending on the type of product,
categorise it under its respective field. If the product is
service oriented, name it under the group head - service. If the
@@ -5,7 +7,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.
-
+
### Create a Item Group
@@ -13,7 +15,7 @@ under Trading.
* Select 'Add Child'
-
+
### Delete an Item Group
@@ -21,6 +23,6 @@ under Trading.
* Select 'delete'
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
index f8cb9eaa9d..32562c6c6e 100644
--- a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
+++ b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
@@ -1,5 +1,7 @@
+# Stock Settings
+
You can set default settings for your stock related transactions here.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
index fb784c4a91..e2ac6a1433 100644
--- a/erpnext/docs/user/manual/en/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md
@@ -1,3 +1,5 @@
+# Stock Entry
+
A Stock Entry is a simple document that lets you record Item movement from a
Warehouse, to a Warehouse and between Warehouses.
@@ -5,7 +7,7 @@ To make a Stock Entry you have to go to:
> Stock > Stock Entry > New
-
+
Stock Entries can be made for the following purposes:
@@ -27,15 +29,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.
-
+
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.
-
+
If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account.
-
+
> **Note:** To update Stock from a spreadsheet, see [Stock Reconciliation]({{doc_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html).
diff --git a/erpnext/docs/user/manual/en/stock/stock-how-to.md b/erpnext/docs/user/manual/en/stock/stock-how-to.md
index e0f5b2f285..e395f43ee7 100644
--- a/erpnext/docs/user/manual/en/stock/stock-how-to.md
+++ b/erpnext/docs/user/manual/en/stock/stock-how-to.md
@@ -1,2 +1,4 @@
+# Stock How To
+
This page contains most frequently asked questions on Stocks.
diff --git a/erpnext/docs/user/manual/en/stock/tools/index.md b/erpnext/docs/user/manual/en/stock/tools/index.md
index 6f3f1cb6f0..1763bf3c8f 100644
--- a/erpnext/docs/user/manual/en/stock/tools/index.md
+++ b/erpnext/docs/user/manual/en/stock/tools/index.md
@@ -1,3 +1,5 @@
+# Tools
+
### Topics
{index}
diff --git a/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
index 1209aff1fd..a11759d233 100644
--- a/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
+++ b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
@@ -1,3 +1,5 @@
+# Landed Cost Voucher
+
Landed Cost is the total cost of a product to reach the product at the buyer’s door. Landed costs include the original cost of the item, complete shipping costs, customs duties, taxes, insurance and currency conversion fees etc. All of these components might not be applicable in every shipment, but relevant components must be considered as a part of the landed cost.
> To understand landed cost better, let’s take an example based on our daily lives. You need to purchase a new washing machine for your home. Before making actual purchase, you probably do some investigation to know the best price. In this process, you often found a better deal from a store which is long away from your home. But you should also consider shipping cost while buying from that store. Total cost including transportation might be more than the price you get in your nearby store. In that case you will choose to buy from your nearest store, as landed cost of the item is cheaper in the nearest store.
@@ -20,7 +22,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.
-
+
### What happend on submission?
diff --git a/erpnext/docs/user/manual/en/stock/tools/packing-slip.md b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
index 0820959677..60cfb5d138 100644
--- a/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
+++ b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
@@ -1,7 +1,9 @@
+# Packing Slip
+
A packing slip is a document listing the items in a shipment. Usually attached to the goods delivered.
While Shipping a product 'Draft' for Delivery Notes are created.
You can make a Packing Slip from these Delivery Notes (Draft)
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
index 34bea40dcc..254da8a477 100644
--- a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
+++ b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
@@ -1,8 +1,10 @@
+# Quality Inspection
+
In ERPNext, you can mark your incoming or outgoing products for Quality
Inspection. To enable ERPNext to perform this function, go to :
> Stock > Quality Inspection > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md
index 74ee8ccb8a..d90e3f9b10 100644
--- a/erpnext/docs/user/manual/en/stock/warehouse.md
+++ b/erpnext/docs/user/manual/en/stock/warehouse.md
@@ -1,3 +1,5 @@
+# Warehouse
+
A warehouse is a commercial building for storage of goods. Warehouses are used
by manufacturers, importers, exporters, wholesalers, transport businesses,
customs, etc. They are usually large plain buildings in industrial areas of
@@ -12,7 +14,7 @@ This can become quite a detailed Tree like >Warehouse >Room >Row >Shelf >Box
To go to Warehouse, click on Stock and go to Warehouse under Setup. You
could also switch to 'Tree' View or simply type warehouse tree in the awsone bar.
-
+
In ERPNext, every Warehouse must belong to a specific company, to maintain
company wise stock balance. In order to do so each Warehouse is linked with an
diff --git a/erpnext/docs/user/manual/en/support/index.md b/erpnext/docs/user/manual/en/support/index.md
index 7777049e2d..1fe172c51e 100644
--- a/erpnext/docs/user/manual/en/support/index.md
+++ b/erpnext/docs/user/manual/en/support/index.md
@@ -1,3 +1,5 @@
+# Support
+
Great customer support and maintenance is at the heart of any successful small
business. ERPNext gives you the tools to track all incoming requests and issues
from your customers so that you can respond quickly. Your database of incoming
diff --git a/erpnext/docs/user/manual/en/support/issue.md b/erpnext/docs/user/manual/en/support/issue.md
index 29fb85800c..56d0058e02 100644
--- a/erpnext/docs/user/manual/en/support/issue.md
+++ b/erpnext/docs/user/manual/en/support/issue.md
@@ -1,3 +1,5 @@
+# Issue
+
Issue is an incoming query from your Customer, usually via email or
from the “Contact” section of your website. (To fully integrate the Support
Ticket to email, see the Email Settings section).
@@ -5,13 +7,13 @@ Ticket to email, see the Email Settings section).
> Tip: A dedicated support Email Address is a good way to integrate incoming
queries via email. For example, you can send support queries to ERPNext at
support@erpnext.com and it will automatically create a Issue in the
-Frappe system.
+Frappé system.
> Support > Issue > New Issue
-
+
#### Discussion Thread
diff --git a/erpnext/docs/user/manual/en/support/maintenance-schedule.md b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
index e211562601..a9be3b9918 100644
--- a/erpnext/docs/user/manual/en/support/maintenance-schedule.md
+++ b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
@@ -1,3 +1,5 @@
+# Maintenance Schedule
+
All machines require regular maintenance, specially those that contain a lot
of moving parts, so if you are in the business of maintaining those or have
some of them in your own premises, this is a useful tool to plan a calendar of
@@ -10,7 +12,7 @@ To create a new Maintenance Schedule go to:
> Support > Maintenance Schedule > New Maintenance Schedule
-
+
In the Maintenance Schedule, there are two sections:
diff --git a/erpnext/docs/user/manual/en/support/maintenance-visit.md b/erpnext/docs/user/manual/en/support/maintenance-visit.md
index e93260d9f1..5bda36a795 100644
--- a/erpnext/docs/user/manual/en/support/maintenance-visit.md
+++ b/erpnext/docs/user/manual/en/support/maintenance-visit.md
@@ -1,10 +1,12 @@
+# Maintenance Visit
+
A Maintenance Visit is a record of a visit made by an engineer to a
Customer’s premise usually against a Customer Issue. You can create a new
Maintenance Visit from:
> Support > Maintenance Visit > New Maintenance Visit
-
+
The Maintenance Visit contains information about the:
diff --git a/erpnext/docs/user/manual/en/support/support_reports.md b/erpnext/docs/user/manual/en/support/support_reports.md
index 2be72e10ef..7ef6ceac0d 100644
--- a/erpnext/docs/user/manual/en/support/support_reports.md
+++ b/erpnext/docs/user/manual/en/support/support_reports.md
@@ -1,3 +1,5 @@
+# Support Reports
+
### Support Hours
@@ -5,4 +7,4 @@ This report provide the information about the time slot along with the count of
> Support > Reports > Support Hours
-
+
diff --git a/erpnext/docs/user/manual/en/support/warranty-claim.md b/erpnext/docs/user/manual/en/support/warranty-claim.md
index 0a58e18fd6..8080e654af 100644
--- a/erpnext/docs/user/manual/en/support/warranty-claim.md
+++ b/erpnext/docs/user/manual/en/support/warranty-claim.md
@@ -1,3 +1,5 @@
+# Warranty Claim
+
If you are selling **Items** under warranty or if you have sold and extended
service contract like the Annual Maintenance Contract (AMC), your **Customer**
may call you about an issue or a break-down and give you the Serial No of this
@@ -15,7 +17,7 @@ To create a new **Warranty Claim**:
> Support > Warranty Claim > New Warranty Claim
-
+
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/manual/en/using-erpnext/articles/Global-search.md b/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md
index 776c6e8879..482f12f1aa 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md
@@ -1,3 +1,5 @@
+# Global Search
+
Global-search.md
@@ -8,9 +10,9 @@ Global Search helps users find information quickly. It’s located in the upper
### Using Awesome bar for Global Search.
-
+
### Enable Global Search for fields in a Doctype.
-
+
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
index 75ade179fb..4ab4df47e5 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
@@ -1,9 +1,11 @@
+# Adding Attachments To Outgoing Messages
+
#Adding Attachments to Outgoing Messages
-ERPNext has in-built file manager. Click [here]({{docs_base_url}}/user/videos/learn/file-manager.html) to learn more on how attachments are managed in ERPNext.
+ERPNext has in-built file manager. Click [here](/docs/user/videos/learn/file-manager.html) to learn more on how attachments are managed in ERPNext.
If you have file attached to the document (say Purchase Order), and same file needs to be emailed as attachment, following is how you can achieve it.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
index e1c4ebd97d..fad7319592 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
@@ -1,3 +1,5 @@
+# Adding File As A Attachment
+
#Adding File as a Attachment
ERPNext allows to attach files with documents. User with a read permission on particular document will also be able to access files attached with it.
@@ -8,11 +10,11 @@ There are several ways to attach file to the document.
####From Browser
-
+
####By drag and drop
-
+
Click on Attach to browse and select the file.
@@ -20,11 +22,11 @@ Click on Attach to browse and select the file.
If you use separate server for files, or use online service like Dropbox, you can attach file by providing link of a particular file.
-
+
`For hosted users, limit of 5 MB is applied on file size.`
-To ensure there are not many files attached to a document, which can affect your accounts performance, you can set limit as how many files can be attached to a particular document. Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) to learn more about it.
+To ensure there are not many files attached to a document, which can affect your accounts performance, you can set limit as how many files can be attached to a particular document. Click [here](/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) to learn more about it.
####File Manager
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
index a753358389..17e81c93d3 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
@@ -1,3 +1,5 @@
+# Bulk Rename
+
#Bulk Rename
Using renaming tool, you can to rectify/change multiple document ids at once. This tool is only accessible to the User who has System Manager role assigned.
@@ -10,7 +12,7 @@ You can rename ids of upto 500 records at a time. Following are step to bulk ren
In a spreadsheet file, enter old Item IDs in the first column, and new Item Ids in the second column. Save spreadsheet file in a CSV format.
-
+
#### Step 2: Upload Data File
@@ -20,7 +22,7 @@ To upload data file go to,
Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
index 76cdeb73fb..03ab4270f4 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
@@ -1,8 +1,10 @@
+# Check Link Between Documents
+
#Checking Link Between Documents
Links option shows one document is linked to which other documents. Check Menu for the Links options.
-
+
####Scenario
@@ -18,6 +20,6 @@ If I check Links in the Purchase Receipt, will it list Purchase Order from which
Links only shows forward linkages. For the backward links, you should check current document itself. In the Purchase Receipt Item table table, you can check which Purchase Order it is linked to.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
index 8d7700a902..f18a355a80 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
@@ -1,3 +1,5 @@
+# Delete Submitted Document
+
#Delete Submitted Document
To be able to delete Submitted document, you should first Cancel. Once canceled, you can delete that document from Menu or from the List View of that Document Type.
@@ -12,18 +14,18 @@ Following are step to delete submitted documents.
You will find option to Cancel in the submitted document. If document is at draft stage, it can delete directly. Also if document is not submittable, but only save, it can be deleted directly.
-
+
####Step 2: Delete Document
After cancellation, go to Menu and click on Delete.
-
+
####Step 3: Deleting from List
For bulk deletion, you can select multiple Cancelled records and delete at once from the List View.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
index 69b4ecf3e5..f57e76f4c2 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
@@ -1,3 +1,5 @@
+# Duplicate Record
+
#Duplicate a Record
Duplicate feature helps you to copy values of existing document into new document.
@@ -10,6 +12,6 @@ You will find Copy option under:
`Menu > Copy`
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.md b/erpnext/docs/user/manual/en/using-erpnext/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/index.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
index f03bbd8247..683a47414e 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -1,3 +1,5 @@
+# Merging Documents
+
#Merging Documents
For a document, if you have two records which are identical, and meant for common purpose, you can merge them into one record.
@@ -12,7 +14,7 @@ Following are step to merge documents. Let's assume we are merging two Accounts.
For an Account to be merged, click on the "Rename" option.
-
+
#### Step 3: Merge Account
@@ -20,7 +22,7 @@ In the New Name field, enter another account name with which this account will b
Following is how the merged account will appear in the Chart of Accounts master.
-
+
###Effect of Merging
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md b/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md
index 839e820afc..75f057ea1a 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/pos-view.md
@@ -1,10 +1,12 @@
+# Pos View
+
#POS View
POS (point of sale) view renders form in a different layout, optimized for the quick selection of items. This view has primarily been designed for the retail business.
Using POS View, you can only create Sales Invoice, without switching to standard form view. For other transactions, like Sales Order, Delivery Note, Purchase Order, Purchase Receipt etc., POS View is only used for Item selection. For entering other values in the transaction, you should switch to form view.
-
+
For creating POS Invoice, check following help video.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
index a6b66965a9..f6072d3854 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
@@ -1,3 +1,5 @@
+# Renaming Documents
+
#Renaming a Document
Using Renaming feature, you can change ID of a master documents like Item, Warehouse, Accounts etc. Following are the steps to rename Item Code. Following same steps, you can rename other masters as well.
@@ -8,7 +10,7 @@ Using Renaming feature, you can change ID of a master documents like Item, Wareh
#### 2. Rename
-
+
###Effect of Renaming
@@ -16,8 +18,8 @@ Renaming document affects existing transaction where this record is selected. Co
###See Also
-1. [Bulk Renaming]({{docs_base_url}}/user/manual/en/using-erpnext/articles/bulk-rename.html)
-2. [Document Merging]({{docs_base_url}}/user/manual/en/using-erpnext/articles/merging-documents.html)
+1. [Bulk Renaming](/docs/user/manual/en/using-erpnext/articles/bulk-rename.html)
+2. [Document Merging](/docs/user/manual/en/using-erpnext/articles/merging-documents.html)
**List of Renamable Documents**
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
index 8a0a67b3ab..307c9964ca 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
@@ -1,3 +1,5 @@
+# Search Filter
+
#Search Filter
Search Filter option allow user to filter records based on value in the specific field of that document. Search Filters are available on the List View of Document Type and in the Report Builder.
@@ -8,20 +10,20 @@ Each filter option has three fields.
Select field of the document based on which you wish to filter records.
-
+
#### Based On
With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
-
+
#### Value
A value should be entered in this field based on while records will be filtered. After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
-
+
You can apply multiple filters at a time. To remove specific filter, just click on cancelled (X) sign ahead of it.
@@ -30,6 +32,6 @@ You can apply multiple filters at a time. To remove specific filter, just click
From the list views, you can also apply filters by clicking on the Status field.
-
+
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
index 44d4e970de..935e32ba6b 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
@@ -1,6 +1,8 @@
+# Tree Master Renaming
+
#Tree Master Renaming
-There are various master which are maintained in tree structure. Click [here]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters.html) to learn more about tree structured masters in ERPNext.
+There are various master which are maintained in tree structure. Click [here](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.html) to learn more about tree structured masters in ERPNext.
Following are the steps to be followed for renaming ID of a master which is maintained in tree structure. Let's rename an Account for the instance.
@@ -12,12 +14,12 @@ Following are the steps to be followed for renaming ID of a master which is main
When click on the Account, you will find Rename option.
-
+
#### Step 2: Rename Account
On clicking Rename, you will get field to enter New Name. After entering new name for the Account, click on the "Rename" button.
-
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
index e78a1123d6..ffd0abd1db 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/assignment.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
@@ -1,3 +1,5 @@
+# Assignment
+
Assign To feature in ERPNext allows you to allocate particular document to specific user, whom needs to further work on that document.
For example, if Sales Order needs to be approved/submitted by Sales Manager, first draft user can allocate that Sales Order to Sales Manager. On allocating document to Sales Manager, it will be added to that user's ToDo list. Same way, allocation can also be done to Material User and Account user who needs to create Delivery Note and Sales Invoice respectively against this Sales Note.
@@ -10,13 +12,13 @@ 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.
-
+
#### 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.
-
+
With assignment, you can also leave a comment for the review of assignee.
@@ -24,13 +26,13 @@ With assignment, you can also leave a comment for the review of assignee.
This transaction will appear in the To-do list of the user in “Todo” section.
-
+
####Removing Assignment
User will be able to remove assignment by clicking on "Assignment Completed" button in the document.
-
+
Once assignment is set as completed, the Status of its ToDo record will be set as Closed.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
index c8b64af98c..bf0412bea7 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/calendar.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
@@ -1,8 +1,10 @@
+# Calendar
+
The Calendar is a tool where you can create and share Events and also see auto-generated events from the system.
You can switch calendar view based on Month, Week and Day.
-
+
### Creating Events in Calendar
@@ -12,7 +14,7 @@ To create event manually, you should first determine Calendar 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.
-
+
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.
@@ -20,7 +22,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 specified in this field.
-
+
#### Birthday Event
@@ -31,7 +33,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".
-
+
### Event Reminders
@@ -41,7 +43,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 notification email to all the participants for this event.
-
+
#### Create Email Digest
@@ -51,6 +53,6 @@ Email Digest can be set from:
`Setup > Email > Email Digest`
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/chat.md b/erpnext/docs/user/manual/en/using-erpnext/chat.md
index ed155d8c06..867c4b45e8 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/chat.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/chat.md
@@ -1,3 +1,5 @@
+# Chat
+
You can send and receive messages from the system by using the Messages tool.
`Explore > Tools > Chat`
@@ -5,10 +7,10 @@ You can send and receive messages from the system by using the Messages tool.
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.
-
+
You can choose to send message to all the users, or to specific user.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
index 7ffec7677f..b0cf94553f 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
@@ -1,24 +1,26 @@
+# Collaborating Around Forms
+
Following are the tools in each document using which you can collaborate with other Users in your ERPNext account.
### Assigned to
-If some document requires an action from User, you can Assign that document to that User. On assignment, User to whom document is assigned is intimated via email. To learn about Assign To feature, [click here.]({{docs_base_url}}/user/manual/en/using-erpnext/assignment.html)
+If some document requires an action from User, you can Assign that document to that User. On assignment, User to whom document is assigned is intimated via email. To learn about Assign To feature, [click here.](/docs/user/manual/en/using-erpnext/assignment.html)
### Comments
Comments are a great way to add information about a transaction that is not a
part of the transactions. Like some background information etc.
-
+
###Share
You can share document with the specific User. If Document is shared with the specific User, he/she will be able to access it, even if that User doesn't have permission to access that document or Document Type.
-
+
### Tags
-[Read more about Tags]({{docs_base_url}}/user/manual/en/using-erpnext/tags.html)
+[Read more about Tags](/docs/user/manual/en/using-erpnext/tags.html)
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md
index bbcdc55dab..126f7615d2 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md
@@ -1,3 +1,5 @@
+# Document Versioning
+
#Document Versioning
The document versioning feature allows you to track all the changes made in the form over the period. It will be very helpful in audit trial to check which user edited what value, and when exactly.
@@ -6,16 +8,16 @@ The document versioning feature allows you to track all the changes made in the
Document Versioning can be enabled for one Document Type as a time. Let's assume that we need to enable it from Purchase Order. Then, we will check Customize Form tool for Purchase Order and check field `Track Changes`. With this, document versioning will be enabled for all the Purchase Orders create and edited hence forth.
-
+
####Version Log
Following is link of version in a Purchase Order form. Each time a document is edited, a version's link will be added in that document. To check more details on specific version, click on it's link.
-
+
####Version Details
In the Version document, you will find log of all the fields and values changes in it.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.md b/erpnext/docs/user/manual/en/using-erpnext/index.md
index 93f080ed0c..f2fe0ad196 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/index.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.md
@@ -1,3 +1,5 @@
+# Using Erpnext
+
We live in an era when people are very comfortable communicating, discussing,
asking, assigning work and getting feedback electronically. The Internet acts
as a great medium to collaborate on work too. Taking this concept into ERP
diff --git a/erpnext/docs/user/manual/en/using-erpnext/notes.md b/erpnext/docs/user/manual/en/using-erpnext/notes.md
index 64e7acbe4f..91c1689344 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/notes.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/notes.md
@@ -1,3 +1,5 @@
+# Notes
+
You can store your long notes under this section. It can contain your partner lists, frequently used passwords, terms and conditions, or any other document which needs to be shared. Following are the steps to create new Note.
`Explore > Note > New`
@@ -6,12 +8,12 @@ You can store your long notes under this section. It can contain your partner li
Enter Title and Context.
-
+
####Set Permissions to select Users
To make Note accessible for all, check "Public" under links section. Else you can share it with the specific User by using Share feature.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md
index 2c60d3505a..d43fc679a2 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md
@@ -1,8 +1,10 @@
+# Restore Deleted Docs
+
#Restore Deleted Documents
In ERPNext, you can delete a records if not needed. They can be masters like Items, Customer or transactions like Sales Order, Payment Entries etc.
-
+
If you have deleted an entry by mistake and wish to restore it back into your ERPNext account.
@@ -14,18 +16,18 @@ Steps below to restore a deleted document.
For the list of deleted document, just type Deleted Document in the Search Bar and go to list.
-
+
####Step 2: Open Doc and Restore
Open the document to be restored from the list. Click on Restore button.
-
+
####Step 3: Restored
Once a document is restored, you will be able to use it for creating entries in your ERPNext account.
-
+
> If canceled document is deleted, then it will not be restored.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/tags.md b/erpnext/docs/user/manual/en/using-erpnext/tags.md
index 0446a32229..99a6aac81a 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/tags.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/tags.md
@@ -1,9 +1,11 @@
+# Tags
+
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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/to-do.md b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
index 295e79ac84..c6cd280757 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/to-do.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
@@ -1,9 +1,11 @@
-To Do is a simple tool where all the activities [assigned]({{docs_base_url}}/user/manual/en/using-erpnext/assignments.html) to you and assigned by you are listed. You can also add your own to-do items in the list.
+# To Do
-
+To Do is a simple tool where all the activities [assigned](/docs/user/manual/en/using-erpnext/assignments.html) to you and assigned by you are listed. You can also add your own to-do items in the list.
+
+
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 master itself.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
index d8ddcf0aaa..e1489193ed 100644
--- a/erpnext/docs/user/manual/en/website/add-products-to-website.md
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md
@@ -1,3 +1,5 @@
+# Add Products To Website
+
### Add Products to the Website
ERPNext will populate your website with products out of your Item Master. The html code will be
@@ -11,14 +13,14 @@ To edit a catalog item go to: `Stock > Items and Pricing > Item`. From there se
For this example, click on the **New** button to create a new item. Fill in the form and then click **Save**.
-
+
#### Step 2: Save Image
1. Click the new item from the list to edit it.
1. In the upper left, click the image block to give the product a picture. Be sure to uncheck the **Private** box so the image will be publicly viewable.
-
+
#### Step 3: Check the 'Show in Website' box
@@ -26,17 +28,17 @@ Under the Website section near the bottom of the form, check the box that says *
* Give the page a route on the website.
-
+
#### Step 4: Enter Website Details
Once the `Show in Website` checkbox is checked, a new section called **Website Specifications** appears. Expand this section to add more details about the rocking chair to the website.
-
+
Click **Save** in the upper right and then click `See on Website` on the left under the product image to see the item on your website.
-
+
### Item Groups
@@ -47,17 +49,17 @@ Items can be grouped together in items groups. To see a listing of the existing
* Fill in a description for your products page.
* Click **Save**.
-
+
* Go back to the rocking chair item, expand the **website** section.
* Click **Add new row** button under the `Item Group` table.
* Select `Products` from the list.
* Click **Save**.
-
+
To see on the website, go back to the `Item Group` and then click **See on website**.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/website/articles/index.md b/erpnext/docs/user/manual/en/website/articles/index.md
index 0dff60b400..fb11735e90 100644
--- a/erpnext/docs/user/manual/en/website/articles/index.md
+++ b/erpnext/docs/user/manual/en/website/articles/index.md
@@ -1 +1,3 @@
+# Articles
+
{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
index b2250e0548..e48b87ae5a 100644
--- a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
@@ -1,8 +1,10 @@
+# Managing User Sign Up Via Website
+
#Customer / Supplier Signup
Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
-
+
As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
diff --git a/erpnext/docs/user/manual/en/website/articles/website-home-page.md b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
index d44a31aad2..92bcc77d1f 100644
--- a/erpnext/docs/user/manual/en/website/articles/website-home-page.md
+++ b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
@@ -18,7 +18,7 @@ To Open website settings page go to: `Website > Setup > Website Settings`
Enter the same value you entered for the `route` field in the previous section to the `Home Page` field. ERPNext will set this route to be the same as /index for your page.
-
+
#### **Step 4: Save Website Settings Form.**
diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.md b/erpnext/docs/user/manual/en/website/articles/website-security.md
index ef7986a6c4..5c0e2de4b4 100644
--- a/erpnext/docs/user/manual/en/website/articles/website-security.md
+++ b/erpnext/docs/user/manual/en/website/articles/website-security.md
@@ -1,11 +1,13 @@
+# Website Security
+
#Website Security
One can easily generate a website using ERPNext. We can list our Products on the website and also create blogs. Products are directly fetched from the Item Master records of your ERPNext account. Some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to the public.
Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to `Selling > Items and Pricing > Item` and in the Item form check the `show in website` checkbox.
-
+
Once the check box has been checked, then more details will appear that you can fill in for the details of the product as to be shown on the website.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/blog-post.md b/erpnext/docs/user/manual/en/website/blog-post.md
index dbf7b171ae..e6f7960354 100644
--- a/erpnext/docs/user/manual/en/website/blog-post.md
+++ b/erpnext/docs/user/manual/en/website/blog-post.md
@@ -1,3 +1,5 @@
+# Blog Post
+
Blogs are a great way to share your thoughts about your business and keep your
customers and readers updated of what you are up to.
@@ -8,13 +10,13 @@ To create a new blog, just create a new Blog from:
> Website > Blog > New Blog
-
+
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.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/website/blogger.md b/erpnext/docs/user/manual/en/website/blogger.md
index 5a5bd81723..a47bdeec7b 100644
--- a/erpnext/docs/user/manual/en/website/blogger.md
+++ b/erpnext/docs/user/manual/en/website/blogger.md
@@ -1,6 +1,8 @@
+# Blogger
+
Blogger is a user who can post blogs.
You can mention a short bio about the blogger and also set a avatar here.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/website/index.md b/erpnext/docs/user/manual/en/website/index.md
index a499316c5d..2ac49558a8 100644
--- a/erpnext/docs/user/manual/en/website/index.md
+++ b/erpnext/docs/user/manual/en/website/index.md
@@ -1,3 +1,5 @@
+# Website
+
Websites are a core component of any business and having a good website
usually means:
diff --git a/erpnext/docs/user/manual/en/website/setup/index.md b/erpnext/docs/user/manual/en/website/setup/index.md
index 212ccfb1d0..f60d1480e4 100644
--- a/erpnext/docs/user/manual/en/website/setup/index.md
+++ b/erpnext/docs/user/manual/en/website/setup/index.md
@@ -1,3 +1,5 @@
+# Setup
+
Settings for your website can be mentioned under setup.
### Topics
diff --git a/erpnext/docs/user/manual/en/website/setup/social-login-keys.md b/erpnext/docs/user/manual/en/website/setup/social-login-keys.md
index bb1329f3e3..be67a8b72f 100644
--- a/erpnext/docs/user/manual/en/website/setup/social-login-keys.md
+++ b/erpnext/docs/user/manual/en/website/setup/social-login-keys.md
@@ -1,3 +1,5 @@
+# Social Login Keys
+
Social Login enables users to login to ERPNext via their Google, Facebook or GitHub account.
### Enabling Social Logins.
diff --git a/erpnext/docs/user/manual/en/website/setup/website-settings.md b/erpnext/docs/user/manual/en/website/setup/website-settings.md
index 2415589f41..6d5ad2321a 100644
--- a/erpnext/docs/user/manual/en/website/setup/website-settings.md
+++ b/erpnext/docs/user/manual/en/website/setup/website-settings.md
@@ -1,10 +1,12 @@
+# Website Settings
+
Most of the website related settings can be defined here.
-
+
####Landing Page
-* Home Page: You can specify which [Web Page]({{docs_base_url}}/user/manual/en/website/web-page.html) must be the homepage of the website
+* Home Page: You can specify which [Web Page](/docs/user/manual/en/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 +16,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.
-
+
* Select 'create new website theme' if you wish to customize the default website theme.
@@ -23,13 +25,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.
-
+
####Top Bar
You can set the menus items in the Top Bar here.
-
+
* Similarlly you can also set sidebar and footer links.
@@ -37,7 +39,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.
-
+
* You can disable public signup to your ERPNext account by checking 'disable signup'
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 6103e3c70f..8fe5244a3d 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -1,3 +1,5 @@
+# Shopping Cart
+
On the Webpage, a shopping cart is an icon that allows you to store all the
things that you have earmarked for purchasing. It is a graphical
representation of a shopping basket or a shopping cart that allows you to save
@@ -14,7 +16,7 @@ To set up a shopping cart, go to the website module.
#### Enter Company Details and Checkout Details.
-
+
To make item available on website go to Item master.
@@ -22,11 +24,11 @@ To make item available on website go to Item master.
#### Enable Item for website.
-
+
#### Enter Website Specifications for Item.
-
+
### Shop using Shopping Cart
@@ -35,20 +37,20 @@ To make item available on website go to Item master.
Click on "Add to Cart" to add item to shopping cart.
-
+
#### Goto Checkout
Click on "Go to Cart" to checkout or on "Cart" which is on upper right side
of the screen.
-
+
#### Checkout
Change quantity, select Shipping and Billing Address and click
on "Place Order" to place the order.
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/website/web-form.md b/erpnext/docs/user/manual/en/website/web-form.md
index 1668ac06a7..b75ef0b0a1 100644
--- a/erpnext/docs/user/manual/en/website/web-form.md
+++ b/erpnext/docs/user/manual/en/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.
-
+
---
@@ -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!
-
+
---
diff --git a/erpnext/docs/user/manual/en/website/web-page.md b/erpnext/docs/user/manual/en/website/web-page.md
index 947891e30f..f931f024d4 100644
--- a/erpnext/docs/user/manual/en/website/web-page.md
+++ b/erpnext/docs/user/manual/en/website/web-page.md
@@ -1,10 +1,12 @@
+# Web Page
+
Static Content like your Home Page, About Us, Contact Us, Terms pages can be created using the Web Page.
To create a new Web Page, go to: > Website > Web Page > New -
+
#### Title
diff --git a/erpnext/docs/user/manual/es/accounts/accounting-entries.md b/erpnext/docs/user/manual/es/accounts/accounting-entries.md
index ffda0b5a3f..9ad5abdef3 100644
--- a/erpnext/docs/user/manual/es/accounts/accounting-entries.md
+++ b/erpnext/docs/user/manual/es/accounts/accounting-entries.md
@@ -1,3 +1,5 @@
+# Accounting Entries
+
@@ -8,7 +10,7 @@ para el negocio.
* Mama (El propietario de Tea-stall) invierte $25000 para iniciar el negocio.
-
+
__Análisis:__ Mama invierte 25000 en la compañía, con la esperanza de obtener alguna
ganancia. En otras palabras, la compañía es responsable del pago de $25000 a mama en
@@ -21,7 +23,7 @@ la compañía y debe ser debitado.
que pertenece a un amigo y le concede cierto crédito. Los equipos cuestan 2800 y las
materias primas valen 2200. La compañía paga 2000 de un total de 5000.
-
+
__Análisis:__ Los equipos son "Activos Fijos" (porque tienen una larga vida útil) de la
compañía y las materias primas son "Activos corrientes" (porque son usados en la
@@ -37,7 +39,7 @@ un crédito de 3000.
día, Tea Stall vende 325 tazas de té, lo cual da una venta neta de RS. 1575. El propietario
registra feliz su primer día de ventas.
-
+
__Análisis:__ Los ingresos han sido anotados en la cuenta "Ventas de Té", la cual se
debita para incrementar el valor y la misma cantidad se acredita de la cuenta
@@ -48,7 +50,7 @@ debe ser registado en la cuenta "Costos de bienes vendidos" en la misma cantidad
Al finalizar el mes, la compañía paga el arriendo del local (5000) y el salario de
un empleado (8000), el cual trabajó desde el primer día.
-
+
### Registro de ganancias
@@ -60,7 +62,7 @@ que pagárselas a Mama). Cuando el Libro de Balance no está balanceado, p.e. el
débito no es igual al crédito, la ganacia aún no ha sido anotada. Se debe realziar
la siguiente entrada:
-
+
Explicación: Las ventas y gastos netos son 40000 y 20000 respectivamente.
Entonces, la compañía tuvo una ganancia de 20000. Para registrar esa entrada,
diff --git a/erpnext/docs/user/manual/es/accounts/accounting-reports.md b/erpnext/docs/user/manual/es/accounts/accounting-reports.md
index 925ea1fa8a..a887f9a81f 100644
--- a/erpnext/docs/user/manual/es/accounts/accounting-reports.md
+++ b/erpnext/docs/user/manual/es/accounts/accounting-reports.md
@@ -1,3 +1,5 @@
+# Accounting Reports
+
@@ -12,7 +14,7 @@ actualizado de todas las entradas que existan para una cuetna dada en un
periodo determinado.
+ src="/docs/assets/img/accounts/general-ledger.png">
### Balance Contable
@@ -24,7 +26,7 @@ en una fecha particular. Para cada cuenta proporciona:
* Creditos
* Cierre
-
+
La suma de todos los balances de cierre en el Balance Contable debe ser igual a cero.
@@ -33,7 +35,7 @@ La suma de todos los balances de cierre en el Balance Contable debe ser igual a
Este reporte permite hacer seguimiento a las facturas enviadas a los clientes y proveedores. En este
reporte, se resaltan diferentes periodos de tiempo. p.e. entre 0-30 días, 30-60 días y así por el estilo.
-
+
### Registro de Ventas y Compras
@@ -41,7 +43,7 @@ En este reporte, cada cuenta de impuestos es transpuesta en columnas. For cada f
se puede obtener la cantidad de impuestos individuales que debe ser pagados, de acuerdo a la
tabla de Impuestos y Contribuciones,
-
+
**Trabajo en progreso.**
diff --git a/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md
index 81491bc24e..e373c7b8a7 100644
--- a/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/es/accounts/advance-payment-entry.md
@@ -1,35 +1,34 @@
-
+# Advance Payment Entry
+
Los pagos realizados por el cliente antes de recibir el envío del producto se
denominan Anticipos. Para ordenes de alto costo, los negocios esperan recibir
dcho tipos de pago.
-
+
__Por Ejemplo:__ Consider a customer- Jane D'souza placing an order for a double
bed costing $10000 She is asked to give some advance before the furniture
house begins work on her order. She gives them $5000 in cash.
-
+
Go to Accounts and open a new Journal Entry to make the advance entry.
-> Accounts > Documents > Journal Entry > New Journal Entry
+> Accounts > Documents > Journal Entry > New Journal Entry
Mention the voucher type as cash voucher. This differs for different
customers. If somebody pays by cheque the voucher type will be Bank Voucher.
Then select the customer account and make the respective debit and credit
-entries.
+entries.
Since the customer has given $5000 as cash advance,it will be recorded as a
credit entry against the customer. To balance it with the debit entry [Double
accounting Entry] enter $5000 as debit against the company's cash account. In
the row "Is Advance" click 'Yes'.
-#### Figure 1 : Journal Entry -Advance Entry
+#### Figure 1 : Journal Entry -Advance Entry
-
+
-### Double Entry Accounting
+### Double Entry Accounting
Double entry bookkeeping is a system of accounting in which every transaction
has a corresponding positive and negative entry : debits and credits. Every
@@ -41,10 +40,10 @@ account. This means that every transaction must be recorded in two accounts;
one account will be debited because it receives value and the other account
will be credited because it has given value.
-
+
#### Figure 2: Transaction and Difference Entry
-
+
Save and submit the JV. If this document is not saved it will not be pulled in
other accounting documents.
@@ -56,9 +55,9 @@ To link the Sales Invoice to the Journal Entry which mentions the advance
payment entry, click on ‘Get Advances Received’. Allocate the amount of
advance in the advances table. The accounting will be adjusted accordingly.
-#### Figure 3: Receive Advance
+#### Figure 3: Receive Advance
-
+
Save and submit the Sales Invoice.
diff --git a/erpnext/docs/user/manual/es/accounts/index.md b/erpnext/docs/user/manual/es/accounts/index.md
index 9599bf9166..2617b587da 100644
--- a/erpnext/docs/user/manual/es/accounts/index.md
+++ b/erpnext/docs/user/manual/es/accounts/index.md
@@ -1,3 +1,5 @@
+# Accounts
+
diff --git a/erpnext/docs/user/manual/es/index.md b/erpnext/docs/user/manual/es/index.md
index 330be14944..c701b421bc 100644
--- a/erpnext/docs/user/manual/es/index.md
+++ b/erpnext/docs/user/manual/es/index.md
@@ -1,6 +1,3 @@
-
# Manual de Usuario (Español)
### Contenido:
@@ -9,4 +6,4 @@ WORK IN PROGRESS
**Trabajo en progreso.**
-[La traducción al Español del manual de ERPNext está en progreso. Click aquí para ver el manual en ingles]({{ docs_base_url }}/user/manual/en)
+[La traducción al Español del manual de ERPNext está en progreso. Click aquí para ver el manual en ingles](/docs/user/manual/en)
diff --git a/erpnext/docs/user/manual/es/introduction/do-i-need-an-erp.md b/erpnext/docs/user/manual/es/introduction/do-i-need-an-erp.md
index a101c837bd..6d916e7475 100644
--- a/erpnext/docs/user/manual/es/introduction/do-i-need-an-erp.md
+++ b/erpnext/docs/user/manual/es/introduction/do-i-need-an-erp.md
@@ -1,3 +1,5 @@
+# Do I Need An Erp
+
ERPNext es una herramienta moderna que no solo abarca el módulo de contabilidad,
sino que también, cubre todas las otras funciones de su negocio en una plataforma integrada.
Tiene muchos beneficios sobre los sistemas tradicionales de contabilidad y otros ERP en el mercado.
diff --git a/erpnext/docs/user/manual/es/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/es/introduction/getting-started-with-erpnext.md
index d1518e5960..cc0b1c0dbc 100644
--- a/erpnext/docs/user/manual/es/introduction/getting-started-with-erpnext.md
+++ b/erpnext/docs/user/manual/es/introduction/getting-started-with-erpnext.md
@@ -1,3 +1,5 @@
+# Getting Started With Erpnext
+
Hay muchas manera de comenzar a utilizar ERPNext.
### 1\. Ver el Demo
@@ -10,7 +12,7 @@ see the demo at:
### 2\. Comienza con una cuenta gratis en ERPNext.com
-ERPNext.com es manejado por la organización (Frappe) que publicó ERPNext.
+ERPNext.com es manejado por la organización (Frappé) que publicó ERPNext.
Puedes iniciar con su propia cuenta en [registrandote en la página](https://erpnext.com).
También, puedes hostear tu aplicación en erpnext.com comprando un plan de alojamiento.
@@ -26,6 +28,6 @@ Puedes usarla en **cualquier** plataforma incluyendo Microsoft Windows.
### 4\. Instalar ERPNext en su ordenador Unix/Linux/Mac
-En caso de estar relacionado con la instalación de aplicaciones en plataformas *nix, leer las instrucciones de como instalarlo usando [Frappe Bench](https://github.com/frappe/bench).
+En caso de estar relacionado con la instalación de aplicaciones en plataformas *nix, leer las instrucciones de como instalarlo usando [Frappé Bench](https://github.com/frappe/bench).
{next}
diff --git a/erpnext/docs/user/manual/es/introduction/implementation-strategy.md b/erpnext/docs/user/manual/es/introduction/implementation-strategy.md
index e5482f24de..6429ddd34a 100644
--- a/erpnext/docs/user/manual/es/introduction/implementation-strategy.md
+++ b/erpnext/docs/user/manual/es/introduction/implementation-strategy.md
@@ -1,3 +1,5 @@
+# Implementation Strategy
+
Antes de que empieces a manejar todas tus operaciones en ERPNext, primero
deberías estar familiarizado con el sistema y los términos que utiliza.
Por esa razón recomendamos que la implementación pase en dos fases.
diff --git a/erpnext/docs/user/manual/es/introduction/index.md b/erpnext/docs/user/manual/es/introduction/index.md
index bbbf930328..17e37041af 100644
--- a/erpnext/docs/user/manual/es/introduction/index.md
+++ b/erpnext/docs/user/manual/es/introduction/index.md
@@ -1,3 +1,5 @@
+# Introduction
+
## ¿Qué es un ERP y Por qué debería interesarme?
(Si ya sabes que necesitas un sistema todo-en-uno para su compañia, puedes pasar a la siguiente página)
diff --git a/erpnext/docs/user/manual/es/introduction/key-workflows.md b/erpnext/docs/user/manual/es/introduction/key-workflows.md
index 6a29abf9d5..6877fb3d02 100644
--- a/erpnext/docs/user/manual/es/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/es/introduction/key-workflows.md
@@ -3,10 +3,10 @@
Este diagrama cubre como ERPNext hace el seguimiento de la información de su compañia a través de funciones claves.
Este diagrama no cubre toda la funcionalidad o características de ERPNext.
-
+
-
+
_Nota: No todos los pasos son obligatorios. ERPNext te permite pasar algunos pasos si deseas simplificar el proceso._
diff --git a/erpnext/docs/user/manual/es/introduction/open-source.md b/erpnext/docs/user/manual/es/introduction/open-source.md
index e12fd51bc0..efa2f131b0 100644
--- a/erpnext/docs/user/manual/es/introduction/open-source.md
+++ b/erpnext/docs/user/manual/es/introduction/open-source.md
@@ -1,3 +1,5 @@
+# Open Source
+
El código fuente de ERPNext es de código abierto. Está abierto para que todos
podamos entenderlo, extenderlo o mejorarlo. Y es gratis!
diff --git a/erpnext/docs/user/manual/es/introduction/the-champion.md b/erpnext/docs/user/manual/es/introduction/the-champion.md
index e124b5366b..0d2106e220 100644
--- a/erpnext/docs/user/manual/es/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/es/introduction/the-champion.md
@@ -1,8 +1,10 @@
+# The Champion
+
+
Hemos visto docenas de implementaciones de sistemas ERP en los últimos años
y nos hemos dado cuenta que una implementación exitosa es más sobre cosas intangibles y actitudes.
diff --git a/erpnext/docs/user/manual/index.md b/erpnext/docs/user/manual/index.md
index d6cf4f16fe..cc37ba4884 100644
--- a/erpnext/docs/user/manual/index.md
+++ b/erpnext/docs/user/manual/index.md
@@ -1,10 +1,7 @@
-
# ERPNext User Manual
Select your language
-1. [English]({{docs_base_url}}/user/manual/en)
-1. [Deutsch]({{docs_base_url}}/user/manual/de)
-1. [Español]({{docs_base_url}}/user/manual/es)
\ No newline at end of file
+1. [English](/docs/user/manual/en)
+1. [Deutsch](/docs/user/manual/de)
+1. [Español](/docs/user/manual/es)
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/index.md b/erpnext/docs/user/videos/index.md
index 9a82db5ee0..8d3b70117b 100644
--- a/erpnext/docs/user/videos/index.md
+++ b/erpnext/docs/user/videos/index.md
@@ -1,13 +1,13 @@
# ERPNext Videos
|
{% if reply.image %}
-
+
{{ reply.sender_name[0] }}
{% endif %}
|
-
+
{{ reply.sender_name }}
|
@@ -30,13 +27,12 @@
||
|
-
+
{{ reply.content }}
|
@@ -51,7 +47,7 @@
{% if did_not_reply %}
+ 
+ 