diff --git a/foundation/www/docs/current/api/hr/print_format/offer_letter/_sidebar.json b/foundation/www/docs/assets/img/accounts/shareholder/_sidebar.json similarity index 100% rename from foundation/www/docs/current/api/hr/print_format/offer_letter/_sidebar.json rename to foundation/www/docs/assets/img/accounts/shareholder/_sidebar.json diff --git a/foundation/www/docs/assets/img/accounts/shareholder/sharebalance_1.png b/foundation/www/docs/assets/img/accounts/shareholder/sharebalance_1.png new file mode 100644 index 00000000..3e223240 Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/shareholder/sharebalance_1.png differ diff --git a/foundation/www/docs/assets/img/accounts/shareholder/sharebalance_2.png b/foundation/www/docs/assets/img/accounts/shareholder/sharebalance_2.png new file mode 100644 index 00000000..c33cae8d Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/shareholder/sharebalance_2.png differ diff --git a/foundation/www/docs/assets/img/accounts/shareholder/shareholder_tonystark.png b/foundation/www/docs/assets/img/accounts/shareholder/shareholder_tonystark.png new file mode 100644 index 00000000..ee05b204 Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/shareholder/shareholder_tonystark.png differ diff --git a/foundation/www/docs/assets/img/accounts/shareholder/shareledger_1.png b/foundation/www/docs/assets/img/accounts/shareholder/shareledger_1.png new file mode 100644 index 00000000..a7cae310 Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/shareholder/shareledger_1.png differ diff --git a/foundation/www/docs/assets/img/accounts/shareholder/shareledger_2.png b/foundation/www/docs/assets/img/accounts/shareholder/shareledger_2.png new file mode 100644 index 00000000..1d14ecce Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/shareholder/shareledger_2.png differ diff --git a/foundation/www/docs/assets/img/accounts/shareholder/sharetransfer_issue_tonystark.png b/foundation/www/docs/assets/img/accounts/shareholder/sharetransfer_issue_tonystark.png new file mode 100644 index 00000000..535353fa Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/shareholder/sharetransfer_issue_tonystark.png differ diff --git a/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/__init__.py b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapper-1.png b/foundation/www/docs/assets/img/articles/cash-flow-mapper-1.png new file mode 100644 index 00000000..c6b37b17 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapper-1.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapper-2.png b/foundation/www/docs/assets/img/articles/cash-flow-mapper-2.png new file mode 100644 index 00000000..b3ba12d4 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapper-2.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapper-3.png b/foundation/www/docs/assets/img/articles/cash-flow-mapper-3.png new file mode 100644 index 00000000..f494ecb7 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapper-3.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapper-4.png b/foundation/www/docs/assets/img/articles/cash-flow-mapper-4.png new file mode 100644 index 00000000..8f94b87d Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapper-4.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapper-5.png b/foundation/www/docs/assets/img/articles/cash-flow-mapper-5.png new file mode 100644 index 00000000..39371e67 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapper-5.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapper-6.png b/foundation/www/docs/assets/img/articles/cash-flow-mapper-6.png new file mode 100644 index 00000000..08472cac Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapper-6.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-1.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-1.png new file mode 100644 index 00000000..e724b5b9 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-1.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-10.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-10.png new file mode 100644 index 00000000..b9ca66f2 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-10.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-2.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-2.png new file mode 100644 index 00000000..89adfb9e Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-2.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-3.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-3.png new file mode 100644 index 00000000..45595f0b Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-3.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-4.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-4.png new file mode 100644 index 00000000..0be7f207 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-4.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-5.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-5.png new file mode 100644 index 00000000..fc517327 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-5.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-7.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-7.png new file mode 100644 index 00000000..6bf3043a Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-7.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-8.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-8.png new file mode 100644 index 00000000..f945a7d2 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-8.png differ diff --git a/foundation/www/docs/assets/img/articles/cash-flow-mapping-9.png b/foundation/www/docs/assets/img/articles/cash-flow-mapping-9.png new file mode 100644 index 00000000..5928909b Binary files /dev/null and b/foundation/www/docs/assets/img/articles/cash-flow-mapping-9.png differ diff --git a/foundation/www/docs/assets/img/articles/default-cash-flow-report.png b/foundation/www/docs/assets/img/articles/default-cash-flow-report.png new file mode 100644 index 00000000..80417812 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/default-cash-flow-report.png differ diff --git a/foundation/www/docs/assets/img/articles/final-cash-flow.png b/foundation/www/docs/assets/img/articles/final-cash-flow.png new file mode 100644 index 00000000..88821c46 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/final-cash-flow.png differ diff --git a/foundation/www/docs/assets/img/articles/format-1.png b/foundation/www/docs/assets/img/articles/format-1.png new file mode 100644 index 00000000..e5044550 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/format-1.png differ diff --git a/foundation/www/docs/assets/img/articles/format-2.png b/foundation/www/docs/assets/img/articles/format-2.png new file mode 100644 index 00000000..c997f99d Binary files /dev/null and b/foundation/www/docs/assets/img/articles/format-2.png differ diff --git a/foundation/www/docs/assets/img/articles/new-cash-flow-mapping.png b/foundation/www/docs/assets/img/articles/new-cash-flow-mapping.png new file mode 100644 index 00000000..df269bca Binary files /dev/null and b/foundation/www/docs/assets/img/articles/new-cash-flow-mapping.png differ diff --git a/foundation/www/docs/assets/img/articles/no-mappers.png b/foundation/www/docs/assets/img/articles/no-mappers.png new file mode 100644 index 00000000..4dd000f1 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/no-mappers.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/__init__.py b/foundation/www/docs/assets/img/articles/twofactor/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/asset/__init__.py b/foundation/www/docs/assets/img/asset/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/asset/asset_prorated_depreciation.png b/foundation/www/docs/assets/img/asset/asset_prorated_depreciation.png new file mode 100644 index 00000000..d81699be Binary files /dev/null and b/foundation/www/docs/assets/img/asset/asset_prorated_depreciation.png differ diff --git a/foundation/www/docs/assets/img/education/module.png b/foundation/www/docs/assets/img/education/module.png index eae84b38..18259f02 100644 Binary files a/foundation/www/docs/assets/img/education/module.png and b/foundation/www/docs/assets/img/education/module.png differ diff --git a/foundation/www/docs/assets/img/education/student/schools-settings.png b/foundation/www/docs/assets/img/education/setup/education-settings.png similarity index 100% rename from foundation/www/docs/assets/img/education/student/schools-settings.png rename to foundation/www/docs/assets/img/education/setup/education-settings.png diff --git a/foundation/www/docs/assets/img/education/setup/setup.png b/foundation/www/docs/assets/img/education/setup/setup.png new file mode 100644 index 00000000..11f32025 Binary files /dev/null and b/foundation/www/docs/assets/img/education/setup/setup.png differ diff --git a/foundation/www/docs/assets/img/education/student/student-batch-validation.gif b/foundation/www/docs/assets/img/education/setup/student-batch-validation.gif similarity index 100% rename from foundation/www/docs/assets/img/education/student/student-batch-validation.gif rename to foundation/www/docs/assets/img/education/setup/student-batch-validation.gif diff --git a/foundation/www/docs/assets/img/education/setup/student-category.png b/foundation/www/docs/assets/img/education/setup/student-category.png new file mode 100644 index 00000000..dc12a0d1 Binary files /dev/null and b/foundation/www/docs/assets/img/education/setup/student-category.png differ diff --git a/foundation/www/docs/assets/img/education/student/student-course-validation.gif b/foundation/www/docs/assets/img/education/setup/student-course-validation.gif similarity index 100% rename from foundation/www/docs/assets/img/education/student/student-course-validation.gif rename to foundation/www/docs/assets/img/education/setup/student-course-validation.gif diff --git a/foundation/www/docs/assets/img/education/student/student group.gif b/foundation/www/docs/assets/img/education/student/student-group.gif similarity index 100% rename from foundation/www/docs/assets/img/education/student/student group.gif rename to foundation/www/docs/assets/img/education/student/student-group.gif diff --git a/foundation/www/docs/assets/img/hotels/_sidebar.json b/foundation/www/docs/assets/img/hotels/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/hotels/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/hotels/hotel-room.png b/foundation/www/docs/assets/img/hotels/hotel-room.png new file mode 100644 index 00000000..7aad2273 Binary files /dev/null and b/foundation/www/docs/assets/img/hotels/hotel-room.png differ diff --git a/foundation/www/docs/assets/img/human-resources/created-payroll.png b/foundation/www/docs/assets/img/human-resources/created-payroll.png new file mode 100644 index 00000000..2465e649 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/created-payroll.png differ diff --git a/foundation/www/docs/assets/img/human-resources/offer-letter-print.png b/foundation/www/docs/assets/img/human-resources/job-offer-print.png similarity index 100% rename from foundation/www/docs/assets/img/human-resources/offer-letter-print.png rename to foundation/www/docs/assets/img/human-resources/job-offer-print.png diff --git a/foundation/www/docs/assets/img/human-resources/job-offer.png b/foundation/www/docs/assets/img/human-resources/job-offer.png new file mode 100644 index 00000000..84c584f2 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/job-offer.png differ diff --git a/foundation/www/docs/assets/img/human-resources/offer-letter.png b/foundation/www/docs/assets/img/human-resources/offer-letter.png deleted file mode 100644 index e3d5671b..00000000 Binary files a/foundation/www/docs/assets/img/human-resources/offer-letter.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/human-resources/payroll-entry.png b/foundation/www/docs/assets/img/human-resources/payroll-entry.png new file mode 100644 index 00000000..345eef80 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/payroll-entry.png differ diff --git a/foundation/www/docs/assets/img/human-resources/payroll-journal-entry.png b/foundation/www/docs/assets/img/human-resources/payroll-journal-entry.png new file mode 100644 index 00000000..2e4f05ec Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/payroll-journal-entry.png differ diff --git a/foundation/www/docs/assets/img/human-resources/payroll-make-bank-entry.png b/foundation/www/docs/assets/img/human-resources/payroll-make-bank-entry.png new file mode 100644 index 00000000..89873ecc Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/payroll-make-bank-entry.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/make_po_mr.png b/foundation/www/docs/assets/img/manufacturing/make_po_mr.png new file mode 100644 index 00000000..e165301a Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/make_po_mr.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/material_request_filter.png b/foundation/www/docs/assets/img/manufacturing/material_request_filter.png new file mode 100644 index 00000000..9b8b6299 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/material_request_filter.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/material_request_items.png b/foundation/www/docs/assets/img/manufacturing/material_request_items.png new file mode 100644 index 00000000..13421f5b Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/material_request_items.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/material_request_plan.png b/foundation/www/docs/assets/img/manufacturing/material_request_plan.png new file mode 100644 index 00000000..e7134397 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/material_request_plan.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/material_requests.png b/foundation/www/docs/assets/img/manufacturing/material_requests.png new file mode 100644 index 00000000..87b360aa Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/material_requests.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/production_plan.png b/foundation/www/docs/assets/img/manufacturing/production_plan.png new file mode 100644 index 00000000..70565c07 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/production_plan.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/sales_order_filter.png b/foundation/www/docs/assets/img/manufacturing/sales_order_filter.png new file mode 100644 index 00000000..6b359ea8 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/sales_order_filter.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/sales_order_items.png b/foundation/www/docs/assets/img/manufacturing/sales_order_items.png new file mode 100644 index 00000000..a9d8b8d5 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/sales_order_items.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/sales_orders.png b/foundation/www/docs/assets/img/manufacturing/sales_orders.png new file mode 100644 index 00000000..1a9645e3 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/sales_orders.png differ diff --git a/foundation/www/docs/assets/img/non_profit/chapter/__init__.py b/foundation/www/docs/assets/img/non_profit/chapter/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/donor/__init__.py b/foundation/www/docs/assets/img/non_profit/donor/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/grant_application/__init__.py b/foundation/www/docs/assets/img/non_profit/grant_application/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/membership/__init__.py b/foundation/www/docs/assets/img/non_profit/membership/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/volunteer/__init__.py b/foundation/www/docs/assets/img/non_profit/volunteer/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/restaurant/__init__.py b/foundation/www/docs/assets/img/restaurant/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/__init__.py b/foundation/www/docs/assets/img/schools/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/admission/__init__.py b/foundation/www/docs/assets/img/schools/admission/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/assessment/__init__.py b/foundation/www/docs/assets/img/schools/assessment/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/fees/__init__.py b/foundation/www/docs/assets/img/schools/fees/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/schedule/__init__.py b/foundation/www/docs/assets/img/schools/schedule/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/setup/__init__.py b/foundation/www/docs/assets/img/schools/setup/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/student/__init__.py b/foundation/www/docs/assets/img/schools/student/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/setup/integrations/braintree_account.png b/foundation/www/docs/assets/img/setup/integrations/braintree_account.png new file mode 100644 index 00000000..6f5783fc Binary files /dev/null and b/foundation/www/docs/assets/img/setup/integrations/braintree_account.png differ diff --git a/foundation/www/docs/assets/img/setup/integrations/braintree_coa.png b/foundation/www/docs/assets/img/setup/integrations/braintree_coa.png new file mode 100644 index 00000000..c0079966 Binary files /dev/null and b/foundation/www/docs/assets/img/setup/integrations/braintree_coa.png differ diff --git a/foundation/www/docs/assets/img/setup/integrations/payment_gateway_account_braintree.png b/foundation/www/docs/assets/img/setup/integrations/payment_gateway_account_braintree.png new file mode 100644 index 00000000..a19cd7a1 Binary files /dev/null and b/foundation/www/docs/assets/img/setup/integrations/payment_gateway_account_braintree.png differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/__init__.py b/foundation/www/docs/assets/img/users-and-permissions/user-perms/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/__init__.py b/foundation/www/docs/current/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/__init__.py b/foundation/www/docs/current/api/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/accounts/__init__.py b/foundation/www/docs/current/api/accounts/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html index ae2d0e51..591912ad 100644 --- a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html +++ b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html @@ -3,7 +3,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 erpnext.accounts.party._get_party_details - (party=None, account=None, party_type=Customer, company=None, posting_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False) + (party=None, account=None, party_type=Customer, company=None, posting_date=None, bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False)

No docs

@@ -88,7 +88,7 @@ erpnext.accounts.party.get_due_date - (posting_date, party_type, party) + (posting_date, party_type, party, company=None, bill_date=None)

Get due date from Payment Terms Template

@@ -104,7 +104,7 @@ erpnext.accounts.party.get_due_date_from_template - (template_name, posting_date) + (template_name, posting_date, bill_date)

Inspects all `Payment Term`s from the a `Payment Terms Template` and returns the due
 date after considering all the `Payment Term`s requirements.
@@ -169,7 +169,7 @@ date after considering all the `Payment Term`s requirements.
         
             
 		erpnext.accounts.party.get_party_details
-        (party=None, account=None, party_type=Customer, company=None, posting_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False)
+        (party=None, account=None, party_type=Customer, company=None, posting_date=None, bill_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False)
     

No docs

@@ -248,7 +248,7 @@ It returns an empty string if there is no matching record. erpnext.accounts.party.get_pyt_term_template - (party_name, party_type) + (party_name, party_type, company=None)

No docs

@@ -280,7 +280,7 @@ It returns an empty string if there is no matching record. erpnext.accounts.party.set_account_and_due_date - (party, account, party_type, company, posting_date, doctype) + (party, account, party_type, company, posting_date, bill_date, doctype)

No docs

@@ -378,7 +378,7 @@ It returns an empty string if there is no matching record. erpnext.accounts.party.validate_due_date - (posting_date, due_date, party_type, party) + (posting_date, due_date, party_type, party, company=None, bill_date=None)

No docs

diff --git a/foundation/www/docs/current/api/accounts/erpnext.accounts.utils.html b/foundation/www/docs/current/api/accounts/erpnext.accounts.utils.html index 1232eccb..a6d18bb1 100644 --- a/foundation/www/docs/current/api/accounts/erpnext.accounts.utils.html +++ b/foundation/www/docs/current/api/accounts/erpnext.accounts.utils.html @@ -3,7 +3,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 erpnext.controllers.accounts_controller.get_due_date - (posting_date, term) + (term, posting_date=None, bill_date=None)

No docs

@@ -726,7 +726,7 @@ erpnext.controllers.accounts_controller.get_payment_term_details - (term, posting_date=None, grand_total=None) + (term, posting_date=None, grand_total=None, bill_date=None)

No docs

@@ -744,7 +744,7 @@ erpnext.controllers.accounts_controller.get_payment_terms - (terms_template, posting_date=None, grand_total=None) + (terms_template, posting_date=None, grand_total=None, bill_date=None)

No docs

diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html index c4e1450c..701075a9 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.buying_controller.html @@ -3,7 +3,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 -

erpnext.hr.print_format.offer_letter

+ +

erpnext.hotels

- Version 10.0.13 + Version 10.1.2 - Source
diff --git a/foundation/www/docs/current/api/hr/print_format/offer_letter/index.html b/foundation/www/docs/current/api/hotels/index.html similarity index 77% rename from foundation/www/docs/current/api/hr/print_format/offer_letter/index.html rename to foundation/www/docs/current/api/hotels/index.html index d7d480f8..5130e590 100644 --- a/foundation/www/docs/current/api/hr/print_format/offer_letter/index.html +++ b/foundation/www/docs/current/api/hotels/index.html @@ -1,16 +1,16 @@ - + -

offer_letter

+

hotels

- Version 10.0.13 + Version 10.1.2 - Source
diff --git a/foundation/www/docs/current/api/hotels/index.txt b/foundation/www/docs/current/api/hotels/index.txt new file mode 100644 index 00000000..19e6891a --- /dev/null +++ b/foundation/www/docs/current/api/hotels/index.txt @@ -0,0 +1 @@ +erpnext.hotels \ No newline at end of file diff --git a/foundation/www/docs/current/api/hr/__init__.py b/foundation/www/docs/current/api/hr/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/hr/email_alert/__init__.py b/foundation/www/docs/current/api/hr/email_alert/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/hr/email_alert/erpnext.hr.email_alert.html b/foundation/www/docs/current/api/hr/email_alert/erpnext.hr.email_alert.html index ef14dc0a..2ff92d4f 100644 --- a/foundation/www/docs/current/api/hr/email_alert/erpnext.hr.email_alert.html +++ b/foundation/www/docs/current/api/hr/email_alert/erpnext.hr.email_alert.html @@ -3,7 +3,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 +

erpnext.hr.print_format.job_offer

+
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hr/print_format/job_offer/index.html b/foundation/www/docs/current/api/hr/print_format/job_offer/index.html new file mode 100644 index 00000000..aabad1b0 --- /dev/null +++ b/foundation/www/docs/current/api/hr/print_format/job_offer/index.html @@ -0,0 +1,22 @@ + + + + + +

job_offer

+ + +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hr/print_format/job_offer/index.txt b/foundation/www/docs/current/api/hr/print_format/job_offer/index.txt new file mode 100644 index 00000000..f72bef16 --- /dev/null +++ b/foundation/www/docs/current/api/hr/print_format/job_offer/index.txt @@ -0,0 +1 @@ +erpnext.hr.print_format.job_offer \ No newline at end of file diff --git a/foundation/www/docs/current/api/hr/print_format/offer_letter/__init__.py b/foundation/www/docs/current/api/hr/print_format/offer_letter/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/hr/print_format/offer_letter/index.txt b/foundation/www/docs/current/api/hr/print_format/offer_letter/index.txt deleted file mode 100644 index eb220825..00000000 --- a/foundation/www/docs/current/api/hr/print_format/offer_letter/index.txt +++ /dev/null @@ -1 +0,0 @@ -erpnext.hr.print_format.offer_letter \ No newline at end of file diff --git a/foundation/www/docs/current/api/hr/print_format/salary_slip_based_on_timesheet/__init__.py b/foundation/www/docs/current/api/hr/print_format/salary_slip_based_on_timesheet/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/hr/print_format/salary_slip_based_on_timesheet/erpnext.hr.print_format.salary_slip_based_on_timesheet.html b/foundation/www/docs/current/api/hr/print_format/salary_slip_based_on_timesheet/erpnext.hr.print_format.salary_slip_based_on_timesheet.html index 8447551d..92a7cc02 100644 --- a/foundation/www/docs/current/api/hr/print_format/salary_slip_based_on_timesheet/erpnext.hr.print_format.salary_slip_based_on_timesheet.html +++ b/foundation/www/docs/current/api/hr/print_format/salary_slip_based_on_timesheet/erpnext.hr.print_format.salary_slip_based_on_timesheet.html @@ -3,7 +3,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 erpnext.hub_node.get_categories - () + (parent=All Categories)

No docs

@@ -71,13 +71,13 @@

Public API -
/api/method/erpnext.hub_node.get_company_details +
/api/method/erpnext.hub_node.get_details

- + - erpnext.hub_node.get_company_details - (hub_sync_id) + erpnext.hub_node.get_details + (hub_sync_id=None, doctype=Hub Item)

No docs

@@ -105,13 +105,13 @@

Public API -
/api/method/erpnext.hub_node.get_item_details +
/api/method/erpnext.hub_node.get_list

- + - erpnext.hub_node.get_item_details - (hub_sync_id=None) + erpnext.hub_node.get_list + (doctype, start=0, limit=20, fields=[u'*'], filters={}, order_by=None)

No docs

@@ -123,13 +123,13 @@

Public API -
/api/method/erpnext.hub_node.get_items +
/api/method/erpnext.hub_node.get_meta

- + - erpnext.hub_node.get_items - (start=0, limit=20, category=None, order_by=None, company=None, text=None) + erpnext.hub_node.get_meta + (doctype)

No docs

@@ -251,6 +251,24 @@ + + + +

Public API +
/api/method/erpnext.hub_node.update_category +

+

+ + + erpnext.hub_node.update_category + (item_name, category) +

+

No docs

+
+
+ + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/hub_node/index.html b/foundation/www/docs/current/api/hub_node/index.html index 9a4e8c4c..3a7ecb72 100644 --- a/foundation/www/docs/current/api/hub_node/index.html +++ b/foundation/www/docs/current/api/hub_node/index.html @@ -7,7 +7,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 +

erpnext.regional.france

+
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/france/erpnext.regional.france.setup.html b/foundation/www/docs/current/api/regional/france/erpnext.regional.france.setup.html new file mode 100644 index 00000000..224c37e5 --- /dev/null +++ b/foundation/www/docs/current/api/regional/france/erpnext.regional.france.setup.html @@ -0,0 +1,68 @@ + +

erpnext.regional.france.setup

+ + + + + + + + + + +

+ + + erpnext.regional.france.setup.add_custom_roles_for_reports + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.regional.france.setup.make_custom_fields + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.regional.france.setup.setup + (company=None, patch=True) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/france/erpnext.regional.france.utils.html b/foundation/www/docs/current/api/regional/france/erpnext.regional.france.utils.html new file mode 100644 index 00000000..3058483c --- /dev/null +++ b/foundation/www/docs/current/api/regional/france/erpnext.regional.france.utils.html @@ -0,0 +1,68 @@ + +

erpnext.regional.france.utils

+ + + + + + + + + + +

+ + + erpnext.regional.france.utils.check_deletion_permission + (doc, method) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.regional.france.utils.create_transaction_log + (doc, method) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.regional.france.utils.test_method + () +

+

test function

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/france/index.html b/foundation/www/docs/current/api/regional/france/index.html new file mode 100644 index 00000000..216cb17b --- /dev/null +++ b/foundation/www/docs/current/api/regional/france/index.html @@ -0,0 +1,22 @@ + + + + + +

france

+ + +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/france/index.txt b/foundation/www/docs/current/api/regional/france/index.txt new file mode 100644 index 00000000..237b4fa4 --- /dev/null +++ b/foundation/www/docs/current/api/regional/france/index.txt @@ -0,0 +1,3 @@ +erpnext.regional.france +erpnext.regional.france.setup +erpnext.regional.france.utils \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/index.html b/foundation/www/docs/current/api/regional/index.html index 90b8cbb8..a1e0e8cd 100644 --- a/foundation/www/docs/current/api/regional/index.html +++ b/foundation/www/docs/current/api/regional/index.html @@ -7,7 +7,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + erpnext.setup.install.create_default_cash_flow_mapper_templates + () +

+

No docs

+
+
+ + + + + + +

diff --git a/foundation/www/docs/current/api/setup/erpnext.setup.utils.html b/foundation/www/docs/current/api/setup/erpnext.setup.utils.html index 3aa23d3b..99432762 100644 --- a/foundation/www/docs/current/api/setup/erpnext.setup.utils.html +++ b/foundation/www/docs/current/api/setup/erpnext.setup.utils.html @@ -3,7 +3,7 @@

- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 erpnext.stock.stock_ledger.get_valuation_rate - (item_code, warehouse, voucher_type, voucher_no, allow_zero_rate=False, currency=None, company=None) + (item_code, warehouse, voucher_type, voucher_no, allow_zero_rate=False, currency=None, company=None, raise_error_if_no_rate=True)

No docs

diff --git a/foundation/www/docs/current/api/stock/erpnext.stock.utils.html b/foundation/www/docs/current/api/stock/erpnext.stock.utils.html index 0a7c39f1..1b4b8aad 100644 --- a/foundation/www/docs/current/api/stock/erpnext.stock.utils.html +++ b/foundation/www/docs/current/api/stock/erpnext.stock.utils.html @@ -3,7 +3,7 @@
- Version 10.0.13 + Version 10.1.2 erpnext.stock.utils.get_incoming_rate - (args) + (args, raise_error_if_no_rate=True)

Get Incoming Rate based on valuation method

diff --git a/foundation/www/docs/current/api/stock/index.html b/foundation/www/docs/current/api/stock/index.html index 8a76b4aa..cc373d78 100644 --- a/foundation/www/docs/current/api/stock/index.html +++ b/foundation/www/docs/current/api/stock/index.html @@ -7,7 +7,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + erpnext.utilities.product.adjust_qty_for_expired_items + (item_code, stock_qty, warehouse) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.utilities.product.get_expired_batches + (batches) +

+

Parameters:

+ +
    +
  • batches - A list of dict in the form [{'expirydate': datetime.date(20XX, 1, 1), 'name': 'batchid'}, ...]
  • +
+
+
+ + + + + + +

@@ -39,7 +75,7 @@ erpnext.utilities.product.get_qty_in_stock - (item_code, item_warehouse_field) + (item_code, item_warehouse_field, warehouse=None)

No docs

@@ -47,6 +83,26 @@ + + + + +

+ + + erpnext.utilities.product.qty_from_all_warehouses + (batch_info) +

+

Parameters:

+ +
    +
  • batch_info - A list of dict in the form [{u'warehouse': u'Stores - I', u'qty': 0.8}, ...]
  • +
+
+
+ + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/utilities/erpnext.utilities.transaction_base.html b/foundation/www/docs/current/api/utilities/erpnext.utilities.transaction_base.html index 40b21288..61d984fe 100644 --- a/foundation/www/docs/current/api/utilities/erpnext.utilities.transaction_base.html +++ b/foundation/www/docs/current/api/utilities/erpnext.utilities.transaction_base.html @@ -3,7 +3,7 @@
- Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - 10.0.13 + 10.1.2 diff --git a/foundation/www/docs/current/models/__init__.py b/foundation/www/docs/current/models/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/accounts/__init__.py b/foundation/www/docs/current/models/accounts/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/accounts/account.html b/foundation/www/docs/current/models/accounts/account.html index 8f15931a..f865665d 100644 --- a/foundation/www/docs/current/models/accounts/account.html +++ b/foundation/www/docs/current/models/accounts/account.html @@ -9,7 +9,7 @@
- Version 10.0.13 + Version 10.1.2 +
  • + + +Cash Flow Mapping Accounts + +
  • + + +
  • diff --git a/foundation/www/docs/current/models/accounts/accounts_settings.html b/foundation/www/docs/current/models/accounts/accounts_settings.html index f8f6301f..b10ffd20 100644 --- a/foundation/www/docs/current/models/accounts/accounts_settings.html +++ b/foundation/www/docs/current/models/accounts/accounts_settings.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 + + 17 + report_settings_sb + + Section Break + + Report Settings + + + + + + + 18 + use_custom_cash_flow + + Check + + Use Custom Cash Flow Format +

    + Only select if you have setup Cash Flow Mapper documents

    + + + + diff --git a/foundation/www/docs/current/models/accounts/bank_guarantee.html b/foundation/www/docs/current/models/accounts/bank_guarantee.html index 38539b1b..ae361372 100644 --- a/foundation/www/docs/current/models/accounts/bank_guarantee.html +++ b/foundation/www/docs/current/models/accounts/bank_guarantee.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + -

    Hub Category

    +

    Cash Flow Mapper

    - Version 10.0.13 + Version 10.1.2 - Source
    @@ -21,7 +21,7 @@ -

    Table Name: tabHub Category

    +

    Table Name: tabCash Flow Mapper

    @@ -42,11 +42,11 @@ 1 - hub_category_name + section_name Data - Category Name + Section Name @@ -54,44 +54,36 @@ 2 - parent_hub_category + section_header - Link + Data - Parent Category - - - - - - - -Hub Category - - - - - - - - 3 - is_group - - Check - - Is Group + Section Header + + 3 + section_leader + + Data + + Section Leader +

    + e.g Adjustments for:

    + + + + 4 - description + section_subtotal - Text Editor + Data - Description + Section Subtotal @@ -99,11 +91,11 @@ 5 - lft + section_footer - Int + Data - Left + Section Footer @@ -111,23 +103,32 @@ 6 - rgt + accounts - Int + Table - Right + Accounts + + + + + + + +Cash Flow Mapping Template Details + + - 7 - old_parent + position - Data + Int - Old Parent + Position @@ -139,7 +140,7 @@

    Controller

    -

    erpnext.hub_node.doctype.hub_category.hub_category

    +

    erpnext.accounts.doctype.cash_flow_mapper.cash_flow_mapper

    @@ -147,9 +148,9 @@ -

    Class HubCategory

    +

    Class CashFlowMapper

    -

    Inherits from frappe.utils.nestedset.NestedSet +

    Inherits from frappe.model.document.Document

    @@ -163,29 +164,6 @@ -

    Linked In:

    - - diff --git a/foundation/www/docs/current/models/accounts/cash_flow_mapping.html b/foundation/www/docs/current/models/accounts/cash_flow_mapping.html new file mode 100644 index 00000000..b6d9fa5d --- /dev/null +++ b/foundation/www/docs/current/models/accounts/cash_flow_mapping.html @@ -0,0 +1,236 @@ + + + + + + + +

    Cash Flow Mapping

    + + + + + + +

    Table Name: tabCash Flow Mapping

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1mapping_name + Data + Name + +
    2label + Data + Label + +
    3accounts + Table + Accounts + + + + + + +Cash Flow Mapping Accounts + + + +
    4sb_1 + Section Break + Select Maximum Of 1 + +
    5is_finance_cost + Check + Is Finance Cost + +
    6is_working_capital + Check + Is Working Capital + +
    7is_finance_cost_adjustment + Check + Is Finance Cost Adjustment + +
    8is_income_tax_liability + Check + Is Income Tax Liability + +
    9is_income_tax_expense + Check + Is Income Tax Expense + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.cash_flow_mapping.cash_flow_mapping

    + + + + + + + +

    Class CashFlowMapping

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_checked_options + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/cash_flow_mapping_accounts.html b/foundation/www/docs/current/models/accounts/cash_flow_mapping_accounts.html new file mode 100644 index 00000000..3c082478 --- /dev/null +++ b/foundation/www/docs/current/models/accounts/cash_flow_mapping_accounts.html @@ -0,0 +1,86 @@ + + + + + + + +

    Cash Flow Mapping Accounts

    + + + +Child Table + + +

    Table Name: tabCash Flow Mapping Accounts

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1account + Link + account + + + + + + +Account + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/cash_flow_mapping_template.html b/foundation/www/docs/current/models/accounts/cash_flow_mapping_template.html new file mode 100644 index 00000000..abfc2007 --- /dev/null +++ b/foundation/www/docs/current/models/accounts/cash_flow_mapping_template.html @@ -0,0 +1,110 @@ + + + + + + + +

    Cash Flow Mapping Template

    + + + + + + +

    Table Name: tabCash Flow Mapping Template

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1template_name + Data + Template Name + +
    2mapping + Table + Cash Flow Mapping + + + + + + +Cash Flow Mapping Template Details + + + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.cash_flow_mapping_template.cash_flow_mapping_template

    + + + + + + + +

    Class CashFlowMappingTemplate

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/cash_flow_mapping_template_details.html b/foundation/www/docs/current/models/accounts/cash_flow_mapping_template_details.html new file mode 100644 index 00000000..e0911f9a --- /dev/null +++ b/foundation/www/docs/current/models/accounts/cash_flow_mapping_template_details.html @@ -0,0 +1,98 @@ + + + + + + + +

    Cash Flow Mapping Template Details

    + + + + + + +

    Table Name: tabCash Flow Mapping Template Details

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1mapping + Link + Mapping + + + + + + +Cash Flow Mapping + + + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.cash_flow_mapping_template_details.cash_flow_mapping_template_details

    + + + + + + + +

    Class CashFlowMappingTemplateDetails

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/cheque_print_template.html b/foundation/www/docs/current/models/accounts/cheque_print_template.html index ac03f746..22e15521 100644 --- a/foundation/www/docs/current/models/accounts/cheque_print_template.html +++ b/foundation/www/docs/current/models/accounts/cheque_print_template.html @@ -9,7 +9,7 @@
  • - 3 + 5 section_break_4 Section Break @@ -87,7 +112,7 @@ Purchase - 4 + 6 invoices Table @@ -132,6 +157,20 @@ Purchase +

    + + + add_party + (self, party_type, party) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html b/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html index 03efbd70..cbfed340 100644 --- a/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html +++ b/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html @@ -9,7 +9,7 @@

    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 set_missing_ref_details - (self) + (self, force=False)

    No docs

    @@ -1222,6 +1222,20 @@ Internal Transfer +

    + + + update_outstanding_amounts + (self) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/accounts/payment_entry_deduction.html b/foundation/www/docs/current/models/accounts/payment_entry_deduction.html index 69906a92..7419f2a5 100644 --- a/foundation/www/docs/current/models/accounts/payment_entry_deduction.html +++ b/foundation/www/docs/current/models/accounts/payment_entry_deduction.html @@ -9,7 +9,7 @@

    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 +Company + + + + + +
  • + + Customer
  • +
  • + + +Customer Group + +
  • + + +
  • diff --git a/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html b/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html index 95ae2d92..cabaf5c1 100644 --- a/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html +++ b/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 9 + allow_user_to_edit_discount + + Check + + Allow user to edit Discount + + + + + + + 10 allow_print_before_pay Check @@ -151,7 +163,7 @@ - 10 + 11 column_break_4 Column Break @@ -163,7 +175,7 @@ - 11 + 12 customer Link @@ -184,7 +196,7 @@ - 12 + 13 company Link @@ -205,7 +217,7 @@ - 13 + 14 country Read Only @@ -219,7 +231,7 @@ - 14 + 15 warehouse Link @@ -240,7 +252,7 @@ - 15 + 16 campaign Link @@ -261,7 +273,7 @@ - 16 + 17 section_break_15 Section Break @@ -273,7 +285,7 @@ - 17 + 18 applicable_for_users Table @@ -294,7 +306,7 @@ - 18 + 19 section_break_11 Section Break @@ -306,7 +318,7 @@ - 19 + 20 payments Table @@ -327,7 +339,7 @@ - 20 + 21 section_break_14 Section Break @@ -339,7 +351,7 @@ - 21 + 22 item_groups Table @@ -360,7 +372,7 @@ - 22 + 23 column_break_16 Column Break @@ -372,7 +384,7 @@ - 23 + 24 customer_groups Table @@ -393,7 +405,7 @@ - 24 + 25 section_break_16 Section Break @@ -405,7 +417,7 @@ - 25 + 26 print_format_for_online Link @@ -426,7 +438,7 @@ - 26 + 27 letter_head Link @@ -447,7 +459,7 @@ - 27 + 28 select_print_heading Link @@ -468,7 +480,7 @@ - 28 + 29 column_break0 Column Break @@ -480,7 +492,7 @@ - 29 + 30 selling_price_list Link @@ -501,7 +513,7 @@ - 30 + 31 tc_name Link @@ -522,7 +534,7 @@ - 31 + 32 apply_discount Check @@ -534,7 +546,7 @@ - 32 + 33 apply_discount_on Select @@ -549,7 +561,7 @@ Net Total - 33 + 34 offline_pos_section Section Break @@ -561,7 +573,7 @@ Net Total - 34 + 35 territory Link @@ -582,7 +594,7 @@ Net Total - 35 + 36 column_break_31 Column Break @@ -594,7 +606,7 @@ Net Total - 36 + 37 print_format Link @@ -615,7 +627,7 @@ Net Total - 37 + 38 customer_group Link @@ -636,7 +648,7 @@ Net Total - 38 + 39 section_break_19 Section Break @@ -648,7 +660,7 @@ Net Total - 39 + 40 currency Link @@ -669,7 +681,7 @@ Net Total - 40 + 41 write_off_account Link @@ -690,7 +702,7 @@ Net Total - 41 + 42 write_off_cost_center Link @@ -711,7 +723,7 @@ Net Total - 42 + 43 account_for_change_amount Link @@ -732,7 +744,7 @@ Net Total - 43 + 44 column_break_23 Column Break @@ -744,7 +756,7 @@ Net Total - 44 + 45 income_account Link @@ -765,7 +777,7 @@ Net Total - 45 + 46 expense_account Link @@ -786,7 +798,7 @@ Net Total - 46 + 47 cost_center Link @@ -807,7 +819,7 @@ Net Total - 47 + 48 taxes_and_charges Link diff --git a/foundation/www/docs/current/models/accounts/pos_profile_user.html b/foundation/www/docs/current/models/accounts/pos_profile_user.html index f2c4d93a..a18bb462 100644 --- a/foundation/www/docs/current/models/accounts/pos_profile_user.html +++ b/foundation/www/docs/current/models/accounts/pos_profile_user.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - + 31 + currency + + Link + + Currency + + + + + + + +Currency + + + + + + + + 32 margin Section Break @@ -549,7 +570,7 @@ Supplier Type - 32 + 33 margin_type Select @@ -565,7 +586,7 @@ Amount - 33 + 34 column_break_33 Column Break @@ -577,7 +598,7 @@ Amount - 34 + 35 margin_rate_or_amount Float @@ -589,7 +610,7 @@ Amount - 35 + 36 price_discount_section Section Break @@ -601,23 +622,23 @@ Amount - 36 - price_or_discount + 37 + rate_or_discount Select - Price or Discount + Rate or Discount
    -Price
    +Rate
     Discount Percentage
    - 37 + 38 col_break2 Column Break @@ -629,19 +650,19 @@ Discount Percentage - 38 - price + 39 + rate Currency - Price + Rate - 39 + 40 discount_percentage Float @@ -653,7 +674,7 @@ Discount Percentage - 40 + 41 for_price_list Link @@ -674,7 +695,7 @@ Discount Percentage - 41 + 42 help_section Section Break @@ -688,7 +709,7 @@ Discount Percentage - 42 + 43 pricing_rule_help HTML @@ -824,9 +845,9 @@ Discount Percentage

    - + - validate_price_or_discount + validate_rate_or_discount (self)

    No docs

    diff --git a/foundation/www/docs/current/models/accounts/purchase_invoice.html b/foundation/www/docs/current/models/accounts/purchase_invoice.html index ab762918..e5e0e237 100644 --- a/foundation/www/docs/current/models/accounts/purchase_invoice.html +++ b/foundation/www/docs/current/models/accounts/purchase_invoice.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 21 + customer_po_details + + Section Break + + Customer PO Details + + + + + + + 22 + po_no + + Data + + Customer's Purchase Order + + + + + + + 23 + column_break_23 + + Column Break + + + + + + + + + 24 + po_date + + Date + + Customer's Purchase Order Date + + + + + + + 25 address_and_contact Section Break @@ -354,7 +402,7 @@ SINV-RET- - 22 + 26 customer_address Link @@ -375,7 +423,7 @@ SINV-RET- - 23 + 27 address_display Small Text @@ -387,7 +435,7 @@ SINV-RET- - 24 + 28 contact_person Link @@ -408,7 +456,7 @@ SINV-RET- - 25 + 29 contact_display Small Text @@ -420,7 +468,7 @@ SINV-RET- - 26 + 30 contact_mobile Small Text @@ -432,7 +480,7 @@ SINV-RET- - 27 + 31 contact_email Data @@ -446,7 +494,7 @@ SINV-RET- - 28 + 32 territory Link @@ -467,7 +515,7 @@ SINV-RET- - 29 + 33 col_break4 Column Break @@ -479,7 +527,7 @@ SINV-RET- - 30 + 34 shipping_address_name Link @@ -500,7 +548,7 @@ SINV-RET- - 31 + 35 shipping_address Small Text @@ -512,7 +560,7 @@ SINV-RET- - 32 + 36 company_address Link @@ -533,7 +581,7 @@ SINV-RET- - 33 + 37 company_address_display Small Text @@ -545,7 +593,7 @@ SINV-RET- - 34 + 38 currency_and_price_list Section Break @@ -557,7 +605,7 @@ SINV-RET- - 35 + 39 currency Link @@ -578,7 +626,7 @@ SINV-RET- - 36 + 40 conversion_rate Float @@ -591,7 +639,7 @@ SINV-RET- - 37 + 41 column_break2 Column Break @@ -603,7 +651,7 @@ SINV-RET- - 38 + 42 selling_price_list Link @@ -624,7 +672,7 @@ SINV-RET- - 39 + 43 price_list_currency Link @@ -645,7 +693,7 @@ SINV-RET- - 40 + 44 plc_conversion_rate Float @@ -658,7 +706,7 @@ SINV-RET- - 41 + 45 ignore_pricing_rule Check @@ -670,7 +718,7 @@ SINV-RET- - 42 + 46 items_section Section Break @@ -684,7 +732,7 @@ SINV-RET- - 43 + 47 update_stock Check @@ -696,7 +744,7 @@ SINV-RET- - 44 + 48 items Table @@ -717,7 +765,7 @@ SINV-RET- - 45 + 49 packing_list Section Break @@ -731,7 +779,7 @@ SINV-RET- - 46 + 50 packed_items Table @@ -752,7 +800,7 @@ SINV-RET- - 47 + 51 product_bundle_help HTML @@ -764,7 +812,7 @@ SINV-RET- - 48 + 52 time_sheet_list Section Break @@ -776,7 +824,7 @@ SINV-RET- - 49 + 53 timesheets Table @@ -797,7 +845,7 @@ SINV-RET- - 50 + 54 total_billing_amount Currency @@ -809,7 +857,7 @@ SINV-RET- - 51 + 55 section_break_30 Section Break @@ -821,7 +869,7 @@ SINV-RET- - 52 + 56 base_total Currency @@ -835,7 +883,7 @@ SINV-RET- - 53 + 57 base_net_total Currency @@ -849,7 +897,7 @@ SINV-RET- - 54 + 58 column_break_32 Column Break @@ -861,7 +909,7 @@ SINV-RET- - 55 + 59 total Currency @@ -875,7 +923,7 @@ SINV-RET- - 56 + 60 net_total Currency @@ -889,7 +937,7 @@ SINV-RET- - 57 + 61 total_net_weight Float @@ -901,7 +949,7 @@ SINV-RET- - 58 + 62 taxes_section Section Break @@ -915,7 +963,7 @@ SINV-RET- - 59 + 63 taxes_and_charges Link @@ -936,7 +984,7 @@ SINV-RET- - 60 + 64 column_break_38 Column Break @@ -948,7 +996,7 @@ SINV-RET- - 61 + 65 shipping_rule Link @@ -969,7 +1017,7 @@ SINV-RET- - 62 + 66 section_break_40 Section Break @@ -981,7 +1029,7 @@ SINV-RET- - 63 + 67 taxes Table @@ -1002,7 +1050,7 @@ SINV-RET- - 64 + 68 sec_tax_breakup Section Break @@ -1014,7 +1062,7 @@ SINV-RET- - 65 + 69 other_charges_calculation Text @@ -1026,7 +1074,7 @@ SINV-RET- - 66 + 70 section_break_43 Section Break @@ -1038,7 +1086,7 @@ SINV-RET- - 67 + 71 base_total_taxes_and_charges Currency @@ -1052,7 +1100,7 @@ SINV-RET- - 68 + 72 column_break_47 Column Break @@ -1064,7 +1112,7 @@ SINV-RET- - 69 + 73 total_taxes_and_charges Currency @@ -1078,7 +1126,7 @@ SINV-RET- - 70 + 74 section_break_49 Section Break @@ -1090,7 +1138,7 @@ SINV-RET- - 71 + 75 apply_discount_on Select @@ -1106,7 +1154,7 @@ Net Total - 72 + 76 base_discount_amount Currency @@ -1120,7 +1168,7 @@ Net Total - 73 + 77 column_break_51 Column Break @@ -1132,7 +1180,7 @@ Net Total - 74 + 78 additional_discount_percentage Float @@ -1144,7 +1192,7 @@ Net Total - 75 + 79 discount_amount Currency @@ -1158,7 +1206,7 @@ Net Total - 76 + 80 totals Section Break @@ -1172,7 +1220,7 @@ Net Total - 77 + 81 base_grand_total Currency @@ -1186,7 +1234,7 @@ Net Total - 78 + 82 base_rounding_adjustment Currency @@ -1200,7 +1248,7 @@ Net Total - 79 + 83 base_rounded_total Currency @@ -1214,7 +1262,7 @@ Net Total - 80 + 84 base_in_words Data @@ -1227,7 +1275,7 @@ Net Total - 81 + 85 column_break5 Column Break @@ -1239,7 +1287,7 @@ Net Total - 82 + 86 grand_total Currency @@ -1253,7 +1301,7 @@ Net Total - 83 + 87 rounding_adjustment Currency @@ -1267,7 +1315,7 @@ Net Total - 84 + 88 rounded_total Currency @@ -1281,7 +1329,7 @@ Net Total - 85 + 89 in_words Data @@ -1293,7 +1341,7 @@ Net Total - 86 + 90 total_advance Currency @@ -1307,7 +1355,7 @@ Net Total - 87 + 91 outstanding_amount Currency @@ -1321,7 +1369,7 @@ Net Total - 88 + 92 advances_section Section Break @@ -1335,7 +1383,7 @@ Net Total - 89 + 93 get_advances Button @@ -1347,7 +1395,7 @@ Net Total - 90 + 94 advances Table @@ -1368,7 +1416,7 @@ Net Total - 91 + 95 payment_schedule_section Section Break @@ -1380,7 +1428,7 @@ Net Total - 92 + 96 payment_terms_template Link @@ -1401,7 +1449,7 @@ Net Total - 93 + 97 payment_schedule Table @@ -1422,7 +1470,7 @@ Net Total - 94 + 98 payments_section Section Break @@ -1436,7 +1484,7 @@ Net Total - 95 + 99 cash_bank_account Link @@ -1457,7 +1505,7 @@ Net Total - 96 + 100 payments Table @@ -1478,7 +1526,7 @@ Net Total - 97 + 101 section_break_84 Section Break @@ -1490,7 +1538,7 @@ Net Total - 98 + 102 base_paid_amount Currency @@ -1504,7 +1552,7 @@ Net Total - 99 + 103 column_break_86 Column Break @@ -1516,7 +1564,7 @@ Net Total - 100 + 104 paid_amount Currency @@ -1530,7 +1578,7 @@ Net Total - 101 + 105 section_break_88 Section Break @@ -1542,7 +1590,7 @@ Net Total - 102 + 106 base_change_amount Currency @@ -1556,7 +1604,7 @@ Net Total - 103 + 107 column_break_90 Column Break @@ -1568,7 +1616,7 @@ Net Total - 104 + 108 change_amount Currency @@ -1582,7 +1630,7 @@ Net Total - 105 + 109 account_for_change_amount Link @@ -1603,7 +1651,7 @@ Net Total - 106 + 110 column_break4 Section Break @@ -1615,7 +1663,7 @@ Net Total - 107 + 111 write_off_amount Currency @@ -1629,7 +1677,7 @@ Net Total - 108 + 112 base_write_off_amount Currency @@ -1643,7 +1691,7 @@ Net Total - 109 + 113 write_off_outstanding_amount_automatically Check @@ -1655,7 +1703,7 @@ Net Total - 110 + 114 column_break_74 Column Break @@ -1667,7 +1715,7 @@ Net Total - 111 + 115 write_off_account Link @@ -1688,7 +1736,7 @@ Net Total - 112 + 116 write_off_cost_center Link @@ -1709,7 +1757,7 @@ Net Total - 113 + 117 terms_section_break Section Break @@ -1721,7 +1769,7 @@ Net Total - 114 + 118 tc_name Link @@ -1742,7 +1790,7 @@ Net Total - 115 + 119 terms Text Editor @@ -1754,7 +1802,7 @@ Net Total - 116 + 120 edit_printing_settings Section Break @@ -1766,7 +1814,7 @@ Net Total - 117 + 121 letter_head Link @@ -1787,7 +1835,7 @@ Net Total - 118 + 122 language Data @@ -1799,7 +1847,7 @@ Net Total - 119 + 123 column_break_84 Column Break @@ -1811,7 +1859,7 @@ Net Total - 120 + 124 select_print_heading Link @@ -1832,7 +1880,7 @@ Net Total - 121 + 125 more_information Section Break @@ -1844,7 +1892,7 @@ Net Total - 122 + 126 customer_group Link @@ -1865,7 +1913,7 @@ Net Total - 123 + 127 campaign Link @@ -1886,7 +1934,7 @@ Net Total - 124 + 128 col_break23 Column Break @@ -1898,7 +1946,7 @@ Net Total - 125 + 129 status Select @@ -1920,7 +1968,7 @@ Cancelled - 126 + 130 source Link @@ -1941,7 +1989,7 @@ Cancelled - 127 + 131 more_info Section Break @@ -1955,7 +2003,7 @@ Cancelled - 128 + 132 debit_to Link @@ -1976,7 +2024,7 @@ Cancelled - 129 + 133 party_account_currency Link @@ -1997,7 +2045,7 @@ Cancelled - 130 + 134 is_opening Select @@ -2012,7 +2060,7 @@ Yes - 131 + 135 c_form_applicable Select @@ -2027,7 +2075,7 @@ Yes - 132 + 136 c_form_no Link @@ -2048,7 +2096,7 @@ Yes - 133 + 137 column_break8 Column Break @@ -2060,7 +2108,7 @@ Yes - 134 + 138 remarks Small Text @@ -2072,7 +2120,7 @@ Yes - 135 + 139 sales_team_section_break Section Break @@ -2086,7 +2134,7 @@ Yes - 136 + 140 sales_partner Link @@ -2107,7 +2155,7 @@ Yes - 137 + 141 column_break10 Column Break @@ -2119,7 +2167,7 @@ Yes - 138 + 142 commission_rate Float @@ -2131,7 +2179,7 @@ Yes - 139 + 143 total_commission Currency @@ -2145,7 +2193,7 @@ Yes - 140 + 144 section_break2 Section Break @@ -2157,7 +2205,7 @@ Yes - 141 + 145 sales_team Table @@ -2178,7 +2226,7 @@ Yes - 142 + 146 subscription_section Section Break @@ -2190,7 +2238,7 @@ Yes - 143 + 147 from_date Date @@ -2202,7 +2250,7 @@ Yes - 144 + 148 to_date Date @@ -2214,7 +2262,7 @@ Yes - 145 + 149 column_break_140 Column Break @@ -2226,7 +2274,7 @@ Yes - 146 + 150 subscription Link @@ -2247,7 +2295,7 @@ Yes - 147 + 151 against_income_account Small Text @@ -2258,6 +2306,18 @@ Yes + + 152 + pos_total_qty + + Float + + Total Qty + + + + + diff --git a/foundation/www/docs/current/models/accounts/sales_invoice_advance.html b/foundation/www/docs/current/models/accounts/sales_invoice_advance.html index 691f1f53..2f1ba9e1 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_advance.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_advance.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + +Hotel Settings + +
  • + + +
  • diff --git a/foundation/www/docs/current/models/accounts/share_balance.html b/foundation/www/docs/current/models/accounts/share_balance.html new file mode 100644 index 00000000..f620030c --- /dev/null +++ b/foundation/www/docs/current/models/accounts/share_balance.html @@ -0,0 +1,198 @@ + + + + + + + +

    Share Balance

    + + + +Child Table + + +

    Table Name: tabShare Balance

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1share_type + Link + Share Type + + + + + + +Share Type + + + +
    2from_no + Int + From No + +
    3rate + Int + Rate + +
    4column_break_4 + Column Break + + +
    5no_of_shares + Int + No of Shares + +
    6to_no + Int + To No + +
    7amount + Int + Amount + +
    8section_break_8 + Section Break + + +
    9is_company + Check + Is Company + +
    10current_state + Select + Current State + + +
    +Issued
    +Purchased
    +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/share_transfer.html b/foundation/www/docs/current/models/accounts/share_transfer.html new file mode 100644 index 00000000..01b9c654 --- /dev/null +++ b/foundation/www/docs/current/models/accounts/share_transfer.html @@ -0,0 +1,545 @@ + + + + + + + +

    Share Transfer

    + + + + + + +

    Table Name: tabShare Transfer

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1transfer_type + Select + Transfer Type + + +
    +Issue
    +Purchase
    +Transfer
    +
    2column_break_1 + Column Break + + +
    3date + Date + Date + +
    4section_break_1 + Section Break + + +
    5from_shareholder + Link + From Shareholder + + + + + + +Shareholder + + + +
    6from_folio_no + Data + From Folio No + + +
    from_shareholder.folio_no
    +
    7column_break_3 + Column Break + + +
    8to_shareholder + Link + To Shareholder + + + + + + +Shareholder + + + +
    9to_folio_no + Data + To Folio No + + +
    to_shareholder.folio_no
    +
    10section_break_4 + Section Break + + +
    11share_type + Link + Share Type + + + + + + +Share Type + + + +
    12from_no + Int + From No +

    + (including)

    +
    13rate + Currency + Rate + +
    14column_break_8 + Column Break + + +
    15no_of_shares + Int + No of Shares + +
    16to_no + Int + To No +

    + (including)

    +
    17amount + Currency + Amount + +
    18section_break_11 + Section Break + + +
    19company + Link + Company + + + + + + +Company + + + +
    20section_break_6 + Section Break + + +
    21remarks + Long Text + Remarks + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.share_transfer.share_transfer

    + + + + + + + +

    Class ShareDontExists

    + +

    Inherits from frappe.exceptions.ValidationError + +

    +
    +
    + +
    +
    + + + + + +

    Class ShareTransfer

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + autoname_folio + (self, shareholder, is_company=False) +

    +

    No docs

    +
    +
    + + + + + +

    + + + basic_validations + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + before_save + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + folio_no_validation + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + get_shareholder_doc + (self, shareholder) +

    +

    No docs

    +
    +
    + + + + + +

    + + + iterative_share_removal + (self, shareholder, share_type, query, rate, amount) +

    +

    No docs

    +
    +
    + + + + + +

    + + + recursive_share_check + (self, shareholder, share_type, query) +

    +

    No docs

    +
    +
    + + + + + +

    + + + remove_shares + (self, shareholder) +

    +

    No docs

    +
    +
    + + + + + +

    + + + return_share_balance_entry + (self, from_no, to_no, rate) +

    +

    No docs

    +
    +
    + + + + + +

    + + + share_exists + (self, shareholder) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/share_type.html b/foundation/www/docs/current/models/accounts/share_type.html new file mode 100644 index 00000000..4c2b0063 --- /dev/null +++ b/foundation/www/docs/current/models/accounts/share_type.html @@ -0,0 +1,124 @@ + + + + + + + +

    Share Type

    + + + + + + +

    Table Name: tabShare Type

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Data + Title + +
    2description + Long Text + Description + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.share_type.share_type

    + + + + + + + +

    Class ShareType

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/shareholder.html b/foundation/www/docs/current/models/accounts/shareholder.html new file mode 100644 index 00000000..35e3aefb --- /dev/null +++ b/foundation/www/docs/current/models/accounts/shareholder.html @@ -0,0 +1,336 @@ + + + + + + + +

    Shareholder

    + + + + + + +

    Table Name: tabShareholder

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1title + Data + Title + +
    2column_break_2 + Column Break + + +
    3naming_series + Select + Series + + +
    SH-
    +
    4section_break_2 + Section Break + + +
    5folio_no + Data + Folio no. + +
    6column_break_4 + Column Break + + +
    7company + Link + Company + + + + + + +Company + + + +
    8is_company + Check + Is Company + +
    9address_contacts + Section Break + Address and Contacts + + +
    fa fa-map-marker
    +
    10address_html + HTML + Address HTML + +
    11column_break_9 + Column Break + + +
    12contact_html + HTML + Contact HTML + +
    13section_break_3 + Section Break + Share Balance + +
    14share_balance + Table + Share Balance + + + + + + +Share Balance + + + +
    15contact_list + Code + Contact List +

    + Hidden list maintaining the list of contacts linked to Shareholder

    +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.shareholder.shareholder

    + + + + + + + +

    Class Shareholder

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + before_save + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + on_trash + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + onload + (self) +

    +

    Load address and contacts in __onload

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/shipping_rule.html b/foundation/www/docs/current/models/accounts/shipping_rule.html index a7257bac..9bfc5736 100644 --- a/foundation/www/docs/current/models/accounts/shipping_rule.html +++ b/foundation/www/docs/current/models/accounts/shipping_rule.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 17 + available_for_use_date + + Date + + Available-for-use Date + + + + + + + 18 is_existing_asset Check @@ -342,7 +354,7 @@ Customer - 18 + 19 disposal_date Date @@ -354,7 +366,7 @@ Customer - 19 + 20 journal_entry_for_scrap Link @@ -375,7 +387,7 @@ Customer - 20 + 21 section_break_5 Section Break @@ -387,7 +399,7 @@ Customer - 21 + 22 gross_purchase_amount Currency @@ -401,7 +413,7 @@ Customer - 22 + 23 column_break_18 Column Break @@ -413,7 +425,7 @@ Customer - 23 + 24 expected_value_after_useful_life Currency @@ -427,7 +439,7 @@ Customer - 24 + 25 opening_accumulated_depreciation Currency @@ -441,7 +453,7 @@ Customer - 25 + 26 section_break_20 Section Break @@ -453,7 +465,7 @@ Customer - 26 + 27 calculate_depreciation Check @@ -465,7 +477,7 @@ Customer - 27 + 28 section_break_23 Section Break @@ -477,7 +489,7 @@ Customer - 28 + 29 depreciation_method Select @@ -494,7 +506,7 @@ Manual - 29 + 30 value_after_depreciation Currency @@ -508,7 +520,7 @@ Manual - 30 + 31 total_number_of_depreciations Int @@ -520,7 +532,7 @@ Manual - 31 + 32 column_break_24 Column Break @@ -532,7 +544,7 @@ Manual - 32 + 33 number_of_depreciations_booked Int @@ -544,7 +556,7 @@ Manual - 33 + 34 frequency_of_depreciation Int @@ -556,7 +568,7 @@ Manual - 34 + 35 next_depreciation_date Date @@ -568,7 +580,7 @@ Manual - 35 + 36 section_break_14 Section Break @@ -580,7 +592,7 @@ Manual - 36 + 37 schedules Table @@ -601,7 +613,7 @@ Manual - 37 + 38 section_break_31 Section Break @@ -613,7 +625,7 @@ Manual - 38 + 39 maintenance_required Check @@ -626,7 +638,7 @@ Manual - 39 + 40 amended_from Link @@ -699,6 +711,20 @@ Manual +

    + + + get_depreciation_amount_prorata_temporis + (self, depreciable_value, start_date=None, end_date=None) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/assets/asset_category.html b/foundation/www/docs/current/models/assets/asset_category.html index 83a1e360..e71dd525 100644 --- a/foundation/www/docs/current/models/assets/asset_category.html +++ b/foundation/www/docs/current/models/assets/asset_category.html @@ -9,7 +9,7 @@

    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + + + + +

    Asset Settings

    +
    + +Single + + + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1depreciation_options + Section Break + Depreciation Options + +
    2schedule_based_on_fiscal_year + Check + Calculate Prorated Depreciation Schedule Based on Fiscal Year + +
    3number_of_days_in_fiscal_year + Data + Number of Days in Fiscal Year +

    + This value is used for pro-rata temporis calculation

    +
    + + +
    +

    Controller

    +

    erpnext.assets.doctype.asset_settings.asset_settings

    + + + + + + + +

    Class AssetSettings

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/assets/depreciation_schedule.html b/foundation/www/docs/current/models/assets/depreciation_schedule.html index 46fba51a..cdd26429 100644 --- a/foundation/www/docs/current/models/assets/depreciation_schedule.html +++ b/foundation/www/docs/current/models/assets/depreciation_schedule.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 101 + raw_material_details + + Section Break + + Raw Materials Supplied + + + + + + + 102 supplied_items_section Section Break @@ -1514,7 +1526,7 @@ Delivered - 102 + 103 supplied_items Table @@ -1535,7 +1547,7 @@ Delivered - 103 + 104 subscription_section Section Break @@ -1547,7 +1559,7 @@ Delivered - 104 + 105 from_date Date @@ -1559,7 +1571,7 @@ Delivered - 105 + 106 to_date Date @@ -1571,7 +1583,7 @@ Delivered - 106 + 107 column_break_97 Column Break @@ -1583,7 +1595,7 @@ Delivered - 107 + 108 subscription Link @@ -2026,13 +2038,13 @@ Delivered

    Public API -
    /api/method/erpnext.buying.doctype.purchase_order.purchase_order.make_stock_entry +
    /api/method/erpnext.buying.doctype.purchase_order.purchase_order.make_rm_stock_entry

    - + - erpnext.buying.doctype.purchase_order.purchase_order.make_stock_entry - (purchase_order, item_code) + erpnext.buying.doctype.purchase_order.purchase_order.make_rm_stock_entry + (purchase_order, rm_items)

    No docs

    diff --git a/foundation/www/docs/current/models/buying/purchase_order_item.html b/foundation/www/docs/current/models/buying/purchase_order_item.html index 8b185cfb..b049dd44 100644 --- a/foundation/www/docs/current/models/buying/purchase_order_item.html +++ b/foundation/www/docs/current/models/buying/purchase_order_item.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + +Member + +
  • + + +
  • diff --git a/foundation/www/docs/current/models/buying/supplier_quotation.html b/foundation/www/docs/current/models/buying/supplier_quotation.html index 272500ca..0ad18424 100644 --- a/foundation/www/docs/current/models/buying/supplier_quotation.html +++ b/foundation/www/docs/current/models/buying/supplier_quotation.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 44 + sales_order + + Link + + Sales Order + + + + + + + +Sales Order + + + + + + + + 45 request_for_quotation Link @@ -670,7 +691,7 @@ - 45 + 46 col_break4 Column Break @@ -682,7 +703,7 @@ - 46 + 47 material_request_item Data @@ -694,7 +715,7 @@ - 47 + 48 request_for_quotation_item Data @@ -706,7 +727,7 @@ - 48 + 49 brand Link @@ -727,7 +748,7 @@ - 49 + 50 item_group Link @@ -748,7 +769,7 @@ - 50 + 51 item_tax_rate Code @@ -762,7 +783,7 @@ Used for Taxes and Charges

    - 51 + 52 section_break_44 Section Break @@ -774,7 +795,7 @@ Used for Taxes and Charges

    - 52 + 53 page_break Check diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard.html b/foundation/www/docs/current/models/buying/supplier_scorecard.html index 32f1ce42..9657d134 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2
    + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + +

    diff --git a/foundation/www/docs/current/models/education/assessment_criteria_group.html b/foundation/www/docs/current/models/education/assessment_criteria_group.html index 9d9a057b..1239d7dd 100644 --- a/foundation/www/docs/current/models/education/assessment_criteria_group.html +++ b/foundation/www/docs/current/models/education/assessment_criteria_group.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + + + + +

    Hotel Room

    +
    + + + + + +

    Table Name: tabHotel Room

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1hotel_room_type + Link + Hotel Room Type + + + + + + +Hotel Room Type + + + +
    2capacity + Int + Capacity + +
    3extra_bed_capacity + Int + Extra Bed Capacity + +
    + + +
    +

    Controller

    +

    erpnext.hotels.doctype.hotel_room.hotel_room

    + + + + + + + +

    Class HotelRoom

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room_amenity.html b/foundation/www/docs/current/models/hotels/hotel_room_amenity.html new file mode 100644 index 00000000..e2b7c095 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_room_amenity.html @@ -0,0 +1,105 @@ + + + + + + + +

    Hotel Room Amenity

    + + + +Child Table + + +

    Table Name: tabHotel Room Amenity

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1item + Link + Item + + + + + + +Item + + + +
    2billable + Check + Billable + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room_package.html b/foundation/www/docs/current/models/hotels/hotel_room_package.html new file mode 100644 index 00000000..66548d36 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_room_package.html @@ -0,0 +1,192 @@ + + + + + + + +

    Hotel Room Package

    + + + + + + +

    Table Name: tabHotel Room Package

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1hotel_room_type + Link + Hotel Room Type + + + + + + +Hotel Room Type + + + +
    2column_break_2 + Column Break + + +
    3item + Link + Item + + + + + + +Item + + + +
    4section_break_4 + Section Break + + +
    5amenities + Table + Amenities + + + + + + +Hotel Room Amenity + + + +
    + + +
    +

    Controller

    +

    erpnext.hotels.doctype.hotel_room_package.hotel_room_package

    + + + + + + + +

    Class HotelRoomPackage

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room_pricing.html b/foundation/www/docs/current/models/hotels/hotel_room_pricing.html new file mode 100644 index 00000000..943528f3 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_room_pricing.html @@ -0,0 +1,167 @@ + + + + + + + +

    Hotel Room Pricing

    + + + + + + +

    Table Name: tabHotel Room Pricing

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1enabled + Check + Enabled + +
    2currency + Link + Currency + + + + + + +Currency + + + +
    3from_date + Date + From Date + +
    4to_date + Date + To Date + +
    5section_break_5 + Section Break + + +
    6items + Table + Items + + + + + + +Hotel Room Pricing Item + + + +
    + + +
    +

    Controller

    +

    erpnext.hotels.doctype.hotel_room_pricing.hotel_room_pricing

    + + + + + + + +

    Class HotelRoomPricing

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room_pricing_item.html b/foundation/www/docs/current/models/hotels/hotel_room_pricing_item.html new file mode 100644 index 00000000..561c5798 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_room_pricing_item.html @@ -0,0 +1,98 @@ + + + + + + + +

    Hotel Room Pricing Item

    + + + +Child Table + + +

    Table Name: tabHotel Room Pricing Item

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1item + Link + Item + + + + + + +Item + + + +
    2rate + Currency + Rate + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room_pricing_package.html b/foundation/www/docs/current/models/hotels/hotel_room_pricing_package.html new file mode 100644 index 00000000..8403649d --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_room_pricing_package.html @@ -0,0 +1,110 @@ + + + + + + + +

    Hotel Room Pricing Package

    + + + +Child Table + + +

    Table Name: tabHotel Room Pricing Package

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1from_date + Date + From Date + +
    2to_date + Date + To Date + +
    3hotel_room_package + Link + Hotel Room Package + + + + + + +Hotel Room Package + + + +
    4rate + Currency + Rate + +
    + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room_reservation.html b/foundation/www/docs/current/models/hotels/hotel_room_reservation.html new file mode 100644 index 00000000..995a49c7 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_room_reservation.html @@ -0,0 +1,377 @@ + + + + + + + +

    Hotel Room Reservation

    + + + + + + +

    Table Name: tabHotel Room Reservation

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1guest_name + Data + Guest Name + +
    2customer + Link + Customer + + + + + + +Customer + + + +
    3from_date + Date + From Date + +
    4to_date + Date + To Date + +
    5late_checkin + Check + Late Checkin + +
    6column_break_6 + Column Break + + +
    7status + Select + Status + + +
    Booked
    +Advance Paid
    +Invoiced
    +Paid
    +Completed
    +Cancelled
    +
    8section_break_8 + Section Break + + +
    9items + Table + Items + + + + + + +Hotel Room Reservation Item + + + +
    10net_total + Currency + Net Total + +
    11amended_from + Link + Amended From + + + + + + +Hotel Room Reservation + + + +
    + + +
    +

    Controller

    +

    erpnext.hotels.doctype.hotel_room_reservation.hotel_room_reservation

    + + + + + + + +

    Class HotelRoomPricingNotSetError

    + +

    Inherits from frappe.exceptions.ValidationError + +

    +
    +
    + +
    +
    + + + + + +

    Class HotelRoomReservation

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + get_total_rooms + (self, item) +

    +

    No docs

    +
    +
    + + + + + +

    + + + set_rates + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate_availability + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + +

    Class HotelRoomUnavailableError

    + +

    Inherits from frappe.exceptions.ValidationError + +

    +
    +
    + +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.hotels.doctype.hotel_room_reservation.hotel_room_reservation.get_room_rate +

    +

    + + + erpnext.hotels.doctype.hotel_room_reservation.hotel_room_reservation.get_room_rate + (hotel_room_reservation) +

    +

    Calculate rate for each day as it may belong to different Hotel Room Pricing Item

    +
    +
    + + + + + + + +

    + + + erpnext.hotels.doctype.hotel_room_reservation.hotel_room_reservation.get_rooms_booked + (room_type, day, exclude_reservation=None) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room_reservation_item.html b/foundation/www/docs/current/models/hotels/hotel_room_reservation_item.html new file mode 100644 index 00000000..5bba19c3 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_room_reservation_item.html @@ -0,0 +1,143 @@ + + + + + + + +

    Hotel Room Reservation Item

    + + + +Child Table + + +

    Table Name: tabHotel Room Reservation Item

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1item + Link + Item + + + + + + +Item + + + +
    2qty + Int + Qty + +
    3currency + Link + Currency + + + + + + +Currency + + + +
    4rate + Currency + Rate + +
    5amount + Currency + Amount + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room_type.html b/foundation/www/docs/current/models/hotels/hotel_room_type.html new file mode 100644 index 00000000..c87a3263 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_room_type.html @@ -0,0 +1,157 @@ + + + + + + + +

    Hotel Room Type

    + + + + + + +

    Table Name: tabHotel Room Type

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1capacity + Int + Capacity + +
    2extra_bed_capacity + Int + Extra Bed Capacity + +
    3section_break_3 + Section Break + + +
    4amenities + Table + Amenities + + + + + + +Hotel Room Amenity + + + +
    + + +
    +

    Controller

    +

    erpnext.hotels.doctype.hotel_room_type.hotel_room_type

    + + + + + + + +

    Class HotelRoomType

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_settings.html b/foundation/www/docs/current/models/hotels/hotel_settings.html new file mode 100644 index 00000000..331da048 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/hotel_settings.html @@ -0,0 +1,129 @@ + + + + + + + +

    Hotel Settings

    + + +Single + + + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1default_customer + Link + Default Customer + + + + + + +Customer + + + +
    2default_taxes_and_charges + Link + Default Taxes and Charges + + + + + + +Sales Taxes and Charges Template + + + +
    3default_invoice_naming_series + Data + Default Invoice Naming Series + +
    + + +
    +

    Controller

    +

    erpnext.hotels.doctype.hotel_settings.hotel_settings

    + + + + + + + +

    Class HotelSettings

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/index.html b/foundation/www/docs/current/models/hotels/index.html new file mode 100644 index 00000000..e73ba941 --- /dev/null +++ b/foundation/www/docs/current/models/hotels/index.html @@ -0,0 +1,22 @@ + + + + + +

    Module hotels

    + + +

    DocTypes for hotels

    + +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/assets/img/agriculture/__init__.py b/foundation/www/docs/current/models/hotels/index.txt similarity index 100% rename from foundation/www/docs/assets/img/agriculture/__init__.py rename to foundation/www/docs/current/models/hotels/index.txt diff --git a/foundation/www/docs/current/models/hr/__init__.py b/foundation/www/docs/current/models/hr/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/hr/appraisal.html b/foundation/www/docs/current/models/hr/appraisal.html index 1f6ee494..23ff0e2b 100644 --- a/foundation/www/docs/current/models/hr/appraisal.html +++ b/foundation/www/docs/current/models/hr/appraisal.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 1 - company + daily_work_summary_group Link - Company + Daily Work Summary Group @@ -54,7 +54,7 @@ -Company +Daily Work Summary Group @@ -131,9 +131,9 @@ Sent send_mails - (self, settings, emails) + (self, dws_group, emails)

    -

    Send emails to get daily work summary to all employees

    +

    Send emails to get daily work summary to all users in selected daily work summary group


    @@ -162,17 +162,17 @@ Sent

    - + - erpnext.hr.doctype.daily_work_summary.daily_work_summary.get_employee_emails - (company, only_working=True) + erpnext.hr.doctype.daily_work_summary.daily_work_summary.get_user_emails_from_group + (group)

    -

    Returns list of Employee user ids for the given company who are working today

    +

    Returns list of email of users from the given group

    Parameters:

      -
    • company - Company name
    • +
    • group - Daily Work Summary Group name

    diff --git a/foundation/www/docs/current/models/hr/daily_work_summary_group.html b/foundation/www/docs/current/models/hr/daily_work_summary_group.html new file mode 100644 index 00000000..e2af1550 --- /dev/null +++ b/foundation/www/docs/current/models/hr/daily_work_summary_group.html @@ -0,0 +1,325 @@ + + + + + + + +

    Daily Work Summary Group

    + + + + + + +

    Table Name: tabDaily Work Summary Group

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1enabled + Check + Enabled + +
    2select_users + Section Break + Select Users + +
    3users + Table + Users + + + + + + +Daily Work Summary Group User + + + +
    4send_emails_at + Select + Send Emails At + + +
    00:00
    +01:00
    +02:00
    +03:00
    +04:00
    +05:00
    +06:00
    +07:00
    +08:00
    +09:00
    +10:00
    +11:00
    +12:00
    +13:00
    +14:00
    +15:00
    +16:00
    +17:00
    +18:00
    +19:00
    +20:00
    +21:00
    +22:00
    +23:00
    +
    5holiday_list + Link + Holiday List + + + + + + +Holiday List + + + +
    6mail_details + Section Break + Reminder + +
    7subject + Data + Subject + +
    8message + Text Editor + Message + +
    + + +
    +

    Controller

    +

    erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group

    + + + + + + + +

    Class DailyWorkSummaryGroup

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + + +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.is_current_hour + (hour) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.is_holiday_today + (holiday_list) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.is_incoming_account_enabled + () +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.send_summary + () +

    +

    Send summary to everyone

    +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.trigger_emails + () +

    +

    Send emails to Employees at the given hour asking + them what did they work on today

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/daily_work_summary_settings_company.html b/foundation/www/docs/current/models/hr/daily_work_summary_group_user.html similarity index 61% rename from foundation/www/docs/current/models/hr/daily_work_summary_settings_company.html rename to foundation/www/docs/current/models/hr/daily_work_summary_group_user.html index 5a304ca2..25276274 100644 --- a/foundation/www/docs/current/models/hr/daily_work_summary_settings_company.html +++ b/foundation/www/docs/current/models/hr/daily_work_summary_group_user.html @@ -1,18 +1,18 @@ - + -

    Daily Work Summary Settings Company

    +

    Daily Work Summary Group User

    - Version 10.0.13 + Version 10.1.2 - Source
    @@ -21,7 +21,7 @@ Child Table -

    Table Name: tabDaily Work Summary Settings Company

    +

    Table Name: tabDaily Work Summary Group User

    @@ -42,11 +42,11 @@ 1 - company + user Link - Company + User @@ -54,7 +54,7 @@ -Company +User @@ -63,38 +63,15 @@ 2 - send_emails_at + email - Select + Read Only - Send Emails At + email -
    00:00
    -01:00
    -02:00
    -03:00
    -04:00
    -05:00
    -06:00
    -07:00
    -08:00
    -09:00
    -10:00
    -11:00
    -12:00
    -13:00
    -14:00
    -15:00
    -16:00
    -17:00
    -18:00
    -19:00
    -20:00
    -21:00
    -22:00
    -23:00
    +
    user.email
    @@ -110,7 +87,7 @@
  • -Daily Work Summary Settings +Daily Work Summary Group
  • diff --git a/foundation/www/docs/current/models/hr/daily_work_summary_settings.html b/foundation/www/docs/current/models/hr/daily_work_summary_settings.html deleted file mode 100644 index 595f5405..00000000 --- a/foundation/www/docs/current/models/hr/daily_work_summary_settings.html +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - -

    Daily Work Summary Settings

    - - -Single - - - - - - -

    Fields

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    SrFieldnameTypeLabelOptions
    1select_companies - Section Break - Select Companies -

    - Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.

    -
    2companies - Table - Companies - - - - - - -Daily Work Summary Settings Company - - - -
    3message_section - Section Break - Message - -
    4subject - Data - Subject - -
    5message - Text Editor - Message - -
    - - -
    -

    Controller

    -

    erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings

    - - - - - - - -

    Class DailyWorkSummarySettings

    - -

    Inherits from frappe.model.document.Document - -

    -
    -
    - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - -
    -
    - - - - - - - -

    - - - erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings.send_summary - () -

    -

    Send summary to everyone

    -
    -
    - - - - - - - -

    - - - erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings.trigger_emails - () -

    -

    Send emails to Employees of the enabled companies at the give hour asking - them what did they work on today

    -
    -
    - - - - - - - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/department.html b/foundation/www/docs/current/models/hr/department.html index 8ff3abd9..fa0c1ab2 100644 --- a/foundation/www/docs/current/models/hr/department.html +++ b/foundation/www/docs/current/models/hr/department.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 -Leave Control Panel +Job Offer @@ -137,7 +137,7 @@
  • -Offer Letter +Leave Control Panel
  • diff --git a/foundation/www/docs/current/models/hr/driver.html b/foundation/www/docs/current/models/hr/driver.html index 3954600e..4f147a49 100644 --- a/foundation/www/docs/current/models/hr/driver.html +++ b/foundation/www/docs/current/models/hr/driver.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 erpnext.hr.doctype.employee_loan.employee_loan.make_jv_entry - (employee_loan, company, employee_loan_account, employee, loan_amount, payment_account) + (employee_loan, company, employee_loan_account, employee, loan_amount, payment_account=None)

    No docs

    diff --git a/foundation/www/docs/current/models/hr/employee_loan_application.html b/foundation/www/docs/current/models/hr/employee_loan_application.html index ccb144af..c0ae1df5 100644 --- a/foundation/www/docs/current/models/hr/employee_loan_application.html +++ b/foundation/www/docs/current/models/hr/employee_loan_application.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 2 - approval_status - - Select - - Approval Status - - - -
    Draft
    -Approved
    -Rejected
    - - - - - 3 - exp_approver - - Link - - Approver -

    - A user with "Expense Approver" role

    - - - - - - -
    User - - - - - - - - 4 - column_break0 - - Column Break - - - - - - - - - 5 total_claimed_amount Currency @@ -119,7 +69,7 @@ Rejected - 6 + 3 total_sanctioned_amount Currency @@ -133,7 +83,7 @@ Rejected - 7 + 4 is_paid Check @@ -145,7 +95,7 @@ Rejected - 8 + 5 expense_details Section Break @@ -157,7 +107,7 @@ Rejected - 9 + 6 expenses Table @@ -178,7 +128,7 @@ Rejected - 10 + 7 sb1 Section Break @@ -192,7 +142,7 @@ Rejected - 11 + 8 posting_date Date @@ -204,7 +154,7 @@ Rejected - 12 + 9 employee Link @@ -225,7 +175,7 @@ Rejected - 13 + 10 employee_name Data @@ -239,7 +189,7 @@ Rejected - 14 + 11 vehicle_log Link @@ -260,7 +210,7 @@ Rejected - 15 + 12 project Link @@ -281,7 +231,7 @@ Rejected - 16 + 13 task Link @@ -302,7 +252,7 @@ Rejected - 17 + 14 cb1 Column Break @@ -314,7 +264,7 @@ Rejected - 18 + 15 total_amount_reimbursed Currency @@ -328,7 +278,7 @@ Rejected - 19 + 16 remark Small Text @@ -340,7 +290,7 @@ Rejected - 20 + 17 title Data @@ -352,7 +302,7 @@ Rejected - 21 + 18 email_id Data @@ -364,7 +314,7 @@ Rejected - 22 + 19 accounting_details Section Break @@ -376,7 +326,7 @@ Rejected - 23 + 20 company Link @@ -397,7 +347,7 @@ Rejected - 24 + 21 mode_of_payment Link @@ -418,7 +368,7 @@ Rejected - 25 + 22 column_break_24 Column Break @@ -430,7 +380,7 @@ Rejected - 26 + 23 payable_account Link @@ -451,7 +401,7 @@ Rejected - 27 + 24 cost_center Link @@ -472,7 +422,7 @@ Rejected - 28 + 25 more_details Section Break @@ -484,7 +434,7 @@ Rejected - 29 + 26 status Select @@ -503,7 +453,7 @@ Cancelled - 30 + 27 amended_from Link @@ -524,7 +474,7 @@ Cancelled - 31 + 28 advance_payments Section Break @@ -536,7 +486,7 @@ Cancelled - 32 + 29 advances Table @@ -557,7 +507,7 @@ Cancelled - 33 + 30 total_advance_amount Currency @@ -584,6 +534,21 @@ Cancelled +

    Class ExpenseApproverIdentityError

    + +

    Inherits from frappe.exceptions.ValidationError + +

    +
    +
    + +
    +
    + + + + +

    Class ExpenseClaim

    Inherits from erpnext.controllers.accounts_controller.AccountsController @@ -609,20 +574,6 @@ Cancelled -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -833,20 +784,6 @@ Cancelled -

    - - - validate_expense_approver - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -899,24 +836,6 @@ Cancelled -

    Public API -
    /api/method/erpnext.hr.doctype.expense_claim.expense_claim.get_expense_approver -

    -

    - - - erpnext.hr.doctype.expense_claim.expense_claim.get_expense_approver - (doctype, txt, searchfield, start, page_len, filters) -

    -

    No docs

    -
    -
    - - - - - -

    Public API
    /api/method/erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim_account

    diff --git a/foundation/www/docs/current/models/hr/expense_claim_account.html b/foundation/www/docs/current/models/hr/expense_claim_account.html index e4249e92..131efecf 100644 --- a/foundation/www/docs/current/models/hr/expense_claim_account.html +++ b/foundation/www/docs/current/models/hr/expense_claim_account.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 +
  • + + +Daily Work Summary Group + +
  • + + +
  • diff --git a/foundation/www/docs/current/models/hr/hr_settings.html b/foundation/www/docs/current/models/hr/hr_settings.html index 0f05fefe..5dd59d44 100644 --- a/foundation/www/docs/current/models/hr/hr_settings.html +++ b/foundation/www/docs/current/models/hr/hr_settings.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2
  • -Offer Letter +Job Offer
  • diff --git a/foundation/www/docs/current/models/hr/offer_letter.html b/foundation/www/docs/current/models/hr/job_offer.html similarity index 86% rename from foundation/www/docs/current/models/hr/offer_letter.html rename to foundation/www/docs/current/models/hr/job_offer.html index a3bbaf6c..872de816 100644 --- a/foundation/www/docs/current/models/hr/offer_letter.html +++ b/foundation/www/docs/current/models/hr/job_offer.html @@ -1,18 +1,18 @@ - + -

    Offer Letter

    +

    Job Offer

    - Version 10.0.13 + Version 10.1.2 - Source
    @@ -21,7 +21,7 @@ -

    Table Name: tabOffer Letter

    +

    Table Name: tabJob Offer

    @@ -175,7 +175,7 @@ Rejected Table - Offer Letter Terms + Job Offer Terms @@ -183,7 +183,7 @@ Rejected -Offer Letter Term +Job Offer Term @@ -249,7 +249,7 @@ Rejected -Offer Letter +Job Offer @@ -262,7 +262,7 @@ Rejected

    Controller

    -

    erpnext.hr.doctype.offer_letter.offer_letter

    +

    erpnext.hr.doctype.job_offer.job_offer

    @@ -270,7 +270,7 @@ Rejected -

    Class OfferLetter

    +

    Class JobOffer

    Inherits from frappe.model.document.Document @@ -287,12 +287,12 @@ Rejected

    Public API -
    /api/method/erpnext.hr.doctype.offer_letter.offer_letter.make_employee +
    /api/method/erpnext.hr.doctype.job_offer.job_offer.make_employee

    - + - erpnext.hr.doctype.offer_letter.offer_letter.make_employee + erpnext.hr.doctype.job_offer.job_offer.make_employee (source_name, target_doc=None)

    No docs

    @@ -311,7 +311,7 @@ Rejected
  • -Offer Letter +Job Offer
  • diff --git a/foundation/www/docs/current/models/hr/offer_letter_term.html b/foundation/www/docs/current/models/hr/job_offer_term.html similarity index 87% rename from foundation/www/docs/current/models/hr/offer_letter_term.html rename to foundation/www/docs/current/models/hr/job_offer_term.html index f8a90ac0..f04ace6d 100644 --- a/foundation/www/docs/current/models/hr/offer_letter_term.html +++ b/foundation/www/docs/current/models/hr/job_offer_term.html @@ -1,18 +1,18 @@ - + -

    Offer Letter Term

    +

    Job Offer Term

    - Version 10.0.13 + Version 10.1.2 - Source
    @@ -21,7 +21,7 @@ Child Table -

    Table Name: tabOffer Letter Term

    +

    Table Name: tabJob Offer Term

    @@ -97,7 +97,7 @@
  • -Offer Letter +Job Offer
  • diff --git a/foundation/www/docs/current/models/hr/job_opening.html b/foundation/www/docs/current/models/hr/job_opening.html index 2ec158a9..2550c1be 100644 --- a/foundation/www/docs/current/models/hr/job_opening.html +++ b/foundation/www/docs/current/models/hr/job_opening.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 2 - status - - Select - - Status - - - -
    Open
    -Approved
    -Rejected
    - - - - - 3 - column_break_12 - - Column Break - - - - - - - - - 4 leave_type Link @@ -104,7 +76,7 @@ Rejected - 5 + 3 leave_balance Float @@ -116,7 +88,7 @@ Rejected - 6 + 4 section_break_5 Section Break @@ -128,7 +100,7 @@ Rejected - 7 + 5 from_date Date @@ -140,7 +112,7 @@ Rejected - 8 + 6 to_date Date @@ -152,7 +124,7 @@ Rejected - 9 + 7 half_day Check @@ -164,7 +136,7 @@ Rejected - 10 + 8 half_day_date Date @@ -176,7 +148,7 @@ Rejected - 11 + 9 total_leave_days Float @@ -188,7 +160,7 @@ Rejected - 12 + 10 column_break1 Column Break @@ -200,7 +172,7 @@ Rejected - 13 + 11 description Small Text @@ -212,7 +184,7 @@ Rejected - 14 + 12 section_break_7 Section Break @@ -224,7 +196,7 @@ Rejected - 15 + 13 employee Link @@ -245,7 +217,7 @@ Rejected - 16 + 14 employee_name Data @@ -256,53 +228,8 @@ Rejected - - 17 - column_break_15 - - Column Break - - - - - - - - - 18 - leave_approver - - Link - - Leave Approver - - - - - - - -
    User - - - - - - - - 19 - leave_approver_name - - Read Only - - Leave Approver Name - - - - - - 20 + 15 sb10 Section Break @@ -314,7 +241,7 @@ Rejected - 21 + 16 posting_date Date @@ -326,7 +253,7 @@ Rejected - 22 + 17 follow_via_email Check @@ -338,7 +265,7 @@ Rejected - 23 + 18 column_break_17 Column Break @@ -350,7 +277,7 @@ Rejected - 24 + 19 company Link @@ -371,7 +298,7 @@ Rejected - 25 + 20 letter_head Link @@ -392,7 +319,7 @@ Rejected - 26 + 21 amended_from Link @@ -513,20 +440,6 @@ Rejected notify_employee - (self, status) -

    -

    No docs

    -
    -
    - - - - - -

    - - - notify_leave_approver (self)

    No docs

    @@ -565,20 +478,6 @@ Rejected -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -692,23 +591,9 @@ Rejected

    - + - validate_dates_acorss_allocation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_leave_approver + validate_dates_across_allocation (self)

    No docs

    @@ -891,24 +776,6 @@ Rejected -

    Public API -
    /api/method/erpnext.hr.doctype.leave_application.leave_application.get_approvers -

    -

    - - - erpnext.hr.doctype.leave_application.leave_application.get_approvers - (doctype, txt, searchfield, start, page_len, filters) -

    -

    No docs

    -
    -
    - - - - - -

    Public API
    /api/method/erpnext.hr.doctype.leave_application.leave_application.get_events

    diff --git a/foundation/www/docs/current/models/hr/leave_block_list.html b/foundation/www/docs/current/models/hr/leave_block_list.html index 0e5b4f47..d13ed9d8 100644 --- a/foundation/www/docs/current/models/hr/leave_block_list.html +++ b/foundation/www/docs/current/models/hr/leave_block_list.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 -Offer Letter Term +Job Offer Term diff --git a/foundation/www/docs/current/models/hr/payroll_employee_detail.html b/foundation/www/docs/current/models/hr/payroll_employee_detail.html index 10b4b670..fe2eb79c 100644 --- a/foundation/www/docs/current/models/hr/payroll_employee_detail.html +++ b/foundation/www/docs/current/models/hr/payroll_employee_detail.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 4 + inspection_required + + Check + + Inspection Required + + + + + + + 5 + quality_inspection_template + + Link + + Quality Inspection Template + + + + + + + +Quality Inspection Template + + + + + + + + 6 cb0 Column Break @@ -100,7 +133,7 @@ - 5 + 7 is_active Check @@ -112,7 +145,7 @@ - 6 + 8 is_default Check @@ -124,7 +157,7 @@ - 7 + 9 with_operations Check @@ -137,7 +170,7 @@ - 8 + 10 rm_cost_as_per Select @@ -153,7 +186,7 @@ Price List - 9 + 11 buying_price_list Link @@ -174,7 +207,7 @@ Price List - 10 + 12 set_rate_of_sub_assembly_item_based_on_bom Check @@ -186,7 +219,7 @@ Price List - 11 + 13 currency_detail Section Break @@ -198,7 +231,7 @@ Price List - 12 + 14 company Link @@ -219,7 +252,7 @@ Price List - 13 + 15 column_break_12 Column Break @@ -231,7 +264,7 @@ Price List - 14 + 16 currency Link @@ -252,7 +285,7 @@ Price List - 15 + 17 conversion_rate Float @@ -264,7 +297,7 @@ Price List - 16 + 18 operations_section Section Break @@ -277,7 +310,7 @@ Price List - 17 + 19 operations Table @@ -298,7 +331,7 @@ Price List - 18 + 20 materials_section Section Break @@ -310,7 +343,7 @@ Price List - 19 + 21 items Table @@ -331,7 +364,7 @@ Price List - 20 + 22 scrap_section Section Break @@ -343,7 +376,7 @@ Price List - 21 + 23 scrap_items Table @@ -364,7 +397,7 @@ Price List - 22 + 24 costing Section Break @@ -376,7 +409,7 @@ Price List - 23 + 25 operating_cost Currency @@ -390,7 +423,7 @@ Price List - 24 + 26 raw_material_cost Currency @@ -404,7 +437,7 @@ Price List - 25 + 27 scrap_material_cost Currency @@ -418,7 +451,7 @@ Price List - 26 + 28 cb1 Column Break @@ -430,7 +463,7 @@ Price List - 27 + 29 base_operating_cost Currency @@ -444,7 +477,7 @@ Price List - 28 + 30 base_raw_material_cost Currency @@ -458,7 +491,7 @@ Price List - 29 + 31 base_scrap_material_cost Data @@ -472,7 +505,7 @@ Price List - 30 + 32 total_cost_of_bom Section Break @@ -484,7 +517,7 @@ Price List - 31 + 33 total_cost Currency @@ -498,7 +531,7 @@ Price List - 32 + 34 column_break_26 Column Break @@ -510,7 +543,7 @@ Price List - 33 + 35 base_total_cost Currency @@ -524,7 +557,7 @@ Price List - 34 + 36 more_info_section Section Break @@ -536,7 +569,7 @@ Price List - 35 + 37 project Link @@ -557,7 +590,7 @@ Price List - 36 + 38 amended_from Link @@ -578,7 +611,7 @@ Price List - 37 + 39 col_break23 Column Break @@ -590,7 +623,7 @@ Price List - 38 + 40 uom Link @@ -611,7 +644,7 @@ Price List - 39 + 41 section_break_25 Section Break @@ -623,7 +656,7 @@ Price List - 40 + 42 description Small Text @@ -635,7 +668,7 @@ Price List - 41 + 43 column_break_27 Column Break @@ -647,7 +680,7 @@ Price List - 42 + 44 image Attach @@ -659,7 +692,7 @@ Price List - 43 + 45 image_view Image @@ -673,7 +706,7 @@ Price List - 44 + 46 section_break0 Section Break @@ -685,7 +718,7 @@ Price List - 45 + 47 exploded_items Table @@ -706,7 +739,7 @@ Price List - 46 + 48 website_section Section Break @@ -718,7 +751,7 @@ Price List - 47 + 49 show_in_website Check @@ -730,7 +763,7 @@ Price List - 48 + 50 route Small Text @@ -742,7 +775,7 @@ Price List - 49 + 51 website_image Attach Image @@ -755,7 +788,7 @@ Price List - 50 + 52 thumbnail Data @@ -767,7 +800,7 @@ Price List - 51 + 53 sb_web_spec Section Break @@ -779,7 +812,7 @@ Price List - 52 + 54 web_long_description Text Editor @@ -791,7 +824,7 @@ Price List - 53 + 55 show_items Check @@ -803,7 +836,7 @@ Price List - 54 + 56 show_operations Check @@ -1247,6 +1280,20 @@ Price List +

    + + + update_parent_cost + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1586,6 +1633,15 @@ Price List +

  • + + +Quality Inspection + +
  • + + +
  • diff --git a/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html b/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html index 16f3349a..badec2e5 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html +++ b/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 get_parent_boms - (self) + (self, bom, bom_list=None)

    No docs

    diff --git a/foundation/www/docs/current/models/manufacturing/bom_website_item.html b/foundation/www/docs/current/models/manufacturing/bom_website_item.html index 2c45c9ba..5a548c47 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_website_item.html +++ b/foundation/www/docs/current/models/manufacturing/bom_website_item.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + + + + +

    Material Request Plan Item

    +
    + + +Child Table + + +

    Table Name: tabMaterial Request Plan Item

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1item_code + Link + Item Code + + + + + + +Item + + + +
    2item_name + Data + Item Name + +
    3warehouse + Link + Warehouse + + + + + + +Warehouse + + + +
    4column_break_4 + Column Break + + +
    5quantity + Float + Quantity + +
    6actual_qty + Float + Actual Qty + +
    7min_order_qty + Float + Minimum Order Quantity + +
    8section_break_8 + Section Break + Reference + +
    9sales_order + Link + Sales Order + + + + + + +Sales Order + + + +
    10requested_qty + Float + Requested Qty + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/manufacturing/operation.html b/foundation/www/docs/current/models/manufacturing/operation.html index bfb66632..9a836073 100644 --- a/foundation/www/docs/current/models/manufacturing/operation.html +++ b/foundation/www/docs/current/models/manufacturing/operation.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 44 + production_plan + + Link + + Production Plan + + + + + + + +Production Plan + + + + + + + + 45 + production_plan_item + + Data + + Production Plan Item + + + + + + + 46 amended_from Link @@ -1084,6 +1117,20 @@ Cancelled +

    + + + update_ordered_qty + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1113,6 +1160,20 @@ Cancelled +

    + + + update_production_plan_status + (self) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/manufacturing/production_order_item.html b/foundation/www/docs/current/models/manufacturing/production_order_item.html index 601d390f..9c4a357f 100644 --- a/foundation/www/docs/current/models/manufacturing/production_order_item.html +++ b/foundation/www/docs/current/models/manufacturing/production_order_item.html @@ -9,7 +9,7 @@

    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + -

    Production Planning Tool

    +

    Production Plan

    - Version 10.0.13 + Version 10.1.2 - Source
    -Single +

    Table Name: tabProduction Plan

    + +

    Fields

    @@ -40,6 +42,41 @@ 1 + naming_series + + Select + + Naming Series + + + +
    PLN-
    + + + + + 2 + company + + Link + + Company + + + + + + + +Company + + + + + + + + 3 get_items_from Select @@ -54,8 +91,32 @@ Material Request + + 4 + column_break1 + + Column Break + + + + + + + + + 5 + posting_date + + Date + + Posting Date + + + + + - 2 + 6 filters Section Break @@ -67,12 +128,12 @@ Material Request - 3 - fg_item + 7 + item_code Link - Item + Item Code @@ -88,7 +149,7 @@ Material Request - 4 + 8 customer Link @@ -109,7 +170,7 @@ Material Request - 5 + 9 warehouse Link @@ -129,63 +190,6 @@ Material Request - - 6 - company - - Link - - Company - - - - - - - -Company - - - - - - - - 7 - column_break1 - - Column Break - - - - - - - - - 8 - from_date - - Date - - From Date - - - - - - - 9 - to_date - - Date - - To Date - - - - - 10 project @@ -207,11 +211,11 @@ Material Request - + 11 - section_break1 - - Section Break + column_break2 + + Column Break @@ -221,19 +225,54 @@ Material Request 12 - get_sales_orders + from_date - Button + Date - Get Sales Orders -

    - Pull sales orders (pending to deliver) based on the above criteria

    + From Date + 13 + to_date + + Date + + To Date + + + + + + + 14 + sales_orders_detail + + Section Break + + Sales Orders Detail + + + + + + + 15 + get_sales_orders + + Button + + Get Sales Orders + + + + + + + 16 sales_orders Table @@ -254,32 +293,31 @@ Material Request - 14 - section_break_16 + 17 + material_request_detail Section Break - + Material Request Detail - 15 + 18 get_material_request Button Get Material Request -

    - Pull Material Request of type Manufacture based on the above criteria

    + - 16 + 19 material_requests Table @@ -300,33 +338,32 @@ Material Request - 17 + 20 items_for_production Section Break Select Items -

    - Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.

    - - - - - - 18 - get_items - - Button - - Get Items - 19 - items + 21 + get_items + + Button + + Get Items For Production Order + + + + + + + 22 + po_items Table @@ -346,70 +383,24 @@ Material Request - 20 - create_production_orders - - Section Break - - Production Orders - - - - - - - 21 - create_production_order - - Button - - Create Production Orders -

    - Separate production order will be created for each finished good item.

    - - - - - - 22 - sb5 - - Section Break - - Material Requirement - - - - - - 23 - purchase_request_for_warehouse + material_request_planning - Link + Section Break - Material Request For Warehouse - - - - - - - -Warehouse - - + Material Request Planning + 24 - create_material_requests_for_all_required_qty + include_non_stock_items Check - Create for full quantity, ignoring quantity already on order + Include Non Stock Items @@ -417,11 +408,11 @@ Material Request 25 - create_material_requests + ignore_existing_ordered_qty - Button + Check - Create Material Requests + Ignore Existing Ordered Quantity @@ -429,20 +420,7 @@ Material Request 26 - download_materials_required - - Button - - Download Materials Required -

    - Download a report containing all raw materials with their latest inventory status

    - - - - - - 27 - column_break_2 + column_break_25 Column Break @@ -453,64 +431,160 @@ Material Request - 28 - create_material_requests_non_stock_request + 27 + include_subcontracted_items Check - Include non-stock items -

    - If checked, Will include non-stock items in the Material Requests.

    + Include Subcontracted Items + + + + + + + 28 + section_break_27 + + Section Break + + + 29 - use_multi_level_bom + get_items_for_mr - Check + Button - Use Multi-Level BOM -

    - If checked, all the children of each production item will be included in the Material Requests.

    + Get Raw Materials For Production + 30 - only_raw_materials + mr_items - Check + Table - Only Obtain Raw Materials -

    - If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created

    + Material Request Plan Item + + + + + + + +Material Request Plan Item + + + + + + + + 31 + other_details + + Section Break + + Other Details + - 31 - include_subcontracted + 32 + total_planned_qty - Check + Float - Include sub-contracted raw materials -

    - If checked, raw materials for items that are sub-contracted will be included in the Material Requests

    + Total Planned Qty + + + 33 + total_produced_qty + + Float + + Total Produced Qty + + + + + + + 34 + column_break_32 + + Column Break + + + + + + + + + 35 + status + + Select + + Status + + + +
    +Draft
    +Submitted
    +Not Started
    +In Process
    +Completed
    +Stopped
    +Cancelled
    +Material Requested
    + + + + + 36 + amended_from + + Link + + Amended From + + + + + + + +Production Plan + + + + + +

    Controller

    -

    erpnext.manufacturing.doctype.production_planning_tool.production_planning_tool

    +

    erpnext.manufacturing.doctype.production_plan.production_plan

    @@ -518,7 +592,7 @@ Material Request -

    Class ProductionPlanningTool

    +

    Class ProductionPlan

    Inherits from frappe.model.document.Document @@ -529,6 +603,20 @@ Material Request +

    + + + add_item_in_material_request_items + (self, item, row, data) +

    +

    No docs

    +
    +
    + + + + +

    @@ -572,10 +660,10 @@ Material Request

    - + - clear_table - (self, table_name) + calculate_total_planned_qty + (self)

    No docs

    @@ -586,9 +674,9 @@ Material Request

    - + - create_material_request + calculate_total_produced_qty (self)

    No docs

    @@ -603,35 +691,7 @@ Material Request create_production_order - (self, item_dict) -

    -

    Create production order. Called from Production Planning Tool

    -
    -
    - - - - - -

    - - - download_raw_materials - (self) -

    -

    Create csv data for required raw material to produce finished goods

    -
    -
    - - - - - -

    - - - get_csv - (self) + (self, item)

    No docs

    @@ -642,10 +702,10 @@ Material Request

    - + - get_item_projected_qty - (self, item) + delete_draft_production_order + (self)

    No docs

    @@ -669,6 +729,34 @@ Material Request +

    + + + get_items_for_material_requests + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + get_itemwise_qty + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -725,51 +813,6 @@ Material Request -

    - - - get_projected_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_raw_materials - (self, bom_dict, non_stock_item=0) -

    -

    Get raw materials considering sub-assembly items - { - "itemcode": [qtyrequired, description, stockuom, minorder_qty] - }

    -
    -
    - - - - - -

    - - - get_requested_items - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -784,28 +827,11 @@ Material Request -

    - - - get_so_wise_planned_qty - (self) -

    -
            bom_dict {
    -            bom_no: ['sales_order', 'qty']
    -        }
    -
    -
    -
    - - - - -

    get_subitems - (self, bom_wise_item_details, bom, parent_qty, include_sublevel, only_raw, supply_subs, non_stock_item=0) + (self, data, bom_wise_item_details, bom_no, parent_qty)

    No docs

    @@ -816,10 +842,10 @@ Material Request

    - + - make_items_dict - (self, item_list) + make_material_request + (self)

    No docs

    @@ -830,14 +856,12 @@ Material Request

    - + - raise_material_requests + make_production_order (self)

    -
            Raise Material Request if projected qty is less than qty required
    -        Requested qty should be shortage qty considering minimum order qty
    -
    +

    No docs


    @@ -846,12 +870,12 @@ Material Request

    - + - raise_production_orders + on_cancel (self)

    -

    It will raise production order (Draft) for all distinct FG items

    +

    No docs


    @@ -860,9 +884,65 @@ Material Request

    - + - validate_company + set_status + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_ordered_status + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_produced_qty + (self, produced_qty, production_plan_item) +

    +

    No docs

    +
    +
    + + + + + +

    + + + update_requested_status + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate (self)

    No docs

    @@ -889,9 +969,59 @@ Material Request + + + +

    Public API +
    /api/method/erpnext.manufacturing.doctype.production_plan.production_plan.get_bin_details +

    +

    + + + erpnext.manufacturing.doctype.production_plan.production_plan.get_bin_details + (row) +

    +

    No docs

    +
    +
    + + + +

    Linked In:

    + + diff --git a/foundation/www/docs/current/models/manufacturing/production_plan_item.html b/foundation/www/docs/current/models/manufacturing/production_plan_item.html index 005ebfcc..16177a38 100644 --- a/foundation/www/docs/current/models/manufacturing/production_plan_item.html +++ b/foundation/www/docs/current/models/manufacturing/production_plan_item.html @@ -9,7 +9,7 @@
  • -Production Planning Tool +Production Plan
  • diff --git a/foundation/www/docs/current/models/manufacturing/production_plan_material_request.html b/foundation/www/docs/current/models/manufacturing/production_plan_material_request.html index 3ed857ed..920ee6d4 100644 --- a/foundation/www/docs/current/models/manufacturing/production_plan_material_request.html +++ b/foundation/www/docs/current/models/manufacturing/production_plan_material_request.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 1 - material_request + material_request Link @@ -97,7 +97,7 @@
  • -Production Planning Tool +Production Plan
  • diff --git a/foundation/www/docs/current/models/manufacturing/production_plan_sales_order.html b/foundation/www/docs/current/models/manufacturing/production_plan_sales_order.html index 6c6fd8b9..c69fd176 100644 --- a/foundation/www/docs/current/models/manufacturing/production_plan_sales_order.html +++ b/foundation/www/docs/current/models/manufacturing/production_plan_sales_order.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 1 - sales_order + sales_order Link @@ -130,7 +130,7 @@
  • -Production Planning Tool +Production Plan
  • diff --git a/foundation/www/docs/current/models/manufacturing/workstation.html b/foundation/www/docs/current/models/manufacturing/workstation.html index 0e4fac4e..2518034d 100644 --- a/foundation/www/docs/current/models/manufacturing/workstation.html +++ b/foundation/www/docs/current/models/manufacturing/workstation.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 5 email - Data + Link Email - + + + + + +User + + + + @@ -123,6 +132,86 @@ 7 + customer_section + + Section Break + + Customer + + + + + + + 8 + customer + + Link + + Customer + + + + + + + +Customer + + + + + + + + 9 + customer_name + + Data + + Customer Name + + + +
    customer.customer_name
    + + + + + 10 + supplier_section + + Section Break + + Supplier + + + + + + + 11 + supplier + + Link + + Supplier + + + + + + + +Supplier + + + + + + + + 12 address_contacts Section Break @@ -136,7 +225,7 @@ - 8 + 13 address_html HTML @@ -148,7 +237,7 @@ - 9 + 14 column_break_9 Column Break @@ -160,7 +249,7 @@ - 10 + 15 contact_html HTML diff --git a/foundation/www/docs/current/models/non_profit/membership.html b/foundation/www/docs/current/models/non_profit/membership.html index b047b71a..9988785e 100644 --- a/foundation/www/docs/current/models/non_profit/membership.html +++ b/foundation/www/docs/current/models/non_profit/membership.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2
  • -Production Planning Tool +Production Plan
  • diff --git a/foundation/www/docs/current/models/projects/project_task.html b/foundation/www/docs/current/models/projects/project_task.html index 81fca4e5..048ca686 100644 --- a/foundation/www/docs/current/models/projects/project_task.html +++ b/foundation/www/docs/current/models/projects/project_task.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + + + + +

    Projects Settings

    +
    + +Single + + + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1timesheet_sb + Section Break + Timesheets + +
    2ignore_workstation_time_overlap + Check + Ignore Workstation Time Overlap + +
    3ignore_user_time_overlap + Check + Ignore User Time Overlap + +
    4ignore_employee_time_overlap + Check + Ignore Employee Time Overlap + +
    + + +
    +

    Controller

    +

    erpnext.projects.doctype.projects_settings.projects_settings

    + + + + + + + +

    Class ProjectsSettings

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/projects/task.html b/foundation/www/docs/current/models/projects/task.html index 604ffdbd..074a4dbf 100644 --- a/foundation/www/docs/current/models/projects/task.html +++ b/foundation/www/docs/current/models/projects/task.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 validate_overlap_for - (self, fieldname, args, value) + (self, fieldname, args, value, ignore_validation=False)

    No docs

    diff --git a/foundation/www/docs/current/models/projects/timesheet_detail.html b/foundation/www/docs/current/models/projects/timesheet_detail.html index 428d98a7..5c4829b0 100644 --- a/foundation/www/docs/current/models/projects/timesheet_detail.html +++ b/foundation/www/docs/current/models/projects/timesheet_detail.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + 6 + b2c_limit + + Data + + B2C Limit +

    + Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.

    + + + + diff --git a/foundation/www/docs/current/models/regional/index.html b/foundation/www/docs/current/models/regional/index.html index 2ddbdd4e..aae8924d 100644 --- a/foundation/www/docs/current/models/regional/index.html +++ b/foundation/www/docs/current/models/regional/index.html @@ -7,7 +7,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 24 - primary_contact_detail + primary_address_and_contact_detail Section Break - Primary Contact Detail - + Primary Address and Contact Detail +

    + Select, to make the customer searchable with these fields

    @@ -416,7 +417,8 @@ Individual Link Customer Primary Contact - +

    + Reselect, if the chosen contact is edited after save

    @@ -432,23 +434,11 @@ Individual 26 - column_break_26 - - Column Break - - - - - - - - - 27 mobile_no Read Only - Mobile Number + Mobile No @@ -457,7 +447,7 @@ Individual - 28 + 27 email_id Read Only @@ -470,8 +460,54 @@ Individual - + + 28 + column_break_26 + + Column Break + + + + + + + + 29 + customer_primary_address + + Link + + Customer Primary Address +

    + Reselect, if the chosen address is edited after save

    + + + + + + +
    Address + + + + + + + + 30 + primary_address + + Read Only + + Primary Address + + + + + + + 31 default_receivable_accounts Section Break @@ -483,7 +519,7 @@ Individual - 30 + 32 accounts Table @@ -505,7 +541,7 @@ Individual - 31 + 33 credit_limit_section Section Break @@ -517,7 +553,7 @@ Individual - 32 + 34 credit_limit Currency @@ -529,7 +565,31 @@ Individual - 33 + 35 + bypass_credit_limit_check_at_sales_order + + Check + + Bypass credit limit check at Sales Order + + + + + + + 36 + column_break_34 + + Column Break + + + + + + + + + 37 payment_terms Link @@ -549,20 +609,8 @@ Individual - - 34 - bypass_credit_limit_check_at_sales_order - - Check - - Bypass credit limit check at Sales Order - - - - - - 35 + 38 more_info Section Break @@ -576,7 +624,7 @@ Individual - 36 + 39 customer_details Text @@ -589,7 +637,7 @@ Individual - 37 + 40 is_frozen Check @@ -601,7 +649,7 @@ Individual - 38 + 41 sales_team_section_break Section Break @@ -615,7 +663,7 @@ Individual - 39 + 42 default_sales_partner Link @@ -636,7 +684,7 @@ Individual - 40 + 43 default_commission_rate Float @@ -648,7 +696,7 @@ Individual - 41 + 44 sales_team_section Section Break @@ -660,7 +708,7 @@ Individual - 42 + 45 sales_team Table @@ -681,7 +729,7 @@ Individual - 43 + 46 customer_pos_id Data @@ -759,6 +807,20 @@ Individual +

    + + + check_customer_group_or_territory_change + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -952,7 +1014,7 @@ Individual erpnext.selling.doctype.customer.customer.check_credit_limit - (customer, company) + (customer, company, ignore_outstanding_sales_order=False, extra_amount=0)

    No docs

    @@ -1012,6 +1074,22 @@ Individual +

    + + + erpnext.selling.doctype.customer.customer.get_customer_primary_address + (doctype, txt, searchfield, start, page_len, filters) +

    +

    No docs

    +
    +
    + + + + + + +

    @@ -1108,6 +1186,24 @@ Individual +

  • + + +Hotel Room Reservation + +
  • + + + +
  • + + +Hotel Settings + +
  • + + +
  • @@ -1162,6 +1258,15 @@ Individual +
  • + + +Member + +
  • + + +
  • @@ -1201,7 +1306,7 @@ Individual
  • -Production Plan Sales Order +Production Plan
  • @@ -1210,7 +1315,7 @@ Individual
  • -Production Planning Tool +Production Plan Sales Order
  • diff --git a/foundation/www/docs/current/models/selling/index.html b/foundation/www/docs/current/models/selling/index.html index c562b279..be833551 100644 --- a/foundation/www/docs/current/models/selling/index.html +++ b/foundation/www/docs/current/models/selling/index.html @@ -7,7 +7,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 +
  • + + +Material Request Plan Item + +
  • + + +
  • @@ -2541,6 +2550,15 @@ Closed
  • + +
  • + + +Supplier Quotation Item + +
  • + + diff --git a/foundation/www/docs/current/models/selling/sales_order_item.html b/foundation/www/docs/current/models/selling/sales_order_item.html index 39a47568..4c89e77d 100644 --- a/foundation/www/docs/current/models/selling/sales_order_item.html +++ b/foundation/www/docs/current/models/selling/sales_order_item.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 39 + column_break_26 + + Column Break + + + + + + + + + 40 credit_limit Currency @@ -698,48 +710,29 @@ Existing Company - - 40 - column_break_26 - - Column Break - - - - - - - 41 - credit_days_based_on + payment_terms - Select + Link - Credit Days Based On + Default Payment Terms Template -
    -Fixed Days
    -Last Day of the Next Month
    - - - - - 42 - credit_days - - Int - - Credit Days + + + + +
    Payment Terms Template + + - - 43 + 42 auto_accounting_for_stock_settings Section Break @@ -751,7 +744,7 @@ Last Day of the Next Month - 44 + 43 enable_perpetual_inventory Check @@ -763,7 +756,7 @@ Last Day of the Next Month - 45 + 44 default_inventory_account Link @@ -784,7 +777,7 @@ Last Day of the Next Month - 46 + 45 stock_adjustment_account Link @@ -805,7 +798,7 @@ Last Day of the Next Month - 47 + 46 column_break_32 Column Break @@ -817,7 +810,7 @@ Last Day of the Next Month - 48 + 47 stock_received_but_not_billed Link @@ -838,7 +831,7 @@ Last Day of the Next Month - 49 + 48 expenses_included_in_valuation Link @@ -859,7 +852,7 @@ Last Day of the Next Month - 50 + 49 fixed_asset_depreciation_settings Section Break @@ -871,7 +864,7 @@ Last Day of the Next Month - 51 + 50 accumulated_depreciation_account Link @@ -892,7 +885,7 @@ Last Day of the Next Month - 52 + 51 depreciation_expense_account Link @@ -913,7 +906,7 @@ Last Day of the Next Month - 53 + 52 series_for_depreciation_entry Data @@ -925,7 +918,7 @@ Last Day of the Next Month - 54 + 53 column_break_40 Column Break @@ -937,7 +930,7 @@ Last Day of the Next Month - 55 + 54 disposal_account Link @@ -958,7 +951,7 @@ Last Day of the Next Month - 56 + 55 depreciation_cost_center Link @@ -979,7 +972,7 @@ Last Day of the Next Month - 57 + 56 company_info Section Break @@ -992,7 +985,7 @@ Last Day of the Next Month - 58 + 57 address_html HTML @@ -1004,7 +997,7 @@ Last Day of the Next Month - 59 + 58 column_break1 Column Break @@ -1016,7 +1009,7 @@ Last Day of the Next Month - 60 + 59 phone_no Data @@ -1030,7 +1023,7 @@ Last Day of the Next Month - 61 + 60 fax Data @@ -1044,7 +1037,7 @@ Last Day of the Next Month - 62 + 61 email Data @@ -1058,7 +1051,7 @@ Last Day of the Next Month - 63 + 62 website Data @@ -1070,7 +1063,7 @@ Last Day of the Next Month - 64 + 63 registration_info Section Break @@ -1082,7 +1075,7 @@ Last Day of the Next Month - 65 + 64 registration_details Code @@ -1095,7 +1088,7 @@ Last Day of the Next Month - 66 + 65 delete_company_transactions Button @@ -1106,6 +1099,18 @@ Last Day of the Next Month + + 66 + company_logo + + Attach Image + + Company Logo + + + + + @@ -1174,10 +1179,10 @@ Last Day of the Next Month

    - + - before_rename - (self, olddn, newdn, merge=False) + check_country_change + (self)

    No docs

    @@ -1672,15 +1677,6 @@ Last Day of the Next Month -
  • - - -Daily Work Summary - -
  • - - -
  • @@ -1888,6 +1884,15 @@ Last Day of the Next Month +
  • + + +Job Offer + +
  • + + +
  • @@ -1987,15 +1992,6 @@ Last Day of the Next Month -
  • - - -Offer Letter - -
  • - - -
  • @@ -2098,7 +2094,7 @@ Last Day of the Next Month
  • -Production Planning Tool +Production Plan
  • @@ -2248,6 +2244,24 @@ Last Day of the Next Month +
  • + + +Share Transfer + +
  • + + + +
  • + + +Shareholder + +
  • + + +
  • diff --git a/foundation/www/docs/current/models/setup/currency_exchange.html b/foundation/www/docs/current/models/setup/currency_exchange.html index 898796e2..626bdcd5 100644 --- a/foundation/www/docs/current/models/setup/currency_exchange.html +++ b/foundation/www/docs/current/models/setup/currency_exchange.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 6 - credit_days_based_on + payment_terms - Select + Link - Credit Days Based On + Default Payment Terms Template -
    -Fixed Days
    -Last Day of the Next Month
    + + + + +
    Payment Terms Template + + + 7 - credit_days - - Int - - Credit Days - - - - - - - 8 credit_limit Currency @@ -160,7 +153,7 @@ Last Day of the Next Month - 9 + 8 lft Int @@ -172,7 +165,7 @@ Last Day of the Next Month - 10 + 9 rgt Int @@ -184,7 +177,7 @@ Last Day of the Next Month - 11 + 10 old_parent Link @@ -205,7 +198,7 @@ Last Day of the Next Month - 12 + 11 default_receivable_account Section Break @@ -217,7 +210,7 @@ Last Day of the Next Month - 13 + 12 accounts Table diff --git a/foundation/www/docs/current/models/setup/email_digest.html b/foundation/www/docs/current/models/setup/email_digest.html index 0afcfc18..e6c20e87 100644 --- a/foundation/www/docs/current/models/setup/email_digest.html +++ b/foundation/www/docs/current/models/setup/email_digest.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + erpnext.setup.doctype.item_group.item_group.adjust_qty_for_expired_items + (data) +

    +

    No docs

    +
    +
    + + + + + + +

    diff --git a/foundation/www/docs/current/models/setup/naming_series.html b/foundation/www/docs/current/models/setup/naming_series.html index f4e44303..2bcfbdd8 100644 --- a/foundation/www/docs/current/models/setup/naming_series.html +++ b/foundation/www/docs/current/models/setup/naming_series.html @@ -9,7 +9,7 @@

    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 -Material Request +Job Offer
  • @@ -196,7 +196,7 @@ Examples:
  • -Offer Letter +Material Request
  • diff --git a/foundation/www/docs/current/models/setup/territory.html b/foundation/www/docs/current/models/setup/territory.html index 03bc87ba..8b19be02 100644 --- a/foundation/www/docs/current/models/setup/territory.html +++ b/foundation/www/docs/current/models/setup/territory.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + after_delete + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -285,6 +299,36 @@ +

    + + + before_save + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + get_name_from_naming_series + (self) +

    +
        Get a name generated for a Batch from the Batch's naming series.
    +    :return: The string that was generated.
    +
    +
    +
    + + + + +

    @@ -347,6 +391,92 @@ + +

    + + + erpnext.stock.doctype.batch.batch._get_batch_prefix + () +

    +
    Get the naming series prefix set in Stock Settings.
    +
    +It does not do any sanity checks so make sure to use it after checking if the Batch
    +is set to use naming series.
    +:return: The naming series.
    +
    +
    +
    + + + + + + + +

    + + + erpnext.stock.doctype.batch.batch._make_naming_series_key + (prefix) +

    +
    Make naming series key for a Batch.
    +
    +Naming series key is in the format [prefix].[#####]
    +
    + +

    Parameters:

    + +
      +
    • prefix - Naming series prefix gotten from Stock Settings

      + +

      :return: The derived key. If no prefix is given, an empty string is returned

    • +
    +
    +
    + + + + + + + +

    + + + erpnext.stock.doctype.batch.batch.batch_uses_naming_series + () +

    +
    Verify if the Batch is to be named using a naming series
    +:return: bool
    +
    +
    +
    + + + + + + + +

    + + + erpnext.stock.doctype.batch.batch.get_batch_naming_series + () +

    +
    Get naming series key for a Batch.
    +
    +Naming series key is in the format [prefix].[#####]
    +:return: The naming series or empty string if not available
    +
    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.stock.doctype.batch.batch.get_batch_no

    @@ -447,23 +577,9 @@ erpnext.stock.doctype.batch.batch.get_name_from_hash ()

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.stock.doctype.batch.batch.get_name_from_naming_series - () -

    -

    No docs

    +
    Get a name for a Batch by generating a unique hash.
    +:return: The hash that was generated.
    +

    diff --git a/foundation/www/docs/current/models/stock/bin.html b/foundation/www/docs/current/models/stock/bin.html index bee34455..7b6151f9 100644 --- a/foundation/www/docs/current/models/stock/bin.html +++ b/foundation/www/docs/current/models/stock/bin.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - -

    @@ -417,22 +403,6 @@ - - - - -

    - - - erpnext.stock.doctype.bin.bin.update_item_projected_qty - (item_code) -

    -

    Set totalprojectedqty in Item as sum of projected qty in all warehouses

    -
    -
    - - - diff --git a/foundation/www/docs/current/models/stock/customs_tariff_number.html b/foundation/www/docs/current/models/stock/customs_tariff_number.html index 1072ea4e..fd3e8e91 100644 --- a/foundation/www/docs/current/models/stock/customs_tariff_number.html +++ b/foundation/www/docs/current/models/stock/customs_tariff_number.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 13 - po_no - - Data - - Customer's Purchase Order No - - - - - - - 14 - po_date - - Date - - Customer's Purchase Order Date - - - - - - - 15 is_return Check @@ -255,7 +231,7 @@ DN-RET- - 16 + 14 return_against Link @@ -276,7 +252,55 @@ DN-RET- + 15 + customer_po_details + + Section Break + + Customer PO Details + + + + + + + 16 + po_no + + Data + + Customer's Purchase Order No + + + + + + 17 + column_break_17 + + Column Break + + + + + + + + + 18 + po_date + + Date + + Customer's Purchase Order Date + + + + + + + 19 contact_info Section Break @@ -290,7 +314,7 @@ DN-RET- - 18 + 20 shipping_address_name Link @@ -311,7 +335,7 @@ DN-RET- - 19 + 21 shipping_address Small Text @@ -323,7 +347,7 @@ DN-RET- - 20 + 22 contact_person Link @@ -344,7 +368,7 @@ DN-RET- - 21 + 23 contact_display Small Text @@ -356,7 +380,7 @@ DN-RET- - 22 + 24 contact_mobile Small Text @@ -368,7 +392,7 @@ DN-RET- - 23 + 25 contact_email Data @@ -382,7 +406,7 @@ DN-RET- - 24 + 26 col_break21 Column Break @@ -394,7 +418,7 @@ DN-RET- - 25 + 27 customer_address Link @@ -415,7 +439,7 @@ DN-RET- - 26 + 28 tax_id Data @@ -427,7 +451,7 @@ DN-RET- - 27 + 29 address_display Small Text @@ -439,7 +463,7 @@ DN-RET- - 28 + 30 company_address Link @@ -460,7 +484,7 @@ DN-RET- - 29 + 31 company_address_display Small Text @@ -472,7 +496,7 @@ DN-RET- - 30 + 32 currency_and_price_list Section Break @@ -486,7 +510,7 @@ DN-RET- - 31 + 33 currency Link @@ -507,7 +531,7 @@ DN-RET- - 32 + 34 conversion_rate Float @@ -520,7 +544,7 @@ DN-RET- - 33 + 35 col_break23 Column Break @@ -532,7 +556,7 @@ DN-RET- - 34 + 36 selling_price_list Link @@ -553,7 +577,7 @@ DN-RET- - 35 + 37 price_list_currency Link @@ -574,7 +598,7 @@ DN-RET- - 36 + 38 plc_conversion_rate Float @@ -587,7 +611,7 @@ DN-RET- - 37 + 39 ignore_pricing_rule Check @@ -599,7 +623,7 @@ DN-RET- - 38 + 40 items_section Section Break @@ -613,7 +637,7 @@ DN-RET- - 39 + 41 items Table @@ -634,7 +658,7 @@ DN-RET- - 40 + 42 packing_list Section Break @@ -648,7 +672,7 @@ DN-RET- - 41 + 43 packed_items Table @@ -669,7 +693,7 @@ DN-RET- - 42 + 44 product_bundle_help HTML @@ -681,7 +705,7 @@ DN-RET- - 43 + 45 section_break_31 Section Break @@ -693,7 +717,7 @@ DN-RET- - 44 + 46 base_total Currency @@ -707,7 +731,7 @@ DN-RET- - 45 + 47 base_net_total Currency @@ -721,7 +745,7 @@ DN-RET- - 46 + 48 column_break_33 Column Break @@ -733,7 +757,7 @@ DN-RET- - 47 + 49 total Currency @@ -747,7 +771,7 @@ DN-RET- - 48 + 50 net_total Currency @@ -761,7 +785,7 @@ DN-RET- - 49 + 51 total_net_weight Float @@ -773,7 +797,7 @@ DN-RET- - 50 + 52 taxes_section Section Break @@ -787,7 +811,7 @@ DN-RET- - 51 + 53 taxes_and_charges Link @@ -809,7 +833,7 @@ DN-RET- - 52 + 54 column_break_39 Column Break @@ -821,7 +845,7 @@ DN-RET- - 53 + 55 shipping_rule Link @@ -842,7 +866,7 @@ DN-RET- - 54 + 56 section_break_41 Section Break @@ -854,7 +878,7 @@ DN-RET- - 55 + 57 taxes Table @@ -875,7 +899,7 @@ DN-RET- - 56 + 58 sec_tax_breakup Section Break @@ -887,7 +911,7 @@ DN-RET- - 57 + 59 other_charges_calculation Text @@ -899,7 +923,7 @@ DN-RET- - 58 + 60 section_break_44 Section Break @@ -911,7 +935,7 @@ DN-RET- - 59 + 61 base_total_taxes_and_charges Currency @@ -925,7 +949,7 @@ DN-RET- - 60 + 62 column_break_47 Column Break @@ -937,7 +961,7 @@ DN-RET- - 61 + 63 total_taxes_and_charges Currency @@ -951,7 +975,7 @@ DN-RET- - 62 + 64 section_break_49 Section Break @@ -963,7 +987,7 @@ DN-RET- - 63 + 65 apply_discount_on Select @@ -979,7 +1003,7 @@ Net Total - 64 + 66 base_discount_amount Currency @@ -993,7 +1017,7 @@ Net Total - 65 + 67 column_break_51 Column Break @@ -1005,7 +1029,7 @@ Net Total - 66 + 68 additional_discount_percentage Float @@ -1017,7 +1041,7 @@ Net Total - 67 + 69 discount_amount Currency @@ -1031,7 +1055,7 @@ Net Total - 68 + 70 totals Section Break @@ -1045,7 +1069,7 @@ Net Total - 69 + 71 base_grand_total Currency @@ -1059,7 +1083,7 @@ Net Total - 70 + 72 base_rounding_adjustment Currency @@ -1073,7 +1097,7 @@ Net Total - 71 + 73 base_rounded_total Currency @@ -1087,7 +1111,7 @@ Net Total - 72 + 74 base_in_words Data @@ -1100,7 +1124,7 @@ Net Total - 73 + 75 column_break3 Column Break @@ -1112,7 +1136,7 @@ Net Total - 74 + 76 grand_total Currency @@ -1126,7 +1150,7 @@ Net Total - 75 + 77 rounding_adjustment Currency @@ -1140,7 +1164,7 @@ Net Total - 76 + 78 rounded_total Currency @@ -1154,7 +1178,7 @@ Net Total - 77 + 79 in_words Data @@ -1167,7 +1191,7 @@ Net Total - 78 + 80 terms_section_break Section Break @@ -1181,7 +1205,7 @@ Net Total - 79 + 81 payment_terms_template_section Section Break @@ -1193,7 +1217,7 @@ Net Total - 80 + 82 payment_terms_template Link @@ -1214,7 +1238,7 @@ Net Total - 81 + 83 terms_section Section Break @@ -1226,7 +1250,7 @@ Net Total - 82 + 84 tc_name Link @@ -1247,7 +1271,7 @@ Net Total - 83 + 85 terms Text Editor @@ -1259,7 +1283,7 @@ Net Total - 84 + 86 transporter_info Section Break @@ -1273,7 +1297,7 @@ Net Total - 85 + 87 transporter_name Data @@ -1285,7 +1309,7 @@ Net Total - 86 + 88 col_break34 Column Break @@ -1297,7 +1321,7 @@ Net Total - 87 + 89 lr_no Data @@ -1309,7 +1333,7 @@ Net Total - 88 + 90 lr_date Date @@ -1321,7 +1345,7 @@ Net Total - 89 + 91 more_info Section Break @@ -1335,7 +1359,7 @@ Net Total - 90 + 92 project Link @@ -1357,7 +1381,7 @@ Net Total - 91 + 93 campaign Link @@ -1378,7 +1402,7 @@ Net Total - 92 + 94 source Link @@ -1399,7 +1423,7 @@ Net Total - 93 + 95 column_break5 Column Break @@ -1411,7 +1435,7 @@ Net Total - 94 + 96 per_billed Percent @@ -1423,7 +1447,7 @@ Net Total - 95 + 97 customer_group Link @@ -1444,7 +1468,7 @@ Net Total - 96 + 98 territory Link @@ -1465,7 +1489,7 @@ Net Total - 97 + 99 printing_details Section Break @@ -1477,7 +1501,7 @@ Net Total - 98 + 100 letter_head Link @@ -1498,7 +1522,7 @@ Net Total - 99 + 101 select_print_heading Link @@ -1519,7 +1543,7 @@ Net Total - 100 + 102 language Data @@ -1531,7 +1555,7 @@ Net Total - 101 + 103 column_break_88 Column Break @@ -1543,7 +1567,7 @@ Net Total - 102 + 104 print_without_amount Check @@ -1555,7 +1579,7 @@ Net Total - 103 + 105 section_break_83 Section Break @@ -1567,7 +1591,7 @@ Net Total - 104 + 106 status Select @@ -1586,7 +1610,7 @@ Closed - 105 + 107 per_installed Percent @@ -1599,7 +1623,7 @@ Closed - 106 + 108 installation_status Select @@ -1611,7 +1635,7 @@ Closed - 107 + 109 column_break_89 Column Break @@ -1623,7 +1647,7 @@ Closed - 108 + 110 to_warehouse Link @@ -1645,7 +1669,7 @@ Closed - 109 + 111 excise_page Data @@ -1657,7 +1681,7 @@ Closed - 110 + 112 instructions Text @@ -1669,7 +1693,7 @@ Closed - 111 + 113 subscription_section Section Break @@ -1681,7 +1705,7 @@ Closed - 112 + 114 subscription Link @@ -1702,7 +1726,7 @@ Closed - 113 + 115 sales_team_section_break Section Break @@ -1716,7 +1740,7 @@ Closed - 114 + 116 sales_partner Link @@ -1737,7 +1761,7 @@ Closed - 115 + 117 column_break7 Column Break @@ -1749,7 +1773,7 @@ Closed - 116 + 118 commission_rate Float @@ -1761,7 +1785,7 @@ Closed - 117 + 119 total_commission Currency @@ -1775,7 +1799,7 @@ Closed - 118 + 120 section_break1 Section Break @@ -1787,7 +1811,7 @@ Closed - 119 + 121 sales_team Table diff --git a/foundation/www/docs/current/models/stock/delivery_note_item.html b/foundation/www/docs/current/models/stock/delivery_note_item.html index 56fd52b7..102de689 100644 --- a/foundation/www/docs/current/models/stock/delivery_note_item.html +++ b/foundation/www/docs/current/models/stock/delivery_note_item.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 23 + sb_barcodes + + Section Break + + Barcodes + + + + + + + 24 + barcodes + + Table + + Barcodes + + + + + + + +Item Barcode + + + + + + + + 25 inventory Section Break @@ -371,7 +404,7 @@ A Product or a Service that is bought, sold or kept in stock. - 24 + 26 default_warehouse Link @@ -392,7 +425,7 @@ A Product or a Service that is bought, sold or kept in stock. - 25 + 27 shelf_life_in_days Int @@ -404,7 +437,7 @@ A Product or a Service that is bought, sold or kept in stock. - 26 + 28 end_of_life Date @@ -416,7 +449,7 @@ A Product or a Service that is bought, sold or kept in stock. - 27 + 29 default_material_request_type Select @@ -433,7 +466,7 @@ Manufacture - 28 + 30 column_break1 Column Break @@ -445,7 +478,7 @@ Manufacture - 29 + 31 valuation_method Select @@ -461,7 +494,7 @@ Moving Average - 30 + 32 warranty_period Data @@ -473,7 +506,7 @@ Moving Average - 31 + 33 weight_per_unit Float @@ -485,7 +518,7 @@ Moving Average - 32 + 34 weight_uom Link @@ -506,7 +539,7 @@ Moving Average - 33 + 35 reorder_section Section Break @@ -520,7 +553,7 @@ Moving Average - 34 + 36 reorder_levels Table @@ -542,7 +575,7 @@ Moving Average - 35 + 37 unit_of_measure_conversion Section Break @@ -554,7 +587,7 @@ Moving Average - 36 + 38 uoms Table @@ -576,7 +609,7 @@ Moving Average - 37 + 39 serial_nos_and_batches Section Break @@ -588,7 +621,7 @@ Moving Average - 38 + 40 has_batch_no Check @@ -600,7 +633,7 @@ Moving Average - 39 + 41 create_new_batch Check @@ -612,7 +645,7 @@ Moving Average - 40 + 42 has_expiry_date Check @@ -624,7 +657,7 @@ Moving Average - 41 + 43 retain_sample Check @@ -636,7 +669,7 @@ Moving Average - 42 + 44 sample_quantity Int @@ -649,7 +682,7 @@ Moving Average - 43 + 45 column_break_37 Column Break @@ -661,7 +694,7 @@ Moving Average - 44 + 46 has_serial_no Check @@ -673,7 +706,7 @@ Moving Average - 45 + 47 serial_no_series Data @@ -687,7 +720,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 46 + 48 variants_section Section Break @@ -699,7 +732,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 47 + 49 has_variants Check @@ -712,7 +745,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 48 + 50 variant_based_on Select @@ -727,7 +760,7 @@ Manufacturer - 49 + 51 attributes Table @@ -748,7 +781,7 @@ Manufacturer - 50 + 52 purchase_details Section Break @@ -762,7 +795,7 @@ Manufacturer - 51 + 53 is_purchase_item Check @@ -774,7 +807,7 @@ Manufacturer - 52 + 54 purchase_uom Link @@ -795,7 +828,7 @@ Manufacturer - 53 + 55 min_order_qty Float @@ -807,7 +840,7 @@ Manufacturer - 54 + 56 safety_stock Float @@ -819,7 +852,7 @@ Manufacturer - 55 + 57 purchase_details_cb Column Break @@ -831,7 +864,7 @@ Manufacturer - 56 + 58 lead_time_days Int @@ -844,7 +877,7 @@ Manufacturer - 57 + 59 buying_cost_center Link @@ -865,7 +898,7 @@ Manufacturer - 58 + 60 expense_account Link @@ -886,7 +919,7 @@ Manufacturer - 59 + 61 last_purchase_rate Float @@ -898,7 +931,7 @@ Manufacturer - 60 + 62 supplier_details Section Break @@ -910,7 +943,7 @@ Manufacturer - 61 + 63 default_supplier Link @@ -931,7 +964,7 @@ Manufacturer - 62 + 64 delivered_by_supplier Check @@ -943,7 +976,7 @@ Manufacturer - 63 + 65 manufacturer Link @@ -964,7 +997,7 @@ Manufacturer - 64 + 66 manufacturer_part_no Data @@ -976,7 +1009,7 @@ Manufacturer - 65 + 67 column_break2 Column Break @@ -988,7 +1021,7 @@ Manufacturer - 66 + 68 supplier_items Table @@ -1009,7 +1042,7 @@ Manufacturer - 67 + 69 foreign_trade_details Section Break @@ -1021,7 +1054,7 @@ Manufacturer - 68 + 70 country_of_origin Link @@ -1042,7 +1075,7 @@ Manufacturer - 69 + 71 column_break_59 Column Break @@ -1054,7 +1087,7 @@ Manufacturer - 70 + 72 customs_tariff_number Link @@ -1075,7 +1108,7 @@ Manufacturer - 71 + 73 sales_details Section Break @@ -1089,7 +1122,7 @@ Manufacturer - 72 + 74 is_sales_item Check @@ -1101,7 +1134,7 @@ Manufacturer - 73 + 75 sales_uom Link @@ -1122,7 +1155,7 @@ Manufacturer - 74 + 76 income_account Link @@ -1143,7 +1176,7 @@ Manufacturer - 75 + 77 selling_cost_center Link @@ -1164,7 +1197,7 @@ Manufacturer - 76 + 78 column_break3 Column Break @@ -1176,7 +1209,7 @@ Manufacturer - 77 + 79 customer_items Table @@ -1197,7 +1230,7 @@ Manufacturer - 78 + 80 max_discount Float @@ -1209,7 +1242,7 @@ Manufacturer - 79 + 81 item_tax_section_break Section Break @@ -1223,7 +1256,7 @@ Manufacturer - 80 + 82 taxes Table @@ -1245,7 +1278,7 @@ Manufacturer - 81 + 83 inspection_criteria Section Break @@ -1259,7 +1292,7 @@ Manufacturer - 82 + 84 inspection_required_before_purchase Check @@ -1271,7 +1304,7 @@ Manufacturer - 83 + 85 inspection_required_before_delivery Check @@ -1283,21 +1316,20 @@ Manufacturer - 84 - quality_parameters + 86 + quality_inspection_template - Table + Link - Quality Parameters -

    - Will also apply to variants

    + Quality Inspection Template + -Item Quality Inspection Parameter +Quality Inspection Template @@ -1305,7 +1337,7 @@ Manufacturer - 85 + 87 manufacturing Section Break @@ -1319,7 +1351,7 @@ Manufacturer - 86 + 88 default_bom Link @@ -1340,7 +1372,7 @@ Manufacturer - 87 + 89 is_sub_contracted_item Check @@ -1353,7 +1385,7 @@ Manufacturer - 88 + 90 column_break_74 Column Break @@ -1365,7 +1397,7 @@ Manufacturer - 89 + 91 customer_code Data @@ -1377,7 +1409,7 @@ Manufacturer - 90 + 92 website_section Section Break @@ -1391,7 +1423,7 @@ Manufacturer - 91 + 93 show_in_website Check @@ -1403,7 +1435,7 @@ Manufacturer - 92 + 94 show_variant_in_website Check @@ -1415,7 +1447,7 @@ Manufacturer - 93 + 95 route Small Text @@ -1427,7 +1459,7 @@ Manufacturer - 94 + 96 weightage Int @@ -1440,7 +1472,7 @@ Manufacturer - 95 + 97 slideshow Link @@ -1462,7 +1494,7 @@ Manufacturer - 96 + 98 website_image Attach @@ -1475,7 +1507,7 @@ Manufacturer - 97 + 99 thumbnail Data @@ -1487,7 +1519,7 @@ Manufacturer - 98 + 100 cb72 Column Break @@ -1499,7 +1531,7 @@ Manufacturer - 99 + 101 website_warehouse Link @@ -1521,7 +1553,7 @@ Manufacturer - 100 + 102 website_item_groups Table @@ -1543,7 +1575,7 @@ Manufacturer - 101 + 103 sb72 Section Break @@ -1555,7 +1587,7 @@ Manufacturer - 102 + 104 copy_from_item_group Button @@ -1567,7 +1599,7 @@ Manufacturer - 103 + 105 website_specifications Table @@ -1588,7 +1620,7 @@ Manufacturer - 104 + 106 web_long_description Text Editor @@ -1600,7 +1632,7 @@ Manufacturer - 105 + 107 total_projected_qty Float @@ -1612,7 +1644,7 @@ Manufacturer - 106 + 108 hub_publishing_sb Section Break @@ -1624,7 +1656,7 @@ Manufacturer - 107 + 109 publish_in_hub Check @@ -1637,28 +1669,19 @@ Manufacturer - 108 + 110 hub_category_to_publish - Link + Data Hub Category to Publish - - - - - -Hub Category - - - - + - 109 + 111 hub_warehouse Link @@ -1680,7 +1703,7 @@ Manufacturer - 110 + 112 synced_with_hub Check @@ -2607,6 +2630,42 @@ Manufacturer +
  • + + +Hotel Room Amenity + +
  • + + + +
  • + + +Hotel Room Package + +
  • + + + +
  • + + +Hotel Room Pricing Item + +
  • + + + +
  • + + +Hotel Room Reservation Item + +
  • + + +
  • @@ -2688,6 +2747,15 @@ Manufacturer +
  • + + +Material Request Plan Item + +
  • + + +
  • @@ -2763,7 +2831,7 @@ Manufacturer
  • -Production Plan Item +Production Plan
  • @@ -2772,7 +2840,7 @@ Manufacturer
  • -Production Planning Tool +Production Plan Item
  • diff --git a/foundation/www/docs/current/models/stock/item_attribute.html b/foundation/www/docs/current/models/stock/item_attribute.html index 0f74ea33..c7a7dd3f 100644 --- a/foundation/www/docs/current/models/stock/item_attribute.html +++ b/foundation/www/docs/current/models/stock/item_attribute.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + + + + + +

    Item Barcode

    +
    + + +Child Table + + +

    Table Name: tabItem Barcode

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1barcode + Data + Barcode + +
    2barcode_type + Select + Barcode Type + + +
    +EAN
    +UPC-A
    +
    + + + + +

    Child Table Of

    +
      + +
    • + + +Item + +
    • + +
    + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/stock/item_customer_detail.html b/foundation/www/docs/current/models/stock/item_customer_detail.html index e3ac2628..1fff9f32 100644 --- a/foundation/www/docs/current/models/stock/item_customer_detail.html +++ b/foundation/www/docs/current/models/stock/item_customer_detail.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 -Item +Quality Inspection Template diff --git a/foundation/www/docs/current/models/stock/item_reorder.html b/foundation/www/docs/current/models/stock/item_reorder.html index d8aec397..cb0bf097 100644 --- a/foundation/www/docs/current/models/stock/item_reorder.html +++ b/foundation/www/docs/current/models/stock/item_reorder.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + 23 + reference + + Section Break + + Reference + + + + + @@ -579,6 +591,20 @@ Transferred +

    + + + update_requested_qty_in_production_plan + (self) +

    +

    No docs

    +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/stock/material_request_item.html b/foundation/www/docs/current/models/stock/material_request_item.html index 624fb348..db0caab9 100644 --- a/foundation/www/docs/current/models/stock/material_request_item.html +++ b/foundation/www/docs/current/models/stock/material_request_item.html @@ -9,7 +9,7 @@

    - Version 10.0.13 + Version 10.1.2 23 + production_plan + + Link + + Production Plan + + + + + + + +Production Plan + + + + + + + + 24 + material_request_plan_item + + Data + + Material Request Plan Item + + + + + + + 25 col_break3 Column Break @@ -389,7 +422,7 @@ - 24 + 26 min_order_qty Float @@ -401,7 +434,7 @@ - 25 + 27 projected_qty Float @@ -413,7 +446,7 @@ - 26 + 28 actual_qty Float @@ -425,7 +458,7 @@ - 27 + 29 ordered_qty Float @@ -437,7 +470,7 @@ - 28 + 30 page_break Check diff --git a/foundation/www/docs/current/models/stock/packed_item.html b/foundation/www/docs/current/models/stock/packed_item.html index f6ce8ba0..34a1d224 100644 --- a/foundation/www/docs/current/models/stock/packed_item.html +++ b/foundation/www/docs/current/models/stock/packed_item.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 Purchase Receipt Purchase Invoice Delivery Note -Sales Invoice +Sales Invoice +Stock Entry @@ -297,6 +298,27 @@ Sales Invoice 18 + bom_no + + Link + + BOM No + + + + + + + +BOM + + + + + + + + 19 column_break_17 Column Break @@ -308,7 +330,7 @@ Sales Invoice - 19 + 20 remarks Text @@ -320,7 +342,7 @@ Sales Invoice - 20 + 21 amended_from Link @@ -341,7 +363,7 @@ Sales Invoice - 21 + 22 specification_details Section Break @@ -355,21 +377,28 @@ Sales Invoice - 22 - get_specification_details + 23 + quality_inspection_template - Button + Link - Get Specification Details + Quality Inspection Template -
    get_item_specification_details
    + + + + +Quality Inspection Template + + + - 23 + 24 readings Table @@ -428,6 +457,20 @@ Sales Invoice +

    + + + get_quality_inspection_template + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -453,6 +496,34 @@ Sales Invoice
    + + + +

    + + + update_qc_reference + (self) +

    +

    No docs

    +
    +
    + + + + + +

    + + + validate + (self) +

    +

    No docs

    +
    +
    + +

    @@ -525,6 +596,15 @@ Sales Invoice + +
  • + + +Stock Entry Detail + +
  • + + diff --git a/foundation/www/docs/current/models/stock/quality_inspection_reading.html b/foundation/www/docs/current/models/stock/quality_inspection_reading.html index eb0e8ec1..459d40f4 100644 --- a/foundation/www/docs/current/models/stock/quality_inspection_reading.html +++ b/foundation/www/docs/current/models/stock/quality_inspection_reading.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 + + + + + + +

    Quality Inspection Template

    +
    + + + + + +

    Table Name: tabQuality Inspection Template

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1quality_inspection_template_name + Data + Quality Inspection Template Name + +
    2item_quality_inspection_parameter + Table + Item Quality Inspection Parameter + + + + + + +Item Quality Inspection Parameter + + + +
    + + +
    +

    Controller

    +

    erpnext.stock.doctype.quality_inspection_template.quality_inspection_template

    + + + + + + + +

    Class QualityInspectionTemplate

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + +

    + + + erpnext.stock.doctype.quality_inspection_template.quality_inspection_template.get_template_details + (template) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/stock/serial_no.html b/foundation/www/docs/current/models/stock/serial_no.html index 1378102c..ca74fcd4 100644 --- a/foundation/www/docs/current/models/stock/serial_no.html +++ b/foundation/www/docs/current/models/stock/serial_no.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 12 + inspection_required + + Check + + Inspection Required + + + + + + + 13 col2 Column Break @@ -249,7 +261,7 @@ Subcontract - 13 + 14 posting_date Date @@ -261,7 +273,7 @@ Subcontract - 14 + 15 posting_time Time @@ -273,7 +285,7 @@ Subcontract - 15 + 16 set_posting_time Check @@ -285,7 +297,7 @@ Subcontract - 16 + 17 sb1 Section Break @@ -297,7 +309,7 @@ Subcontract - 17 + 18 bom_no Link @@ -318,7 +330,7 @@ Subcontract - 18 + 19 fg_completed_qty Float @@ -331,7 +343,7 @@ Subcontract - 19 + 20 cb1 Column Break @@ -343,7 +355,7 @@ Subcontract - 20 + 21 use_multi_level_bom Check @@ -356,7 +368,7 @@ Subcontract - 21 + 22 get_items Button @@ -368,7 +380,7 @@ Subcontract - 22 + 23 section_break_12 Section Break @@ -380,7 +392,7 @@ Subcontract - 23 + 24 from_warehouse Link @@ -401,7 +413,7 @@ Subcontract - 24 + 25 cb0 Column Break @@ -413,7 +425,7 @@ Subcontract - 25 + 26 to_warehouse Link @@ -434,7 +446,7 @@ Subcontract - 26 + 27 sb0 Section Break @@ -448,7 +460,7 @@ Subcontract - 27 + 28 items Table @@ -469,7 +481,7 @@ Subcontract - 28 + 29 get_stock_and_rate Button @@ -483,7 +495,7 @@ Subcontract - 29 + 30 section_break_19 Section Break @@ -495,7 +507,7 @@ Subcontract - 30 + 31 total_incoming_value Currency @@ -509,7 +521,7 @@ Subcontract - 31 + 32 column_break_22 Column Break @@ -521,7 +533,7 @@ Subcontract - 32 + 33 total_outgoing_value Currency @@ -535,7 +547,7 @@ Subcontract - 33 + 34 value_difference Currency @@ -549,7 +561,7 @@ Subcontract - 34 + 35 additional_costs_section Section Break @@ -561,7 +573,7 @@ Subcontract - 35 + 36 additional_costs Table @@ -582,7 +594,7 @@ Subcontract - 36 + 37 total_additional_costs Currency @@ -596,7 +608,7 @@ Subcontract - 37 + 38 contact_section Section Break @@ -608,7 +620,7 @@ Subcontract - 38 + 39 supplier Link @@ -629,7 +641,7 @@ Subcontract - 39 + 40 supplier_name Data @@ -641,7 +653,7 @@ Subcontract - 40 + 41 supplier_address Link @@ -662,7 +674,7 @@ Subcontract - 41 + 42 address_display Small Text @@ -674,7 +686,7 @@ Subcontract - 42 + 43 column_break_39 Column Break @@ -686,7 +698,7 @@ Subcontract - 43 + 44 customer Link @@ -707,7 +719,7 @@ Subcontract - 44 + 45 customer_name Data @@ -719,7 +731,7 @@ Subcontract - 45 + 46 customer_address Small Text @@ -731,7 +743,7 @@ Subcontract - 46 + 47 printing_settings Section Break @@ -743,7 +755,7 @@ Subcontract - 47 + 48 select_print_heading Link @@ -764,7 +776,7 @@ Subcontract - 48 + 49 letter_head Link @@ -785,7 +797,7 @@ Subcontract - 49 + 50 more_info Section Break @@ -797,7 +809,7 @@ Subcontract - 50 + 51 project Link @@ -818,7 +830,7 @@ Subcontract - 51 + 52 remarks Text @@ -830,7 +842,7 @@ Subcontract - 52 + 53 col5 Column Break @@ -842,7 +854,7 @@ Subcontract - 53 + 54 total_amount Currency @@ -856,7 +868,7 @@ Subcontract - 54 + 55 amended_from Link @@ -877,7 +889,7 @@ Subcontract - 55 + 56 credit_note Link @@ -1000,7 +1012,7 @@ Subcontract calculate_rate_and_amount - (self, force=False, update_finished_item_rate=True) + (self, force=False, update_finished_item_rate=True, raise_error_if_no_rate=True)

    No docs

    @@ -1282,7 +1294,7 @@ Subcontract set_basic_rate - (self, force=False, update_finished_item_rate=True) + (self, force=False, update_finished_item_rate=True, raise_error_if_no_rate=True)

    get stock and incoming rate on posting date

    diff --git a/foundation/www/docs/current/models/stock/stock_entry_detail.html b/foundation/www/docs/current/models/stock/stock_entry_detail.html index 4223a34b..92b19713 100644 --- a/foundation/www/docs/current/models/stock/stock_entry_detail.html +++ b/foundation/www/docs/current/models/stock/stock_entry_detail.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - + 33 + quality_inspection + + Link + + Quality Inspection + + + + + + + +Quality Inspection + + + + + + + + 34 accounting Section Break @@ -505,7 +526,7 @@ - 34 + 35 expense_account Link @@ -526,7 +547,7 @@ - 35 + 36 col_break5 Column Break @@ -538,7 +559,7 @@ - 36 + 37 cost_center Link @@ -559,7 +580,7 @@ - 37 + 38 more_info Section Break @@ -571,7 +592,7 @@ - 38 + 39 allow_zero_valuation_rate Check @@ -583,7 +604,7 @@ - 39 + 40 actual_qty Float @@ -595,7 +616,7 @@ - 40 + 41 bom_no Link @@ -617,7 +638,7 @@ - 41 + 42 col_break6 Column Break @@ -629,7 +650,7 @@ - 42 + 43 material_request Link @@ -651,7 +672,7 @@ - 43 + 44 material_request_item Link diff --git a/foundation/www/docs/current/models/stock/stock_ledger_entry.html b/foundation/www/docs/current/models/stock/stock_ledger_entry.html index 5504d7d6..7d990f88 100644 --- a/foundation/www/docs/current/models/stock/stock_ledger_entry.html +++ b/foundation/www/docs/current/models/stock/stock_ledger_entry.html @@ -9,7 +9,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 + + +Material Request Plan Item + + + + +
  • @@ -789,7 +798,7 @@ A logical Warehouse against which stock entries are made.
  • -Production Plan Item +Production Plan
  • @@ -798,7 +807,7 @@ A logical Warehouse against which stock entries are made.
  • -Production Planning Tool +Production Plan Item
  • diff --git a/foundation/www/docs/current/models/subscription/__init__.py b/foundation/www/docs/current/models/subscription/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/subscription/index.html b/foundation/www/docs/current/models/subscription/index.html index 17da8963..e148437f 100644 --- a/foundation/www/docs/current/models/subscription/index.html +++ b/foundation/www/docs/current/models/subscription/index.html @@ -7,7 +7,7 @@
    - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 - Version 10.0.13 + Version 10.1.2 CRM > Dokumente > Kontakt > Neu -Kontakt +Kontakt Alternativ können Sie einen Kontakt oder eine Adresse auch direkt aus dem Kundendatensatz erstellen. Klicken Sie hierzu auf "Neuer Kontakt" oder "Neue Adresse". -Kontakt +Kontakt > 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/foundation/www/docs/user/manual/de/CRM/customer.md b/foundation/www/docs/user/manual/de/CRM/customer.md index a3c8c263..906961e6 100644 --- a/foundation/www/docs/user/manual/de/CRM/customer.md +++ b/foundation/www/docs/user/manual/de/CRM/customer.md @@ -8,7 +8,7 @@ Sie können Ihre Kunden entweder direkt erstellen über > CRM > Dokumente > Kunde > Neu -Kunde +Kunde oder einen Upload über ein Datenimportwerkzeug durchführen. diff --git a/foundation/www/docs/user/manual/de/CRM/lead.md b/foundation/www/docs/user/manual/de/CRM/lead.md index 869f6647..48e8c7e4 100644 --- a/foundation/www/docs/user/manual/de/CRM/lead.md +++ b/foundation/www/docs/user/manual/de/CRM/lead.md @@ -17,6 +17,6 @@ Um einen Lead zu generieren, gehen Sie zu: > CRM > Dokumente > Lead > Neu -Lead +Lead {next} diff --git a/foundation/www/docs/user/manual/de/CRM/newsletter.md b/foundation/www/docs/user/manual/de/CRM/newsletter.md index 07e1828d..752d0287 100644 --- a/foundation/www/docs/user/manual/de/CRM/newsletter.md +++ b/foundation/www/docs/user/manual/de/CRM/newsletter.md @@ -8,8 +8,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. -Newsletter - Neu +Newsletter - Neu -Newsletter - Test +Newsletter - Test {next} diff --git a/foundation/www/docs/user/manual/de/CRM/opportunity.md b/foundation/www/docs/user/manual/de/CRM/opportunity.md index 5a9a4236..1a3526b4 100644 --- a/foundation/www/docs/user/manual/de/CRM/opportunity.md +++ b/foundation/www/docs/user/manual/de/CRM/opportunity.md @@ -12,11 +12,11 @@ Alternativ können Sie einen offenen Lead öffnen und auf die Schaltfläche "Opp ### Abbildung 1: Opportunity erstellen -Opportunity +Opportunity ### Abbildung 2: Opportunity aus einem offenen Lead heraus erstellen -Opportunity +Opportunity 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/foundation/www/docs/user/manual/de/CRM/setup/campaign.md b/foundation/www/docs/user/manual/de/CRM/setup/campaign.md index c3097530..ebe57dc4 100644 --- a/foundation/www/docs/user/manual/de/CRM/setup/campaign.md +++ b/foundation/www/docs/user/manual/de/CRM/setup/campaign.md @@ -4,7 +4,7 @@ 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. -Kampagne +Kampagne 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. @@ -12,11 +12,11 @@ Sie können in einer Kampagne [Leads](/docs/user/manual/de/CRM/lead.html), [Oppo * Um einen Lead zu einer Kampagne nach zu verfolgen, wählen Sie "Leads anzeigen" aus. -Kampange - Leads ansehen +Kampange - Leads ansehen * 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. -Kampagne - Neuer Lead +Kampagne - Neuer Lead {next} diff --git a/foundation/www/docs/user/manual/de/CRM/setup/customer-group.md b/foundation/www/docs/user/manual/de/CRM/setup/customer-group.md index 865b471f..6ddf49b0 100644 --- a/foundation/www/docs/user/manual/de/CRM/setup/customer-group.md +++ b/foundation/www/docs/user/manual/de/CRM/setup/customer-group.md @@ -4,10 +4,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). -Baumstruktur der Kundengruppen +Baumstruktur der Kundengruppen > 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. -Vertriebsanalyse +Vertriebsanalyse {next} diff --git a/foundation/www/docs/user/manual/de/CRM/setup/sales-person.md b/foundation/www/docs/user/manual/de/CRM/setup/sales-person.md index 921aa48d..770747d0 100644 --- a/foundation/www/docs/user/manual/de/CRM/setup/sales-person.md +++ b/foundation/www/docs/user/manual/de/CRM/setup/sales-person.md @@ -4,7 +4,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. -Baumstruktur der Vertriebsmitarbeiter +Baumstruktur der Vertriebsmitarbeiter ### Vertriebspersonen in Transaktionen diff --git a/foundation/www/docs/user/manual/de/accounts/accounting-reports.md b/foundation/www/docs/user/manual/de/accounts/accounting-reports.md index 1a61591e..36e983cf 100644 --- a/foundation/www/docs/user/manual/de/accounts/accounting-reports.md +++ b/foundation/www/docs/user/manual/de/accounts/accounting-reports.md @@ -9,7 +9,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. Hauptbuch + src="{{docs_base_url}}/assets/img/accounts/general-ledger.png"> ### Probebilanz @@ -20,7 +20,7 @@ Eine Probebilanz ist eine Liste von Kontoständen aller Konten (Bücher und Grup * Summe Haben * Schlußstand -Probebilanz +Probebilanz Die Summe aller Schlußstände in einer Probebilanz muss 0 sein. @@ -28,12 +28,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. -Forderungskonten +Forderungskonten ### 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. -Übersicht Verkäufe +Übersicht Verkäufe {next} diff --git a/foundation/www/docs/user/manual/de/accounts/advance-payment-entry.md b/foundation/www/docs/user/manual/de/accounts/advance-payment-entry.md index deb211a9..a032611e 100644 --- a/foundation/www/docs/user/manual/de/accounts/advance-payment-entry.md +++ b/foundation/www/docs/user/manual/de/accounts/advance-payment-entry.md @@ -16,7 +16,7 @@ Da der Kunde 5.000 Euro bar angezahlt hat, wird dieser Betrag als Habenbuchung z #### Abbildung 1: Journalbuchung bei Vorkasse -Anzahlung +Anzahlung ### Doppelte Buchführung @@ -24,7 +24,7 @@ Bei der doppelten Buchführung hat jede Transaktion einen positiven oder negativ #### Abbildung 2: Transaktion und Ausgleichsbuchung -Anzahlung +Anzahlung Speichern und übertragen Sie den Buchungssatz. Wenn das Dokument nicht gespeichert wird, dann wird es in anderen Buchungsdokumenten nicht übernommen. @@ -34,7 +34,7 @@ Um die Ausgangsrechnung mit einem Buchungssatz zu verknüpfen, der die Buchung z #### Abbildung 3: Anzahlung erhalten -Anzahlung +Anzahlung Speichern und übertragen Sie die Ausgangsrechnung diff --git a/foundation/www/docs/user/manual/de/accounts/budgeting.md b/foundation/www/docs/user/manual/de/accounts/budgeting.md index 68760357..6e5beb47 100644 --- a/foundation/www/docs/user/manual/de/accounts/budgeting.md +++ b/foundation/www/docs/user/manual/de/accounts/budgeting.md @@ -12,29 +12,29 @@ Um ein Budget zuzuweisen, gehen Sie zu Rechnungswesen > Einstellungen > Übersic #### Schritt 1: Klicken Sie auf "Öffnen -Budget +Budget #### Schritt 2: Monatliche Verteilung eingeben -Budget +Budget 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 -Budget +Budget ### 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. -Monthly Distribution +Monthly Distribution Das kann über die Firmenstammdaten eingestellt werden. -Budget Variance Report +Budget Variance Report 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/foundation/www/docs/user/manual/de/accounts/chart-of-accounts.md b/foundation/www/docs/user/manual/de/accounts/chart-of-accounts.md index e2ef33d3..f667630f 100644 --- a/foundation/www/docs/user/manual/de/accounts/chart-of-accounts.md +++ b/foundation/www/docs/user/manual/de/accounts/chart-of-accounts.md @@ -18,7 +18,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. -Finanzanalyse Bilanz +Finanzanalyse Bilanz Um Ihren Kontenplan in ERPNext zu bearbeiten gehen Sie zu: @@ -28,7 +28,7 @@ Im Kontenplan erhalten Sie eine Baumstruktur der Konten(bezeichnungen) und Konte Lassen Sie uns die Hauptgruppen des Kontenplans besser verstehen lernen. -Kontenplan +Kontenplan ### Bilanzkonten @@ -48,7 +48,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: -Finanzanalyse GuV +Finanzanalyse GuV (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.) @@ -62,7 +62,7 @@ Buchungstransaktionen können nur zu Kontobüchern erstellt werden (nicht zu Gru > Anmerkung: Ein Kontenbuch wird manchmal auch als Kontokopf bezeichnet. -Kontenplan +Kontenplan ### Andere Kontentypen @@ -72,7 +72,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. -Kontenplan +Kontenplan Die Option zum Erstellen erscheint nur dann, wenn Sie auf ein Konto vom Typ Gruppe (Ordner) klicken. diff --git a/foundation/www/docs/user/manual/de/accounts/credit-limit.md b/foundation/www/docs/user/manual/de/accounts/credit-limit.md index 0290e985..9d64ea02 100644 --- a/foundation/www/docs/user/manual/de/accounts/credit-limit.md +++ b/foundation/www/docs/user/manual/de/accounts/credit-limit.md @@ -10,7 +10,7 @@ Um das Kreditlimit einzustellen, gehen Sie zur Kundenvorlage ### Abbildung 1: Kreditlinie -Kreditlimit +Kreditlimit Gehen Sie zum Abschnitt "Kreditlimit" und geben Sie den Betrag in das Feld "Kreditlimit" ein. @@ -22,7 +22,7 @@ Im Feld Kredit-Controller wählen Sie die Rolle aus, die dazu autorisiert sein s ### Abbildung 2: Kredit-Controller -Kreditlimit +Kreditlimit Speichern Sie die Änderungen diff --git a/foundation/www/docs/user/manual/de/accounts/journal-entry.md b/foundation/www/docs/user/manual/de/accounts/journal-entry.md index fc62e4fb..6ffb069f 100644 --- a/foundation/www/docs/user/manual/de/accounts/journal-entry.md +++ b/foundation/www/docs/user/manual/de/accounts/journal-entry.md @@ -8,7 +8,7 @@ Um einen neuen Buchungssatz zu erstellen, gehen Sie zu: > Rechnungswesen > Dokumente > Journalbuchung > Neu -Buchungssatz +Buchungssatz In einem Buchungssatz müssen Sie folgendes tun: diff --git a/foundation/www/docs/user/manual/de/accounts/making-payments.md b/foundation/www/docs/user/manual/de/accounts/making-payments.md index fa81a5c5..70a0b95b 100644 --- a/foundation/www/docs/user/manual/de/accounts/making-payments.md +++ b/foundation/www/docs/user/manual/de/accounts/making-payments.md @@ -9,7 +9,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 durchführen +Zahlungen durchführen Zahlungen können auch unabhängig von Rechnungen erstellt werden, indem Sie einen neuen Journalbeleg erstellen und die Zahlungsart auswählen. @@ -31,7 +31,7 @@ Für Zahlungen an Lieferanten gilt: ### Beispiel eines Buchungssatzes für eine Zahlung -Zahlungen durchführen +Zahlungen durchführen --- diff --git a/foundation/www/docs/user/manual/de/accounts/multi-currency-accounting.md b/foundation/www/docs/user/manual/de/accounts/multi-currency-accounting.md index b118bbf6..7263e2cc 100644 --- a/foundation/www/docs/user/manual/de/accounts/multi-currency-accounting.md +++ b/foundation/www/docs/user/manual/de/accounts/multi-currency-accounting.md @@ -8,15 +8,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. -Währung über den Kontenplan einstellen +Währung über den Kontenplan einstellen Sie können die Währung auch zuordnen oder bearbeiten, indem Sie den jeweiligen Datensatz für bereits angelegte Konten öffnen. -Kontenwährung anpassen +Kontenwährung anpassen 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. -Währung des Kundenkontos +Währung des Kundenkontos 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. @@ -34,7 +34,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. -Offene Ausgangsrechnung +Offene Ausgangsrechnung #### Eingangsrechnung @@ -44,13 +44,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. -Wechselkurs im Buchungssatz +Wechselkurs im Buchungssatz 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. -Buchungssatz mit verschiedenen Währungen +Buchungssatz mit verschiedenen Währungen #### Beispiel 1: Zahlungsbuchung eines Kunden in alternativer Währung @@ -58,7 +58,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. -Zahlungsbuchung +Zahlungsbuchung #### Beispiel 2: Überweisung zwischen Banken (US-Dollar -> Indische Rupien) @@ -101,7 +101,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: -Übertrag zwischen den Banken +Übertrag zwischen den Banken ### Berichte @@ -109,12 +109,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. -Bericht zum Hauptbuch +Bericht zum Hauptbuch #### 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. -Bericht zu den Forderungen +Bericht zu den Forderungen {next} diff --git a/foundation/www/docs/user/manual/de/accounts/opening-accounts.md b/foundation/www/docs/user/manual/de/accounts/opening-accounts.md index 77b2c773..8cfd83f2 100644 --- a/foundation/www/docs/user/manual/de/accounts/opening-accounts.md +++ b/foundation/www/docs/user/manual/de/accounts/opening-accounts.md @@ -21,7 +21,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. -Eröffnungskonto +Eröffnungskonto 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. @@ -39,13 +39,13 @@ Hinweis: Stellen Sie sicher, dass im Abschnitt "Weitere Informationen" "Ist Erö Vervollständigen Sie die Buchungssätze auf der Soll- und Haben-Seite. -Opening Account +Opening Account 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: -Opening Account +Opening Account 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. @@ -60,7 +60,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: -Probebilanz +Probebilanz ### Offene Rechnungen diff --git a/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md b/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md index fb8fc6fe..5d11bfad 100644 --- a/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md +++ b/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md @@ -10,7 +10,7 @@ Um eine neue Eingangsrechnung zu erstellen, gehen Sie zu: oder klicken Sie in einem Lieferantenauftrag oder einem Kaufbeleg auf "Eingangsrechnung erstellen". -Eingangsrechnung +Eingangsrechnung 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/foundation/www/docs/user/manual/de/accounts/sales-invoice.md b/foundation/www/docs/user/manual/de/accounts/sales-invoice.md index ed5d3cbe..cf7aceb8 100644 --- a/foundation/www/docs/user/manual/de/accounts/sales-invoice.md +++ b/foundation/www/docs/user/manual/de/accounts/sales-invoice.md @@ -10,7 +10,7 @@ Sie können eine Ausgangsrechnung direkt erstellen über: oder indem Sie in der rechten Ecke des Lieferscheins auf "Rechnung erstellen" klicken. -Ausgangsrechnung +Ausgangsrechnung ### Auswirkung auf die Buchhaltung diff --git a/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md b/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md index 3be8f647..7024f431 100644 --- a/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md +++ b/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md @@ -2,7 +2,7 @@ # Konteneinstellungen Beigetragen von CWT Connector & Wire Technology GmbH -Konteneinstellungen +Konteneinstellungen * 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/foundation/www/docs/user/manual/de/accounts/setup/cost-center.md b/foundation/www/docs/user/manual/de/accounts/setup/cost-center.md index 3fc80102..fdf8b2cf 100644 --- a/foundation/www/docs/user/manual/de/accounts/setup/cost-center.md +++ b/foundation/www/docs/user/manual/de/accounts/setup/cost-center.md @@ -23,7 +23,7 @@ Um Ihren Kostenstellenplan einzurichten, gehen Sie zu: >Rechnungswesen > Einstellungen > Kostenstellenplan -Kostenstellenplan +Kostenstellenplan Kostenstellen helfen Ihnen bei der Erstellung von Budgets für Geschäftstätigkeiten. diff --git a/foundation/www/docs/user/manual/de/accounts/setup/fiscal-year.md b/foundation/www/docs/user/manual/de/accounts/setup/fiscal-year.md index c808d8ac..f1e0220f 100644 --- a/foundation/www/docs/user/manual/de/accounts/setup/fiscal-year.md +++ b/foundation/www/docs/user/manual/de/accounts/setup/fiscal-year.md @@ -6,6 +6,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. -Geschäftsjahr +Geschäftsjahr {next} diff --git a/foundation/www/docs/user/manual/de/accounts/setup/tax-rule.md b/foundation/www/docs/user/manual/de/accounts/setup/tax-rule.md index d20779ad..dfcf61df 100644 --- a/foundation/www/docs/user/manual/de/accounts/setup/tax-rule.md +++ b/foundation/www/docs/user/manual/de/accounts/setup/tax-rule.md @@ -4,7 +4,7 @@ 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. -Steuerregel +Steuerregel 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. @@ -12,9 +12,9 @@ Betrachten wir ein Szenario um Steuerregeln besser zu verstehen. Angenommen wird haben zwei Steuerregeln wie unten abgebildet erstellt. -Steuerregel +Steuerregel -Steuerregel +Steuerregel In unserem Beispiel gilt Regel 1 für Indien und Regel 2 für Großbritannien. diff --git a/foundation/www/docs/user/manual/de/accounts/tools/bank-reconciliation.md b/foundation/www/docs/user/manual/de/accounts/tools/bank-reconciliation.md index d4746110..ac1706eb 100644 --- a/foundation/www/docs/user/manual/de/accounts/tools/bank-reconciliation.md +++ b/foundation/www/docs/user/manual/de/accounts/tools/bank-reconciliation.md @@ -34,7 +34,7 @@ Jetzt werden alle Buchungen im angegebenen Zeitraum in der Tabelle darunter ange #### Abbildung 2: Werkzeug zum Kontenabgleich -Kontenabgleich +Kontenabgleich **Schritt 5:** Klicken Sie auf die Schaltfläche "Abwicklungsdatum aktualisieren" diff --git a/foundation/www/docs/user/manual/de/accounts/tools/payment-reconciliation.md b/foundation/www/docs/user/manual/de/accounts/tools/payment-reconciliation.md index f29b6eb0..86b26fcf 100644 --- a/foundation/www/docs/user/manual/de/accounts/tools/payment-reconciliation.md +++ b/foundation/www/docs/user/manual/de/accounts/tools/payment-reconciliation.md @@ -8,7 +8,7 @@ Um das Werkzeug zum Zahlungsabgleich zu verwenden, gehen Sie zu: > Rechnungswesen > Werkzeuge > Zahlungsabgleich -Zahlungsabgleich +Zahlungsabgleich **Schritt 1:** Wählen Sie das Konto aus, zu dem die Zahlungen abgeglichen werden sollen. diff --git a/foundation/www/docs/user/manual/de/accounts/tools/payment-tool.md b/foundation/www/docs/user/manual/de/accounts/tools/payment-tool.md index eef05d4f..76fa3283 100644 --- a/foundation/www/docs/user/manual/de/accounts/tools/payment-tool.md +++ b/foundation/www/docs/user/manual/de/accounts/tools/payment-tool.md @@ -24,14 +24,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. -Zahlungswerkzeug +Zahlungswerkzeug 7\. Sobald die Daten angezogen wurden, klicken Sie auf die detaillierte Buchung und geben Sie den Zahlungsbetrag zur Rechnung/Bestellung/zum Beleg ein. -Zahlungswerkzeug +Zahlungswerkzeug 8\. Klicken Sie auf "Buchungssatz erstellen" um einen neuen Buchungssatz mit den entsprechenden Einzelheiten zu erstellen. -Zahlungswerkzeug +Zahlungswerkzeug {next} diff --git a/foundation/www/docs/user/manual/de/accounts/tools/period-closing-voucher.md b/foundation/www/docs/user/manual/de/accounts/tools/period-closing-voucher.md index 933d0a71..52b80262 100644 --- a/foundation/www/docs/user/manual/de/accounts/tools/period-closing-voucher.md +++ b/foundation/www/docs/user/manual/de/accounts/tools/period-closing-voucher.md @@ -23,7 +23,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. -Periodenabschlussbeleg +Periodenabschlussbeleg 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/foundation/www/docs/user/manual/de/buying/purchase-order.md b/foundation/www/docs/user/manual/de/buying/purchase-order.md index 6ef1fc6b..b148da71 100644 --- a/foundation/www/docs/user/manual/de/buying/purchase-order.md +++ b/foundation/www/docs/user/manual/de/buying/purchase-order.md @@ -8,7 +8,7 @@ Ein Lieferantenauftrag kann automatisch aus einer Materialanfrage oder einem Lie ### Flußdiagramm der Lieferantenbestellung -Lieferantenauftrag +Lieferantenauftrag In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über: @@ -16,7 +16,7 @@ In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über: ### Einen Lieferantenauftrag erstellen -Lieferantenauftrag +Lieferantenauftrag Einen Lieferantenauftrag einzugeben ist sehr ähnlich zu einer Lieferantenanfrage. Zusätzlich müssen Sie Folgendes eingeben: @@ -51,7 +51,7 @@ Beispiel: Wenn Sie Ihr Rohmaterial in großen Mengen in Großverpackungen eingek ### Abbildung 3: Umrechung von Einkaufsmaßeinheit in Lagermaßeinheit -Lieferantenauftrag - Maßeinheit +Lieferantenauftrag - Maß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/foundation/www/docs/user/manual/de/buying/setup/buying-settings.md b/foundation/www/docs/user/manual/de/buying/setup/buying-settings.md index cd692fcb..78ded538 100644 --- a/foundation/www/docs/user/manual/de/buying/setup/buying-settings.md +++ b/foundation/www/docs/user/manual/de/buying/setup/buying-settings.md @@ -4,7 +4,7 @@ Hier können Sie Werte einstellen, die in den Transaktionen des Moduls Einkauf zugrunde gelegt werden. -![Einkaufseinstellungen](/docs/assets/img/buying/buying-settings.png) +![Einkaufseinstellungen]({{docs_base_url}}/assets/img/buying/buying-settings.png) Lassen Sie uns die verschiedenen Optionen durckgehen. diff --git a/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md b/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md index e1a6d516..642bb9df 100644 --- a/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md +++ b/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md @@ -10,7 +10,7 @@ Aufbauend darauf, was die Lieferanten anbieten, werden Sie in verschiedene Kateg > Einkauf > Einstellungen > Lieferantentyp > Neuer Lieferantentyp -Lieferantentyp +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/foundation/www/docs/user/manual/de/buying/supplier-quotation.md b/foundation/www/docs/user/manual/de/buying/supplier-quotation.md index df8d1438..9c3d4e80 100644 --- a/foundation/www/docs/user/manual/de/buying/supplier-quotation.md +++ b/foundation/www/docs/user/manual/de/buying/supplier-quotation.md @@ -8,7 +8,7 @@ Sie können ein Lieferantenangebot aus einer Materialanfrage heraus erstellen. ### Flußdiagramm zum Lieferantenangebot -Lieferantenangebot +Lieferantenangebot Sie können ein Lieferantenangebot auch direkt erstellen über: @@ -16,7 +16,7 @@ Sie können ein Lieferantenangebot auch direkt erstellen über: ### Ein Lieferantenangebot erstellen -Lieferantenangebot +Lieferantenangebot 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/foundation/www/docs/user/manual/de/buying/supplier.md b/foundation/www/docs/user/manual/de/buying/supplier.md index 0923d8b0..4556c440 100644 --- a/foundation/www/docs/user/manual/de/buying/supplier.md +++ b/foundation/www/docs/user/manual/de/buying/supplier.md @@ -8,7 +8,7 @@ So können Sie einen neuen Lieferanten erstellen: > Einkauf > Dokumente > Lieferant > Neu -Lieferant +Lieferant ### Kontakte und Adressen diff --git a/foundation/www/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md b/foundation/www/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md index 6322028b..9e51382a 100644 --- a/foundation/www/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md +++ b/foundation/www/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md @@ -5,18 +5,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. -Customer Portal Order 1 +Customer Portal Order 1 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. -Customer Portal Order 1 +Customer Portal Order 1 ### Rechnung mit Status "gezahlt" -Customer Portal Order 1 +Customer Portal Order 1 ### Rechnung mit Status "abgerechnet" -Customer Portal Order 1 +Customer Portal Order 1 {next} diff --git a/foundation/www/docs/user/manual/de/customer-portal/issues.md b/foundation/www/docs/user/manual/de/customer-portal/issues.md index 791cf4a5..9b6f6b3a 100644 --- a/foundation/www/docs/user/manual/de/customer-portal/issues.md +++ b/foundation/www/docs/user/manual/de/customer-portal/issues.md @@ -6,17 +6,17 @@ Kunden können über das Kundenportal sehr einfach Fälle eröffnen. Eine einfac ### Ticketliste leeren -Ausgabeliste +Ausgabeliste ### Neuer Fall -Neues Problem +Neues Problem ### Fall öffnen -Ausgabe aufgehoben +Ausgabe aufgehoben ### Fall beantworten -Frage beantworten +Frage beantworten {next} diff --git a/foundation/www/docs/user/manual/de/customer-portal/portal-login.md b/foundation/www/docs/user/manual/de/customer-portal/portal-login.md index 00d4ea03..79d28eb3 100644 --- a/foundation/www/docs/user/manual/de/customer-portal/portal-login.md +++ b/foundation/www/docs/user/manual/de/customer-portal/portal-login.md @@ -4,6 +4,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. -Website User Signup +Website User Signup {next} diff --git a/foundation/www/docs/user/manual/de/customer-portal/sign-up.md b/foundation/www/docs/user/manual/de/customer-portal/sign-up.md index e8ba85db..509d13c5 100644 --- a/foundation/www/docs/user/manual/de/customer-portal/sign-up.md +++ b/foundation/www/docs/user/manual/de/customer-portal/sign-up.md @@ -7,11 +7,11 @@ Kunden müssen sich über die Webseite als Kunden registrieren. ### Schritt 1: Klicken Sie auf das Registrieren-Symbol -Website User Signup +Website User Signup ### Schritt 3: Geben Sie Ihren Kundennamen und Ihre ID ein -Website User Signup +Website User Signup Wenn der Registrierungsprozess abgeschlossen ist, wird dem Kunden eine E-Mail mit dem Passwort zugeschickt. diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/custom-doctype.md b/foundation/www/docs/user/manual/de/customize-erpnext/custom-doctype.md index cc6cdd0b..52029090 100644 --- a/foundation/www/docs/user/manual/de/customize-erpnext/custom-doctype.md +++ b/foundation/www/docs/user/manual/de/customize-erpnext/custom-doctype.md @@ -18,7 +18,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. -![Grundlagen zum Doctype](/docs/assets/img/setup/customize/doctype-basics.png) +![Grundlagen zum Doctype]({{docs_base_url}}/assets/img/setup/customize/doctype-basics.png) ### Felder @@ -33,7 +33,7 @@ Felder sind viel mehr als Datenbankspalten; sie können sein: 5. Aktionen (Schaltflächen) 6. Anhänge oder Bilder -![Felder im DocType](/docs/assets/img/setup/customize/Doctype-all-fields.png) +![Felder im DocType]({{docs_base_url}}/assets/img/setup/customize/Doctype-all-fields.png) 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. @@ -43,19 +43,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**. -![Bezeichnung von DocTypes](/docs/assets/img/setup/customize/doctype-field-naming.png) +![Bezeichnung von DocTypes]({{docs_base_url}}/assets/img/setup/customize/doctype-field-naming.png) ### Berechtigung In dieser Tabelle können Sie Rollen und Berechtigungs-Rollen für diese für die betreffenden DocTypes auswählen. -![Berechtigungen bei DocTypes](/docs/assets/img/setup/customize/Doctype-permissions.png) +![Berechtigungen bei DocTypes]({{docs_base_url}}/assets/img/setup/customize/Doctype-permissions.png) ### DocTypes abspeichern Wenn Sie einen DocType abspeichern, erscheint ein Popup-Fenster über welches Sie den Namen des DocTypes eingeben können. -![DocTypes speichern](/docs/assets/img/setup/customize/Doctype-save.png) +![DocTypes speichern]({{docs_base_url}}/assets/img/setup/customize/Doctype-save.png) ### Der DocType im System @@ -63,12 +63,12 @@ Um den DocType zu aktivieren, öffnen Sie das Modul, welches Sie für den DocTyp > Personalwesen > Dokumente > Buch -![Übersicht der DocTypes](/docs/assets/img/setup/customize/Doctype-list-view.png) +![Übersicht der DocTypes]({{docs_base_url}}/assets/img/setup/customize/Doctype-list-view.png) ### Buchvorlage Wenn Sie die Felder ausfüllen, schaut das ganze dann so aus. -![Übersicht der DocTypes](/docs/assets/img/setup/customize/Doctype-book-added.png) +![Übersicht der DocTypes]({{docs_base_url}}/assets/img/setup/customize/Doctype-book-added.png) {next} diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/custom-field.md b/foundation/www/docs/user/manual/de/customize-erpnext/custom-field.md index f9bdf119..88ee0c2b 100644 --- a/foundation/www/docs/user/manual/de/customize-erpnext/custom-field.md +++ b/foundation/www/docs/user/manual/de/customize-erpnext/custom-field.md @@ -17,7 +17,7 @@ Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpa 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. -Formular anpassen - benutzerdefiniertes Feld +Formular anpassen - benutzerdefiniertes Feld Im Folgenden sind die Schritte aufgeführt, wie man ein benutzerdefiniertes Feld in ein bestehendes Formular einfügt. @@ -29,31 +29,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. -Select Document Type +Select Document Type ### 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. -Select Document Type +Select Document Type ### 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. -Select Document Type +Select Document Type ### Feldtyp auswählen Klicken Sie hier um weitere Informationen über Feldtypen, die Sie bei einem benutzerdefinierten Feld auswählen können, zu erhalten. -Select Document Type +Select Document Type ### 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/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt. -Select Document Type +Select Document Type 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. @@ -70,7 +70,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. -Select Document Type +Select Document Type ### Benutzerdefiniertes Feld löschen diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/index.md b/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/index.md index e4491246..c65f0cbd 100644 --- a/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/index.md +++ b/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/index.md @@ -6,7 +6,7 @@ Wenn Sie Formate von ERPNext-Formularen ändern wollen, können Sie das über be > Einstellungen > Anpassen > Benutzerdefiniertes Skript -Custom Script +Custom Script ### Themen diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/document-title.md b/foundation/www/docs/user/manual/de/customize-erpnext/document-title.md index 1ceadc90..5871ef51 100644 --- a/foundation/www/docs/user/manual/de/customize-erpnext/document-title.md +++ b/foundation/www/docs/user/manual/de/customize-erpnext/document-title.md @@ -25,14 +25,14 @@ Sie können eine Bezeichnung definieren, indem Sie Dokumenteneinstellungen in ge > {customer_name} for {project} Bezeichnung anpassen + src="{{docs_base_url}}/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. Bearbeitbare Bezeichnung + src="{{docs_base_url}}/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/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md b/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md index 17ecb3fd..8ddf947b 100644 --- a/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md +++ b/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md @@ -15,7 +15,7 @@ Um Ihre eigenen Versionen zu erstellen, öffnen Sie eine bereits vorhandene Vorl > Einstellungen > Druck > Druckformate -![Druckformat](/docs/assets/img/customize/print-settings.png) +![Druckformat]({{docs_base_url}}/assets/img/customize/print-settings.png) 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. @@ -38,7 +38,7 @@ Um Ihre Druck- und PDF-Einstellungen zu bearbeiten/zu aktualisieren, gehen Sie z > Einstellungen > Druck und Branding > Druckeinstellungen -![Druckformat](/docs/assets/img/customize/print-settings.png) +![Druckformat]({{docs_base_url}}/assets/img/customize/print-settings.png) ### Beispiel diff --git a/foundation/www/docs/user/manual/de/human-resources/appraisal.md b/foundation/www/docs/user/manual/de/human-resources/appraisal.md index 5972de6d..d24bce16 100644 --- a/foundation/www/docs/user/manual/de/human-resources/appraisal.md +++ b/foundation/www/docs/user/manual/de/human-resources/appraisal.md @@ -8,13 +8,13 @@ In ERPNext können Sie Mitarbeiterbeurteilungen verwalten, in dem Sie für jede #### Schritt 1: Wählen Sie eine Bewertungsvorlage aus -Beurteilung +Beurteilung Wenn Sie eine Vorlage ausgewählt haben, erscheint der restliche Teil des Formulars. #### Schritt 2: Geben Sie die Daten des Mitarbeiters ein -Beurteilung +Beurteilung 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/foundation/www/docs/user/manual/de/human-resources/attendance.md b/foundation/www/docs/user/manual/de/human-resources/attendance.md index 5207cd5f..b0b7d0cf 100644 --- a/foundation/www/docs/user/manual/de/human-resources/attendance.md +++ b/foundation/www/docs/user/manual/de/human-resources/attendance.md @@ -6,7 +6,7 @@ Ein Anwesenheitsdatensatz der wiedergibt, dass ein Mitarbeiter zu einem bestimmt > Personalwesen > Dokumente > Anwesenheit > Neu -Anwesenheit +Anwesenheit Sie können einen monatlichen Report über Ihre Anwesenheiten erhalten, indem Sie zum "Monatlichen Anwesenheitsbericht" gehen. diff --git a/foundation/www/docs/user/manual/de/human-resources/employee.md b/foundation/www/docs/user/manual/de/human-resources/employee.md index 5cb408be..a3f72a31 100644 --- a/foundation/www/docs/user/manual/de/human-resources/employee.md +++ b/foundation/www/docs/user/manual/de/human-resources/employee.md @@ -8,6 +8,6 @@ Um einen neuen Mitarbeiter zu erstellen, gehen Sie zu: > Personalwesen > Dokumente > Mitarbeiter > Neu -Mitarbeiter +Mitarbeiter {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/expense-claim.md b/foundation/www/docs/user/manual/de/human-resources/expense-claim.md index 579bdf67..053bbea6 100644 --- a/foundation/www/docs/user/manual/de/human-resources/expense-claim.md +++ b/foundation/www/docs/user/manual/de/human-resources/expense-claim.md @@ -8,7 +8,7 @@ Um eine neue Aufwandsabrechnung zu erstellen, gehen Sie zu: > Personalwesen > Dokumente > Aufwandsabrechnung > Neu -Aufwandsabrechnung +Aufwandsabrechnung 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. @@ -28,6 +28,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. -Aufwandsabrechnung - Verknüpfung zum Projekt +Aufwandsabrechnung - Verknüpfung zum Projekt {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/human-resources-reports.md b/foundation/www/docs/user/manual/de/human-resources/human-resources-reports.md index 4dae74f6..98e2d93e 100644 --- a/foundation/www/docs/user/manual/de/human-resources/human-resources-reports.md +++ b/foundation/www/docs/user/manual/de/human-resources/human-resources-reports.md @@ -6,30 +6,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. -Mitarbeier-Urlaubskonto +Mitarbeier-Urlaubskonto ### Mitarbeiter-Geburtstag Dieser Bericht zeigt die Geburtstage der Mitarbeiter an. -Mitarbeiter-Geburtstag +Mitarbeiter-Geburtstag ### Mitarbeiterinformationen Dieser Bericht wichtige Informationen über Mitarbeiter in den Mitarbeiterdatensätzen. -Mitarbeiterinformation +Mitarbeiterinformation ### Übersicht monatliche Gehälter Dieser Bericht zeigt die Nettozahlungen der Mitarbeiter und deren einzelne Bestandteile im Überblick. -Übersicht monatliche Gehälter +Übersicht monatliche Gehälter ### Monatliche Anwesenheitsliste Dieser Bericht zeit die monatlichen Anwesenheiten ausgewählter Mitarbeiter im Überblick. -Monatliche Anwesenheitsliste +Monatliche Anwesenheitsliste {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/index.txt b/foundation/www/docs/user/manual/de/human-resources/index.txt index caa32929..998ce324 100644 --- a/foundation/www/docs/user/manual/de/human-resources/index.txt +++ b/foundation/www/docs/user/manual/de/human-resources/index.txt @@ -6,7 +6,7 @@ salary-and-payroll appraisal job-applicant job-opening -offer-letter +job-offer tools human-resources-reports setup diff --git a/foundation/www/docs/user/manual/de/human-resources/job-applicant.md b/foundation/www/docs/user/manual/de/human-resources/job-applicant.md index 63246438..50ce5e50 100644 --- a/foundation/www/docs/user/manual/de/human-resources/job-applicant.md +++ b/foundation/www/docs/user/manual/de/human-resources/job-applicant.md @@ -8,7 +8,7 @@ Um einen neuen Bewerber anzulegen, gehen Sie zu: > Personalwesen > Dokumente > Bewerber > Neu -Bewerber +Bewerber ### Verknüpfung mit einem E-Mail-Konto @@ -21,6 +21,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. -E-Mail-Konto +E-Mail-Konto {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/job-opening.md b/foundation/www/docs/user/manual/de/human-resources/job-opening.md index df422de4..5982319a 100644 --- a/foundation/www/docs/user/manual/de/human-resources/job-opening.md +++ b/foundation/www/docs/user/manual/de/human-resources/job-opening.md @@ -8,6 +8,6 @@ Um eine neue Offene Stelle anzulegen, gehen Sie zu: > Personalwesen > Dokumente > Offene Stellen > Neu -Offene Stellen +Offene Stellen {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/leave-application.md b/foundation/www/docs/user/manual/de/human-resources/leave-application.md index 821bc77a..b60a07c3 100644 --- a/foundation/www/docs/user/manual/de/human-resources/leave-application.md +++ b/foundation/www/docs/user/manual/de/human-resources/leave-application.md @@ -6,14 +6,14 @@ Wenn Ihre Firma ein formales System hat, wo Mitarbeiter einen Antrag für Ihren > Personalwesen > Dokumente > Urlaubsantrag > Neu -Urlaubsantrag +Urlaubsantrag ### 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. -Urlaubsgenehmiger +Urlaubsgenehmiger > 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). diff --git a/foundation/www/docs/user/manual/de/human-resources/offer-letter.md b/foundation/www/docs/user/manual/de/human-resources/offer-letter.md index 01d17ca4..677c910c 100644 --- a/foundation/www/docs/user/manual/de/human-resources/offer-letter.md +++ b/foundation/www/docs/user/manual/de/human-resources/offer-letter.md @@ -8,12 +8,12 @@ Ein ERPNext können Sie einen Datensatz zu den Angebotsschreiben, die Sie an Bew > Personalwesen > Dokumente > Angebotsschreiben > Neu -Angebotsschreiben +Angebotsschreiben > 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. -Angebotsschreiben +Angebotsschreiben {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/salary-and-payroll.md b/foundation/www/docs/user/manual/de/human-resources/salary-and-payroll.md index b9c7c844..e50ac0ba 100644 --- a/foundation/www/docs/user/manual/de/human-resources/salary-and-payroll.md +++ b/foundation/www/docs/user/manual/de/human-resources/salary-and-payroll.md @@ -44,7 +44,7 @@ Um eine neue Gehaltsstruktur zu erstellen, gehen Sie zu: #### Abbildung 1: Gehaltsstruktur -Gehaltsstruktur +Gehaltsstruktur ### In der Gehaltsstruktur @@ -68,7 +68,7 @@ Um eine Gehaltsabrechnung über die Gehaltsstruktur zu erstellen, klicken Sie au #### Abbildung 2: Gehaltsabrechnung -Lohnzettel +Lohnzettel Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über "Gehaltsabrechnung bearbeiten" anlegen. @@ -76,7 +76,7 @@ Sie können auch Gehaltsabrechnungen für mehrere verschiedene Mitarbeiter über #### Abbildung 3: Gehaltsabrechnung durchführen -Gehaltsabrechnung durchführen +Gehaltsabrechnung durchführen Beim Bearbeiten einer Gehaltsabrechnung diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/branch.md b/foundation/www/docs/user/manual/de/human-resources/setup/branch.md index 413c33a8..f0762f45 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/branch.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/branch.md @@ -4,6 +4,6 @@ Filialen Ihres Unternehmens -Filiale +Filiale {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/deduction-type.md b/foundation/www/docs/user/manual/de/human-resources/setup/deduction-type.md index bbe64bd0..4ad6614f 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/deduction-type.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/deduction-type.md @@ -8,6 +8,6 @@ Um eine neue Abzugsart anzulegen, gehen Sie zu: > Personalwesen > Einstellungen > Abzugsart > Neu -Abzugsart +Abzugsart {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/department.md b/foundation/www/docs/user/manual/de/human-resources/setup/department.md index ac220645..49d6d1e1 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/department.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/department.md @@ -4,6 +4,6 @@ Abteilungen Ihres Unternehmens -Abteilung +Abteilung {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/designation.md b/foundation/www/docs/user/manual/de/human-resources/setup/designation.md index f1371c2e..66bb7cbb 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/designation.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/designation.md @@ -4,6 +4,6 @@ Stellenbezeichnungen in Ihrem Unternehmen -Stellenbezeichnung +Stellenbezeichnung {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/earning-type.md b/foundation/www/docs/user/manual/de/human-resources/setup/earning-type.md index 9c940cfe..c18e88fa 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/earning-type.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/earning-type.md @@ -8,6 +8,6 @@ Um eine neue Eikommensart zu erstellen, gehen Sie zu: > Personalwesen > Einstellungen > Einkommensart > Neu -Einkommensart +Einkommensart {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/employment-type.md b/foundation/www/docs/user/manual/de/human-resources/setup/employment-type.md index 17a315bc..cae4e842 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/employment-type.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/employment-type.md @@ -4,6 +4,6 @@ Verschiedene Beschäftigungsverträge, die Sie mit Ihren Mitarbeitern abgeschlossen haben. -Art der Beschäftigung +Art der Beschäftigung {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/holyday-list.md b/foundation/www/docs/user/manual/de/human-resources/setup/holyday-list.md index 29f3ac12..daa0dcd9 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/holyday-list.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/holyday-list.md @@ -4,6 +4,6 @@ Sie können Urlaub für ein bestimmtes Jahr über die Urlaubsübersicht planen. -Urlaubsübersicht +Urlaubsübersicht {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/hr-settings.md b/foundation/www/docs/user/manual/de/human-resources/setup/hr-settings.md index 82cf2194..d9169ca5 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/hr-settings.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/hr-settings.md @@ -4,6 +4,6 @@ Globale Einstellungen zu Dokumenten des Personalwesens -Einstellungen zum Personalwesen +Einstellungen zum Personalwesen {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/leave-allocation.md b/foundation/www/docs/user/manual/de/human-resources/setup/leave-allocation.md index e9183c24..3f1374bc 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/leave-allocation.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/leave-allocation.md @@ -4,7 +4,7 @@ Hilft Ihnen Urlaub bestimmten Mitarbeitern zuzuteilen -Urlaubszuordnung +Urlaubszuordnung Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug](/docs/user/manual/de/human-resources/tools/leave-allocation-tool.html). diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/leave-type.md b/foundation/www/docs/user/manual/de/human-resources/setup/leave-type.md index f667fb4d..fb45c4a6 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/leave-type.md +++ b/foundation/www/docs/user/manual/de/human-resources/setup/leave-type.md @@ -4,7 +4,7 @@ Geben Sie den Urlaubstyp an, der Mitarbeitern zugeordnet werden kann. -Urlaubstyp +Urlaubstyp * "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/foundation/www/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md b/foundation/www/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md index ee5ee584..866c84e7 100644 --- a/foundation/www/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md +++ b/foundation/www/docs/user/manual/de/human-resources/tools/leave-allocation-tool.md @@ -4,6 +4,6 @@ Das Urlaubszuordnungs-Werkzeug hilft Ihnen dabei eine bestimmte Menge an Urlaub einem Mitarbeiter zuzuteilen. -Urlaubsantrag +Urlaubsantrag {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/tools/upload-attendance.md b/foundation/www/docs/user/manual/de/human-resources/tools/upload-attendance.md index ba7f1433..dd6231c8 100644 --- a/foundation/www/docs/user/manual/de/human-resources/tools/upload-attendance.md +++ b/foundation/www/docs/user/manual/de/human-resources/tools/upload-attendance.md @@ -8,6 +8,6 @@ Um eine Anwesenheit hochzuladen, gehen Sie zu: > Personalwesen > Werkzeuge > Anwesenheit hochladen -Anwesenheit hochladen +Anwesenheit hochladen {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/training.md b/foundation/www/docs/user/manual/de/human-resources/training.md index 1205b590..5f1a963f 100644 --- a/foundation/www/docs/user/manual/de/human-resources/training.md +++ b/foundation/www/docs/user/manual/de/human-resources/training.md @@ -4,13 +4,13 @@ Erstelle ein Schulungsprogramm und teile die Schulungstermine ein. Auf der Seite des Schulungsprogramms gibt es einen Link zur Ansicht aller Schulungstermine dieses Schulungsprogramms. -Employee +Employee ### Schulungstermin Erstelle Termine für Seminare, Workshops, Konferenzen etc über den Link im Schulungsprogramm. Hier können die Teilnehmer die die Schulung benötigen eingetragen werden. -Employee +Employee ### Teilnehmer zum Schulungstermin einladen @@ -18,7 +18,7 @@ Die Teilnehmer können aus der Liste der Mitarbeiter ausgewählt werden. Standardmäßig ist der Status des Mitarbeiters „Offen“. -Employee +Employee Wenn der Schulungstermin gebucht wird, dann wird eine Benachrichtigung an den Mitarbeiter gesendet, dass er zum Schulungstermin eigeladen ist. Dies wird über die automatische Email „Schulungstermin“ gesendet. Der Inhalt der Email kann entsprechend angepasst werden. @@ -26,7 +26,7 @@ Wenn der Schulungstermin gebucht wird, dann wird eine Benachrichtigung an den Mi Nach der Schulung können die Ergebnisse gespeichert werden basierend auf dem Feedback des Trainers. -Employee +Employee Wenn das Schulungsergebnis gebucht wird, bekommen die Mitarbeiter eine Benachrichtigung, dass sie eine Schulungsbeurteilung abgeben sollen. Dies wird ebenfalls über die automatische Email verwaltet, der Inhalt kann auch hier angepasst werden. @@ -34,5 +34,5 @@ Wenn das Schulungsergebnis gebucht wird, bekommen die Mitarbeiter eine Benachric Die Mitarbeiter können ihre Rückmeldung durch die Schulungsbeurteilung geben. -Employee +Employee diff --git a/foundation/www/docs/user/manual/de/introduction/key-workflows.md b/foundation/www/docs/user/manual/de/introduction/key-workflows.md index 085520fa..44f7d8d1 100644 --- a/foundation/www/docs/user/manual/de/introduction/key-workflows.md +++ b/foundation/www/docs/user/manual/de/introduction/key-workflows.md @@ -5,7 +5,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. -Hohe Auflösung +Hohe Auflösung _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/foundation/www/docs/user/manual/de/introduction/the-champion.md b/foundation/www/docs/user/manual/de/introduction/the-champion.md index e920ea49..28fd9a9d 100644 --- a/foundation/www/docs/user/manual/de/introduction/the-champion.md +++ b/foundation/www/docs/user/manual/de/introduction/the-champion.md @@ -2,7 +2,7 @@ # Der Champion Beigetragen von CWT Connector & Wire Technology GmbH -Champion +Champion 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/foundation/www/docs/user/manual/de/manufacturing/bill-of-materials.md b/foundation/www/docs/user/manual/de/manufacturing/bill-of-materials.md index fd47adc5..64321bdd 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/bill-of-materials.md +++ b/foundation/www/docs/user/manual/de/manufacturing/bill-of-materials.md @@ -8,11 +8,11 @@ Um passende Einkaufsanfragen zu erstellen, müssen Sie Ihre Stücklisten immer a >Fertigung > Dokumente > Stückliste > Neue Stückliste -Task +Task Um Arbeitsgänge hinzuzufügen, wählen Sie "Mit Arbeitsgängen". Die Übersicht der Arbeitsgänge erscheint. -Task +Task * 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. @@ -24,16 +24,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. -Kostenkalkulation +Kostenkalkulation * Diese Kosten können über die Schaltfläche "Kosten aktualisieren" aktualisiert werden. -Kosten aktualisieren +Kosten aktualisieren ### 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. -Aufgelöste Ansicht +Aufgelöste Ansicht {next} diff --git a/foundation/www/docs/user/manual/de/manufacturing/operation.md b/foundation/www/docs/user/manual/de/manufacturing/operation.md index a2899de1..00486d32 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/operation.md +++ b/foundation/www/docs/user/manual/de/manufacturing/operation.md @@ -10,6 +10,6 @@ Sie können einen Arbeitsgang anlegen über: > Fertigung > Dokumente > Arbeitsgang > Neu -Arbeitsgang +Arbeitsgang {next} diff --git a/foundation/www/docs/user/manual/de/manufacturing/production-order.md b/foundation/www/docs/user/manual/de/manufacturing/production-order.md index 83500ca6..49767eba 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/production-order.md +++ b/foundation/www/docs/user/manual/de/manufacturing/production-order.md @@ -8,7 +8,7 @@ Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generi > Fertigung > Dokumente > Fertigungsauftrag > Neu -Fertigungsauftrag +Fertigungsauftrag ### Einen Fertigungsauftrag erstellen @@ -24,11 +24,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. -Fertigungsauftrag - Arbeitsgänge +Fertigungsauftrag - Arbeitsgänge * 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. -Fertigungsauftrag - Arbeitsgänge neu zuordnen +Fertigungsauftrag - Arbeitsgänge neu zuordnen * Wählen Sie den betreffenden Arbeitsgang aus und ändern Sie seinen Arbeitsplatz. * Sie können auch die Dauer des Arbeitsgangs ändern. @@ -43,28 +43,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". -Materialübertrag +Materialübertrag * Geben Sie die Menge des Materials an, das übertragen werden soll. -Materialübertrag - Menge +Materialübertrag - Menge * Übertragen Sie die Lagerbuchung. -Lagerbuchung zum Kundenauftrag +Lagerbuchung zum Kundenauftrag * Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Fertigungsauftrag aktualisiert. -Lagerbuchung zum Fertigungsauftrag +Lagerbuchung zum Fertigungsauftrag ### Zeitprotokoll erstellen -* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]Make TL against PO mitprotokolliert werden. +* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]Make TL against PO 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. -Zeitprotokoll zum Fertigungsauftrag erstellen +Zeitprotokoll zum Fertigungsauftrag erstellen ### Fertige Erzeugnisse aktualisieren @@ -72,11 +72,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". -Fertigerzeugnisse aktualiseren +Fertigerzeugnisse aktualiseren * Geben Sie die Menge des übertragenen Materials an. -Menge der Fertigerzeugnisse aktualisieren +Menge der Fertigerzeugnisse aktualisieren >Tipp: Sie können einen Fertigungsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren. @@ -91,7 +91,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". -Fertigungsauftrag anhalten +Fertigungsauftrag anhalten * Sie können auch einen angehaltenen Fertigungsauftrag wieder weiter laufen lassen. diff --git a/foundation/www/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md b/foundation/www/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md index 37613841..8cec04a6 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md +++ b/foundation/www/docs/user/manual/de/manufacturing/setup/manufacturing-settings.md @@ -6,7 +6,7 @@ Die Fertigungseinstellungen finden Sie unter > Fertigung > Einstellungen > Fertigungseinstellungen -Fertigungseinstellungen +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/foundation/www/docs/user/manual/de/manufacturing/subcontracting.md b/foundation/www/docs/user/manual/de/manufacturing/subcontracting.md index 61e36ef3..c5edf4dc 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/subcontracting.md +++ b/foundation/www/docs/user/manual/de/manufacturing/subcontracting.md @@ -12,7 +12,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. -Fremdvergabe +Fremdvergabe **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/foundation/www/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md b/foundation/www/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md index 652a3f2c..b5a553ca 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md +++ b/foundation/www/docs/user/manual/de/manufacturing/tools/bom-replace-tool.md @@ -35,7 +35,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. -Stücklistenaustauschwerkzeug +Stücklistenaustauschwerkzeug 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/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md b/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md index 3a168d38..7d661a11 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md +++ b/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md @@ -13,30 +13,30 @@ Um das Werkzeug zur Fertigungsplanung zu nutzen, gehen Sie zu: > Fertigung > Werkzeuge > Werkzeug zur Fertigungsplanung -Werkzeug zur Fertigungsplanung +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. -Werkzeug zur Fertigungsplanung +Werkzeug zur Fertigungsplanung ### Schritt 2: Artikel aus Kundenaufträgen abrufen Sie können Artikel hinzufügen, entfernen oder die Menge dieser Artikel verändern. -Werkzeug zur Fertigungsplanung +Werkzeug zur Fertigungsplanung ### Schritt 3: Fertigungsaufträge erstellen -Werkzeug zur Fertigungsplanung +Werkzeug zur Fertigungsplanung ### Schritt 4: Materialanfragen erstellen Erstellen Sie für Artikel mit prognostiziertem Engpass Materialanfragen. -Werkzeug zur Fertigungsplanung +Werkzeug zur Fertigungsplanung Das Werkzeug zur Fertigungsplanung wird auf zwei Ebenend verwendet: diff --git a/foundation/www/docs/user/manual/de/manufacturing/workstation.md b/foundation/www/docs/user/manual/de/manufacturing/workstation.md index 5dc2232a..6c6312b6 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/workstation.md +++ b/foundation/www/docs/user/manual/de/manufacturing/workstation.md @@ -10,7 +10,7 @@ Sie können einen Arbeitsplatz erstellen über: > Fertigung > Dokumente > Arbeitsplatz > Neu -Arbeitsplatz +Arbeitsplatz 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. diff --git a/foundation/www/docs/user/manual/de/projects/activity-cost.md b/foundation/www/docs/user/manual/de/projects/activity-cost.md index 54f95c88..a2878dad 100644 --- a/foundation/www/docs/user/manual/de/projects/activity-cost.md +++ b/foundation/www/docs/user/manual/de/projects/activity-cost.md @@ -4,4 +4,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. -Aktivitätskosten +Aktivitätskosten diff --git a/foundation/www/docs/user/manual/de/projects/activity-type.md b/foundation/www/docs/user/manual/de/projects/activity-type.md index 6227cabc..58ab386b 100644 --- a/foundation/www/docs/user/manual/de/projects/activity-type.md +++ b/foundation/www/docs/user/manual/de/projects/activity-type.md @@ -4,7 +4,7 @@ Unter dem Punkt "Aktivitätsart" wird eine Liste verschiedener Typen von Aktivitäten erstellt zu denen Zeitprotokolle erstellt werden können. -Aktivitätsart +Aktivitätsart Standardmäßig sind die folgenden Aktivitätsarten angelegt: diff --git a/foundation/www/docs/user/manual/de/projects/project.md b/foundation/www/docs/user/manual/de/projects/project.md index 8c09f7f2..12f83ef7 100644 --- a/foundation/www/docs/user/manual/de/projects/project.md +++ b/foundation/www/docs/user/manual/de/projects/project.md @@ -4,24 +4,24 @@ Das Projektmanagement in ERPNext ist aufgabengesteuert. Sie können ein Projekt erstellen und ihm mehrere unterschiedliche Aufgaben zuweisen. -Projekt +Projekt ### 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/user/manual/de/projects/tasks.html). -Projekt +Projekt * Um eine Aufgabe, die zu einem Projekt erstellt wurde, anzusehen, klicken Sie auf "Aufgabe", -Projekt - Aufgabe ansehen +Projekt - Aufgabe ansehen -Projekt - List der Aufgaben +Projekt - List der Aufgaben * Sie können Aufgaben auch über das Projektdokument selbst ansehen. -Projekt - Aufgabenmatrix +Projekt - Aufgabenmatrix ### Zeitmanagement @@ -29,13 +29,13 @@ ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html) * Um ein Zeitprotokoll zu einem Projekt anzusehen, klicken Sie auf "Zeitprotokolle" -Projekt - Zeitprotokoll ansehen +Projekt - Zeitprotokoll ansehen -Projekt - Übersicht der Zeitprotokolle +Projekt - Übersicht der Zeitprotokolle * Sie können ein Zeitprotokoll auch direkt erstellen und mit dem Projekt verknüpfen. -Projekt - Zeitprotokoll verknüpfen +Projekt - Zeitprotokoll verknüpfen ### Aufwände verwalten @@ -43,27 +43,27 @@ Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense- * Um die Aufwandsabrechnungen zu einem Projekt anzusehen, klicken Sie auf "Aufwandsabrechnung". -Projekt - Aufwandsabrechnung ansehen +Projekt - Aufwandsabrechnung ansehen * Sie könne Aufwandsabrechnungen auch direkt erstellen und mit einem Projekt verknüpfen. -Projekt - Aufwandsabrechnung verknüpfen +Projekt - Aufwandsabrechnung verknüpfen * Der Gesamtbetrag der mit einem Projekt verbuchten Aufwandsabrechnungen wird unter "Gesammtsumme der Aufwandsabrechnungen" im Abschnitt "Kostenabrechnung" angezeigt. -Projekt - Gesamtsumme Aufwandsabrechnung +Projekt - Gesamtsumme Aufwandsabrechnung ### Kostenstelle 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. -Projekt - Kostenstelle +Projekt - Kostenstelle ### Projektkostenabrechnung Der Abschnitt Projektkostenabrechnung hilft Ihnen dabei, die Zeit und die AUfwände die in einem Projekt anfallen, nachzuverfolgen. -Projekt - Kostenabrechnung +Projekt - Kostenabrechnung * 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. @@ -72,7 +72,7 @@ Der Abschnitt Projektkostenabrechnung hilft Ihnen dabei, die Zeit und die AUfwä 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. -Projekt - Kundenauftrag +Projekt - Kundenauftrag ### Gantt-Diagramm @@ -80,8 +80,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". -Projekt - Gantt-Diagramm ansehen +Projekt - Gantt-Diagramm ansehen -Projekt - Gantt-Diagramm +Projekt - Gantt-Diagramm [next] diff --git a/foundation/www/docs/user/manual/de/projects/tasks.md b/foundation/www/docs/user/manual/de/projects/tasks.md index cbbc1646..dc95d3db 100644 --- a/foundation/www/docs/user/manual/de/projects/tasks.md +++ b/foundation/www/docs/user/manual/de/projects/tasks.md @@ -4,13 +4,13 @@ Ein Projekt wird in Aufgaben unterteilt. In ERPNext können Sie auch Abhängigkeiten zwischen Aufgaben erstellen. -Aufgabe +Aufgabe ### Status der Aufgabe Ein Aufgabe kann folgende Stati haben: "Offen", "In Arbeit", "Wartet auf Überprüfung", "Geschlossen" und "Abgebrochen". -Aufgabe - Status +Aufgabe - Status * 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. @@ -19,7 +19,7 @@ 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. -Anhängigkeiten +Anhängigkeiten * 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. @@ -30,13 +30,13 @@ ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html) * Um ein zu einer Aufgabe erstelltes Zeitprotokoll anzuschauen, klicken Sie auf "Zeitprotokolle". -Aufgabe - Zeitprotokoll ansehen +Aufgabe - Zeitprotokoll ansehen -Aufgabe - Liste der Zeitprotokolle +Aufgabe - Liste der Zeitprotokolle * Sie können ein Zeitprotokoll auch direkt erstellen und mit einer Aufgabe verknüpfen. -Aufgabe - Zeitprotokoll verknüpfen +Aufgabe - Zeitprotokoll verknüpfen ### Ausgabenmanagement @@ -44,15 +44,15 @@ Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense- * Um eine Aufwandsabrechnung, die zu einer Aufgabe erstellt wurde, anzuschauen, klicken Sie auf "Aufwandsabrechnung". -Aufgabe - Aufwandsabrechnung ansehen +Aufgabe - Aufwandsabrechnung ansehen * Sie können eine Aufwandsabrechnung auch direkt erstellen und sie mit einer Aufgabe verknüpfen. -Aufgabe - Aufwandsabrechnung verknüpfen +Aufgabe - Aufwandsabrechnung verknüpfen * Der Gesamtbetrag der Aufwandsabrechnungen zu einer Aufgabe wird unter "Gesamtbetrag der Aufwandsabrechnungen" im Abschnitt Kostenabrechnung angezeigt. -Aufgabe - Gesamtsumme Aufwandsabrechnung +Aufgabe - Gesamtsumme Aufwandsabrechnung {next} diff --git a/foundation/www/docs/user/manual/de/projects/time-log-batch.md b/foundation/www/docs/user/manual/de/projects/time-log-batch.md index 983902e1..56f524c1 100644 --- a/foundation/www/docs/user/manual/de/projects/time-log-batch.md +++ b/foundation/www/docs/user/manual/de/projects/time-log-batch.md @@ -10,17 +10,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. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen ### Ausgangsrechnungen erstellen * Sobald Sie einen Zeitprotokollstapel übertragen haben, sollte die Schaltfläche "Rechnung erstellen" erscheinen. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen * Klicken Sie auf diese Schaltfläche und erstellen Sie eine Ausgangsrechnung zu einem Zeitprotokollstapel. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen * 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/foundation/www/docs/user/manual/de/projects/time-log.md b/foundation/www/docs/user/manual/de/projects/time-log.md index 03d8f03c..eb95693a 100644 --- a/foundation/www/docs/user/manual/de/projects/time-log.md +++ b/foundation/www/docs/user/manual/de/projects/time-log.md @@ -10,7 +10,7 @@ * Projekte * Interne Referenzen -Zeitprotokoll +Zeitprotokoll ### Zeitprotokolle erstellen @@ -22,15 +22,15 @@ Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll" und wählen Sie "Kalender" aus. -Zeitprotokoll - Kalender ansehen +Zeitprotokoll - Kalender ansehen * Um ein Zeitprotokoll für mehrere Tage zu erstellen, klicken Sie und ziehen Sie den Mauszeiger über die Tage. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen * Sie können Zeitprotokolle auch aus der Wochen- oder Tagesansicht des Kalender heraus erstellen. -Zeitprotokoll - Kalender aufziehen +Zeitprotokoll - Kalender aufziehen * 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". @@ -42,7 +42,7 @@ Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll" * 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. -Zeitprotokoll - Abrechnung +Zeitprotokoll - Abrechnung * 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. diff --git a/foundation/www/docs/user/manual/de/selling/quotation.md b/foundation/www/docs/user/manual/de/selling/quotation.md index db6295c4..49d86923 100644 --- a/foundation/www/docs/user/manual/de/selling/quotation.md +++ b/foundation/www/docs/user/manual/de/selling/quotation.md @@ -12,11 +12,11 @@ Um ein neues Angebot zu erstellen gehen Sie zu: Sie können auch ein Angebot aus einer Opportunity heraus erstellen. -Angebot aus Opportunity erstellen +Angebot aus Opportunity erstellen Oder Sie erstellen ein neues Angebot und übernehmen Details aus der Opportunity. -Angebot aus Opportunity erstellen +Angebot aus Opportunity erstellen Ein Angebot enthält Informationen über: diff --git a/foundation/www/docs/user/manual/de/selling/sales-order.md b/foundation/www/docs/user/manual/de/selling/sales-order.md index 426d7151..107760cd 100644 --- a/foundation/www/docs/user/manual/de/selling/sales-order.md +++ b/foundation/www/docs/user/manual/de/selling/sales-order.md @@ -10,7 +10,7 @@ Wenn Ihr Kunde das Angebot annimmt, können Sie das Angebot in einen Kundenauftr ### Flußdiagramm des Kundenauftrags -Kundenauftrag aus Angebot erstellen +Kundenauftrag aus Angebot erstellen Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag @@ -18,11 +18,11 @@ Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftr Sie können einen Kundenauftrag auch aus einem übertragenen Angebot heraus erstellen. -Kundenauftrag aus Angebot erstellen +Kundenauftrag aus Angebot erstellen Oder Sie erstellen einen neuen Kundenauftrag und entnehmen die Details aus dem Angebot. -Kundenauftrag aus Angebot erstellen +Kundenauftrag aus Angebot erstellen Die meisten Informationen im Kundenauftrag sind dieselben wie im Angebot. Einige Dinge möchte der Kundenauftrag aber aktualisiert haben. @@ -61,7 +61,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. -Wiederkehrende Kundenaufträge +Wiederkehrende Kundenaufträge ### Die nächsten Schritte diff --git a/foundation/www/docs/user/manual/de/selling/setup/product-bundle.md b/foundation/www/docs/user/manual/de/selling/setup/product-bundle.md index 88ec038c..5e77cdb6 100644 --- a/foundation/www/docs/user/manual/de/selling/setup/product-bundle.md +++ b/foundation/www/docs/user/manual/de/selling/setup/product-bundle.md @@ -12,7 +12,7 @@ Um ein neues Produkt-Bundle zu erstellen, gehen Sie zu: > Vertrieb > Einstellungen > Produkt-Bundle > Neu -Produkt-Bundle +Produkt-Bundle ### Hauptartikel auswählen @@ -28,7 +28,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. -Produkt-Bundle +Produkt-Bundle 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/foundation/www/docs/user/manual/de/selling/setup/sales-partner.md b/foundation/www/docs/user/manual/de/selling/setup/sales-partner.md index 3ba581e9..9dfeeae1 100644 --- a/foundation/www/docs/user/manual/de/selling/setup/sales-partner.md +++ b/foundation/www/docs/user/manual/de/selling/setup/sales-partner.md @@ -14,7 +14,7 @@ Um einen Vertriebspartner anzulegen, gehen Sie zu: Vertriebspartner werden mit einem vom Benutzer vergebenen Namen abgespeichert. -Vertriebspartner +Vertriebspartner Sie können die Adressen und Kontaktdaten von Vertriebsmitarbeitern erfassen und sie basierend auf Menge und Betrag jeder Artikelgruppe zuweisen. @@ -22,13 +22,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. -Vertriebspartner +Vertriebspartner Um eine Übersicht Ihrer Partner zu erhalten, gehen Sie zu: https://example.erpnext.com/Partners -Auflistung der Vertriebspartner +Auflistung der Vertriebspartner {next} diff --git a/foundation/www/docs/user/manual/de/selling/setup/selling-settings.md b/foundation/www/docs/user/manual/de/selling/setup/selling-settings.md index cd04a7bb..1dbdb06a 100644 --- a/foundation/www/docs/user/manual/de/selling/setup/selling-settings.md +++ b/foundation/www/docs/user/manual/de/selling/setup/selling-settings.md @@ -4,7 +4,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. -Vertriebseinstellungen +Vertriebseinstellungen ### 1\. Benennung der Kunden nach diff --git a/foundation/www/docs/user/manual/de/selling/setup/shipping-rule.md b/foundation/www/docs/user/manual/de/selling/setup/shipping-rule.md index 74808daa..4622eba0 100644 --- a/foundation/www/docs/user/manual/de/selling/setup/shipping-rule.md +++ b/foundation/www/docs/user/manual/de/selling/setup/shipping-rule.md @@ -4,6 +4,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. -Versandregel +Versandregel {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/authorization-rule.md b/foundation/www/docs/user/manual/de/setting-up/authorization-rule.md index a9c654a2..051f2be4 100644 --- a/foundation/www/docs/user/manual/de/setting-up/authorization-rule.md +++ b/foundation/www/docs/user/manual/de/setting-up/authorization-rule.md @@ -38,7 +38,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. -Autorisierungsregel +Autorisierungsregel 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/foundation/www/docs/user/manual/de/setting-up/data/bulk-rename.md b/foundation/www/docs/user/manual/de/setting-up/data/bulk-rename.md index 51e3f9c7..67a57964 100644 --- a/foundation/www/docs/user/manual/de/setting-up/data/bulk-rename.md +++ b/foundation/www/docs/user/manual/de/setting-up/data/bulk-rename.md @@ -14,4 +14,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. -Bulk Rename \ No newline at end of file +Bulk Rename \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/setting-up/data/data-import-tool.md b/foundation/www/docs/user/manual/de/setting-up/data/data-import-tool.md index 2207a1b7..a53116df 100644 --- a/foundation/www/docs/user/manual/de/setting-up/data/data-import-tool.md +++ b/foundation/www/docs/user/manual/de/setting-up/data/data-import-tool.md @@ -6,7 +6,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: -Importvorgang starten +Importvorgang starten Das Werkzeug hat zwei Abschnitte, einen um eine Vorlage herunter zu laden, und einen zweiten um Daten hoch zu laden. @@ -16,7 +16,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. -Vorlage herunterladen +Vorlage herunterladen * Klicken Sie auf die Tabelle, die Sie herunter laden wollen, oder auf "Alle Tabellen". * Für Massenbearbeitung klicken Sie auf "Mit Daten herunterladen". @@ -35,7 +35,7 @@ Exportieren Sie dann Ihre Vorlage oder speichern Sie sie im CSV-Format (**Comma Fügen Sie abschliessend die CSV-Datei im Abschnitt Import hinzu. Klicken Sie auf die Schaltfläche "Hochladen und Importieren". -Upload +Upload #### Anmerkungen diff --git a/foundation/www/docs/user/manual/de/setting-up/email/email-account.md b/foundation/www/docs/user/manual/de/setting-up/email/email-account.md index a241529a..d099c1d3 100644 --- a/foundation/www/docs/user/manual/de/setting-up/email/email-account.md +++ b/foundation/www/docs/user/manual/de/setting-up/email/email-account.md @@ -12,7 +12,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. -Kriterien definieren +Kriterien definieren ### Konten zu ausgehenden E-Mails @@ -20,13 +20,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. -Ausgehende E-Mails +Ausgehende E-Mails ### 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. -Eingehende E-Mails +Eingehende E-Mails ### Wie ERPNext Antworten handhabt @@ -36,6 +36,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. -Eingehende Email +Eingehende Email {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/email/email-alerts.md b/foundation/www/docs/user/manual/de/setting-up/email/email-alerts.md index 60a6a8f9..2968be1b 100644 --- a/foundation/www/docs/user/manual/de/setting-up/email/email-alerts.md +++ b/foundation/www/docs/user/manual/de/setting-up/email/email-alerts.md @@ -33,7 +33,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/foundation/www/docs/user/manual/de/setting-up/email/email-digest.md b/foundation/www/docs/user/manual/de/setting-up/email/email-digest.md index 2758e46c..82b2a9a6 100644 --- a/foundation/www/docs/user/manual/de/setting-up/email/email-digest.md +++ b/foundation/www/docs/user/manual/de/setting-up/email/email-digest.md @@ -14,6 +14,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. -E-Mail-Bericht +E-Mail-Bericht {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/email/sending-email.md b/foundation/www/docs/user/manual/de/setting-up/email/sending-email.md index 0b044199..89397b6e 100644 --- a/foundation/www/docs/user/manual/de/setting-up/email/sending-email.md +++ b/foundation/www/docs/user/manual/de/setting-up/email/sending-email.md @@ -4,7 +4,7 @@ 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. -Emails versenden +Emails versenden **Anmerkung:** Es müssen Konten zum [E-Mail-Versand](/docs/user/manual/de/setting-up/email/email-account.html) eingerichtet sein. diff --git a/foundation/www/docs/user/manual/de/setting-up/pos-setting.md b/foundation/www/docs/user/manual/de/setting-up/pos-setting.md index bd4c441f..ce2730c3 100644 --- a/foundation/www/docs/user/manual/de/setting-up/pos-setting.md +++ b/foundation/www/docs/user/manual/de/setting-up/pos-setting.md @@ -10,7 +10,7 @@ Wenn Sie im Endkundengeschäft tätig sind, möchten Sie, dass Ihr POS so schnel Setzen Sie die Standardeinstellungen wie definiert. -POS-Einstellungen +POS-Einstellungen > 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/foundation/www/docs/user/manual/de/setting-up/price-lists.md b/foundation/www/docs/user/manual/de/setting-up/price-lists.md index b2f618dd..32ff4800 100644 --- a/foundation/www/docs/user/manual/de/setting-up/price-lists.md +++ b/foundation/www/docs/user/manual/de/setting-up/price-lists.md @@ -12,7 +12,7 @@ Sie können eine neue Preisliste erstellen über: > Vertrieb/Einkauf/Lagerbestand > Einstellungen > Preisliste > Neu -Preisliste +Preisliste * 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/foundation/www/docs/user/manual/de/setting-up/print/address-template.md b/foundation/www/docs/user/manual/de/setting-up/print/address-template.md index 7dd88379..8604340a 100644 --- a/foundation/www/docs/user/manual/de/setting-up/print/address-template.md +++ b/foundation/www/docs/user/manual/de/setting-up/print/address-template.md @@ -29,6 +29,6 @@ Hier sehen Sie die Standardvorlage: ### Beispiel -Adressvorlage +Adressvorlage {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/print/letter-head.md b/foundation/www/docs/user/manual/de/setting-up/print/letter-head.md index e1df9e83..5eee079f 100644 --- a/foundation/www/docs/user/manual/de/setting-up/print/letter-head.md +++ b/foundation/www/docs/user/manual/de/setting-up/print/letter-head.md @@ -16,10 +16,10 @@ Sie können Briefköpfe erstellen/verwalten über: #### Beispiel -Briefkopf +Briefkopf So sieht der Briefkopf eines Ausdruckes aus: -Briefkopf +Briefkopf {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/print/print-format-builder.md b/foundation/www/docs/user/manual/de/setting-up/print/print-format-builder.md index b493fa22..618395e1 100644 --- a/foundation/www/docs/user/manual/de/setting-up/print/print-format-builder.md +++ b/foundation/www/docs/user/manual/de/setting-up/print/print-format-builder.md @@ -12,19 +12,19 @@ Oder Sie öffnen das Dokument, für das Sie ein Druckformat erstellen wollen. Kl ### Schritt 1: Erstellen Sie ein neues Format -E-Mail senden +E-Mail senden ### 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. -E-Mail senden +E-Mail senden ### Schritt 3: Ein Feld entfernen Um ein Feld zu entfernen, legen Sie es einfach zurück in die Seitenleiste. -E-Mail senden +E-Mail senden ### Schritt 4 @@ -32,7 +32,7 @@ Sie können benutzerdefinierten Text als HTML in Ihr Druckformat übernehmen. F Klicken Sie dann auf **HTML bearbeiten** um den Inhalt zu bearbeiten. -E-Mail senden +E-Mail senden Um Ihr Format abzuspeichern klicken Sie einfach auf die Schaltfläche **Speichern**. diff --git a/foundation/www/docs/user/manual/de/setting-up/print/print-headings.md b/foundation/www/docs/user/manual/de/setting-up/print/print-headings.md index 42e03662..7177751f 100644 --- a/foundation/www/docs/user/manual/de/setting-up/print/print-headings.md +++ b/foundation/www/docs/user/manual/de/setting-up/print/print-headings.md @@ -10,10 +10,10 @@ Sie können Druckköpfe erstellen über: #### Abbildung 1: Druckköpfe abspeichern -Druckköpfe +Druckköpfe Hier ist ein Beispiel abgebildet, wie man einen Druckkopf auswechselt: -Druckköpfe +Druckköpfe {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/print/print-settings.md b/foundation/www/docs/user/manual/de/setting-up/print/print-settings.md index 77bf32ae..8ec6d4b6 100644 --- a/foundation/www/docs/user/manual/de/setting-up/print/print-settings.md +++ b/foundation/www/docs/user/manual/de/setting-up/print/print-settings.md @@ -8,6 +8,6 @@ Um die Druckeinstellungen zu bearbeiten, gehen Sie zu: > Einstellungen > Druck > Druckeinstellungen -Druckeinstellungen +Druckeinstellungen {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/print/terms-and-conditions.md b/foundation/www/docs/user/manual/de/setting-up/print/terms-and-conditions.md index 8a4e1a9d..3c635681 100644 --- a/foundation/www/docs/user/manual/de/setting-up/print/terms-and-conditions.md +++ b/foundation/www/docs/user/manual/de/setting-up/print/terms-and-conditions.md @@ -10,13 +10,13 @@ Um die Vorlage für die Allgemeinen Geschäftsbedingungen zu erstellen, gehen Si > Vertrieb > Einstellungen > Vorlage für Allgemeine Geschäftsbedingungen > Neu -Geschäftsbedingungen +Geschäftsbedingungen ### 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. -Geschäfsbedingungen - HTML bearbeiten +Geschäfsbedingungen - HTML bearbeiten 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. @@ -24,6 +24,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. -Geschäfsbedingungen - Im Dokument auswählen +Geschäfsbedingungen - Im Dokument auswählen {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/setting-up-taxes.md b/foundation/www/docs/user/manual/de/setting-up/setting-up-taxes.md index c1d0eeff..e6d4ff7e 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setting-up-taxes.md +++ b/foundation/www/docs/user/manual/de/setting-up/setting-up-taxes.md @@ -14,11 +14,11 @@ Wenn einige Ihrer Artikel einer anderen Besteuerung unterliegen als andere, gebe Die Tabelle zu den Artikelsteuern ist ein Abschnitt in den Artikelstammdaten. -Artikelsteuer +Artikelsteuer * **Inklusive oder Exklusive Steuer:** ERPNext erlaubt es Ihnen Artikelpreise inklusive Steuer einzugeben. -Steuer inklusive +Steuer inklusive * **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. @@ -35,7 +35,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 -Vorlage für Verkaufssteuern +Vorlage für Verkaufssteuern Wenn Sie eine neue Vorlage erstellen, müssen Sie für jeden Steuertyp eine neue Zeile einfügen. diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/global-defaults.md b/foundation/www/docs/user/manual/de/setting-up/settings/global-defaults.md index 50114c07..d3d3b31c 100644 --- a/foundation/www/docs/user/manual/de/setting-up/settings/global-defaults.md +++ b/foundation/www/docs/user/manual/de/setting-up/settings/global-defaults.md @@ -8,6 +8,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. -Globale Voreinstellungen +Globale Voreinstellungen {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/module-settings.md b/foundation/www/docs/user/manual/de/setting-up/settings/module-settings.md index 3096e9ad..cb91d8c6 100644 --- a/foundation/www/docs/user/manual/de/setting-up/settings/module-settings.md +++ b/foundation/www/docs/user/manual/de/setting-up/settings/module-settings.md @@ -12,6 +12,6 @@ Beispiel: Wenn Sie im Dienstleistungsbereich arbeiten, möchten Sie evtl. das Fe Markieren oder demarkieren Sie die Elemente die angezeigt / ausgeblendet werden sollen. -Moduleinstellungen +Moduleinstellungen {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/naming-series.md b/foundation/www/docs/user/manual/de/setting-up/settings/naming-series.md index 5c0f1c67..016e4639 100644 --- a/foundation/www/docs/user/manual/de/setting-up/settings/naming-series.md +++ b/foundation/www/docs/user/manual/de/setting-up/settings/naming-series.md @@ -34,6 +34,6 @@ Sie können auch den Startpunkt eines Nummernkreises auswählen, indem Sie den N Sehen Sie hier, wie der Nummernkreis eingestellt wird. -Nummernkreise +Nummernkreise {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/system-settings.md b/foundation/www/docs/user/manual/de/setting-up/settings/system-settings.md index ee447f05..56a0c36d 100644 --- a/foundation/www/docs/user/manual/de/setting-up/settings/system-settings.md +++ b/foundation/www/docs/user/manual/de/setting-up/settings/system-settings.md @@ -8,6 +8,6 @@ Um die Systemeinstellungen zu öffnen, gehen Sie zu: > Einstellungen > Einstellungen > Systemeinstellungen -Systemeinstellungen +Systemeinstellungen {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md index 0498ef57..17305c5b 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-1-language.md @@ -4,7 +4,7 @@ Wählen Sie Ihre Sprache. ERPNext gibt es in mehr als 20 Sprachen. -Sprache +Sprache --- diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md index c23f1fd7..63e00bf3 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-10-item.md @@ -5,7 +5,7 @@ In diesem letzten Schritt geben Sie bitte die Bezeichnungen der Artikel ein, die Sie kaufen oder verkaufen. Artikel hinzufügen +src="{{docs_base_url}}/assets/img/setup-wizard/step-10.png"> Bitte stellen Sie auch die Artikelart (Produkt oder Dienstleistung) und die Standardmaßeinheit ein. Machen Sie sich keine Sorgen, Sie können das alles später noch bearbeiten. diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md index 2fbaf6f9..f4e63f6c 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-2-currency-and-timezone.md @@ -4,7 +4,7 @@ Stellen Sie den Namen Ihres Landes, die Währung und die Zeitzone ein. -Währung +Währung --- diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md index fb00719e..e78fec80 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-3-user-details.md @@ -5,7 +5,7 @@ Geben Sie Details zum Benutzerprofil, wie Name, Benutzer-ID und das bevorzugte Passwort ein. Benutzer +src="{{docs_base_url}}/assets/img/setup-wizard/step-3.png"> --- diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md index 24ff12f1..14d70bc5 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-4-company-details.md @@ -5,7 +5,7 @@ Geben Sie Details zum Unternehmen wie Name, Kürzel und Geschäftsjahr ein. Unternehmensdetails +src="{{docs_base_url}}/assets/img/setup-wizard/step-4.png"> --- diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md index b4aef54f..e47403cc 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-5-letterhead-and-logo.md @@ -5,7 +5,7 @@ Fügen Sie einen Firmenbriefkopf und ein Firmenlogo hinzu. Firmenlogo und Briefkopf +src="{{docs_base_url}}/assets/img/setup-wizard/step-5.png"> --- diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md index 91f74bf2..df9f73c5 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-6-add-users.md @@ -5,6 +5,6 @@ Fügen Sie weitere Benutzer hinzu und teilen Sie ihnen gemäß Ihren Verantwortungsbereichen am Arbeitsplatz Rollen zu. Benutzer +src="{{docs_base_url}}/assets/img/setup-wizard/step-6.png"> {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md index 60670aa3..f6430b60 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-7-tax-details.md @@ -5,7 +5,7 @@ Geben Sie bis zu drei Steuerarten an, die Sie regelmäßig in Bezug auf Ihr Gehalt zahlen. Dieser Assistent erstellt eine Steuervorlage, die die Steuren für jede Steuerart berechnet. Steuerdetails +src="{{docs_base_url}}/assets/img/setup-wizard/step-7.png"> Geben Sie einfach den Namen der Steuerart und den Steuersatz ein. diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md index d74d9eb9..dfe7d238 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-8-customer-names.md @@ -5,7 +5,7 @@ Geben Sie die Namen Ihrer Kunden und die Kontaktpersonen ein. Customers +src="{{docs_base_url}}/assets/img/setup-wizard/step-8.png"> --- diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md index 125d6679..692818e7 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/step-9-suppliers.md @@ -5,7 +5,7 @@ Geben Sie ein paar Namen Ihrer Lieferanten ein. Lieferanten +src="{{docs_base_url}}/assets/img/setup-wizard/step-9.png"> --- diff --git a/foundation/www/docs/user/manual/de/setting-up/sms-setting.md b/foundation/www/docs/user/manual/de/setting-up/sms-setting.md index 86c69b9f..38d3ce78 100644 --- a/foundation/www/docs/user/manual/de/setting-up/sms-setting.md +++ b/foundation/www/docs/user/manual/de/setting-up/sms-setting.md @@ -11,7 +11,7 @@ Beispiel-URL: http://instant.smses.com/web2sms.php?username=&password;=&to;=&sender;=&message;= -SMS-Einstellungen +SMS-Einstellungen > Anmerkung: Die Zeichenfolge bis zum "?" ist die URL des SMS-Gateways. @@ -24,7 +24,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. -SMS-Einstellungen +SMS-Einstellungen {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md b/foundation/www/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md index 38d7605a..d5ad9d25 100644 --- a/foundation/www/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md +++ b/foundation/www/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md @@ -24,18 +24,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. -Bestandsabgleich +Bestandsabgleich #### Schritt 2: Geben Sie Daten in die CSV-Datei ein. -Bestandsabgleich +Bestandsabgleich 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. -Bestandsabgleich +Bestandsabgleich ##### Buchungsdatum @@ -53,11 +53,11 @@ Notiz: Wenn Sie die bewerteten Beträge eines Artikels eingeben, können Sie zum #### Schritt 4: Überprüfen Sie die Daten zum Bestandsabgleich -Bestandsabgleich Überprüfung +Bestandsabgleich Überprüfung ### Bericht zum Lagerbuch -Bestandsabgleich +Bestandsabgleich ##### So arbeitet der Bestandsabgleich diff --git a/foundation/www/docs/user/manual/de/setting-up/territory.md b/foundation/www/docs/user/manual/de/setting-up/territory.md index 5fd88ca1..0e70de86 100644 --- a/foundation/www/docs/user/manual/de/setting-up/territory.md +++ b/foundation/www/docs/user/manual/de/setting-up/territory.md @@ -4,6 +4,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. -Baumstruktur Regionen +Baumstruktur Regionen {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md index 282aa497..e4c21481 100644 --- a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md +++ b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/adding-users.md @@ -12,7 +12,7 @@ Für einen Benutzer können viele Informationen eingegeben werden. Im Sinne der ### 1. Übersicht der Benutzer -Benutzerliste +Benutzerliste Um einen neuen Benutzer hinzuzufügen, klicken Sie auf "Neu". @@ -29,18 +29,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. -Benutzerrollen +Benutzerrollen ### 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. -Geblockte Module für Benutzer +Geblockte Module für Benutzer ### 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. -Sicherheitseinstellungen für Benutzer +Sicherheitseinstellungen für Benutzer {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md index a8b3a5d2..2fd197ad 100644 --- a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md +++ b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md @@ -8,7 +8,7 @@ Wenn Sie das tun wollen, gehen Sie zu: > Einstellungen > Berechtigungen > Rollenberechtigungen-Manager -Berechtigungen für Lesen, Schreiben, Erstellen, Übertragen und Abändern mit Hilfe des Rollenberechtigungen-Managers einstellen +Berechtigungen für Lesen, Schreiben, Erstellen, Übertragen und Abändern mit Hilfe des Rollenberechtigungen-Managers einstellen Berechtigungen werden angewandt auf einer Kombination von: @@ -44,23 +44,23 @@ Um Benutzerberechtigungen zu setzen, gehen Sie zu: Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechtigungssystems abdeckt. -Der Urlaubsantrag sollte von einem Mitarbeiter erstellt werden, und von einem Urlaubsgenehmiger oder Mitarbeiter des Personalwesens genehmigt werden. +Der Urlaubsantrag sollte von einem Mitarbeiter erstellt werden, und von einem Urlaubsgenehmiger oder Mitarbeiter des Personalwesens genehmigt werden. 1\. **Er sollte von einem "Mitarbeiter" erstellt werden.** Aus diesem Grund sollte die Rolle "Mitarbeiter" Berechtigungen zum Lesen, Schreiben und Erstellen haben. -Einem Mitarbeiter Lese-, Schreib- und Erstellrechte für einen Urlaubsantrag geben. +Einem Mitarbeiter Lese-, Schreib- und Erstellrechte für einen Urlaubsantrag geben. 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.) -Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken. +Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken. 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. -Einem Personalmanager Rechte für Übertragen und Stornieren für Urlaubsanträge geben. 'Benutzerberechtigungen anwenden' ist demarkiert um vollen Zugriff zu ermöglichen. +Einem Personalmanager Rechte für Übertragen und Stornieren für Urlaubsanträge geben. 'Benutzerberechtigungen anwenden' ist demarkiert um vollen Zugriff zu ermöglichen. 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.) -Rechte für Schreiben, Lesen und Übertragen an einen Urlaubsgenehmiger zum Genehmigen von Urlauben geben. 'Benutzerberechtigungen anwenden' ist markiert, um den Zugriff basierend auf dem Mitarbeitertyp einzuschränken. +Rechte für Schreiben, Lesen und Übertragen an einen Urlaubsgenehmiger zum Genehmigen von Urlauben geben. 'Benutzerberechtigungen anwenden' ist markiert, um den Zugriff basierend auf dem Mitarbeitertyp einzuschränken. 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. @@ -68,6 +68,6 @@ Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechti 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. -Es dem Benutzer der Personalverwaltung ermöglichen, den Zugriff auf Urlaubsanträge zu delegieren, indem er 'Benutzerberechtigungen einstellen' markiert. Dies erlaubt es dem Benutzer der Personalverwaltung auf den Benutzerberechtigungen-Manager für 'Urlaubsanträge' zuzugreifen +Es dem Benutzer der Personalverwaltung ermöglichen, den Zugriff auf Urlaubsanträge zu delegieren, indem er 'Benutzerberechtigungen einstellen' markiert. Dies erlaubt es dem Benutzer der Personalverwaltung auf den Benutzerberechtigungen-Manager für 'Urlaubsanträge' zuzugreifen {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/sharing.md b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/sharing.md index 67aa3a1c..95170340 100644 --- a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/sharing.md +++ b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/sharing.md @@ -6,6 +6,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/foundation/www/docs/user/manual/de/setting-up/workflows.md b/foundation/www/docs/user/manual/de/setting-up/workflows.md index 2bdbaab5..dab34f6e 100644 --- a/foundation/www/docs/user/manual/de/setting-up/workflows.md +++ b/foundation/www/docs/user/manual/de/setting-up/workflows.md @@ -8,7 +8,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. -Workflow +Workflow Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu: @@ -16,11 +16,11 @@ Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu: #### Schritt 1: Geben Sie die unterschiedlichen Zustände des Prozesses Urlaubsantrag ein. -Workflow +Workflow #### Schritt 2: Geben Sie die Übergangsregeln ein. -Workflow +Workflow Hinweise: @@ -38,14 +38,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". -Workflow +Workflow 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. -Workflow +Workflow Wenn der Urlaubsgenehmiger die Seite mit den Urlaubsanträgen öffnet, kann er den Status von "Genehmigt" auf "Abgelehnt" ändern. -Workflow +Workflow {next} diff --git a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md index 1a888fa3..d995319a 100644 --- a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md +++ b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md @@ -134,11 +134,11 @@ Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück

    Lagerbuch

    -Lagerbuch +Lagerbuch **Hauptbuch:** -Hauptbuch +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. @@ -150,7 +150,7 @@ Wenn eine Rechnung des Lieferanten für den oben angesprochenen Kaufbeleg eintri #### Hauptbuch -Hauptbuch +Hauptbuch Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und hebt den Effekt des Kaufbeleges auf. @@ -207,11 +207,11 @@ Nehmen wir an, dass Sie eine Kundenbestellung von "Utah Automation Services" üb **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch +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. @@ -232,11 +232,11 @@ Nehmen wir an, dass Sie zur obigen Bestellung keinen Lieferschein erstellt haben **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch +Hauptbuch Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten "In Verkaufsstellen" und "Selbstkosten" basierend auf der Bewertung beeinflusst. @@ -269,11 +269,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch +Hauptbuch * * * @@ -304,11 +304,11 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch +Hauptbuch * * * @@ -341,8 +341,8 @@ Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten **Lagerbuch** -Lagerbuch +Lagerbuch **Hauptbuch** -Hauptbuch \ No newline at end of file +Hauptbuch \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/stock/batch.md b/foundation/www/docs/user/manual/de/stock/batch.md index a128befb..39206748 100644 --- a/foundation/www/docs/user/manual/de/stock/batch.md +++ b/foundation/www/docs/user/manual/de/stock/batch.md @@ -14,7 +14,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. -Charge +Charge > 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/foundation/www/docs/user/manual/de/stock/delivery-note.md b/foundation/www/docs/user/manual/de/stock/delivery-note.md index 221e2834..cd953bc4 100644 --- a/foundation/www/docs/user/manual/de/stock/delivery-note.md +++ b/foundation/www/docs/user/manual/de/stock/delivery-note.md @@ -12,7 +12,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. -Lieferschein +Lieferschein Sie können die Details auch aus einer noch nicht gelieferten Kundenbestellung "herausziehen". diff --git a/foundation/www/docs/user/manual/de/stock/material-request.md b/foundation/www/docs/user/manual/de/stock/material-request.md index 75ba82e6..1eb35420 100644 --- a/foundation/www/docs/user/manual/de/stock/material-request.md +++ b/foundation/www/docs/user/manual/de/stock/material-request.md @@ -4,7 +4,7 @@ Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst. -Materialanfrage +Materialanfrage Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: @@ -12,7 +12,7 @@ Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: ### Materialanfrage erstellen -Materialanfrage +Materialanfrage Eine Materialanfrage kann auf folgende Arten erstellt werden: diff --git a/foundation/www/docs/user/manual/de/stock/projected-quantity.md b/foundation/www/docs/user/manual/de/stock/projected-quantity.md index 0a17a69d..20e0d31a 100644 --- a/foundation/www/docs/user/manual/de/stock/projected-quantity.md +++ b/foundation/www/docs/user/manual/de/stock/projected-quantity.md @@ -8,7 +8,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. -Bericht zur projizierten Menge +Bericht zur projizierten Menge > Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge diff --git a/foundation/www/docs/user/manual/de/stock/purchase-receipt.md b/foundation/www/docs/user/manual/de/stock/purchase-receipt.md index 7bfc82c6..842d5781 100644 --- a/foundation/www/docs/user/manual/de/stock/purchase-receipt.md +++ b/foundation/www/docs/user/manual/de/stock/purchase-receipt.md @@ -12,7 +12,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. -Kaufbeleg +Kaufbeleg ### Ausschuss diff --git a/foundation/www/docs/user/manual/de/stock/purchase-return.md b/foundation/www/docs/user/manual/de/stock/purchase-return.md index ad58e4b8..76b9b51c 100644 --- a/foundation/www/docs/user/manual/de/stock/purchase-return.md +++ b/foundation/www/docs/user/manual/de/stock/purchase-return.md @@ -8,18 +8,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. -Original-Eingangsrechnung +Original-Eingangsrechnung 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. -Reklamation zum Lieferschein +Reklamation zum Lieferschein 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. -Reklamation und Lagerbuch +Reklamation und Lagerbuch 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. -Reklamation und Lagerbuch +Reklamation und Lagerbuch {next} diff --git a/foundation/www/docs/user/manual/de/stock/sales-return.md b/foundation/www/docs/user/manual/de/stock/sales-return.md index b4d59010..bfba6f02 100644 --- a/foundation/www/docs/user/manual/de/stock/sales-return.md +++ b/foundation/www/docs/user/manual/de/stock/sales-return.md @@ -8,22 +8,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. -Original-Lieferschein +Original-Lieferschein 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. -Kundenreklamation zum Lieferschein +Kundenreklamation zum Lieferschein 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. -Kundenreklamation zur Eingangsrechnung +Kundenreklamation zur Eingangsrechnung 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. -Lagerbuch und Reklamation +Lagerbuch und Reklamation -Lagerbuch und Reklamation +Lagerbuch und Reklamation {next} diff --git a/foundation/www/docs/user/manual/de/stock/serial-no.md b/foundation/www/docs/user/manual/de/stock/serial-no.md index 5fdf2507..3ad1c4d4 100644 --- a/foundation/www/docs/user/manual/de/stock/serial-no.md +++ b/foundation/www/docs/user/manual/de/stock/serial-no.md @@ -14,7 +14,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. -Seriennummer +Seriennummer * Der Status wird aufgrund der Lagerbuchung eingestellt. * Nur Seriennummern mit dem Status "Verfügbar" können geliefert werden. diff --git a/foundation/www/docs/user/manual/de/stock/setup/item-attribute.md b/foundation/www/docs/user/manual/de/stock/setup/item-attribute.md index 1f93b44e..95504014 100644 --- a/foundation/www/docs/user/manual/de/stock/setup/item-attribute.md +++ b/foundation/www/docs/user/manual/de/stock/setup/item-attribute.md @@ -4,18 +4,18 @@ Sie können Attribute und Attributwerte für Ihre Artikelvarianten hier auswählen. -Attributvorlage +Attributvorlage ### Nicht-numerische Attribute * Für nicht-numerische Attribute definieren Sie Attributwerte und deren Abkürzungen in der Tabelle Attributwerte. -Attributvorlage +Attributvorlage ### Numerische Attribute * Wenn Ihr Attribut numerisch ist, wählen Sie numerische Werte. * Geben Sie den Bereich an und die Schrittweite. -Attributvorlage +Attributvorlage diff --git a/foundation/www/docs/user/manual/de/stock/setup/item-group.md b/foundation/www/docs/user/manual/de/stock/setup/item-group.md index 6fadb9a1..5626c2aa 100644 --- a/foundation/www/docs/user/manual/de/stock/setup/item-group.md +++ b/foundation/www/docs/user/manual/de/stock/setup/item-group.md @@ -4,19 +4,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. -Baumstruktur Artikelgruppe +Baumstruktur Artikelgruppe ### Eine Artikelgruppe erstellen * Wählen Sie eine Artikelgruppe aus unter der Sie eine Artikelgruppe erstellen wollen. * Klicken Sie auf "Unterpunkt hinzufügen". -Artikelgruppe hinzufügen +Artikelgruppe hinzufügen ### Eine Artikelgruppe löschen * Wählen Sie die zu löschende Artikelgruppe aus. * Klicken Sie auf "Löschen" -Artikelgruppe hinzufügen +Artikelgruppe hinzufügen {next} diff --git a/foundation/www/docs/user/manual/de/stock/setup/stock-settings.md b/foundation/www/docs/user/manual/de/stock/setup/stock-settings.md index b9a0bd87..5bd75c60 100644 --- a/foundation/www/docs/user/manual/de/stock/setup/stock-settings.md +++ b/foundation/www/docs/user/manual/de/stock/setup/stock-settings.md @@ -4,6 +4,6 @@ Sie können Standardeinstellungen für Ihre mit dem Lager verbundenen Transaktionen hier voreinstellen. -Lagereinstellungen +Lagereinstellungen {next} diff --git a/foundation/www/docs/user/manual/de/stock/stock-entry.md b/foundation/www/docs/user/manual/de/stock/stock-entry.md index 3b0314b5..659ebb21 100644 --- a/foundation/www/docs/user/manual/de/stock/stock-entry.md +++ b/foundation/www/docs/user/manual/de/stock/stock-entry.md @@ -8,7 +8,7 @@ Wenn Sie eine Lagerbuchung erstellen möchten, gehen Sie zu: > Lagerbestand > Dokumente > Lagerbuchung > Neu -Lagerbuchung +Lagerbuchung Lagerbuchungen können aus folgenden Gründen erstellt werden: @@ -28,15 +28,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. -Lagerbuchung Zusatzlkosten +Lagerbuchung Zusatzlkosten 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. -Lagerbuchung Preis für Artikelvarianten +Lagerbuchung Preis für Artikelvarianten Wenn die laufende Inventur aktiviert ist, werden Zusatzkosten auf das Konto "Aufwendungen im Wert beinhaltet" gebucht. -Zusatzkosten Hauptbuch +Zusatzkosten Hauptbuch > Hinweis: Um den Lagerbestand über eine Tabellenkalkulation zu aktualisieren, bitte unter Lagerabgleich nachlesen. {next} diff --git a/foundation/www/docs/user/manual/de/stock/tools/landed-cost-voucher.md b/foundation/www/docs/user/manual/de/stock/tools/landed-cost-voucher.md index 4fc7c1fa..d6c590b0 100644 --- a/foundation/www/docs/user/manual/de/stock/tools/landed-cost-voucher.md +++ b/foundation/www/docs/user/manual/de/stock/tools/landed-cost-voucher.md @@ -24,7 +24,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. -Einstandskostenbeleg +Einstandskostenbeleg ### Was passiert bei der Ausgabe? diff --git a/foundation/www/docs/user/manual/de/stock/tools/packing-slip.md b/foundation/www/docs/user/manual/de/stock/tools/packing-slip.md index 52f35046..41b65093 100644 --- a/foundation/www/docs/user/manual/de/stock/tools/packing-slip.md +++ b/foundation/www/docs/user/manual/de/stock/tools/packing-slip.md @@ -4,6 +4,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. -Packzettel +Packzettel {next} diff --git a/foundation/www/docs/user/manual/de/stock/tools/quality-inspection.md b/foundation/www/docs/user/manual/de/stock/tools/quality-inspection.md index f00fdfab..c0f00986 100644 --- a/foundation/www/docs/user/manual/de/stock/tools/quality-inspection.md +++ b/foundation/www/docs/user/manual/de/stock/tools/quality-inspection.md @@ -6,6 +6,6 @@ In ERPNext können Sie eingehende und ausgehende Produkte für eine Qualitätspr > Lagerbestand > Werkzeuge > Qualitätsprüfung > Neu -Qualitätsprüfung +Qualitätsprüfung {next} diff --git a/foundation/www/docs/user/manual/de/stock/warehouse.md b/foundation/www/docs/user/manual/de/stock/warehouse.md index 94429f22..b4067951 100644 --- a/foundation/www/docs/user/manual/de/stock/warehouse.md +++ b/foundation/www/docs/user/manual/de/stock/warehouse.md @@ -8,7 +8,7 @@ Um zum Bereich "Lager" zu gelangen, klicken Sie auf "Lagerbestand" und gehen Sie > Lagerbestand > Einstellungen > Lager > Neu -Lager +Lager 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/foundation/www/docs/user/manual/de/support/issue.md b/foundation/www/docs/user/manual/de/support/issue.md index 1d3b8faf..6fb212b9 100644 --- a/foundation/www/docs/user/manual/de/support/issue.md +++ b/foundation/www/docs/user/manual/de/support/issue.md @@ -8,7 +8,7 @@ Bei einem Fall handelt es ich um eine eingehende Nachricht vom Kunden, normalerw > Support > Dokumente > Anfrage > Neu -Fall +Fall ### Gesprächsaufzeichnung diff --git a/foundation/www/docs/user/manual/de/support/maintenance-schedule.md b/foundation/www/docs/user/manual/de/support/maintenance-schedule.md index 48ffe93e..1ae71a03 100644 --- a/foundation/www/docs/user/manual/de/support/maintenance-schedule.md +++ b/foundation/www/docs/user/manual/de/support/maintenance-schedule.md @@ -10,7 +10,7 @@ Um einen neuen Wartungsplan zu erstellen, gehen Sie zu: > Support > Dokumente > Wartungsplan > Neu -Wartungsplan +Wartungsplan Im Wartungsplan gibt es zwei Abschnitte: diff --git a/foundation/www/docs/user/manual/de/support/maintenance-visit.md b/foundation/www/docs/user/manual/de/support/maintenance-visit.md index 68cccecc..52b9328f 100644 --- a/foundation/www/docs/user/manual/de/support/maintenance-visit.md +++ b/foundation/www/docs/user/manual/de/support/maintenance-visit.md @@ -6,7 +6,7 @@ Ein Wartungsbesuch ist ein Datensatz über einen Besuch eines Technikers bei ein > Support > Dokumente > Wartungsbesuch > Neu -Wartungsbesuch +Wartungsbesuch Der Wartungsbesuch inhält Informationen über: diff --git a/foundation/www/docs/user/manual/de/support/warranty-claim.md b/foundation/www/docs/user/manual/de/support/warranty-claim.md index bde40cdc..4dd64f48 100644 --- a/foundation/www/docs/user/manual/de/support/warranty-claim.md +++ b/foundation/www/docs/user/manual/de/support/warranty-claim.md @@ -12,7 +12,7 @@ Um einen neuen **Garantiefall** zu erstellen, gehen Sie zu: > Support > Dokukumente > Garantieantrag > Neu -![Warranty Claim](/docs/assets/img/support/warranty-claim.png) +![Warranty Claim]({{docs_base_url}}/assets/img/support/warranty-claim.png) Wenn für die Lösung des Problems ein Besuch beim Kunden notwendig ist, können Sie einen neuen Wartungsbesuch erstellen. diff --git a/foundation/www/docs/user/manual/de/using-erpnext/calendar.md b/foundation/www/docs/user/manual/de/using-erpnext/calendar.md index cfc454f2..00c4541c 100644 --- a/foundation/www/docs/user/manual/de/using-erpnext/calendar.md +++ b/foundation/www/docs/user/manual/de/using-erpnext/calendar.md @@ -6,7 +6,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. -Calendar +Calendar ### Ereignisse im Kalender erstellen @@ -16,7 +16,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. -Calendar +Calendar 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. @@ -24,7 +24,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. -Lead Event +Lead Event #### Geburtstag @@ -34,7 +34,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. -Calendar Recurring Event +Calendar Recurring Event ### Erinnerungen an Ereignisse @@ -44,7 +44,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. -Calendar Recurring Event +Calendar Recurring Event #### Einen täglichen E-Mail-Bericht erstellen @@ -54,6 +54,6 @@ Der tägliche E-Mail-Bericht kann eingestellt werden über: > Einstellungen > E-Mail > Täglicher E-Mail-Bericht -Calendar Recurring Event +Calendar Recurring Event {next} diff --git a/foundation/www/docs/user/manual/de/website/blog-post.md b/foundation/www/docs/user/manual/de/website/blog-post.md index 27d073b2..46ae46d4 100644 --- a/foundation/www/docs/user/manual/de/website/blog-post.md +++ b/foundation/www/docs/user/manual/de/website/blog-post.md @@ -10,12 +10,12 @@ Um einen neuen Blog zu erstellen, gehen Sie zu: > Webseite > Blog-Eintrag > Neu -Blogeintrag +Blogeintrag 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. -Beispiel für ein Blog +Beispiel für ein Blog {next} diff --git a/foundation/www/docs/user/manual/de/website/blogger.md b/foundation/www/docs/user/manual/de/website/blogger.md index 61ac7a43..ec3476f2 100644 --- a/foundation/www/docs/user/manual/de/website/blogger.md +++ b/foundation/www/docs/user/manual/de/website/blogger.md @@ -4,6 +4,6 @@ Ein Blogger ist ein Benutzer, der Blog-Einträge erstellen kann. Sie können eine Kurzbiografie des Bloggers angeben und dazu einen Avatar. -Blogger +Blogger {next} diff --git a/foundation/www/docs/user/manual/de/website/setup/website-settings.md b/foundation/www/docs/user/manual/de/website/setup/website-settings.md index 16f48e94..c61f9de9 100644 --- a/foundation/www/docs/user/manual/de/website/setup/website-settings.md +++ b/foundation/www/docs/user/manual/de/website/setup/website-settings.md @@ -4,7 +4,7 @@ Die meisten der Einstellungen, die Ihre Webseite betreffen, können hier eingestellt werden. -Webseiten-Einstellungen +Webseiten-Einstellungen ### Zielseite @@ -16,7 +16,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. -Webseiten-Themen +Webseiten-Themen * Wählen "Neues Webseiten-Thema erstellen" wenn Sie das Standars-Thema der Webseite anpassen wollen. @@ -24,13 +24,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. -Banner +Banner ### Kopfleiste Hier können Sie die Menüeinträge in der Kopfleiste einstellen. -Kopfleiste +Kopfleiste * In ähnlicher Art und Weise können Sie auch die Verknüpfungen auf der Seitenleiste und in der Fußzeile einstellen. @@ -38,7 +38,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. -Einbindungen +Einbindungen * Sie können ein öffentliches Anmelden auf Ihr ERPNext-Konto unterbinden indem Sie auf "Anmelden deaktivieren" klicken. diff --git a/foundation/www/docs/user/manual/de/website/web-form.md b/foundation/www/docs/user/manual/de/website/web-form.md index 0f9f7ee7..639ac48b 100644 --- a/foundation/www/docs/user/manual/de/website/web-form.md +++ b/foundation/www/docs/user/manual/de/website/web-form.md @@ -19,7 +19,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. -Webformular +Webformular * * * @@ -27,7 +27,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! -Webformular +Webformular * * * diff --git a/foundation/www/docs/user/manual/de/website/web-page.md b/foundation/www/docs/user/manual/de/website/web-page.md index b08b4363..786398ac 100644 --- a/foundation/www/docs/user/manual/de/website/web-page.md +++ b/foundation/www/docs/user/manual/de/website/web-page.md @@ -8,7 +8,7 @@ Um eine neue Webseite zu erstellen, gehen Sie zu: > Webseite > Webseite > Neu -Webseit +Webseit ### Bezeichnung diff --git a/foundation/www/docs/user/manual/en/CRM/contact.md b/foundation/www/docs/user/manual/en/CRM/contact.md index aab2c1dd..ffd54682 100644 --- a/foundation/www/docs/user/manual/en/CRM/contact.md +++ b/foundation/www/docs/user/manual/en/CRM/contact.md @@ -19,12 +19,12 @@ To create a new Contact go to, > CRM > Contact > New -Contact +Contact Or you can add a Contact or Address directly from the Customer record, click on “New Contact” or “New Address”. -Contact +Contact > Tip: When you select a Customer in any transaction, one Contact and Address gets pre-selected. This is the “Default Contact or Address”. diff --git a/foundation/www/docs/user/manual/en/CRM/crm_reports.md b/foundation/www/docs/user/manual/en/CRM/crm_reports.md index 840f0be1..0d5d59e5 100644 --- a/foundation/www/docs/user/manual/en/CRM/crm_reports.md +++ b/foundation/www/docs/user/manual/en/CRM/crm_reports.md @@ -6,7 +6,7 @@ CRM module's reports helps users to get the information about the prospects. Usi ###Lead Details It has data about the leads and their contact and address details. Lead Details + src="{{docs_base_url}}/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. @@ -16,28 +16,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. Lead Details + src="{{docs_base_url}}/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. Lead Details + src="{{docs_base_url}}/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. Lead Details + src="{{docs_base_url}}/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. Lead Details + src="{{docs_base_url}}/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. Lead Details + src="{{docs_base_url}}/assets/img/crm/report/inactive_customers.png"> diff --git a/foundation/www/docs/user/manual/en/CRM/customer.md b/foundation/www/docs/user/manual/en/CRM/customer.md index 39effa70..30c81fff 100644 --- a/foundation/www/docs/user/manual/en/CRM/customer.md +++ b/foundation/www/docs/user/manual/en/CRM/customer.md @@ -12,13 +12,13 @@ You can either directly create your Customers via > Selling > Customer -Create Customer +Create Customer 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: -Customer +Customer > Note: Customers are separate from Contacts and Addresses. A Customer can have multiple Contacts and Addresses. diff --git a/foundation/www/docs/user/manual/en/CRM/lead.md b/foundation/www/docs/user/manual/en/CRM/lead.md index 47bf792f..5e27ff10 100644 --- a/foundation/www/docs/user/manual/en/CRM/lead.md +++ b/foundation/www/docs/user/manual/en/CRM/lead.md @@ -27,7 +27,7 @@ To create a Lead, go to: > CRM > Lead > New Lead -Lead +Lead ERPNext gives you a lot of options you may want to store about your Leads. For example what is the source, how likely are they to give you business etc. If @@ -52,7 +52,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. -Create Customer +Create Customer --- diff --git a/foundation/www/docs/user/manual/en/CRM/newsletter.md b/foundation/www/docs/user/manual/en/CRM/newsletter.md index f953a7da..be013086 100644 --- a/foundation/www/docs/user/manual/en/CRM/newsletter.md +++ b/foundation/www/docs/user/manual/en/CRM/newsletter.md @@ -15,8 +15,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. -Newsletter - New +Newsletter - New -Newsletter - Test +Newsletter - Test {next} diff --git a/foundation/www/docs/user/manual/en/CRM/opportunity.md b/foundation/www/docs/user/manual/en/CRM/opportunity.md index 72605b3c..61e99030 100644 --- a/foundation/www/docs/user/manual/en/CRM/opportunity.md +++ b/foundation/www/docs/user/manual/en/CRM/opportunity.md @@ -10,17 +10,17 @@ You can create an Opportunity from: #### Figure 1: Create Opportunity -Opportunity +Opportunity You can also go to an “Open” Lead and select “Opportunity” from the **Make** dropdown. #### Figure 2: Create Opportunity from an open Lead -Opportunity +Opportunity #### Figure 3: Create Opportunity for Customer to Collect their Requirement -Opportunity +Opportunity An Opportunity can also come from an existing Customer. You can create multiple Opportunities against the same Lead. In Opportunity, apart from the @@ -30,7 +30,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. -Opportunity +Opportunity > 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/foundation/www/docs/user/manual/en/CRM/setup/campaign.md b/foundation/www/docs/user/manual/en/CRM/setup/campaign.md index aec3b1a5..e3a1a2d0 100644 --- a/foundation/www/docs/user/manual/en/CRM/setup/campaign.md +++ b/foundation/www/docs/user/manual/en/CRM/setup/campaign.md @@ -5,7 +5,7 @@ A Campaign is a full-scale implementation of a sales strategy to promote a product or a service. This is done in a market segment of a particular geographical area, to achieve specified objectives. -Campaign +Campaign You can track [Lead](/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. @@ -13,11 +13,11 @@ You can track [Lead](/docs/user/manual/en/CRM/lead.html), [Opportunity](/docs/us * To track a 'Lead' against a campaign select 'View Leads'. -Campaign - View Leads +Campaign - View Leads * You shall get a filtered list of all leads made against that campaign. * You can also create new leads by clicking 'New' -Campaign - New Lead +Campaign - New Lead {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/CRM/setup/customer-group.md b/foundation/www/docs/user/manual/en/CRM/setup/customer-group.md index 13dfcde2..293c60d7 100644 --- a/foundation/www/docs/user/manual/en/CRM/setup/customer-group.md +++ b/foundation/www/docs/user/manual/en/CRM/setup/customer-group.md @@ -6,12 +6,12 @@ You can also get trend analysis for each group. Typically Customers are grouped by market segment (that is usually based on your domain). -Customer Group Tree +Customer Group Tree > Tip: If you think all this is too much effort, you can leave it at “Default Customer Group”. But all this effort, will pay off when you start getting reports. An example of a sample report is given below: -Customer Group report +Customer Group report {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/CRM/setup/sales-person.md b/foundation/www/docs/user/manual/en/CRM/setup/sales-person.md index 8f7c2663..b27e1f1d 100644 --- a/foundation/www/docs/user/manual/en/CRM/setup/sales-person.md +++ b/foundation/www/docs/user/manual/en/CRM/setup/sales-person.md @@ -6,7 +6,7 @@ chart of Sales Persons where each Sales Person’s target can be set individually. Again as in Territory, the target has to be set against Item Group. -Sales Person Tree +Sales Person Tree ####Sales Person in Transactions diff --git a/foundation/www/docs/user/manual/en/accounts/accounting-reports.md b/foundation/www/docs/user/manual/en/accounts/accounting-reports.md index c3b878d5..ed1bf950 100644 --- a/foundation/www/docs/user/manual/en/accounts/accounting-reports.md +++ b/foundation/www/docs/user/manual/en/accounts/accounting-reports.md @@ -10,7 +10,7 @@ and between a period. This will help you to get a full update for all entries done in that period for that Account. General Ledger + src="{{docs_base_url}}/assets/img/accounts/general-ledger.png"> ### Trial Balance @@ -23,7 +23,7 @@ the: * Credits * Closing -Trial Balance +Trial Balance The sum of all closing balances in a Trial Balance must be zero. @@ -33,7 +33,7 @@ These reports help you to track the outstanding invoices sent to Customer and Suppliers. In this report, you will get your outstanding amounts period wise. i.e. between 0-30 days, 30-60 days and so on. -Accounts Receivable +Accounts Receivable ### Sales and Purchase Register @@ -41,6 +41,6 @@ In this report, each tax Account is transposed in columns. For each Invoice and invoice Item, you will get the amount of individual tax that has been paid, based on the Taxes and Charges table. -Sales Register +Sales Register {next} diff --git a/foundation/www/docs/user/manual/en/accounts/advance-payment-entry.md b/foundation/www/docs/user/manual/en/accounts/advance-payment-entry.md index 3a29107d..1a02342a 100644 --- a/foundation/www/docs/user/manual/en/accounts/advance-payment-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/advance-payment-entry.md @@ -25,7 +25,7 @@ the row "Is Advance" click 'Yes'. #### Figure 1 : Journal Entry -Advance Entry -Advace Payment +Advace Payment ### Double Entry Accounting @@ -42,7 +42,7 @@ will be credited because it has given value. #### Figure 2: Transaction and Difference Entry -Advace Payment +Advace Payment Save and submit the Journal Entry. If this document is not saved it will not be pulled in other accounting documents. @@ -56,7 +56,7 @@ advance in the advances table. The accounting will be adjusted accordingly. #### Figure 3: Receive Advance -Advace Payment +Advace Payment Save and submit the Sales Invoice. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md b/foundation/www/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md index cbc69348..e0966b49 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/adjust-withhold-amount-payment-entry.md @@ -23,7 +23,7 @@ To create Payment Entry, go to unpaid Sales Invoice and create click on Make Pay Enter Payment Amount as 19,600. -Sales Invoice Payment Amount +Sales Invoice Payment Amount #####Step 2.2: Allocate Against Sales Invoice @@ -33,6 +33,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. -Deduction/Loss Account +Deduction/Loss 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/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md b/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md index 82af8df9..0e58f309 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md @@ -15,22 +15,22 @@ Click on Account for which Parent Account is to be changed. ####2. Edit Account -Project Default Cost Center +Project Default Cost Center ####3. Change Parent Account Search and select preferred Parent Account and save. -Project Default Cost Center +Project Default Cost Center Refresh system from Help menu to experience the change. -Project Default Cost Center +Project Default Cost Center
    Note: Parent cannot be customized for the Root Accounts, like Asset, Liability, Income, Expense, Equity.
    #### Quick Help -Project Default Cost Center +Project Default Cost Center \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md b/foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md index 8b439ee9..97af52e6 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/common-receivable-account.md @@ -3,7 +3,7 @@ As per the party model, a common receivable account called **Debtor** is auto-created. This is a default Receivable Account for all the Customers. -Role Desk Permission +Role Desk Permission If needed, you can also create a new receivable account and update in the Customer master. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md index f290c8b2..1c89ab6f 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md @@ -3,13 +3,13 @@ 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. -Debit Credit Not Equal +Debit Credit Not Equal 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. -Debit Credit Not Equal +Debit Credit Not Equal 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/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md index 60702d25..0280d6f0 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/fiscal-year-error.md @@ -19,13 +19,13 @@ Click [here](/docs/user/manual/en/accounts/setup/fiscal-year.html) to learn more After Fiscal Year is saved, you will find option to set that Fiscal year as Default. -Debit Credit Not Equal +Debit Credit Not Equal 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` -Debit Credit Not Equal +Debit Credit Not Equal Save Global Default, and Reload your ERPNext account. Then, default Fiscal Year will be auto-updated in your transactions. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md b/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md index 9d41e676..53307766 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/freeze-account.md @@ -7,8 +7,8 @@ Once an Account is Frozen, you won't be able to use it any accounting transactio To freeze an Account, go to Chart of Accounts, and edit an Account. -Download Backup +Download Backup If User has Role define in the  Account Setting assigned, then he/she will be able to set an Account as Frozen. -Download Backup \ No newline at end of file +Download Backup \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md b/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md index 405de6e5..36d70dd2 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md @@ -11,12 +11,12 @@ To freeze accounting entries upto a certain date, follow below given steps. Set date in the **Accounts Frozen Upto** field. -Accounts Frozen Date +Accounts Frozen Date 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. -Frozen Date Error +Frozen Date Error 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. -Frozen Date Error +Frozen Date Error diff --git a/foundation/www/docs/user/manual/en/accounts/articles/how-to-customise-cash-flow-report.md b/foundation/www/docs/user/manual/en/accounts/articles/how-to-customise-cash-flow-report.md new file mode 100644 index 00000000..48a4ff86 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/articles/how-to-customise-cash-flow-report.md @@ -0,0 +1,157 @@ + +# How To Customise Cash Flow Report + +As your chart of accounts begins to get more complex and reporting standards change and evolve, the default cash flow +report might no longer suffice. This is because ERPNext might not be able to accurately guess the classification and +purpose of all accounts in the charts of accounts. Another gripe you might have is the inability to adjust the report +format to fit your needs. + +This will no longer be a problem because ERPNext now allows users to customise the cash flow report. + + +## Technical Overview +Customisation is made possible by the introduction of two new doctypes - Cash Flow Mapper and Cash Flow Mapping. Both +doctypes contain the information required to generate a cash flow report. + +Cash Flow Mapping shows how accounts in your charts of accounts map to a line item in your cash flow report while +Cash Flow Mapper gets all the Cash Flow Mappings that relate to the three sections of a cash flow statement. + +With this, you generate detailed cash flow reports to your requirements. This might not make a lot of sense but it will +after we go through an example. + +## Example +### Background information +Let's assume we have a fictitious company for which we want to generate a cash flow report. +This is what the cash flow report looks like at the moment: +Default cash flow report + +We don't like the report for the following reasons: +- The reporting format is too scant. +- The 'Net Cash From Operations' figure is wrong + +### Customisation Process + +We wants the Cash Flow Report to look something similar to the format in the images below: +cash flow format 1 +cash flow format 1 + +#### Activate Customised Cash Flow Report +Do this in Accounts Settings by checking the 'Use Custom Cash Flow Format' checkbox. This will cause ERPNext to only +use your custom format for cash flow reports. + +After doing that, your cash flow report should look like this: +custom cash flow statement + +Move to the next section to build the report. + +#### Create Cash Flow Mappings +For each line, we need to create a Cash Flow Mapping document to represent it. + +new cash flow mapping form + +You can think of the Cash Flow Mapping as a representation of each line in the cash flow report. A Cash Flow Mapping +is a child of a Cash Flow Mapper which will be explained later. + +Let's start by creating Cash Flow Mappings that will represent the add back of non cash expenses already recodgnised in +the Profit or Loss statement. We want them to appear on the cash statement as: +- Income taxes recognised in profit or loss +- Finance costs recognised in profit or loss +- Depreciation of non-current assets + +Start by opening a new Cash Flow Mapping form. + +The fields in the Cash Flow Mapping doctype are: +- **Name**: This something to identify this document. Name it something related to the label +- **Label**: This is what will show in the cash flow statement +- **Accounts**: This table contains all the accounts which this line relates to. + +With this information, let's go ahead and create the Cash Flow Mapping Document for the line 'Income taxes recognised in profit or loss' + +custom cash flow statement + +I have named it 'Income Tax Charge' and given it a label 'Income taxes recognised in profit or loss'. We want this +line to reflect income tax charges from our profit or loss statement. The account where this happens in our chart +of account is named 'Income Taxes' (an expense) so I have added 'Income Taxes' into the accounts table. If you have +more accounts representing income tax expenses, you should add all of them here. + +Because Income Tax expense needs to be adjusted further in the cash flow statement, check the 'Is Income Tax Expense' +checkbox. This is what will help ERPNext properly calculate the adjustments to be made. + +*For best results, let parent accounts have child accounts that have the same treatment for cash flow reporting +purposes because ERPNext will calculate net change of all children accounts in a situation where the selected account +is a parent account.* + +In the same way, I have created for the remaining two mappings. + +custom cash flow statement + +Finance costs also need to be adjusted so make sure to check the 'Is Finance Cost' checkbox. + +custom cash flow statement + +Next let's add Cash Flow Mapping for items that show changes in working capital: +- Increase/(decrease) in other liabilities +- (Increase)/decrease in trade and other receivables +- Increase/(decrease) in trade and other payables +- VAT payable +- (Increase)/decrease in inventory + +custom cash flow statement + +custom cash flow statement + +custom cash flow statement + +custom cash flow statement + +custom cash flow statement + +Don't forget to tell ERPNext that these mappings represent changes in working capital by checking the 'Is Working +Capital' checkbox. + +At this point we have created all the mappings necessary for the Operating Activities section of our cash flow +statement. However, ERPNext doesn't know that yet until we create Cash Flow Mapper documents. We'll create Cash Flow +Mapper documents next. + + +#### Create Cash Flow Mappers +Cash Flow Mappers represents the sections of the cash flow statement. A standard cash flow statement has only three +sections so when you view the Cash Flow Mapper list, you will that three have been created for you named: +- Operating Activities +- Financing Activities +- Investing Activities + +You will not be able to add or remove any of them but they are editable and can be renamed. +cash flow mapper list + + +Open the Operating Activities Cash Flow Mapper so we can add the Cash Flow Mappings we have created. + + +- **Section Name**: This is the heading of the section. +- **Section Leader**: This is the first sub-header immediately after the profit figure. Relates only to Operating +Activities Cash Flow Mapper +- **Section Subtotal**: This is the label for subtotal in the cash flow statement section. Relates only to Operating +Activities Cash Flow Mapper +- **Section Footer**: This is the label for the total in the cash flow statement section. +- **Mapping**: This table contains all the Cash Flow Mappings related to the Cash Flow Mapper. + +Now add all the Cash Flow Mappings you have created and Save. You should have something like this: +cash flow mapper for operating activities + + Refresh the cash flow statement and view the changes. +updated cash flow report + +Looks close to our requirements but we are not done yet. Create new mappings for 'Investing Activities' and 'Financing +Activities' sections of the cash flow statement. + +cash flow mapping + +cash flow mapping + +cash flow mapper for operating activities + +cash flow mapper for operating activities + +Here's what our cash flow statement now looks like: +final cash flow statement diff --git a/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md index 075e969c..54bd29b9 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md @@ -13,7 +13,7 @@ To edit an Account, go to Chart of Accounts: `Explore > Accounts > Chart of Accounts` -Freeze Account +Freeze Account Click on Account in which Frozen Date is to be updated. @@ -21,7 +21,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' -Freeze Account +Freeze Account ####Step 3: Save diff --git a/foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md index e43ef7a6..bff85890 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md @@ -7,7 +7,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. -Accounts Frozen Date +Accounts Frozen Date #### Book Payment Entry @@ -17,7 +17,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. -Accounts Frozen Date +Accounts Frozen Date 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/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md b/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md index d01da800..6c6c9443 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md @@ -17,7 +17,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. -Accounts Frozen Date +Accounts Frozen Date #### Step 4: Update Details @@ -27,7 +27,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. -Accounts Frozen Date +Accounts Frozen Date #### Currency Exchange Masters diff --git a/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md index bf08a4a3..63b1feea 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md @@ -15,7 +15,7 @@ To open new journal voucher go to Assuming your Cheque Date is 31st December, 2016 (or any future date). As a result, this posting in your bank ledger will appear on Posting Date updated. -JE Posting Date +JE Posting Date Note: Payment Entry Reference Date should equal to or less than Posting Date. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md b/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md index 1a64643b..d877f6f4 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/purchase-invoice-account-type-error.md @@ -3,7 +3,7 @@ **Question:** On saving the Purchase Invoice, I am getting a validation message that Credit To Account must be a Balance Sheet account. -Role Desk Permission +Role Desk Permission **Answer: **On submission of a Purchase Invoice, payable is updated towards the Supplier. As per the accounting standards, Payable Account is aligned under Current Liability (credit side of Balance Sheet). diff --git a/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md b/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md index 23a0911d..eaf46712 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/tracking-project-profitability-using-cost-center.md @@ -16,7 +16,7 @@ To create new Project, go to: `Projects > Project > New` -Project Default Cost Center +Project Default Cost Center #### 1.2 Create Cost Center @@ -32,7 +32,7 @@ To create new Cost Center, go to: Update Cost Center in the Project master. -Project Default Cost Center +Project Default Cost Center In the sales and purchase transactions, if Project is selected, then Cost Center will fetched from the Project master. @@ -44,7 +44,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. -Project Default Cost Center +Project Default Cost Center #### 2.2 Project in the Purchase Transactions @@ -52,7 +52,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. -Project Default Cost Center +Project Default Cost Center ### 3. Accounting Report for a Project @@ -62,11 +62,11 @@ Since Project's Cost Center is updated in both sales and purchase entries, you c **Monthly Project Analysis** -Project Default Cost Center +Project Default Cost Center **Overall Profitability** -Project Default Cost Center +Project Default Cost Center #### 3.2 Projectwise Budgeting diff --git a/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md b/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md index 3be3b1ca..be14ce4c 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/types-in-tax-template.md @@ -3,7 +3,7 @@ In the Sales Taxes and Purchase Taxes master, you will find a column called Type. Following a brief on a meaning of each Type and how you can use it. -Role Desk Permission +Role Desk Permission **Actual:** This allows you to enter expense amount directly. For example, Rs. 500 incurred for Shipping. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md b/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md index e42eb1d7..9f7da0c3 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md @@ -3,7 +3,7 @@ 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. -Update Stock +Update Stock On checking Update Stock, Sales Invoice Item will show relevant fields like Warehouse, Serial No., Batch No., Item valuation etc. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md index 79de7fb2..ceea4b66 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md @@ -7,7 +7,7 @@ Consider Tax or Charge field in Purchase Taxes and Charges master has three valu - Valuation - Total and Valuation -Purchase Tax and Charges Categories +Purchase Tax and Charges Categories Let's consider an example to understand an effect of each charge type. We purchase ten units of item, at the rate of 800. total purchase amount is 800. Purchased item has 4% VAT applied on it, and INR 100 was incurred in transportation. diff --git a/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md b/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md index 6f51fbf4..800bab4a 100644 --- a/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md +++ b/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md @@ -7,6 +7,6 @@ A client may ask you to provide a Bank Guarantee from a third party such as a ba 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. -Bank Guarantee +Bank Guarantee {next} diff --git a/foundation/www/docs/user/manual/en/accounts/budgeting.md b/foundation/www/docs/user/manual/en/accounts/budgeting.md index 31029602..7336e4a0 100644 --- a/foundation/www/docs/user/manual/en/accounts/budgeting.md +++ b/foundation/www/docs/user/manual/en/accounts/budgeting.md @@ -13,7 +13,7 @@ To create new Cost Center, go to: > Accounts > Budget and Cost Center > Chart of Cost Center > Add New Cost Center -Budget +Budget ###Budgeting @@ -31,20 +31,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. -Budget +Budget ####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. -Monthly Distribution +Monthly Distribution ####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. -Monthly Distribution +Monthly Distribution ####Budget Variance Report @@ -54,6 +54,6 @@ To check Budget Variance report, go to: Accounts > Budget and Cost Center > Budget Variance Report -Budget Variance Report +Budget Variance Report {next} diff --git a/foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md b/foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md index ee1d788d..adf257c9 100644 --- a/foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md +++ b/foundation/www/docs/user/manual/en/accounts/chart-of-accounts.md @@ -28,13 +28,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 -Cash Flow Report +Cash Flow Report #### Profit and Loss Report -Profit and Loss Report +Profit and Loss Report #### Balance Sheet Report -Balance Sheet Report +Balance Sheet Report To edit your Chart of Accounts in ERPNext go to: @@ -49,7 +49,7 @@ based on statutory (tax, compliance to government regulations) requirements. Let us understand the main groups of the Chart of Accounts. -Chart of Accounts +Chart of Accounts ### Balance Sheet Accounts @@ -87,7 +87,7 @@ beginning and end of your Fiscal Year, they become zero. In ERPNext it is easy to create a Profit and Loss analysis chart. An example of a Profit and Loss analysis chart is given below: -Financial Analytics Profit and Loss Statement +Financial Analytics Profit and Loss Statement (On the first day of the year you have not made any profit or loss, but you still have assets, hence balance sheet accounts never become zero at the @@ -107,7 +107,7 @@ Supplier). > Note: An Account “Ledger” is also sometimes called as Account “Head”. -Chart of Accounts +Chart of Accounts ### Account Number A standard chart of accounts is organized according to a numerical system. Each major category will begin with a certain number, and then the sub-categories within that major category will all begin with the same number. For example, if assets are classified by numbers starting with the digit 1000, then cash accounts might be labeled 1100, bank accounts might be labeled 1200, accounts receivable might be labeled 1300, and so on. A gap between account numbers is generally maintained for adding accounts in the future. @@ -140,7 +140,7 @@ To create new Accounts, explore your Chart of Accounts and click on an Account group under which you want to create the new Account. On the right side, you will see an option to “Open” or “Add Child” a new Account. -Chart of Accounts +Chart of Accounts Option to create will only appear if you click on a Group (folder) type Account. There you need to enter account name, account number and some more diff --git a/foundation/www/docs/user/manual/en/accounts/credit-limit.md b/foundation/www/docs/user/manual/en/accounts/credit-limit.md index adc5cbbc..dcbb96ed 100644 --- a/foundation/www/docs/user/manual/en/accounts/credit-limit.md +++ b/foundation/www/docs/user/manual/en/accounts/credit-limit.md @@ -15,7 +15,7 @@ To set credit limit go to Customer - Master #### Figure 1: Credit Limit -Credit Limit +Credit Limit Go to the 'CREDIT LIMIT' section and enter the amount in the field Credit Limit. @@ -51,7 +51,7 @@ For 'CREDIT LIMIT' check functionality, Priority (High to Low) is as below #### Figure 2: Credit Controller -Credit Limit +Credit Limit Save the changes. diff --git a/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md b/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md index 2adfe91a..45aad38f 100644 --- a/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md +++ b/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md @@ -13,17 +13,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. -Opening Account +Opening Account For the item which is exempted from GST totally, mention 0% as tax rate in the Item master. -Opening Account +Opening Account ####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. -Opening Account +Opening Account
    If you want to have tax rate always applied from the Item master, then you should update Rate for the tax account as zero in the Taxes and Charges master.
    @@ -31,7 +31,7 @@ In Sales Taxes and Other Charges master, select GST 16% account and mention Tax In the Sales Order, we have selected many Items. For the items mentioned in blue, tax rate is applied based on tax rate mentioned in the taxes table. For the items highlited in red, tax rate has fetched for them from the respective item master. -Opening Account +Opening Account 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/foundation/www/docs/user/manual/en/accounts/journal-entry.md b/foundation/www/docs/user/manual/en/accounts/journal-entry.md index 19f588f6..350e3945 100644 --- a/foundation/www/docs/user/manual/en/accounts/journal-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/journal-entry.md @@ -8,9 +8,9 @@ multiple Accounts and the sum of debits is equal to the sum of credits. To create a Journal Entry go to: -> Accounts > Documents > Journal Entry > New +> Accounts > Company and Accounts > Journal Entry > New -Journal Entry +Journal Entry In a Journal Entry, you must select. diff --git a/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md b/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md index d630da20..644a1df9 100644 --- a/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md +++ b/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md @@ -7,15 +7,15 @@ In ERPNext, you can make accounting entries in multiple currency. For example, i To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account. -Set Currency from Chart of Accounts +Set Currency from Chart of Accounts You can also assign / modify the currency by opening specific Account record for existing Accounts. -Modify Account Currency +Modify Account Currency For Customer / Supplier (Party), you can also define it's 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. -Customer Accounting Currency +Customer Accounting 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. @@ -43,7 +43,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. -Sales Invoice Outstanding +Sales Invoice Outstanding ### Purchase Invoice @@ -53,12 +53,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. -Journal Entry Exchange Rate +Journal Entry Exchange Rate In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically. -Journal Entry in multi currency +Journal Entry in multi currency ## Reports @@ -66,12 +66,12 @@ In Accounts table, on selection of foreign currency account, system will show Cu In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency. -General Ledger Report +General Ledger Report ### Accounts Receivable / Payable In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency. -Accounts Receivable Report +Accounts Receivable Report {next} diff --git a/foundation/www/docs/user/manual/en/accounts/opening-accounts.md b/foundation/www/docs/user/manual/en/accounts/opening-accounts.md index dc727061..bca15194 100644 --- a/foundation/www/docs/user/manual/en/accounts/opening-accounts.md +++ b/foundation/www/docs/user/manual/en/accounts/opening-accounts.md @@ -29,7 +29,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. -Opening Account +Opening Account #### Step 3: Posting Date @@ -39,13 +39,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. -Opening Account +Opening Account ####Step 5: Is Opening Set field `Is Opening` as `Yes`. -Opening Account +Opening Account ####Step 6: Save and Submit @@ -57,13 +57,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. -Opening Account +Opening Account 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. -Opening Account +Opening Account Once all your invoices are entered, your **Temporary Opening** account will have a balance of zero! @@ -71,7 +71,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: -Opening Account +Opening Account ###Stock Opening @@ -79,7 +79,7 @@ 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)` -Opening Account +Opening 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. @@ -103,6 +103,6 @@ To use this tool, just type "Opening Invoice" in the search bar and select the * Here, select the company and type of invoice (sales or purchase) and add a line item for each invoice you want to create. -Opening Invoice Creation Tool +Opening Invoice Creation Tool {next} diff --git a/foundation/www/docs/user/manual/en/accounts/payment-entry.md b/foundation/www/docs/user/manual/en/accounts/payment-entry.md index 498ec215..af655c0c 100644 --- a/foundation/www/docs/user/manual/en/accounts/payment-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/payment-entry.md @@ -13,25 +13,25 @@ Payment Entry can be made against following transactions. On submitting a document against which Payment Entry can be made, you will find Make Payment button. -Making Payment +Making Payment ####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. -Making Paymentt +Making Paymentt ####Step 3: Payment Amount Enter actual payment amount received from the Customer or paid to the Supplier or Employee. -Making Payment +Making Payment ####Step 4: Allocate Amount If creating Payment Entry for the Customer, Payment Amount will be allocated against Sales Invoice. -Making Payment +Making Payment On the same lines, when creating Payment Entry for a Supplier, Payment Amount will be allocated against Purchase Invoice. @@ -41,13 +41,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. -Making Payment +Making Payment ####Step 6: Submit Save and Submit Payment Entry. On submission, outstanding will be updated in the Invoices. -Making Payment +Making Payment 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. @@ -65,11 +65,11 @@ For outgoing 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. -Making Payment +Making 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. -Making Payment +Making Payment Payments can also be made independent of invoices by creating a new Payment Entry. @@ -82,7 +82,7 @@ Following internal transfers can be managed from the Payment Entry. 3. Cash - Cash 4. Bank - Bank -Making Payment +Making Payment ###Difference between Payment Entry and Journal Entry? diff --git a/foundation/www/docs/user/manual/en/accounts/payment-request.md b/foundation/www/docs/user/manual/en/accounts/payment-request.md index b1b2931d..7869cb68 100644 --- a/foundation/www/docs/user/manual/en/accounts/payment-request.md +++ b/foundation/www/docs/user/manual/en/accounts/payment-request.md @@ -4,10 +4,10 @@ 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 -Payment Request +Payment Request - Create payment Request via Sales Invoice -Payment Request +Payment Request --- @@ -16,16 +16,16 @@ considered to create journal entry. Note: Invoice/Order currency and Payment Gateway Account currency should be same. -Payment Request +Payment Request --- ##### 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. -Payment Request +Payment Request ##### Request Mail -Payment Request +Payment Request {next} diff --git a/foundation/www/docs/user/manual/en/accounts/payments.md b/foundation/www/docs/user/manual/en/accounts/payments.md index dc0b2df4..f36e5345 100644 --- a/foundation/www/docs/user/manual/en/accounts/payments.md +++ b/foundation/www/docs/user/manual/en/accounts/payments.md @@ -19,11 +19,11 @@ 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. -Making Payment +Making Payment ####Step 2: Payment Entry -Making Payment +Making Payment For more details about payment entry [check here.](/docs/user/manual/en/accounts/payment-entry) @@ -35,18 +35,18 @@ To make paymant using journal entry, check below steps Goto Accounts Settings > checked Make Payment via Journal Entry -Making Payment +Making Payment ####Step 2: Make Payment On submitting a document against which Journal Entry can be made, you will find Make Payment button. -Making Payment +Making Payment ####Step 3: Journal Entry Save and submit the journal entry to record the payament against the invoice -Making Payment +Making Payment For more details about journal entry [check here.](/docs/user/manual/en/accounts/journal-entry) diff --git a/foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md index 25381173..b41b335e 100644 --- a/foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md @@ -30,7 +30,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. -POS Customer +POS Customer ### Adding an Item @@ -40,7 +40,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. -POS Item +POS Item > 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. @@ -52,7 +52,7 @@ in Search box. 1. Select row in the cart and clik on delete button in the numeric keypad -POS Item +POS Item 2. Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item. @@ -70,7 +70,7 @@ ready to make the Payment. Payment process is divided into 3 steps - 2. Select your “Mode of Payment”. 3. Click on “Pay” button to Save the document. -POS Payment +POS Payment Submit the document to finalise the record. After the document is submitted, you can either print or email it directly to the customer. @@ -79,7 +79,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. -POS Payment +POS Payment System books the write off amount into the ledger which has selected on the POS Profile. @@ -87,12 +87,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. -POS Payment +POS Payment ### 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 -POS Payment +POS Payment #### Accounting entries (GL Entry) for a Point of Sale: @@ -113,7 +113,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 -POS Payment +POS Payment After sync of an order, email sent to the customer with the print of the bill in the attachment {next} diff --git a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md index 0aa5ec79..2e9251eb 100644 --- a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md +++ b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md @@ -22,11 +22,11 @@ Pricing Rule master has two sections: ### 1. Applicability Section: -In this section, conditions are set for the application of Pricing Rule. When transaction meets condition as specified in this section, Price or Discount as specified in the Pricing Rule will be applied. You can set condition on following values. +In this section, conditions are set for the application of Pricing Rule. When transaction meets condition as specified in this section, Rate or Discount as specified in the Pricing Rule will be applied. You can set condition on following values. ####1.1 Applicable On: -Applicable On +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). @@ -34,31 +34,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. -Applicable for +Applicable for ####1.3 Quantity: Specify minimum and maximum qty of an item when this Pricing Rule should be applicable. -Applicable Qty +Applicable Qty ###2. Application: -Using Price List Rule, you can ultimately define price or %discount to be applied on an item. +Using Price List Rule, you can ultimately define rate or %discount to be applied on an item. -Applicable +Applicable -####2.1 Price +####2.1 Rate -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. +Rate or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Rate mentioned in Pricing Rule will be given priority over item's Price List rate. -Applicable Price +Applicable 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. -Discount +Discount If %Discount is to be applied on all Price Lists, then leave Price List field blank. @@ -66,19 +66,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. -Validity +Validity #### 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. -Priority +Priority #### Disable Check to Disable Pricing Rule. -Disable +Disable ### Add Margin @@ -90,20 +90,20 @@ 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. -Disable +Disable ####2. Make Pricing Rule Create pricing rule for the item against which supplier rate has created -Disable +Disable ####2. Make Invoice System apply the margin rate on the item price on selection of an item. -Disable +Disable For more details about pricing rule [Click Here](/docs/user/manual/en/selling/articles/adding-margin.html) diff --git a/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md b/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md index 00198a5d..5d049e63 100644 --- a/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md @@ -15,7 +15,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 -Purchase Invoice +Purchase Invoice The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and “Bill Date” helps to track the bill number as set by your Supplier for diff --git a/foundation/www/docs/user/manual/en/accounts/recurring-orders-and-invoices.md b/foundation/www/docs/user/manual/en/accounts/recurring-orders-and-invoices.md index af70b8a8..524aa419 100644 --- a/foundation/www/docs/user/manual/en/accounts/recurring-orders-and-invoices.md +++ b/foundation/www/docs/user/manual/en/accounts/recurring-orders-and-invoices.md @@ -11,7 +11,7 @@ Feature of setting document as recurring is available in Sales Order, Sales Invo Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check **Is Recurring** to set document as recurring. -Recurring Invoice +Recurring Invoice **From Date and To Date:** This defines contract period with the customer. diff --git a/foundation/www/docs/user/manual/en/accounts/sales-invoice.md b/foundation/www/docs/user/manual/en/accounts/sales-invoice.md index 6acf6310..323e7082 100644 --- a/foundation/www/docs/user/manual/en/accounts/sales-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/sales-invoice.md @@ -9,7 +9,7 @@ You can create a Sales Invoice directly from or you can Make a new Sales Invoice after you submit the Delivery Note. -Sales Invoice +Sales Invoice #### Accounting Impact @@ -65,7 +65,7 @@ is checked. The batch number will be fetched on a First Expiring First Out (FEFO) basis. This is a variant of First In First Out (FIFO) that gives highest priority to the soonest to expire Items. -POS Invoice +POS Invoice Note that if the first batch in the queue cannot satisfy the order on the invoice, the next batch in the queue that can satisfy the order will be selected. If there is @@ -80,7 +80,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. -POS Invoice +POS Invoice #### Billing Timesheet with Project @@ -89,7 +89,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. -POS Invoice +POS Invoice * * * diff --git a/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md b/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md index fcbfa9db..35368a41 100644 --- a/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md +++ b/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md @@ -2,7 +2,7 @@ # Accounts Settings -Account Settings +Account Settings * Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role. diff --git a/foundation/www/docs/user/manual/en/accounts/setup/cost-center.md b/foundation/www/docs/user/manual/en/accounts/setup/cost-center.md index 5631048f..111ec01a 100644 --- a/foundation/www/docs/user/manual/en/accounts/setup/cost-center.md +++ b/foundation/www/docs/user/manual/en/accounts/setup/cost-center.md @@ -35,6 +35,6 @@ To setup your Chart of Cost Centers go to: > Accounts > Setup > Chart of Cost Centers -Cost Center +Cost Center {next} diff --git a/foundation/www/docs/user/manual/en/accounts/setup/fiscal-year.md b/foundation/www/docs/user/manual/en/accounts/setup/fiscal-year.md index 548d90ac..15da8df2 100644 --- a/foundation/www/docs/user/manual/en/accounts/setup/fiscal-year.md +++ b/foundation/www/docs/user/manual/en/accounts/setup/fiscal-year.md @@ -26,6 +26,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. -Fiscal Year +Fiscal Year {next} diff --git a/foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md b/foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md index 09020adc..e8eab740 100644 --- a/foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md +++ b/foundation/www/docs/user/manual/en/accounts/setup/tax-rule.md @@ -3,7 +3,7 @@ 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. -Tax Rule +Tax Rule You can define Tax Rules for Sales or Purchase Taxes. While making a Transaction the system will select and apply tax template based on the tax rule defined. @@ -13,9 +13,9 @@ Let us consider a senario to understand Tax Rule Better. Suppose we define 2 Tax Rules as below. -Tax Rule +Tax Rule -Tax Rule +Tax Rule Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country as United Kingdom diff --git a/foundation/www/docs/user/manual/en/accounts/share/_sidebar.json b/foundation/www/docs/user/manual/en/accounts/share/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/share/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/share/share_balance.md b/foundation/www/docs/user/manual/en/accounts/share/share_balance.md new file mode 100644 index 00000000..0e743b9b --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/share/share_balance.md @@ -0,0 +1,10 @@ + +# Share Balance + +This is a report view which gives the list of all the shares held by a given Shareholder and its value + +> Accounts > Share Balance + +Create Shareholder + +Create Shareholder diff --git a/foundation/www/docs/user/manual/en/accounts/share/share_ledger.md b/foundation/www/docs/user/manual/en/accounts/share/share_ledger.md new file mode 100644 index 00000000..b05a1b3a --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/share/share_ledger.md @@ -0,0 +1,10 @@ + +# Share Ledger + +This is a report view which gives the list of all the transactions made by a given Shareholder + +> Accounts > Share Ledger + +Create Shareholder + +Create Shareholder diff --git a/foundation/www/docs/user/manual/en/accounts/share/share_transfer.md b/foundation/www/docs/user/manual/en/accounts/share/share_transfer.md new file mode 100644 index 00000000..5d46cfd3 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/share/share_transfer.md @@ -0,0 +1,10 @@ + +# Shareholder Transfer + +There may be times when you want to change the share structure of your company; either by adding a new shareholder or by changing the existing proportion of shares between shareholders. A share transfer is the process of transferring existing shares from one person to another; either by sale or gift. + +You can directly create your Shareholders via + +> Accounts > Share Transfer + +Create Shareholder diff --git a/foundation/www/docs/user/manual/en/accounts/share/shareholder.md b/foundation/www/docs/user/manual/en/accounts/share/shareholder.md new file mode 100644 index 00000000..eb5f08db --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/share/shareholder.md @@ -0,0 +1,22 @@ + +# Shareholder + +A shareholder is any person, company or other institution that owns at least one share of a company’s stock. Because shareholders are a company's owners, they reap the benefits of the company's successes in the form of increased stock valuation. If the company does poorly, however, shareholders can lose money if the price of its stock declines. + +A shareholder is uniquely identified by the Shareholder ID. Normally this ID is a naming series, starting with `SH-`. Also as soon as the Shareholder makes even a single transaction, a Folio number is allocated to him. This also is a unique to the Shareholder. + +You can directly create your Shareholders via + +> Accounts > Shareholder + +Create Shareholder + +A Shareholder can avail the features (operations) in the [Share Transfer](/docs/user/manual/en/accounts/share/share_transfer.html) process. + +> Note: Shareholders are separate from Contacts and Addresses. A Shareholder can +have multiple Contacts and Addresses. + +### Contacts and Addresses + +[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 Shareholders, Customers and Suppliers \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/subscription.md b/foundation/www/docs/user/manual/en/accounts/subscription.md index a0ee889b..477989ad 100644 --- a/foundation/www/docs/user/manual/en/accounts/subscription.md +++ b/foundation/www/docs/user/manual/en/accounts/subscription.md @@ -3,7 +3,7 @@ If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing. -Subscription +Subscription #### Scenario @@ -12,7 +12,7 @@ Subscription for your hosted ERPNext account requires yearly renewal. We use Sal To set the subscription for the sales invoice Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save -Subscription +Subscription **From Date and To Date**: This defines contract period with the customer. diff --git a/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md index 2215fade..a000f20c 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md +++ b/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md @@ -9,7 +9,7 @@ The Bank Reconciliation Report provide the difference between the bank balance s ####Bank Reconciliation Statement -Bank Reconciliation statement +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. @@ -37,7 +37,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. -Bank Reconciliation +Bank Reconciliation __Step 5:__ Click on the button 'Update Clearance Date'. diff --git a/foundation/www/docs/user/manual/en/accounts/tools/payment-reconciliation.md b/foundation/www/docs/user/manual/en/accounts/tools/payment-reconciliation.md index c1b31a2b..1918a3e9 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/payment-reconciliation.md +++ b/foundation/www/docs/user/manual/en/accounts/tools/payment-reconciliation.md @@ -11,7 +11,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”. -Payment Reconciliation +Payment Reconciliation __Step 1:__ Select the Account against whom the payments need to be reconciled. diff --git a/foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md b/foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md index 93cef31e..4286680b 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md +++ b/foundation/www/docs/user/manual/en/accounts/tools/period-closing-voucher.md @@ -22,7 +22,7 @@ In ERPNext after making all the special entries via Journal Entry for the curren **Closing Fiscal Year** will be an year for which you are closing your financial statement. -Period Closing Voucher +Period Closing Voucher This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a liability account like Reserves and Surplus, or Capital Fund account as Closing Account. diff --git a/foundation/www/docs/user/manual/en/agriculture/__init__.py b/foundation/www/docs/user/manual/en/agriculture/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/agriculture/analytics/__init__.py b/foundation/www/docs/user/manual/en/agriculture/analytics/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/__init__.py b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md index 7a24324f..7769b23e 100644 --- a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop.md @@ -46,6 +46,6 @@ Click 'Save' You form should now look something like this -Task +Task Repeat step 2 for as many crops as you need. You can save some time by duplicating existing crops and modifying only the necessary items \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md index 1b773587..34ef5592 100644 --- a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/crop_cycle.md @@ -20,7 +20,7 @@ Save the new Crop Cycle It should now look something like this -Task +Task Repeat these for every Crop Cycle you need @@ -28,4 +28,4 @@ As you can see a Project was created, with the same name as the Crop Cycle and l > Projects > Project -Task +Task diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md index 01d09f82..0a828603 100644 --- a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/land_unit.md @@ -18,7 +18,7 @@ Click Save It should look something like this -Task +Task With the farm created, we can now create our first Carrot Field! Click on New diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/__init__.py b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md index 07e5dcbd..3027caa5 100644 --- a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md +++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/disease.md @@ -20,6 +20,6 @@ Click Save Now it should look something like this -Task +Task These Tasks will be imported into the Crop Cycle Project if you choose to add this Disease to the list of Detected Diesase in Crop Cycle \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md index 53125878..c535ed84 100644 --- a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md +++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/fertilizer.md @@ -3,4 +3,4 @@ This is used to keep track of available fertilizers, and their chemical composition, which is linked to the Item master -Task \ No newline at end of file +Task \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/index.md b/foundation/www/docs/user/manual/en/agriculture/index.md index eca5cf68..5ed981c4 100644 --- a/foundation/www/docs/user/manual/en/agriculture/index.md +++ b/foundation/www/docs/user/manual/en/agriculture/index.md @@ -5,7 +5,7 @@ Farmers know that even a small operation requires intensive recordkeeping. A wel A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing, etc.), recording environmental and crop data for analysis, and reports to help make effective decisions. -Task +Task The Agriculture module in ERPNext helps you keep track of your farming operations. It allows you keep records for each field where you farm, such as geospatial and soil texture characteristics. It allows you to: @@ -16,7 +16,7 @@ The Agriculture module in ERPNext helps you keep track of your farming operation * Record sale of the harvest or transfer to warehouse for further processing * View reports -Task +Task ### Topics diff --git a/foundation/www/docs/user/manual/en/asset/__init__.py b/foundation/www/docs/user/manual/en/asset/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/asset/asset-maintenance.md b/foundation/www/docs/user/manual/en/asset/asset-maintenance.md index ea936d3f..1552460a 100644 --- a/foundation/www/docs/user/manual/en/asset/asset-maintenance.md +++ b/foundation/www/docs/user/manual/en/asset/asset-maintenance.md @@ -12,21 +12,21 @@ To perform Asset Maintenance in ERPNext, ### Enable Asset Maintenance Check Maintain Required in Asset to enable Asset Maintenance -Asset +Asset ### Asset Maintenance Team Create Asset Maintenance Team, select team members and their role. -Asset +Asset ### Asset Maintenance For each asset create a Asset Maintenance record listing all the associated maintenance tasks, maintenance type (Preventive Maintenance or Calibration), periodicity, assign to and start and end date of maintenance. Based on start date and periodicity the next due date is auto-calculated and a ToDo is created for the Assignee. -Asset +Asset ### Asset Maintenance Log For each task in Asset Maintenance, Asset Maintenance Log is auto created to keep track of the upcoming Maintenances. It will have status, completion date and actions performed. Based on completion date here, next due date is calculated automatically and new Asset Maintenance Log is created. -Asset +Asset ### Asset Repair You can also maintain the records of Repair/Failures of your asset which are not listed in Asset Maintenance. -Asset \ No newline at end of file +Asset \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/asset/assets.md b/foundation/www/docs/user/manual/en/asset/assets.md index 8de79f46..3d8130fc 100644 --- a/foundation/www/docs/user/manual/en/asset/assets.md +++ b/foundation/www/docs/user/manual/en/asset/assets.md @@ -7,7 +7,7 @@ In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Car 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. -Asset Category +Asset Category > **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master. @@ -15,13 +15,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. -Asset +Asset Explanation of the fields: 1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked. - Asset Item + Asset Item 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. @@ -43,24 +43,31 @@ Explanation of the fields: The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record. -Asset +Asset 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. -Asset +Asset 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. +If you are required to calculate the depreciation based on your Fiscal Year and prorated by the number of days left, select the corresponding option in "Account Settings". + +The system will automatically set the fiscal year end date as the next depreciation date and calculate the depreciation amount prorata temporis based on the Available-for-use Date (IFRS16) + +Asset + + For better visibility, net value of the asset on different depreciation dates are shown in a line graph. -Asset +Asset ## 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. -Asset +Asset 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. @@ -74,23 +81,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. -Asset +Asset ## 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 +Asset ## Asset Movement The movement of the assets (from one warehouse to another) is also tracked via Asset Movement form. -Asset +Asset There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement. -Asset +Asset {next} diff --git a/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md index cad5e1c7..71aa7229 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md +++ b/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md @@ -7,7 +7,7 @@ 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. -Supplier Item Code +Supplier Item Code #### 2. Supplier's Item Code in Transactions @@ -15,7 +15,7 @@ Each purchase transaction has field in the Item table where Supplier's Item Code 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. -Supplier Item Code in transaction +Supplier Item Code in transaction \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md b/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md index 851f94c3..84311897 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md +++ b/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md @@ -13,7 +13,7 @@ To pull items from Material Request for specific Supplier only, follow below giv Update Default Supplier in the Item master. -Item Purchase UoM +Item Purchase UoM ####Step 2: New Purchase Order @@ -23,13 +23,13 @@ Update Default Supplier in the Item master. From the options available to pull data in the Purchase Order, click on `For Supplier`. -Item Purchase UoM +Item Purchase UoM ####Step 4: Get Items Select Supplier name and click on `Get`. -Item Purchase UoM +Item Purchase UoM ####Step 5: Edit Items diff --git a/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md index d5ea1162..94c0f0f1 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md +++ b/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md @@ -16,28 +16,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. -Item Purchase UoM +Item Purchase UoM #### Step 2: Update UoM Conversion Factors In one Box, if you get 20 Nos. of Pen, UoM Conversion Factor would be 20. -Item Conversion Factor +Item Conversion Factor 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. -Purchase Qty in Default UoM +Purchase Qty in Default UoM ### 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. -Print Format in Purchase UoM +Print Format in Purchase 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. -Purchase UoM master +Purchase UoM master \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/buying/purchase-order.md b/foundation/www/docs/user/manual/en/buying/purchase-order.md index 236987f8..58efe502 100644 --- a/foundation/www/docs/user/manual/en/buying/purchase-order.md +++ b/foundation/www/docs/user/manual/en/buying/purchase-order.md @@ -10,7 +10,7 @@ Supplier Quotation. #### Purchase Order Flow Chart -![Purchase Order](/docs/assets/img/buying/buying_flow.png) +![Purchase Order]({{docs_base_url}}/assets/img/buying/buying_flow.png) In ERPNext, you can also make a Purchase Order directly by going to: @@ -18,7 +18,7 @@ In ERPNext, you can also make a Purchase Order directly by going to: #### Create Purchase Order -Purchase Order +Purchase Order Entering a Purchase Order is very similar to a Purchase Request, additionally you will have to set: @@ -43,10 +43,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 -Purchase Order +Purchase Order #### Show Tax break-up -Purchase Order +Purchase Order 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 @@ -82,7 +82,7 @@ Nos (from the Item form) #### Figure 3: Conversion of Purchase UOM to stock UOM -Purchase Order - UOM +Purchase Order - UOM __Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has 100 pieces. diff --git a/foundation/www/docs/user/manual/en/buying/purchase-taxes.md b/foundation/www/docs/user/manual/en/buying/purchase-taxes.md index c3b4f032..e350c057 100644 --- a/foundation/www/docs/user/manual/en/buying/purchase-taxes.md +++ b/foundation/www/docs/user/manual/en/buying/purchase-taxes.md @@ -11,7 +11,7 @@ Orders and Purchase Invoices. > Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges Master -Purchase taxes +Purchase taxes You can specify if the tax / charge is only for valuation (not a part of diff --git a/foundation/www/docs/user/manual/en/buying/request-for-quotation.md b/foundation/www/docs/user/manual/en/buying/request-for-quotation.md index 0c4bd087..1d412277 100644 --- a/foundation/www/docs/user/manual/en/buying/request-for-quotation.md +++ b/foundation/www/docs/user/manual/en/buying/request-for-quotation.md @@ -14,35 +14,35 @@ 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. -![Request For Quotation](/docs/assets/img/buying/make-supplier-quotation-from-rfq.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/make-supplier-quotation-from-rfq.png) __Step 2:__ Select supplier and click on make Supplier Quotation. -![Request For Quotation](/docs/assets/img/buying/supplier-selection-from-rfq.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-selection-from-rfq.png) __Step 3:__ System will open the Supplier Quotation, user has to enter the rate and submit it. -![Request For Quotation](/docs/assets/img/buying/supplier-quotation-from-rfq.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-quotation-from-rfq.png) #### For Supplier __Step 1:__ User has to create contact or enter Email Address against the supplier on Request for Quotation. -![Request For Quotation](/docs/assets/img/buying/set-email-id.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/set-email-id.png) __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. -![Request For Quotation](/docs/assets/img/buying/supplier-password-update-link.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-password-update-link.png) * 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. -![Request For Quotation](/docs/assets/img/buying/send-rfq-link.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/send-rfq-link.png) __Step 3:__ Supplier has to enter amount and notes(payment terms) on the form and click on submit -![Request For Quotation](/docs/assets/img/buying/supplier-portal-rfq.png) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-portal-rfq.png) __Step 4:__ On submission, system will create Supplier Quotation (draft mode) against the supplier. The user has to review the Supplier Quotation and submit it. When all items from the Request for Quotation have been quoted by a supplier, the status is updated in the Supplier @@ -52,4 +52,4 @@ __Step 4:__ On submission, system will create Supplier Quotation (draft mode) ag If a supplier indicates that they will not provide a quotation for the item, this can be indicated in the RFQ document by checking the 'No Quote' box after the Request for Quotation has been submitted. -![Request For Quotation](/docs/assets/img/buying/request-for-quotation.gif) +![Request For Quotation]({{docs_base_url}}/assets/img/buying/request-for-quotation.gif) diff --git a/foundation/www/docs/user/manual/en/buying/setup/buying-settings.md b/foundation/www/docs/user/manual/en/buying/setup/buying-settings.md index 968fb28c..d85955e0 100644 --- a/foundation/www/docs/user/manual/en/buying/setup/buying-settings.md +++ b/foundation/www/docs/user/manual/en/buying/setup/buying-settings.md @@ -3,7 +3,7 @@ Buying Settings is where you can define properties which will be applied in the Buying module's transactions. -![Buying Settings](/docs/assets/img/buying/buying-settings.png) +![Buying Settings]({{docs_base_url}}/assets/img/buying/buying-settings.png) Let us look at the various options that can be configured: diff --git a/foundation/www/docs/user/manual/en/buying/setup/supplier-type.md b/foundation/www/docs/user/manual/en/buying/setup/supplier-type.md index 01fb913b..ebd5fc74 100644 --- a/foundation/www/docs/user/manual/en/buying/setup/supplier-type.md +++ b/foundation/www/docs/user/manual/en/buying/setup/supplier-type.md @@ -17,7 +17,7 @@ You can create your own category of Supplier Type. > Buying > Setup > Supplier Type > New Supplier Type -Supplier Type +Supplier Type You can classify your suppliers from a range of choice available in ERPNext. Choose from a set of given options like Distributor, Electrical,Hardware, diff --git a/foundation/www/docs/user/manual/en/buying/supplier-quotation.md b/foundation/www/docs/user/manual/en/buying/supplier-quotation.md index 98e7672c..ee72e1ee 100644 --- a/foundation/www/docs/user/manual/en/buying/supplier-quotation.md +++ b/foundation/www/docs/user/manual/en/buying/supplier-quotation.md @@ -11,7 +11,7 @@ You can make a supplier quotation from a Material Request #### Supplier Quotation Flow-Chart -![Supplier Quotation](/docs/assets/img/buying/buying_flow.png) +![Supplier Quotation]({{docs_base_url}}/assets/img/buying/buying_flow.png) You can also make a Supplier Quotation directly from: @@ -19,7 +19,7 @@ You can also make a Supplier Quotation directly from: #### Create Supplier Quotation -Supplier Quotation +Supplier Quotation If you have multiple Suppliers who supply you with the same Item, you usually send out a message (Request for Quote) to various Suppliers. In @@ -38,10 +38,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, -Supplier Quotation +Supplier Quotation Besides, in case of multiple items you can keep track of taxes on each by clicking "Show tax break-up" -Supplier Quotation +Supplier Quotation {next} diff --git a/foundation/www/docs/user/manual/en/buying/supplier-scorecard.md b/foundation/www/docs/user/manual/en/buying/supplier-scorecard.md index 141d8f22..173d08a1 100644 --- a/foundation/www/docs/user/manual/en/buying/supplier-scorecard.md +++ b/foundation/www/docs/user/manual/en/buying/supplier-scorecard.md @@ -15,24 +15,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. -Purchase Order +Purchase Order #### 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. -Purchase Order +Purchase Order 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. -Purchase Order +Purchase Order #### 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. -Purchase Order +Purchase Order 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/foundation/www/docs/user/manual/en/buying/supplier.md b/foundation/www/docs/user/manual/en/buying/supplier.md index e9226c8f..85d81171 100644 --- a/foundation/www/docs/user/manual/en/buying/supplier.md +++ b/foundation/www/docs/user/manual/en/buying/supplier.md @@ -7,13 +7,13 @@ You can create a new Supplier from: `Explore > Supplier > New Supplier` -Supplier Master +Supplier Master ### 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. -Supplier Master +Supplier Master > 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. @@ -23,7 +23,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. -Supplier Master +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/foundation/www/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/foundation/www/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md index 3475a4d8..09aacccc 100644 --- a/foundation/www/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md +++ b/foundation/www/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md @@ -3,18 +3,18 @@ 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. -Customer Portal +Customer Portal Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance. -Customer Portal +Customer Portal #### Outstanding Sales Invoice -Customer Portal +Customer Portal #### Paid Sales Invoice -Customer Portal +Customer Portal {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/customer-portal/issues.md b/foundation/www/docs/user/manual/en/customer-portal/issues.md index 0a0ad056..ef7a55b5 100644 --- a/foundation/www/docs/user/manual/en/customer-portal/issues.md +++ b/foundation/www/docs/user/manual/en/customer-portal/issues.md @@ -8,18 +8,18 @@ conversation. #### Empty Issue List -Issue List +Issue List #### New Issue -New Issue +New Issue #### Open Issue -Issue Raised +Issue Raised #### Reply on Issue -Issue reply +Issue reply {next} diff --git a/foundation/www/docs/user/manual/en/customer-portal/portal-login.md b/foundation/www/docs/user/manual/en/customer-portal/portal-login.md index 3af66f09..a431309b 100644 --- a/foundation/www/docs/user/manual/en/customer-portal/portal-login.md +++ b/foundation/www/docs/user/manual/en/customer-portal/portal-login.md @@ -4,6 +4,6 @@ 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. -Website User Signup +Website User Signup {next} diff --git a/foundation/www/docs/user/manual/en/customer-portal/sign-up.md b/foundation/www/docs/user/manual/en/customer-portal/sign-up.md index 879a399b..8f9d9b81 100644 --- a/foundation/www/docs/user/manual/en/customer-portal/sign-up.md +++ b/foundation/www/docs/user/manual/en/customer-portal/sign-up.md @@ -7,11 +7,11 @@ Your Customer and Suppliers can signup to your ERPNext account by following Sign On the Login Page, you will find option to Signup. -Website User Signup +Website User Signup #### Step 2: Enter Customer Name and ID -Website User Signup +Website User Signup After the sign up process, an email will be sent to the customers Email Address with the password details. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md index 016c05a9..cf15087f 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md @@ -13,17 +13,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.) -select docytpe +select docytpe #### Step 3: Edit Field Property In the fields section, click on the Custom field and check the **Allow On Submit**. -Check Allow on Submit +Check Allow on Submit #### Step 3: Update Customize Form -Update +Update 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/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md index ee28f288..b34812cb 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/child-table-.md @@ -7,28 +7,28 @@ This is how Quotation Item table renders value when Editable Grid is enabled. It will maximum list four columns in the table. -Role Desk Permission +Role Desk Permission As per the default setting, only four columns are listed in the child table. Following is how you can add more columns in the editable itself. For the field to be added as a column in the table, enter a value in the Column field. Also, ensure that "Is List View" property is checked for that field. -Role Desk Permission +Role Desk Permission Based on the value in the Column field, columns will be added in the child table. Ensure that sum total of value added in the Column field doesn't exceed 10. Based on the Column value, width for that column will be set. -Role Desk Permission +Role Desk Permission **Switch to Un-editable Grid** To have more values shown in the preview of Quotation Item table, you can disable Editable Grid for the Quotation Item Doctype. Steps below. -Role Desk Permission +Role Desk Permission Once Editable Grid is disabled for the Quotation Item, the following is how values will be rendered in a preview of the Quotation Item table. -Role Desk Permission +Role Desk Permission To have specific field's value shown in the preview, ensure that for that field, in the Customize Form tool, "In List View" property is checked. -Role Desk Permission \ No newline at end of file +Role Desk Permission \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md index 5338e675..48518d58 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md @@ -14,7 +14,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 fields are updated in the accompanying table below, open a field above the one you wish to insert your Custom Field. Then click on "Insert Above" to insert the new Custom Field. -Select Docytpe +Select Docytpe ####Step 4: Custom Field Values @@ -25,6 +25,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 -Enter Values +Enter Values diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md index 718228ca..ecd1b775 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md @@ -13,13 +13,13 @@ Select document type for which Sort Order is to be customized. -Sort Order field +Sort Order field ####Step 3: Update Sort Details In the Customize Form, you will find these fields. -Sort Order field +Sort Order field 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/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md index a20d6bcc..a72744e3 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md @@ -9,16 +9,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. -Report Search +Report Search ####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. -Report List +Report List Or you can open that report, and delete it from File menu option. -Report Delete +Report Delete \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md index 71dbf353..3a31a8c4 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md @@ -3,7 +3,7 @@ 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. -Print Preview +Print Preview Follow steps given below to hide rounded total from Standard Print Formats, for all the sales transactions. @@ -15,7 +15,7 @@ Follow steps given below to hide rounded total from Standard Print Formats, for Check Disable Rounded Total, and Save Global Defaults. -Print Preview +Print Preview 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/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md index 85409f44..d66c2fc0 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/fetching-data-from-a-document.md @@ -9,12 +9,12 @@ For example, if you want Customer's PO No. and PO Date to be fetched from Sales Sales Order (standard fields) -Standard fields in Sales Order +Standard fields in Sales Order Sales Invoice (custom fields) -Custom Field in Sales Invoice +Custom Field in Sales Invoice Since names for the Customer's PO related fields are same in the Sales Order and Sales Invoice, when creating Sales Invoice from the Sales Order, values in these fields are auto-fetched. -Values fetching from Sales Order to Sales Invoice \ No newline at end of file +Values fetching from Sales Order to Sales Invoice \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md index 16c9c5c0..6e0fe7ca 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md @@ -11,13 +11,13 @@ Let's assume we need to update Max Attachment for Quotation to five. #### Step 2: Select Document Type -Select Doctype +Select Doctype #### Step 3: Set Limit Set Maximum Attachments as five. -Set Max Attachment +Set Max Attachment 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/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md index dfe6cbcc..ed6ebf9d 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md @@ -15,13 +15,13 @@ Go to: As per our scenario, Sales Order will be selected as Document Type. field-visible-2.gif -Document Type +Document Type #### Step 3: Uncheck Print Hide click to open field to be made visible in the Standard Print Format. Uncheck **Print Hide** field. -Uncheck Print Hide +Uncheck Print Hide #### Step 4: Update diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md index 89a5c407..e9e2a8c6 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md @@ -13,7 +13,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. -Custom Link Field +Custom Link Field 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. @@ -28,17 +28,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. -journal Voucher Link Field +journal Voucher Link Field #### 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. -Custom Dynamic Field +Custom Dynamic Field 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. -Custom Dynamic Field +Custom Dynamic Field
    **Customizing options in the Doctype Link field** diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/module-visibility.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/module-visibility.md index b1f00672..55e8b12d 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/module-visibility.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/module-visibility.md @@ -7,7 +7,7 @@ As step zero, ensure that you have "Website Manager" role assigned. It is a stan If module is hidden in-spite of assignment of required Role, then you should check if Website is not disabled from All Application. -All Applications +All Applications 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/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md index 8cb9e68a..db442b5d 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md @@ -17,12 +17,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. -Search By in Customize Form +Search By in Customize Form #### Searching in Another Record. While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier. -Search By in Customize Form +Search By in Customize Form diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md index 638959f3..44eceb0b 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md @@ -9,13 +9,13 @@ Following are the steps to set language in your ERPNext account. #### 1.1 Go to My Setting -My Setting +My Setting #### 1.2 Select Language -Select Language +Select Language -Select Language +Select Language #### 1.3 Save User @@ -31,13 +31,13 @@ Being a System Manager, you can set language in other user's master as well. #### Set Language -Global Language +Global Language #### Save Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference. -Select Language +Select Language 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/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md index deba31b9..69279a92 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md @@ -9,11 +9,11 @@ To change the precision globally, go to: `Setup > Settings > System Settings`. -Global Precision +Global Precision 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. -Field-wise Precision +Field-wise Precision \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/user-restriction.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/user-restriction.md index 41cd92df..f9018853 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/user-restriction.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/user-restriction.md @@ -11,10 +11,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. -Sales Order +Sales Order #### Step 3: Apply User Permission For Role to be restricted (Sales User in this case), check "If Owner". -S +S diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md index 42adef23..ed442865 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-doctype.md @@ -22,7 +22,7 @@ in the Sales Order Doctype, then you should check Is Child Table. Else no. not be able to re-produce. 1. Custom?: This field will be checked by default when adding Custom Doctype. -Doctype Basic +Doctype Basic #### Fields @@ -37,7 +37,7 @@ Fields are much more than database columns, they can be: 1. Actions (button) 1. Attachments or Images -Doc fields +Doc fields 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. @@ -47,19 +47,19 @@ You can also set other properties of the field like whether it is mandatory, rea In this section, you can define criteria based on which document for this doctype will be named. There are multiple criterion based on which document can be named, like naming based on the value in the specific field, or based on Naming Series, or based on value provided by the user in the prompt, which will be shown when saving document. In the following example, we are doing naming based on the value in the field **book_name**. -Doctype Naming +Doctype Naming #### Permission In this table, you should select roles and define permission roles for them for this Doctype. -Doctype Permissions +Doctype Permissions #### Save DocType On saving doctype, you will get pop-up to provide name for this Doctype. -Doctype Save +Doctype Save #### DocType in System @@ -68,12 +68,12 @@ Human Resource module, to access this doctype, go to: `Human Resource > Document > Book` -Doctype List +Doctype List #### Book master Using the fields entered, following is the master one book. -Doctype Form +Doctype Form {next} diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-field.md index 1c14abdf..6a3ed040 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-field.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-field.md @@ -15,25 +15,25 @@ 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. -Select Document Type +Select Document Type #### 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. -Select Document Type +Select Document Type ####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 Document Type +Select Document Type ####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. -Select Document Type +Select Document Type 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. @@ -45,7 +45,7 @@ If you are creating a Link field, then in the Options, enter Doctype name with w 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. -Select Document Type +Select Document Type For Data field, Option can be set to "Email" or "Phone" and the field will be validated accordingly. @@ -66,7 +66,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. -Select Document Type +Select Document Type ####Deleting Custom Field diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/index.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/index.md index 22d3a477..b4c67c89 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/index.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/index.md @@ -7,7 +7,7 @@ Lead form, you can do so by creating your own script. `Setup > Customization > Custom Script` -Custom Script +Custom Script ### Topics diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/customize-form.md b/foundation/www/docs/user/manual/en/customize-erpnext/customize-form.md index 555aa400..e8d4dd32 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/customize-form.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/customize-form.md @@ -14,7 +14,7 @@ Go to Customize Form from: You can also reach the Customize Form tool from the List Views. -Customize Form List +Customize Form List ####Step 2: Select Document Type @@ -22,7 +22,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. -Customize Form select doctype +Customize Form select doctype ####Step 3: Edit Property @@ -30,7 +30,7 @@ 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. -Customize Form select doctype +Customize Form select doctype Like setting setting field Mandatory, following are the other customization options in the Customize Form tool. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/document-title.md b/foundation/www/docs/user/manual/en/customize-erpnext/document-title.md index bdc366c3..f3bf9d7f 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/document-title.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/document-title.md @@ -24,14 +24,14 @@ You can define the title by setting document properties in braces `{}`. For exam {customer_name} for {project} Customize Title + src="{{docs_base_url}}/assets/img/customize/customize-title.gif"> #### Fixed or Editable Titles If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document. Editable Title + src="{{docs_base_url}}/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/foundation/www/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md b/foundation/www/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md index f5e6516b..132095c3 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md @@ -5,7 +5,7 @@ To hide modules (icons) from the home page, go to: `Setup > Permissions > Show / Hide Modules` -Hide Features +Hide Features 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. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md index 32fa5e68..3554a2b5 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md @@ -9,35 +9,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 Kanban Board +Add 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. -Add card in Kanban Board +Add card in Kanban Board ###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. -Move Cards on Kanban Board +Move Cards on Kanban Board ###Manage Columns To add more columns in the Kanban board click Add columns. -Add New column in Kanban Board +Add New column in Kanban Board To move columns based on the priority drag and drop the columns as per requirement. -Move columns in Kanban Board +Move columns in Kanban Board To set Colors to a Card click drop down menu on the card and assign color to it. -Add color to cards in Kanban Board +Add color to cards in Kanban Board 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. -Archive and Restore in Kanban Board +Archive and Restore in Kanban Board diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/print-format.md b/foundation/www/docs/user/manual/en/customize-erpnext/print-format.md index 849287a7..2a300a24 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/print-format.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/print-format.md @@ -19,7 +19,7 @@ To create your own versions, open an existing template from: `Setup > Printing > Print Formats` -Print Format +Print Format 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” @@ -46,7 +46,7 @@ To edit / update your print and PDF settings, go to: `Setup > Printing and Branding > Print Settings` -Print Format +Print Format #### Example diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md index 03497409..aa232e2f 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md @@ -3,12 +3,25 @@ Assessment Criteria is the parameter based on which you assess the Student. -Assessment Criteria +Assessment Criteria 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. -Assessment Plan Criteria +Assessment Plan Criteria + +#### Video Tutorial on Assessment Criteria + + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria_group.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria_group.md deleted file mode 100644 index d5d6b2cb..00000000 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria_group.md +++ /dev/null @@ -1,2 +0,0 @@ - -# \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md index f697361b..4c73c40b 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md @@ -5,10 +5,23 @@ Assessment Group tree is a master where you can define the hierarchy for examina For example, if you conduct two assessment in a academic year, then setup Assessment Group as following. -Assessment Group Term +Assessment Group Term On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute. -Assessment Group Term +Assessment Group Term + +#### Video Tutorial on Assessment Group + + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md index 12d74767..ba6d0abf 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md @@ -11,10 +11,23 @@ To schedule an assessment/examination for a Student Group, for specific Course, 4. Examiner and Supervisor -Assessment Plan Details +Assessment Plan Details 5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned. -Assessment Plan Criteria +Assessment Plan Criteria + +#### Video Tutorial on Assessment Plan + + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md index 5cff1851..cfb86d7d 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md @@ -3,6 +3,18 @@ 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/education/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result + +#### Video Tutorial on Assessment Result + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md index 441e460f..eb97f928 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md @@ -3,8 +3,21 @@ 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. -Assessment Result Tool +Assessment Result Tool 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. +#### Video Tutorial on Assessment Result Tool + + + +
    + +
    + +
    +
    + {next} diff --git a/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md b/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md index 123408ee..2d16d46e 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md @@ -3,6 +3,19 @@ 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. -Grading Scale +Grading Scale + +#### Video Tutorial on Grading Scale + + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Attendance/index.txt b/foundation/www/docs/user/manual/en/education/Attendance/index.txt index 8cd02627..14ecda38 100644 --- a/foundation/www/docs/user/manual/en/education/Attendance/index.txt +++ b/foundation/www/docs/user/manual/en/education/Attendance/index.txt @@ -1,3 +1,3 @@ student-attendance -student-leave-application -student-attendance-tool \ No newline at end of file +student-attendance-tool +student-leave-application \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md index 058e395f..478684f1 100644 --- a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md @@ -11,6 +11,19 @@ To mark the **Attedance* based on Student Group select the group based on Student detials will be autofetched and you can mark the attendance of the given date. -Student Attendance +Student Attendance + +#### Tutorial Video for Student Attendance Tool + + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md index e576b8c4..17807b97 100644 --- a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md @@ -9,8 +9,21 @@ To create Attendance record : Select the **Student, Course Schedule and Student Group** for which attendance is to be marked for the given date. Set the Status to Present/Absent and save. -Student Attendance +Student Attendance **Student Attendance tool** can be used for bulk updation of the attendance based on **Batch, Course or Activity**. +#### Tutorial Video on Student Attendance + + + +
    + +
    + +
    +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md b/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md index 4876bb8a..ae873dbd 100644 --- a/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md @@ -5,10 +5,23 @@ ERPNext allows you to record the leave application for a student. To create a Student Leave application record, enter the Student and the date for the leave is applied and save. -Student Attendance +Student Attendance Incase the student is not attending the institute in order to participate or represent institute in any event, he/she can be mark as present from the Leave Application itself. Once a Leave Application is recorded for a student it will not be recorded in the absent student report as he has applied for a leave. +#### Tutorial Video for Student Leave Application + + + +
    + +
    + +
    +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md b/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md index 89ae7032..2479cded 100644 --- a/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md +++ b/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md @@ -9,14 +9,26 @@ You can create the Program Enrollment for : 1. **Student Applicants**: List of Student Applicants will be fetched for the selected **Program**, **Academic year** and **Academic Term** (if provided). -Student Applicant Enrollment +Student Applicant Enrollment 2. **Program Enrollment**: List of students already enrolled in selected **Program** for the given **Academic Year**, **Academic Term** (if provided) and **Student Batch** will be fetched and can be used to enroll students from one academic year/term to another in the same **Program** or a new **Program**. -Student Applicant Enrollment +Student Applicant Enrollment **New Student Batch**: This can be selected for the entire students fetched in the table. Priority will be given to the Batch selected in the table (for individual students). For promoting the students, the new academic year, academic term and program can also be selected for the enrollment of the fetched students list. +#### Video Tutorial for Program Enrollment Tool + + +
    + +
    + +
    +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md b/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md index 21778ed8..63b2bd44 100644 --- a/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md +++ b/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md @@ -8,7 +8,7 @@ If the student has applied online for the admission in a particular **Program** Else, to create the new Program Enrollment manually, go to: > Education > Program Enrollment > New -Student Applicant Enrollment +Student Applicant Enrollment If any institution has skipped the online admission process then Program Enrollment can also be considered as the confirmation of the admission in a particular Program. @@ -18,5 +18,15 @@ Student Batch: To categorize student into different sections/batches, you can as Student Category: For the Institutions having multiple Fees Structure, this field can be used to differentiate the student enrollment in a given fee category. +#### Video Tutorial For Program Enrollment -{next} \ No newline at end of file + +
    + +
    + +
    +
    + +{next} diff --git a/foundation/www/docs/user/manual/en/education/admission/student-applicant.md b/foundation/www/docs/user/manual/en/education/admission/student-applicant.md index 3e1f1b50..a8a33e7b 100644 --- a/foundation/www/docs/user/manual/en/education/admission/student-applicant.md +++ b/foundation/www/docs/user/manual/en/education/admission/student-applicant.md @@ -4,7 +4,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. -Student Applicant +Student Applicant ### Application Status @@ -21,11 +21,23 @@ You can Approve or Reject a student applicant. By accepting a student applicant ### Student Enrollment Once the form is submitted you can either approve or reject the application form. -Student Applicant Enrollment +Student Applicant Enrollment 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/user/manual/en/education/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment + +#### Video Tutorial for Student Application + + + +
    + +
    + +
    +
    {next} diff --git a/foundation/www/docs/user/manual/en/education/admission/student_admission.md b/foundation/www/docs/user/manual/en/education/admission/student_admission.md index c89874f5..8178e8fa 100644 --- a/foundation/www/docs/user/manual/en/education/admission/student_admission.md +++ b/foundation/www/docs/user/manual/en/education/admission/student_admission.md @@ -8,7 +8,7 @@ To create a Student Admission record go to : **education** >> **Admissions** >> **Student Admission** >> -Student Applicant +Student Applicant Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant. diff --git a/foundation/www/docs/user/manual/en/education/fees/fee-category.md b/foundation/www/docs/user/manual/en/education/fees/fee-category.md index 0b67a529..a3c2c473 100644 --- a/foundation/www/docs/user/manual/en/education/fees/fee-category.md +++ b/foundation/www/docs/user/manual/en/education/fees/fee-category.md @@ -3,6 +3,6 @@ List of all different type of fees collected. -Fees Category +Fees Category {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/fees/fee-structure.md b/foundation/www/docs/user/manual/en/education/fees/fee-structure.md index 3e173e65..738f9e6b 100644 --- a/foundation/www/docs/user/manual/en/education/fees/fee-structure.md +++ b/foundation/www/docs/user/manual/en/education/fees/fee-structure.md @@ -9,7 +9,7 @@ You can create the Fee Structure directly from or you can create the Fee Structure from Program also. -Fees Structure +Fees Structure #### Academic Year Impact @@ -21,4 +21,16 @@ You can set the "Income Account" and "Receivable Account" in the Accounts sectio If you are going to use this in the Fee Schedule, you must select the Accounts carefully as Fee Schedule updates the respected Accounts in bulk. +#### Video Tutorial for Fee Structure + + +
    + +
    + +
    +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/fees/fees.md b/foundation/www/docs/user/manual/en/education/fees/fees.md index 1acdf052..efb4a601 100644 --- a/foundation/www/docs/user/manual/en/education/fees/fees.md +++ b/foundation/www/docs/user/manual/en/education/fees/fees.md @@ -4,6 +4,6 @@ Maintain a record of fees collected from students. The [Fee Structure](/docs/user/manual/en/education/fees/fee-structure.html) is fetched based on the selected Program and Academic Term. -Fees +Fees {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/fees/index.md b/foundation/www/docs/user/manual/en/education/fees/index.md index 46952ec7..770b1764 100644 --- a/foundation/www/docs/user/manual/en/education/fees/index.md +++ b/foundation/www/docs/user/manual/en/education/fees/index.md @@ -3,7 +3,7 @@ This section contains 'Fee' related documents. -Fees Section +Fees Section ### Topics diff --git a/foundation/www/docs/user/manual/en/education/index.md b/foundation/www/docs/user/manual/en/education/index.md index db28dfc1..e22eaf6d 100644 --- a/foundation/www/docs/user/manual/en/education/index.md +++ b/foundation/www/docs/user/manual/en/education/index.md @@ -4,6 +4,6 @@ The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination. -Fees Section +Fees Section {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md b/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md index d4848005..757f23d3 100644 --- a/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md +++ b/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md @@ -4,13 +4,25 @@ 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. -Course Schedule +Course Schedule + +#### Video Tutorial on Course Scheduling + + +
    + +
    + +
    +
    ### Marking Attendance You can mark attendance for a Student Group against a Course Schedule. -Course Schedule Attendance +Course Schedule Attendance - To make attendance, expand the attendance section. - Check the students who were present for that session. @@ -21,6 +33,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. -Course Schedule Attendance +Course Schedule Attendance {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/schedule/examination.md b/foundation/www/docs/user/manual/en/education/schedule/examination.md index 63ef7633..7bdee05a 100644 --- a/foundation/www/docs/user/manual/en/education/schedule/examination.md +++ b/foundation/www/docs/user/manual/en/education/schedule/examination.md @@ -3,7 +3,7 @@ The Examination record can be used to track the exam schedule and the results of that exam. -Examination +Examination {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/schedule/index.md b/foundation/www/docs/user/manual/en/education/schedule/index.md index bb3ff65c..11d75709 100644 --- a/foundation/www/docs/user/manual/en/education/schedule/index.md +++ b/foundation/www/docs/user/manual/en/education/schedule/index.md @@ -1,7 +1,7 @@ # Schedule -Schedule Section +Schedule Section ### Topics diff --git a/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md b/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md index 0594c828..5ce1faf5 100644 --- a/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md +++ b/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md @@ -3,7 +3,7 @@ This tool can be used to create 'Course Schedules'. -Scheduling Tool +Scheduling Tool ### Creating Course Schedules @@ -21,4 +21,14 @@ This tool can be used to create 'Course Schedules'. - Check the 'Reschedule' checkbox and then click 'Schedule Course' button. - System will delete existing Course Schedules for specified Course within the mentioned Course Start Date and Course End Date and crate new Course Schedules. +#### Video Tutorial on Scheduling Tool + +
    + +
    + +
    +
    + {next} diff --git a/foundation/www/docs/user/manual/en/education/setup/academic-term.md b/foundation/www/docs/user/manual/en/education/setup/academic-term.md index 57f81809..0983103f 100644 --- a/foundation/www/docs/user/manual/en/education/setup/academic-term.md +++ b/foundation/www/docs/user/manual/en/education/setup/academic-term.md @@ -5,7 +5,7 @@ An academic term (or simply "term") is a portion of an academic year, the time d The **Academic term** form in ERPNext enables you to create academic terms within in a year. Based on the term schedule enter the start and end date for the schedule and generate the term for a Academic year. -Academic Term +Academic Term {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/academic-year.md b/foundation/www/docs/user/manual/en/education/setup/academic-year.md index f6878444..86f08839 100644 --- a/foundation/www/docs/user/manual/en/education/setup/academic-year.md +++ b/foundation/www/docs/user/manual/en/education/setup/academic-year.md @@ -5,7 +5,7 @@ An academic year is a period of time which education, colleges and universities The **Academic year** form have the Start and End date for the Academic year. -Academic Year +Academic Year **Student group** link is given to view or add the respective groups to the Academic year. diff --git a/foundation/www/docs/user/manual/en/education/setup/course.md b/foundation/www/docs/user/manual/en/education/setup/course.md index 427f5fe5..b0b37e4d 100644 --- a/foundation/www/docs/user/manual/en/education/setup/course.md +++ b/foundation/www/docs/user/manual/en/education/setup/course.md @@ -5,12 +5,24 @@ To create a **Course** enter the Course name and Code. Code for the course should be unique for every course. You can also link the department under which the course is conducted. -Course +Course Once a **Course** is created, a course schedule can defined for the same. -Course - The Course form is further linked to **Program, Student Group and Assessment Plan** doctypes. The links allow to view/create the related documents for a **Course**. +#### Video Tutorial for Course + + + +
    + +
    + +
    +
    + + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/school-settings.md b/foundation/www/docs/user/manual/en/education/setup/education-settings.md similarity index 62% rename from foundation/www/docs/user/manual/en/education/setup/school-settings.md rename to foundation/www/docs/user/manual/en/education/setup/education-settings.md index cd87239b..9b99cdcf 100644 --- a/foundation/www/docs/user/manual/en/education/setup/school-settings.md +++ b/foundation/www/docs/user/manual/en/education/setup/education-settings.md @@ -3,14 +3,15 @@ The Education Settings page allow you to setup basic settings like **Academic Year and Term** for the educational setup. -Student + +Student The checkbox to Validate Batch for Students in Student Group enables the Student Batch validation for every Student from the Program Enrollment for the **Batch** based on **Student Group** -Student +Student You can enable the validation of Course for every Student from the enrolled Courses in Program Enrollment,for Course based Student Group by checking the settings for **Validate Enrolled Course for Students in Student Group** -Student +Student {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/index.md b/foundation/www/docs/user/manual/en/education/setup/index.md index b93c8b28..69a1c3a0 100644 --- a/foundation/www/docs/user/manual/en/education/setup/index.md +++ b/foundation/www/docs/user/manual/en/education/setup/index.md @@ -1,9 +1,9 @@ # Setup -The Setup section of education module provides facility to make some basic configuration. Below are doctypes for basic configuration. +The Setup section of education module provides facility to make some basic master records and configuration. Below are doctypes for those masters and configuration. -Setup Section +Setup Section ### Topics diff --git a/foundation/www/docs/user/manual/en/education/setup/instructor.md b/foundation/www/docs/user/manual/en/education/setup/instructor.md index 9e5434aa..365dcc53 100644 --- a/foundation/www/docs/user/manual/en/education/setup/instructor.md +++ b/foundation/www/docs/user/manual/en/education/setup/instructor.md @@ -7,7 +7,7 @@ To create new Instructor go to: > Education > Instructor > New -Instructor +Instructor An **Instructor** can also be linked to a **Course Schedule**, where you can define the schedule for a **Course** for a give date and **Room no**. @@ -17,5 +17,16 @@ While creating the **Assessment Plan** for a Student Group, **Instructor** can b Further, the log for the Instructor can be entered in the Instructor Log table which can be used for keeping the records of subjects taught by that Instructor. +#### Video Tutorial for Instructor + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/program.md b/foundation/www/docs/user/manual/en/education/setup/program.md index 1552b5a5..3a1ff0b5 100644 --- a/foundation/www/docs/user/manual/en/education/setup/program.md +++ b/foundation/www/docs/user/manual/en/education/setup/program.md @@ -5,16 +5,28 @@ An educational program is a program written by the institutions which determines To create a Program go to : -###education >> Setup >> Program >> New Program +> Education > Setup > Program > New Program Enter a unique code for every **Program**. You can also link the **Program** to the department under which it is conducted. -Program +Program Add the relevant Course and the Fee details for a program. -Program +Program The Program Doctype is further linked to the **Student applicant**, **Program enrollment, Student group, Fee structre and Fee**. The links allow to view or create the related document for a Program. +#### Video Tutorial on Program and Courses + + +
    + +
    + +
    +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/room.md b/foundation/www/docs/user/manual/en/education/setup/room.md index d184e6ef..4ed4c9a1 100644 --- a/foundation/www/docs/user/manual/en/education/setup/room.md +++ b/foundation/www/docs/user/manual/en/education/setup/room.md @@ -5,14 +5,14 @@ A classroom is a space (room or lab) where you want to schedule courses or exami The Room doctype allows you to record the room number and the seating capacity for a classroom. Once a room is created Course schedule link is provided in the Room doctype to view or add the course schedule for the classroom. -Room +Room The course schedule validate the availability of the Room number and an alert message is shown if there is an overlap for the Room number for a given time slot. -Room +Room The Room number is further linked to the Assesment plan. It validates the availability of examination room for the assessment to be held for a given date and time. -Room +Room {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/student-batch-name.md b/foundation/www/docs/user/manual/en/education/setup/student-batch-name.md index 261ee0cf..1c198d41 100644 --- a/foundation/www/docs/user/manual/en/education/setup/student-batch-name.md +++ b/foundation/www/docs/user/manual/en/education/setup/student-batch-name.md @@ -3,7 +3,7 @@ Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch -Student +Student You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch. diff --git a/foundation/www/docs/user/manual/en/education/setup/student-category.md b/foundation/www/docs/user/manual/en/education/setup/student-category.md index bfaf4c7f..ee4a3420 100644 --- a/foundation/www/docs/user/manual/en/education/setup/student-category.md +++ b/foundation/www/docs/user/manual/en/education/setup/student-category.md @@ -3,11 +3,15 @@ Student Category doctype allow you to classify student based various categories. In Institutions, there may be fee concession for some categories such as Handicapped students, foreign, nationals, reserved category by the government etc. -To create Student category go to Setup >> Student Category >> New. +To create Student category go to: + +> Setup > Student Category > New We can create new student category by adding a name and save it -Student +Student + +You can select the Student Category while making the Fee Structure and accordingly the student from the selected groups can be filtered out while making the Fee Schedule. {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/student/guardian.md b/foundation/www/docs/user/manual/en/education/student/guardian.md index 6f291857..6461447b 100644 --- a/foundation/www/docs/user/manual/en/education/student/guardian.md +++ b/foundation/www/docs/user/manual/en/education/student/guardian.md @@ -3,7 +3,7 @@ The Guardian doctype allows you to record the guardian details for a **Student**. -Student +Student The email id added in the **Guardian** detail can be linked to a email group for sending newsletter or announcements. diff --git a/foundation/www/docs/user/manual/en/education/student/student-batch.md b/foundation/www/docs/user/manual/en/education/student/student-batch.md index 261ee0cf..1c198d41 100644 --- a/foundation/www/docs/user/manual/en/education/student/student-batch.md +++ b/foundation/www/docs/user/manual/en/education/student/student-batch.md @@ -3,7 +3,7 @@ Student batch is a collection of students from Student Groups. **Student batch** allows you to create **Student Group** based on a batch. When a student is enrolled for a **Program**, the Student batch is selected to enroll the student for the given Program and batch -Student +Student You can also get a **Student Batch-Wise Attendance** report to view the number of student present from the Batch. diff --git a/foundation/www/docs/user/manual/en/education/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/en/education/student/student-group-creation-tool.md index 079f5e0b..a0c76e77 100644 --- a/foundation/www/docs/user/manual/en/education/student/student-group-creation-tool.md +++ b/foundation/www/docs/user/manual/en/education/student/student-group-creation-tool.md @@ -5,14 +5,26 @@ The Student group creation tool allows you to create student groups in bulk. To create Student group using this tool go to -##education >>Student >> Student Group creation tool +> Education > Student > Student Group creation tool Select the **Academic Term** and the **Program** for which a student group is to be created. -Student Group Creation Tool +Student Group Creation Tool By default the student group is created based on the **Course** only. The check box for "Separate course based Group for every Batch" allows you to create batchwise Student groups for a course. You can leave it unchecked if you don't want to consider batch while making course based groups. +#### Tutorial Video on Student Group Creation Tool + + +
    + +
    + +
    +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/student/student-group.md b/foundation/www/docs/user/manual/en/education/student/student-group.md index f3fe200c..5fd22007 100644 --- a/foundation/www/docs/user/manual/en/education/student/student-group.md +++ b/foundation/www/docs/user/manual/en/education/student/student-group.md @@ -7,17 +7,32 @@ A Student Group needs to be created for every course for **Academic Term** and * To create a Student Group go to: -education >> Student >> New Student Group +> Education > Student > New Student Group + + +Student Group -Student Group To create a Student group based on **Batch**, select the **Progam** and **Batch**, where as to create a Student group based on **Course**, you will only have to select the Course Code. Creating a student group based on activity allows you to group of student for events and activities happening in the institute. Once a student group is created you can mark attendance for the group. -Student Group +Student Group You can also update the **Email Group** for the Student Group. Click on Update Email Group to add all the email ids of the gaurdians in the respective email group and **Newsletter** can be created and sent to the Email group. +#### Tutorial Video on Student Groups + + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/student/student-log.md b/foundation/www/docs/user/manual/en/education/student/student-log.md index 6d26622e..1c652b7a 100644 --- a/foundation/www/docs/user/manual/en/education/student/student-log.md +++ b/foundation/www/docs/user/manual/en/education/student/student-log.md @@ -5,6 +5,6 @@ The Student log Doctype enables you to add and edit addtional information for a You can make a note of student activities using Student log. Logs can be categorised as 'General', 'Academic', 'Medical' or 'Achievement' -Student +Student {next} diff --git a/foundation/www/docs/user/manual/en/education/student/student.md b/foundation/www/docs/user/manual/en/education/student/student.md index e2a98a0e..b0d208c0 100644 --- a/foundation/www/docs/user/manual/en/education/student/student.md +++ b/foundation/www/docs/user/manual/en/education/student/student.md @@ -4,10 +4,23 @@ A Student is a person who has enrolled at your institute and you have accepted their application. The Student doctype maintains detials like personal information, date of birth, address etc. It also records the **Guardian** and sibling details. -Student + +Student + The student is enrolled in a **Program** when the application is approved. Once the enrollement is done the **Student Applicant** status is update to Admitted. You can view every doctype created for a particular student. Eg : Fees, Student Group, etc +#### Video Tutorial on Student Management + + +
    + +
    + +
    +
    {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/fleet_management/index.md b/foundation/www/docs/user/manual/en/fleet_management/index.md index f72328cf..80cd567b 100644 --- a/foundation/www/docs/user/manual/en/fleet_management/index.md +++ b/foundation/www/docs/user/manual/en/fleet_management/index.md @@ -20,15 +20,15 @@ ERPNext > Vehicle * Enter License Plate,Make,Model,Odometer Value,Fuel Type and Fuel UOM for a quick entry. - Vehicle + Vehicle * Enter details like Insurance,Chassis,Vehicle Value,Location and Employee. - Vehicle + Vehicle * Enter Vehicle attributes like color,wheels,doors and last carbon check - Vehicle + Vehicle ### Vehicle Log @@ -40,17 +40,17 @@ ERPNext > Vehicle Log * Enter License Plate,Employee,Date,Odometer reading for a quick entry. - Vehicle Log + Vehicle Log * Enter Refuelling details,Service details if applicable. - Vehicle Log + Vehicle Log ### Make Expense Claim * Click on Make Expense Claim button .This button appears only in case of Submitted Vehicle Logs. - Vehicle Log + Vehicle Log When you click on 'Make Expense Claim', @@ -58,10 +58,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 Log + Vehicle Log ### 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. - Vehicle Log + Vehicle Log diff --git a/foundation/www/docs/user/manual/en/healthcare/appointment.md b/foundation/www/docs/user/manual/en/healthcare/appointment.md index 266f0941..3afa7944 100755 --- a/foundation/www/docs/user/manual/en/healthcare/appointment.md +++ b/foundation/www/docs/user/manual/en/healthcare/appointment.md @@ -7,15 +7,15 @@ You can create a Patient Appointment from You can book appointments for a registered Patient by searching and selecting the Patient field. You can search the Patient by Patient ID, Name, Email or Mobile number. You can also register a new Patient from the Appointment screen by selecting "Create a new patient" in the Patient field. -ERPNext Healthcare +ERPNext Healthcare If you have a front desk executive to manage your appointments, you can configure a user role to have access to Patient Appointment so that she can do the bookings by selecting the Physician whom the Patient wish to consult and the date for booking. "Check Availability" button will pop up all the available time slots with status indicators for the date. She can select a time slot and "Book" the Appointment for the Patient. -ERPNext Healthcare +ERPNext Healthcare After Booking, the scheduled time of the Appointment and duration will be updated and seved in the document. -ERPNext Healthcare +ERPNext Healthcare You can configure ERPNext to send an SMS alert to the Patient about the booking confirmation or a reminder on the day of Appointment by doing necessary configurations in - diff --git a/foundation/www/docs/user/manual/en/healthcare/consultation.md b/foundation/www/docs/user/manual/en/healthcare/consultation.md index 1af2397c..640ae569 100755 --- a/foundation/www/docs/user/manual/en/healthcare/consultation.md +++ b/foundation/www/docs/user/manual/en/healthcare/consultation.md @@ -5,13 +5,13 @@ ERPNext Healthcare allows you to record Patient encounters through the Consultat If you are creating the Consultation document from an Appointment, Patient and other related data will automatically be populated else you can search the Patient by name, email phone number etc. The Patient Details section will list the latest Vital Signs record of the patient and other information captured in the Patient screen. -ERPNext Healthcare +ERPNext Healthcare ### Assessment Encounter Impression section allows you to select (or create new) Complaints and your assessment based on the presented complaints. You can opt to include the captured data in Consultation print by selecting the "In Print" flag -ERPNext Healthcare +ERPNext Healthcare ### Prescriptions @@ -19,11 +19,11 @@ You can prescribe medicines in the Drug Prescription section by selecting the dr Prescribing a laboratory investigation is similar and if you have Lab Tests configured, you can select from the list. Or key in the Lab Test name to be printed as part of the Prescription. -ERPNext Healthcare +ERPNext Healthcare ### Medical Coding You can also attach one or more Medical Codes to designate the Diagnosis in the Medical Coding Section. You will have to select the Medical Code Standard you wish to encode the diagnosis and then select the Code by searching the Code itself or the Code Description. -ERPNext Healthcare +ERPNext Healthcare {next} diff --git a/foundation/www/docs/user/manual/en/healthcare/index.md b/foundation/www/docs/user/manual/en/healthcare/index.md index 798e1f20..d8a94383 100755 --- a/foundation/www/docs/user/manual/en/healthcare/index.md +++ b/foundation/www/docs/user/manual/en/healthcare/index.md @@ -3,7 +3,7 @@ ERPNext Healthcare helps you manage your Clinic or Practice efficiently by scheduling **Appointments** and recording **Patient Encounters** (Consultations). You can easily pull out a **Patient's Health Record** anytime to review all the history of treatments assisting you in providing effective, high quality care. -ERPNext Healthcare +ERPNext Healthcare Patients can view various documents relevant to them and book Appointments via the **ERPNext Portal**. The healthcare module is integrated with **Accounts** and **Human Resources** modules, helping you in **Billing**, **Payroll Management** etc. and benefit from other rich features of ERPNext. You can configure the **Selling** and **Stock** modules manage your Pharmacy. diff --git a/foundation/www/docs/user/manual/en/healthcare/lab_test.md b/foundation/www/docs/user/manual/en/healthcare/lab_test.md index 085df504..2d262fac 100755 --- a/foundation/www/docs/user/manual/en/healthcare/lab_test.md +++ b/foundation/www/docs/user/manual/en/healthcare/lab_test.md @@ -7,11 +7,11 @@ ERPNext Healthcare allows you to manage a clinical laboratory efficiently by all Once you have all necessary Lab Test Templates configured, you can start creating Lab Tests by selecting a Test Template every time you create a Test. To create a new Lab Test >Healthcare > Laboratory > Lab Test > New Lab Test -ERPNext Healthcare +ERPNext Healthcare You can record the test results in the Lab Test document as the results gets ready. -ERPNext Healthcare +ERPNext Healthcare > Note: To create Sample Collection documents for every Lab Test, check "Manage Sample Collection" flag in Healthcare Settings and select Sample in the Lab Test Template diff --git a/foundation/www/docs/user/manual/en/healthcare/medical_codes.md b/foundation/www/docs/user/manual/en/healthcare/medical_codes.md index 5f0950de..880ea8f6 100755 --- a/foundation/www/docs/user/manual/en/healthcare/medical_codes.md +++ b/foundation/www/docs/user/manual/en/healthcare/medical_codes.md @@ -5,6 +5,6 @@ Medical Coding are in many countries required for regulatory compliance and many Medical Code Standard document is used to name the Code Standard and act as a container for all the medical codes which are standardized under it. Medical Codes and descriptions can then be imported to the Medical Code document, after ensuring that you set the Medical Code Standard field to the appropriate Standard name. -ERPNext Healthcare +ERPNext Healthcare {next} diff --git a/foundation/www/docs/user/manual/en/healthcare/medical_record.md b/foundation/www/docs/user/manual/en/healthcare/medical_record.md index a2e33cd9..97552848 100755 --- a/foundation/www/docs/user/manual/en/healthcare/medical_record.md +++ b/foundation/www/docs/user/manual/en/healthcare/medical_record.md @@ -4,11 +4,11 @@ The maintenance of complete and accurate medical records is a requirement of hea Medical Record automatically keeps track of all Consultations, recorded Vital Signs, Lab Investigations etc. Complaints, Diagnosis etc. captured as part of consultation are easily viewable but to look at the details of other documents, links are provided. -ERPNext Healthcare +ERPNext Healthcare ##### Adding notes manually to Medical Record In the Patient screen Create > Medical Record will allow you to record notes to the Medical Record manually. You can also attach files when doing this, and the Medical Record will display links to the attached file along side the notes. Create > Medical Record button is also made available in the Consultation screen -ERPNext Healthcare +ERPNext Healthcare {next} diff --git a/foundation/www/docs/user/manual/en/healthcare/patient.md b/foundation/www/docs/user/manual/en/healthcare/patient.md index 1a084eaa..e323bc85 100755 --- a/foundation/www/docs/user/manual/en/healthcare/patient.md +++ b/foundation/www/docs/user/manual/en/healthcare/patient.md @@ -4,11 +4,11 @@ In ERPNext Healthcare, the Patient document corresponds any individual who is the recipient of healthcare services you provide. For every ERPNext Healthcare document, it is important to have a Patient associated with it. You can create a new Patient from > Healthcare > Masters > Patient > New Patient -ERPNext Healthcare +ERPNext Healthcare The Patient document holds most details that are required to identify and qualify a patient. You can enter as much information available while creating the Patient. All information in the patient document is presented on the Consultation screen for easy lookup and you can always update this information. Other data like observations, vital signs etc. are not part of the Patient document. These could be recorded during patient encounters and will be available as part of the Patient Medical Record. -ERPNext Healthcare +ERPNext Healthcare ### Patient as a Customer @@ -17,7 +17,7 @@ ERPNext Accounts makes use of "Customer" document for booking all transactions. In many cases, you may want to associate multiple Patients to a single Customer against whom you want to book the transactions. For instance, a Veterinarian would require the care services provided to different pets of an individual invoiced against a single Customer. -ERPNext Healthcare +ERPNext Healthcare The Patient Relation section of the Patient allows you to select how a Patient is related to another Patient in the system. This is optional, but will be quite handy if you want to use ERPNext in a fertility clinic, for example. diff --git a/foundation/www/docs/user/manual/en/healthcare/physician.md b/foundation/www/docs/user/manual/en/healthcare/physician.md index 34667691..8e89a781 100755 --- a/foundation/www/docs/user/manual/en/healthcare/physician.md +++ b/foundation/www/docs/user/manual/en/healthcare/physician.md @@ -6,12 +6,12 @@ ERPNext Healthcare allows you to create multiple physicians and optionally link Linking a User to the Physician makes the system populate the Physician field in all documents to the Physician associated with the logged in User. >Note: You should also relate the User to an Employee to utilize the various features of Human Resources module. -ERPNext Healthcare +ERPNext Healthcare ### Scheduling and Availability Each Physician can have a "Physician Schedule" and a "Time per Appointment" on the basis of which, the scheduler will book Appointments. Also, you can select appropriate Income Accounts for a Physician to book all Consultation charges into separate accounts. -ERPNext Healthcare +ERPNext Healthcare ### Referring Physicians You may also want to manage a list of Doctors who refers Patients to your facility. You can manage such data in the Physician document itself by leaving out the User link. diff --git a/foundation/www/docs/user/manual/en/healthcare/physician_schedule.md b/foundation/www/docs/user/manual/en/healthcare/physician_schedule.md index 0c388f2d..bd64005a 100755 --- a/foundation/www/docs/user/manual/en/healthcare/physician_schedule.md +++ b/foundation/www/docs/user/manual/en/healthcare/physician_schedule.md @@ -5,10 +5,10 @@ Physician Schedule will help you to configure the availability and work hours of You can create Physician Schedule from - > Healthcare > Masters > Physician Schedule -ERPNext Healthcare +ERPNext Healthcare After naming the schedule you can use the "Add Time Slots" button to create time slots for each day of the week. These time slots will then be displayed while checking the availability of a Physician when booking an Appointment. -ERPNext Healthcare +ERPNext Healthcare {next} diff --git a/foundation/www/docs/user/manual/en/healthcare/sample_collection.md b/foundation/www/docs/user/manual/en/healthcare/sample_collection.md index 7acdc7ae..c93d0ff5 100755 --- a/foundation/www/docs/user/manual/en/healthcare/sample_collection.md +++ b/foundation/www/docs/user/manual/en/healthcare/sample_collection.md @@ -3,7 +3,7 @@ It's critical for a Laboratory to manage collected samples and you may want to ID the sample, print stickers etc. ERPNext Healthcare "Sample Collection" document helps you to easily manage the sample collection process by creating a sample collection document for every Lab Test automatically. You will have to turn on the flag in Healthcare Settings to enable this feature. > Healthcare Settings > Laboratory Settings > Manage Sample Collection -ERPNext Healthcare +ERPNext Healthcare > Note: You will have to select a Sample in the Lab Test Template for the system to automatically create a Sample Collection document diff --git a/foundation/www/docs/user/manual/en/healthcare/vital_signs.md b/foundation/www/docs/user/manual/en/healthcare/vital_signs.md index 1fda1482..31ddf4b0 100755 --- a/foundation/www/docs/user/manual/en/healthcare/vital_signs.md +++ b/foundation/www/docs/user/manual/en/healthcare/vital_signs.md @@ -3,11 +3,11 @@ ERPNext Healthcare allows you to record Vital Signs of Patients and manage this information as part of the Patient's health record. You can create a new document and record Vital Signs of a Patient from most of the Healthcare documents or directly by > Healthcare > Consultation > Vital Signs > New Vital Signs -ERPNext Healthcare +ERPNext Healthcare You can select the Patient for whom you are recording the vitals and start by entering each of the fields. Normal values or ranges are provided for ease of assessment. Also present is an auto BMI calculator. -ERPNext Healthcare +ERPNext Healthcare All recorded Vital Signs are made available in the Patient Medical Record and the last recorded Vital Sign is displayed on the left hand side pane for easy review. diff --git a/foundation/www/docs/user/manual/en/hospitality/__init__.py b/foundation/www/docs/user/manual/en/hospitality/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/hospitality/hotel-room.md b/foundation/www/docs/user/manual/en/hospitality/hotel-room.md new file mode 100644 index 00000000..3822f196 --- /dev/null +++ b/foundation/www/docs/user/manual/en/hospitality/hotel-room.md @@ -0,0 +1,6 @@ + +# Hotel Room + +Hotel Room is a master to create hotel rooms for reservation + +Hotel Room diff --git a/foundation/www/docs/user/manual/en/hospitality/index.md b/foundation/www/docs/user/manual/en/hospitality/index.md index 9311135a..15cb348a 100644 --- a/foundation/www/docs/user/manual/en/hospitality/index.md +++ b/foundation/www/docs/user/manual/en/hospitality/index.md @@ -7,4 +7,8 @@ ERPNext Hospitality module is designed to handle workflows for Hotels and Restau The Restaurant module in ERPNext will help you manage a chain of restaurants. You can create Restaurants, Menus, Tables, Reservations and a manage Order Entry and Billing. +### Manage Hotels + +The Hotels module in ERPNext will help you manage creating Hotel Rooms, create Hotel Room Reservation. It will also help in creating Invoice from hotel room reservation + {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/hospitality/index.txt b/foundation/www/docs/user/manual/en/hospitality/index.txt index cbe6da00..0c909d84 100644 --- a/foundation/www/docs/user/manual/en/hospitality/index.txt +++ b/foundation/www/docs/user/manual/en/hospitality/index.txt @@ -1,4 +1,5 @@ restaurant restaurant-menu reservations -order-entry \ No newline at end of file +order-entry +hotel-room diff --git a/foundation/www/docs/user/manual/en/hospitality/order-entry.md b/foundation/www/docs/user/manual/en/hospitality/order-entry.md index 663b9822..c949663d 100644 --- a/foundation/www/docs/user/manual/en/hospitality/order-entry.md +++ b/foundation/www/docs/user/manual/en/hospitality/order-entry.md @@ -9,7 +9,7 @@ When the guest places an order, the waiter will select the table number and add To place an order you can select an item and click the enter key so that the item will be updated in the items table. -Order Entry +Order Entry You can also choose items with the POS style item selector. @@ -17,11 +17,11 @@ You can also choose items with the POS style item selector. When it is time for billing, you just choose the bill and you can select the customer and mode of payment. On saving, a Sales Invoice is generated and the order section becomes empty. -Order Entry +Order Entry ### Sales Invoice To print the invoice, you can click on the Invoice Link and print the invoice -Sales Invoice +Sales Invoice diff --git a/foundation/www/docs/user/manual/en/hospitality/reservations.md b/foundation/www/docs/user/manual/en/hospitality/reservations.md index 545dc43c..a6064603 100644 --- a/foundation/www/docs/user/manual/en/hospitality/reservations.md +++ b/foundation/www/docs/user/manual/en/hospitality/reservations.md @@ -5,10 +5,10 @@ Once you have setup the restaurant and tables, you can start taking in reservati To take a reservation, just make a new Restaurant Reservation from the Restaurant Page and set the time, number of people and name of the guest. -Reservation +Reservation ### Kanban As your guests walk in, You can also manage the reservations by making a simple Kanban board for the same. -Reservation Kanban Board +Reservation Kanban Board diff --git a/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md b/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md index 9495382c..e856e038 100644 --- a/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md +++ b/foundation/www/docs/user/manual/en/hospitality/restaurant-menu.md @@ -5,4 +5,4 @@ For every restaurant you must set an active Restaurant Menu from which orders ca When you save the Restaurant Menu, a Price List is created for that Menu and all pricing is linked to that price list. This way you can easily control the items on offer and pricing from the menu. -Restaurant Menu +Restaurant Menu diff --git a/foundation/www/docs/user/manual/en/hospitality/restaurant.md b/foundation/www/docs/user/manual/en/hospitality/restaurant.md index a37139c9..4f3614de 100644 --- a/foundation/www/docs/user/manual/en/hospitality/restaurant.md +++ b/foundation/www/docs/user/manual/en/hospitality/restaurant.md @@ -7,7 +7,7 @@ You can set a unique numbering prefix for each of your restaurants. All invoices If you have a default Sales Taxes and Charges Template, you can add it so that the same charge + tax will be applicable for all invoices in the restaurant. -Restaurant +Restaurant After your restaurant is created, you can add Tables and Menus for that restaurant @@ -15,6 +15,6 @@ After your restaurant is created, you can add Tables and Menus for that restaura You can add a Restaurant Table by creating a new Restaurant Table from the dashboard. -Restaurant Table +Restaurant Table diff --git a/foundation/www/docs/user/manual/en/human-resources/appraisal.md b/foundation/www/docs/user/manual/en/human-resources/appraisal.md index 7ae085c2..ff5b27c4 100644 --- a/foundation/www/docs/user/manual/en/human-resources/appraisal.md +++ b/foundation/www/docs/user/manual/en/human-resources/appraisal.md @@ -9,13 +9,13 @@ giving appropriate weightage to each parameter. #### Step 1: Select an Appraisal Template -Appraisal +Appraisal After you select the template, the remaining form appears. #### Step 2: Enter Employee Details -Appraisal +Appraisal Once the Appraisal Template is completed, you can create Appraisal records for each period where you track performance. You can give points out of 5 for each diff --git a/foundation/www/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/foundation/www/docs/user/manual/en/human-resources/articles/employees-loan-management.md index 03f94516..4b9de42d 100644 --- a/foundation/www/docs/user/manual/en/human-resources/articles/employees-loan-management.md +++ b/foundation/www/docs/user/manual/en/human-resources/articles/employees-loan-management.md @@ -13,13 +13,13 @@ Create following Groups and Ledgers in Chart of Accounts if not there. 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) -![CoA](/docs/assets/img/articles/Selection_433.png) +![CoA]({{docs_base_url}}/assets/img/articles/Selection_433.png) #### 1.2 Salaries Account Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it. -![CoA](/docs/assets/img/articles/Selection_434.png) +![CoA]({{docs_base_url}}/assets/img/articles/Selection_434.png) #### 1.3 Interest Account @@ -29,7 +29,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. -![Loan Entry](/docs/assets/img/articles/Selection_435.png) +![Loan Entry]({{docs_base_url}}/assets/img/articles/Selection_435.png) ### 3. Book Loan Recovery and Interest @@ -37,13 +37,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. -![Loan Reco](/docs/assets/img/articles/Selection_436.png) +![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_436.png) #### 3.2 Loan Adjustment in Salary And if you deduct loan installment and interest from employees salary, then book journal entry for the same. -![Loan Reco](/docs/assets/img/articles/Selection_437.png) +![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_437.png) 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. @@ -51,6 +51,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. -![Loan Reco](/docs/assets/img/articles/Selection_439.png) +![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_439.png) diff --git a/foundation/www/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md b/foundation/www/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md index a01125c8..78b0dacd 100644 --- a/foundation/www/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md +++ b/foundation/www/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md @@ -28,7 +28,7 @@ a scenario to understand how leaves impact employees Salary Slip.
  • Create Holiday List (if any), and link it with Employee master.
  • When creating Salary Slip for an Employee, following is what you will see:

    - +

    Working Days: Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
    @@ -47,7 +47,7 @@ Leave Type as "Leave Without Pay".
    As indicated above, if you have LWP checked for components in the earning and deducted table, you will notice a reduction in Amount based on no. of LWP of an Employee for that month.

    -
    +
    \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md b/foundation/www/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md index debbe1c1..074a9694 100644 --- a/foundation/www/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md +++ b/foundation/www/docs/user/manual/en/human-resources/articles/working-days-in-salary-slip.md @@ -7,6 +7,6 @@ Working Days are shown in the In the Salary Slip. Based on your preference, it m If you want to include holidays in the count of Total Working days, then ensure that in the HR Settings, field **Include holidays in Total no. of Working Days** is checked and vice versa. -Role Desk Permission +Role Desk Permission To learn how to define holidays for your company, check [Holiday List](/user/manual/en/human-resources/holiday-list) feature in the HR module. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/attendance.md b/foundation/www/docs/user/manual/en/human-resources/attendance.md index fd541570..46bfad92 100644 --- a/foundation/www/docs/user/manual/en/human-resources/attendance.md +++ b/foundation/www/docs/user/manual/en/human-resources/attendance.md @@ -6,7 +6,7 @@ day can be created manually by: > Human Resources > Documents > Attendance > New Attendance -Attendence +Attendence You can get a monthly report of your Attendance data by going to the “Monthly Attendance Details” report. diff --git a/foundation/www/docs/user/manual/en/human-resources/daily-work-summary.md b/foundation/www/docs/user/manual/en/human-resources/daily-work-summary.md index 7b8f0ea0..410c6218 100644 --- a/foundation/www/docs/user/manual/en/human-resources/daily-work-summary.md +++ b/foundation/www/docs/user/manual/en/human-resources/daily-work-summary.md @@ -1,16 +1,25 @@ # Daily Work Summary -Daily Work Summary is way to get a automated way to get a summary of work done by all employees in a company. Once you set it up, each active Employee of the Company gets an email asking them what did they work on during the day. +Daily Work Summary is way to get a automated way to get a summary of work done by users. + +Replies of all users who choose to respond is collected and sent as a summary at midnight. Emails are only sent based on the Holiday List selected for the group + +**Note:** +> You must have one active incoming email account setup for this to work. -Replies of all employees who choose to respond is collected and sent as a summary at midnight. Emails are only sent based on the Holiday List setup in the Company or Employee master. -*Note:* You must have one active incoming email account setup for this to work. ### How to Use -Go to "Daily Work Summary Settings" via HR module or search bar and set the company for which you want to activate this feature. +Go to "Daily Work Summary Group" via HR module or search bar and set the users for whom you want to send the reminder. -You can also choose to Customize the Message you send to your employees: +You can set multiple groups with different set of _users_ from your user list with different _time to send emails_ and with separate _holiday list_ for each. + +You can also choose to customize the _Message_ you send to users. + +**Note:** +>1. If no holiday list is selected then the email will be sent every day. +>2. Name of a "Daily Work Summary Group" will be sent as the title for daily summary email. +>3. Mail will not be sent to the users of a disabled Daily Work Summary Group. -Department diff --git a/foundation/www/docs/user/manual/en/human-resources/employee-advance.md b/foundation/www/docs/user/manual/en/human-resources/employee-advance.md index e6a90dad..666cc6f7 100644 --- a/foundation/www/docs/user/manual/en/human-resources/employee-advance.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee-advance.md @@ -7,7 +7,7 @@ To make a new Employee Advance, go to: > HR > Employee Advance > New Employee Advance -Expense Claim +Expense Claim Set the Employee ID, date, purpose and requested amount and “Save” the record. @@ -15,19 +15,19 @@ Set the Employee ID, date, purpose and requested amount and “Save” the recor Employee Advance record can be created by any employee but they cannot submit the record. -After saving Employee Advance, 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). +After saving Employee Advance, Employee should [Assign document to Approver](/docs/user/manual/en/using-erpnext/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). After verification, approver can submit the Employee Advance form or reject the request. ### Make Payment Entry After submission of Employee Advance record, accounts user will be able to create payment entry via Journal Entry or Payment Entry form. The payment entry will look like following: -Employee Advance Payment via Journal Entry +Employee Advance Payment via Journal Entry -Employee Advance Payment via Payment Entry +Employee Advance Payment via Payment Entry On submission of payment entry, the paid amount and status will be updated in Employee Advance record. ### Adjust advances on Expense Claim Later when employee claims the expense and advance record can be fetched in Expense Claim and linked to the claim record. -Employee Advance Payment via Payment Entry \ No newline at end of file +Employee Advance Payment via Payment Entry \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md b/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md index 85a0e17e..acad6252 100644 --- a/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md @@ -11,7 +11,7 @@ To create a new Loan Type go to: Configure Loan limit and Rate of interest. -Loan Type +Loan Type ### Employee Loan Application @@ -19,7 +19,7 @@ Employee can apply for loan by going to: > Human Resources > Employee Loan Management > Employee Loan Application > New Employee Loan Application -Employee Loan Application +Employee Loan Application #### In the Employee Loan Application, @@ -28,7 +28,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 Application +Employee Loan Application ### Employee Loan @@ -36,7 +36,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 -Employee Loan Application +Employee Loan Application #### In the Employee Loan, @@ -45,13 +45,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. -repayment Schedule +repayment Schedule #### 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. -Salary Slip +Salary Slip \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/employee.md b/foundation/www/docs/user/manual/en/human-resources/employee.md index 5d29dfde..846148b3 100644 --- a/foundation/www/docs/user/manual/en/human-resources/employee.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee.md @@ -7,6 +7,6 @@ To create new Employee go to: > Human Resources > Employee > New -Employee +Employee {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/expense-claim.md b/foundation/www/docs/user/manual/en/human-resources/expense-claim.md index 91dd3dfb..5779e321 100644 --- a/foundation/www/docs/user/manual/en/human-resources/expense-claim.md +++ b/foundation/www/docs/user/manual/en/human-resources/expense-claim.md @@ -7,14 +7,14 @@ To make a new Expense Claim, go to: > HR > Expense Claim > New Expense Claim -Expense Claim +Expense Claim Set the Employee ID, date and the list of expenses that are to be claimed and “Submit” the record. ### Set Account for Employee Set employee's expense account on the employee form, system books an expense amount of an employee under this account. -Expense Claim +Expense Claim ### Approving Expenses @@ -28,16 +28,16 @@ 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 -Expense Claim +Expense Claim User can view unpaid expense claim using report "Unclaimed Expense Claims" -Expense Claim +Expense Claim ### Payment for Expense Claim To make payment against the expense claim, user has to click on Make > Bank Entry #### Expense Claim -Expense Claim +Expense Claim #### Payment Entry Expense Claim @@ -56,6 +56,6 @@ from. All outstanding expense claims will be pulled in and payments amounts can * To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim -Expense Claim - Project Link +Expense Claim - Project Link {next} diff --git a/foundation/www/docs/user/manual/en/human-resources/fleet-management.md b/foundation/www/docs/user/manual/en/human-resources/fleet-management.md index 65f9955c..d63caf4f 100644 --- a/foundation/www/docs/user/manual/en/human-resources/fleet-management.md +++ b/foundation/www/docs/user/manual/en/human-resources/fleet-management.md @@ -20,15 +20,15 @@ Human Resources > Fleet Management > Vehicle * Enter License Plate, Make, Model, Odometer Value, Fuel Type and Fuel UOM for a quick entry. - Vehicle + Vehicle * Enter details like Insurance, Chassis, Vehicle Value, Location and Employee. - Vehicle + Vehicle * Enter Vehicle attributes like color, wheels, doors and last carbon check - Vehicle + Vehicle ### Vehicle Log @@ -40,17 +40,17 @@ Human Resources > Fleet Management > Vehicle Log * Enter License Plate, Employee, Date, Odometer reading for a quick entry. - Vehicle Log + Vehicle Log * Enter Refueling details, Service details if applicable. - Vehicle Log + Vehicle Log ### Make Expense Claim * Click on Make Expense Claim button. This button appears only in case of Submitted Vehicle Logs. - Vehicle Log + Vehicle Log When you click on 'Make Expense Claim', @@ -58,10 +58,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 Log + Vehicle Log ### 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. - Vehicle Log + Vehicle Log diff --git a/foundation/www/docs/user/manual/en/human-resources/holiday-list.md b/foundation/www/docs/user/manual/en/human-resources/holiday-list.md index bb03c188..c119cca9 100644 --- a/foundation/www/docs/user/manual/en/human-resources/holiday-list.md +++ b/foundation/www/docs/user/manual/en/human-resources/holiday-list.md @@ -15,22 +15,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. -Holiday List +Holiday List You can quickly add Weekly Off in the Holiday List as following. -Holiday List +Holiday List After that, you can also add specific days (like festival holidays) manually. -Holiday List +Holiday List ### Holiday List in Employee If you have created multiple Holiday List, then select specific Holiday List for an Employee in the respective master. -Holiday List +Holiday List 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/foundation/www/docs/user/manual/en/human-resources/human-resources-reports.md b/foundation/www/docs/user/manual/en/human-resources/human-resources-reports.md index 1f360ca3..33a4ae99 100644 --- a/foundation/www/docs/user/manual/en/human-resources/human-resources-reports.md +++ b/foundation/www/docs/user/manual/en/human-resources/human-resources-reports.md @@ -5,37 +5,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 Leave Balance +Employee Leave Balance ### Employee Birthday Employee Birthday Report shows Birthdays of your employees. -Employee Birthday +Employee Birthday ### Employee Information Employee Information Report shows Report View of important information recorded in Employee master. -Employee Information +Employee Information ### Employee Holiday Attendance Employee Holiday Attendance shows the list of Employees who attended on Holidays. -Employee Information +Employee Information ### Monthly Salary Register Monthly Salary Register shows net pay and its components of employee(s) at a glance. -Monthly Salary Register +Monthly Salary Register ### Monthly Attendance Sheet Monthly Attendance Sheet shows monthly attendance of selected employee at a glance. -Monthly Attendance Sheet +Monthly Attendance Sheet {next} diff --git a/foundation/www/docs/user/manual/en/human-resources/index.md b/foundation/www/docs/user/manual/en/human-resources/index.md index fe32d069..838ec1ec 100644 --- a/foundation/www/docs/user/manual/en/human-resources/index.md +++ b/foundation/www/docs/user/manual/en/human-resources/index.md @@ -3,7 +3,7 @@ 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 +Payroll Entry to generate Salary Slips. Most countries have complex tax rules stating which expenses the company can make on behalf of the Employees. There are a set of rules for the company to deduct taxes and social security from employee payroll. ERPNext allows to accomodate all types of taxes and diff --git a/foundation/www/docs/user/manual/en/human-resources/index.txt b/foundation/www/docs/user/manual/en/human-resources/index.txt index 04abb85a..758c4197 100644 --- a/foundation/www/docs/user/manual/en/human-resources/index.txt +++ b/foundation/www/docs/user/manual/en/human-resources/index.txt @@ -4,10 +4,11 @@ employee-advance expense-claim attendance salary-and-payroll +payroll-entry appraisal job-applicant job-opening -offer-letter +job-offer training tools human-resources-reports diff --git a/foundation/www/docs/user/manual/en/human-resources/job-applicant.md b/foundation/www/docs/user/manual/en/human-resources/job-applicant.md index 075b57dd..2a2ffd95 100644 --- a/foundation/www/docs/user/manual/en/human-resources/job-applicant.md +++ b/foundation/www/docs/user/manual/en/human-resources/job-applicant.md @@ -7,7 +7,7 @@ To create a new Job Applicant go to > Human Resource > Job Applicant > New -Job Applicant +Job Applicant ### Linking with an Email Account @@ -23,6 +23,6 @@ system shall create a New Job Applicant against each email received on the mailb * In 'Append To' select 'Job Applicant' -Email Account +Email Account {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/job-offer.md b/foundation/www/docs/user/manual/en/human-resources/job-offer.md new file mode 100644 index 00000000..d8ea73d6 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/job-offer.md @@ -0,0 +1,19 @@ + +# Job Offer + +Job Offer is given to candidate after Interview & selection which states the offered salary package, +designation, grade, department working, no of days entitled for leave. + +In ERPNext you can make a record of the Job Offers that you can given to candidates. To create a new Job Offer go to + +> Human Resource > Job Offer > New + +Job Offer + +> Note: A Job Offer 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 Job Offer. + +Job Offer + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/job-opening.md b/foundation/www/docs/user/manual/en/human-resources/job-opening.md index 9527ee37..4a3584a4 100644 --- a/foundation/www/docs/user/manual/en/human-resources/job-opening.md +++ b/foundation/www/docs/user/manual/en/human-resources/job-opening.md @@ -7,7 +7,7 @@ To create a new Job Opening go to > Human Resource > Job Opening > New -Job Opening +Job Opening {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/leave-application.md b/foundation/www/docs/user/manual/en/human-resources/leave-application.md index 5c272e07..f0403aff 100644 --- a/foundation/www/docs/user/manual/en/human-resources/leave-application.md +++ b/foundation/www/docs/user/manual/en/human-resources/leave-application.md @@ -8,7 +8,7 @@ Type and the period for which the leave is taken. > Human Resources > Leave Application > New Leave Application -Leave Application +Leave Application ###Setting Leave Approver @@ -16,7 +16,7 @@ Type and the period for which the leave is taken. * You need to mention a list of Leave Approvers against an Employee in the Employee Master. -Leave Approver +Leave Approver > Tip : If you want all users to create their own Leave Applications, you can set their “Employee ID” as a match rule in the Leave Application Permission diff --git a/foundation/www/docs/user/manual/en/human-resources/leave.md b/foundation/www/docs/user/manual/en/human-resources/leave.md index 931a46cf..3bc7a638 100644 --- a/foundation/www/docs/user/manual/en/human-resources/leave.md +++ b/foundation/www/docs/user/manual/en/human-resources/leave.md @@ -13,7 +13,7 @@ Leave Type refers to types of leave allotted to an employee by a company. An emp requirement. New Leave Type + src="{{docs_base_url}}/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. @@ -46,7 +46,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. Manual Leave Allocation + src="{{docs_base_url}}/assets/img/human-resources/manual-leave-allocation.png"> ###Via Leave Allocation Tool > Human Resources > Tools > Leave Allocation Tool @@ -54,7 +54,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. Leave Allocation Tool + src="{{docs_base_url}}/assets/img/human-resources/leave-allocation-tool.png"> --- @@ -72,7 +72,7 @@ Leave Application section enables an employee to apply for leaves. Employee can - Employee gets notification on the status of his/her Leave Application Leave Allocation Tool + src="{{docs_base_url}}/assets/img/human-resources/new-leave-application.png"> **Notes:** @@ -90,4 +90,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. Leave Allocation Tool \ No newline at end of file + src="{{docs_base_url}}/assets/img/human-resources/leave-block-list.png"> \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/offer-letter.md b/foundation/www/docs/user/manual/en/human-resources/offer-letter.md deleted file mode 100644 index 85143b66..00000000 --- a/foundation/www/docs/user/manual/en/human-resources/offer-letter.md +++ /dev/null @@ -1,19 +0,0 @@ - -# 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. - -In ERPNext you can make a record of the Offer Letters that you can given to candidates. To create a new offer Letter go to - -> Human Resource > Offer Letter > New - -Offer Letter - -> 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. - -Offer Letter - -{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/payroll-entry.md b/foundation/www/docs/user/manual/en/human-resources/payroll-entry.md new file mode 100644 index 00000000..3fb7037f --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/payroll-entry.md @@ -0,0 +1,50 @@ + +# Payroll Entry + +You can also create salary slip for multiple employees using Payroll Entry: + +> Human Resources > Payroll Entry + +Payroll Entry + +In Payroll Entry, + + 1. Select the Company for which you want to create the Salary Slips. You can also select the other fields like Branch, Department, Designation or Project to be more specific. + 2. Check "Salary Slip based on Timesheet" if you want to process timesheet based Salary Slips. + 3. Select the Start Date and End Date or Fiscal year and month for which you want to create the Salary Slips. + 4. Click on "Get Employee Details" to get a list of Employees for which the Salary Slips will be created based on the selected criteria. + 5. Select the Cost Center and Payment Account. + 6. Save the form and Submit it to create Salary Slip records for each active Employee for the time period selected. If the Salary Slips are already created, the system will not create any more Salary Slips. You can also just save the form as Draft and create the Salary Slips later. + +Payroll Entry + +Once all Salary Slips are created, you can check by clicking on "View Salary Slips", if they are created correctly or edit it if you want to deduct Leave Without Pay (LWP). + +After checking, you can "Submit" them all together by clicking on "Submit Salary Slip". + +### Booking Salaries in Accounts + +The final step is to book the Salaries in your Accounts. + +Salaries in businesses are usually dealt with extreme privacy. In most cases, +the companies issues a single payment to the bank combining all salaries and +the bank distributes the salaries to each employee’s salary account. This way +there is only one payment entry in the company’s books of accounts and anyone +with access to the company’s accounts will not have access to the individual +salaries. + +The salary payment entry is a Journal Entry that debits the total of the +earning type salary component and credits the total of deduction type salary +component of all Employees to the default account set at Salary Component level +for each component. + +To generate your salary payment voucher from Payroll Entry, click on, +> Make > Bank Entry + +Payroll Entry + +It will ask to enter the Bank Transaction Reference Number and date. All other details will be auto-filled according to your Payroll Entry form. Click on Save and create it. + +Payroll Entry + +{next} diff --git a/foundation/www/docs/user/manual/en/human-resources/salary-and-payroll.md b/foundation/www/docs/user/manual/en/human-resources/salary-and-payroll.md index 62cfcc25..6a7052a9 100644 --- a/foundation/www/docs/user/manual/en/human-resources/salary-and-payroll.md +++ b/foundation/www/docs/user/manual/en/human-resources/salary-and-payroll.md @@ -8,7 +8,7 @@ Payroll is the administration of financial records of employees' salaries, wages To process Payroll in ERPNext, 1. Create Salary Structures for all Employees. - 2. Generate Salary Slips via Process Payroll. + 2. Generate Salary Slips via [Payroll Entry](/docs/user/manual/en/human-resources/payroll-entry.html). 3. Book the Salary in your Accounts. ### Salary Structure @@ -47,7 +47,7 @@ To create a new Salary Structure go to: #### Figure 1.1:Salary Structure -Salary Structure +Salary Structure ### In the Salary Structure, @@ -56,7 +56,7 @@ To create a new Salary Structure go to: #### Figure 1.2:Salary Structure for Salary Slip based on Timesheet -Salary Structure +Salary Structure ### Salary Slip Based on Timesheet @@ -73,20 +73,20 @@ In the “Earnings” and “Deductions” tables, you can calculate the values #### Figure 1.3:Condition and Formula -Salary Structure +Salary Structure * Condition and Amount #### Figure 1.4:Condition and Amount -Salary Structure +Salary Structure * Only Formula * Only Amount #### Figure 1.5:Account Details -Salary Structure +Salary Structure * Select Mode of Payment and Payment Account for the Salary Slips which will be generated using this Salary Structure @@ -116,7 +116,7 @@ Earning Types and Deduction Types. ### Creating Salary Slips Once the Salary Structure is created, you can make a salary slip from the same -form or you can process your payroll for the month using Process Payroll. +form or you can process your payroll for the month using Payroll Entry. To create a new Salary Slip go to: @@ -124,7 +124,8 @@ To create a new Salary Slip go to: #### Figure 2: Salary Slip -Salary Slip +Salary Slip + You can also create salary slip for multiple employees using Process Payroll: @@ -132,7 +133,7 @@ You can also create salary slip for multiple employees using Process Payroll: #### Figure 3: Process Payroll -Process Payroll +Process Payroll In Process Payroll, @@ -167,7 +168,8 @@ created. #### Figure 3.1: Make Bank Entry -Process Payroll +Process Payroll + {next} diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/branch.md b/foundation/www/docs/user/manual/en/human-resources/setup/branch.md index 4fc31b71..3d0658c2 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/branch.md +++ b/foundation/www/docs/user/manual/en/human-resources/setup/branch.md @@ -3,6 +3,6 @@ Branches of your organization -Branch +Branch {next} diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/deduction-type.md b/foundation/www/docs/user/manual/en/human-resources/setup/deduction-type.md index 4d212004..6441076e 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/deduction-type.md +++ b/foundation/www/docs/user/manual/en/human-resources/setup/deduction-type.md @@ -7,7 +7,7 @@ To create a new Deduction Type > Human Resource > Setup > Deduction Type > New -Deduction Type +Deduction Type {next} diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/department.md b/foundation/www/docs/user/manual/en/human-resources/setup/department.md index 3d38f826..af8192be 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/department.md +++ b/foundation/www/docs/user/manual/en/human-resources/setup/department.md @@ -3,6 +3,6 @@ Departments in your organization -Department +Department {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/designation.md b/foundation/www/docs/user/manual/en/human-resources/setup/designation.md index c2f6da17..f8fc20aa 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/designation.md +++ b/foundation/www/docs/user/manual/en/human-resources/setup/designation.md @@ -3,6 +3,6 @@ Designations in your organization -Designation +Designation {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/earning-type.md b/foundation/www/docs/user/manual/en/human-resources/setup/earning-type.md index cae7d726..4be77a7b 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/earning-type.md +++ b/foundation/www/docs/user/manual/en/human-resources/setup/earning-type.md @@ -7,7 +7,7 @@ To create a new Earning Type > Human Resource > Setup > Earning Type > New -Earning Type +Earning Type {next} diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/employment-type.md b/foundation/www/docs/user/manual/en/human-resources/setup/employment-type.md index e364ebe4..65498692 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/employment-type.md +++ b/foundation/www/docs/user/manual/en/human-resources/setup/employment-type.md @@ -3,6 +3,6 @@ Various employment contracts you have with your employees. -Employment Type +Employment Type {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/hr-settings.md b/foundation/www/docs/user/manual/en/human-resources/setup/hr-settings.md index 9c385592..a3ed99b1 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/hr-settings.md +++ b/foundation/www/docs/user/manual/en/human-resources/setup/hr-settings.md @@ -3,6 +3,6 @@ GLobal settings for HR related documents -HR Settings +HR Settings {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md b/foundation/www/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md index c6be28c2..2f7c336e 100644 --- a/foundation/www/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md +++ b/foundation/www/docs/user/manual/en/human-resources/tools/employee-attendance-tool.md @@ -7,6 +7,6 @@ To go the attendance tool, go to: This tool allows you to add attendance records for multiple employees quickly. -Attendence upload +Attendence upload {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md b/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md index b091ca0e..285dac71 100644 --- a/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md +++ b/foundation/www/docs/user/manual/en/human-resources/tools/upload-attendance.md @@ -7,6 +7,6 @@ To upload the attendance go to: > Human Resources > Upload Attendance -Attendence upload +Attendence upload {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/training.md b/foundation/www/docs/user/manual/en/human-resources/training.md index 1f33f586..542ba8ba 100644 --- a/foundation/www/docs/user/manual/en/human-resources/training.md +++ b/foundation/www/docs/user/manual/en/human-resources/training.md @@ -4,13 +4,13 @@ Create Training Program and schedule Training Events under it. It has a dashboard linked to Training Event to view which event is under the Training Program. -Employee +Employee ### Training Event Schedule seminars, workshops, conferences etc using Training Event linked to a Training Program. You can also invite your employees to attend the event using this feature. -Employee +Employee ### Inviting Employees for Event @@ -18,7 +18,7 @@ You can invite your employees to attend the event. You can do so by selecting th By default the status of the employee will be 'Open'. -Employee +Employee When you submit the Training Event, a notification will be sent to the employee notifying that the Training has been scheduled. This is sent via Email Alert "Training Scheduled". You can modify this Email Alert to customize the message. @@ -26,7 +26,7 @@ When you submit the Training Event, a notification will be sent to the employee After completion of the training Employee-wise training results can be stored based on the Feedback received from the Trainer. -Employee +Employee When the Training Result is submitted, all the employees will receive an email notifying them that they must share their feedback via "Training Feedback". This is also managed via an Email Alert, so you can customize this alert too. @@ -34,4 +34,4 @@ When the Training Result is submitted, all the employees will receive an email n Employees can then share their feedback via Training Feedback. -Employee +Employee diff --git a/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md b/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md index a54d83ec..3062457a 100644 --- a/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md +++ b/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md @@ -303,11 +303,11 @@ A type of leave (e.g., Sick Leave, Maternity Leave, etc.). > Human Resource > Leave and Attendance > Leave Type -#### Process Payroll +#### Payroll Entry A tool that helps in creation of multiple Salary Slips for Employees. -> Human Resource > Salary and Payroll > Process Payroll +> Human Resource > Payroll Entry #### Salary Slip diff --git a/foundation/www/docs/user/manual/en/introduction/key-workflows.md b/foundation/www/docs/user/manual/en/introduction/key-workflows.md index c9076ad8..8e5894d5 100644 --- a/foundation/www/docs/user/manual/en/introduction/key-workflows.md +++ b/foundation/www/docs/user/manual/en/introduction/key-workflows.md @@ -7,7 +7,7 @@ functions. This diagram does not cover all the features of ERPNext. ![](/docs/assets/old_images/erpnext/overview.png) -Workflow +Workflow _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/foundation/www/docs/user/manual/en/introduction/the-champion.md b/foundation/www/docs/user/manual/en/introduction/the-champion.md index 50922bb6..670cae62 100644 --- a/foundation/www/docs/user/manual/en/introduction/the-champion.md +++ b/foundation/www/docs/user/manual/en/introduction/the-champion.md @@ -1,7 +1,7 @@ # The Champion -Champion +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/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md b/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md index 876c96f0..f7a36bf3 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md @@ -3,7 +3,7 @@ Capacity Planning functionality helps you in tracking production jobs allocated on each Workstation. -Role Desk Permission +Role Desk Permission Follow are the steps to use Capacity Planning Feature in your ERPNext account. @@ -33,7 +33,7 @@ Follow are the steps to use Capacity Planning Feature in your ERPNext account. **Question:** On Submission of Production Order, we are getting following error message. -Role Desk Permission +Role Desk Permission **Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Production Order. @@ -46,7 +46,7 @@ If you have update working hours in the Workstation, but still getting this issu If you want to ignore above validation and allow scheduling of production job beyond the working hours of the Workstation, enable Overtime in the Manufacturing Settings. -Role Desk Permission +Role Desk Permission If you want to complete disable Capacity Planning feature, in the Manufacturing Settings, check field "Disable Capacity Planning and Time Tracking". diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md index 5f7aeba4..a48dffa0 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md @@ -9,7 +9,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. -Nested BOM +Nested BOM Following is how the structure of nested BOM will look: diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md b/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md index 278beb30..0d50ab60 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md @@ -5,7 +5,7 @@ **Answer:** There are 3 available options in the Valuation Based On field: -Nested BOM +Nested BOM **Valuation Rate:** Item valuation rate is defined based on it's purchase or manufacture value. diff --git a/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md b/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md index ad285178..1eb618a5 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md +++ b/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md @@ -11,11 +11,11 @@ To make a new BOM: > Manufacturing > Bill of Materials > New BOM -Task +Task * To add Operations select 'With Operation'. The Operations table shall appear. -Task +Task * Select the Item for which you want to make the BOM. * Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary. @@ -28,22 +28,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. -Costing +Costing * This cost can be updated on by using the 'Update Cost' button. -Update Cost +Update Cost * User can select the currency in the BOM * System calculates the costing based on the price list currency -Update Cost +Update Cost ### Materials Required(exploded) This table lists down all the Material required for the Item to be Manufactured. It also fetches sub-assemblies along with the quantity. -Exploded Section +Exploded Section {next} diff --git a/foundation/www/docs/user/manual/en/manufacturing/introduction.md b/foundation/www/docs/user/manual/en/manufacturing/introduction.md index 54efd223..90fcafca 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/introduction.md +++ b/foundation/www/docs/user/manual/en/manufacturing/introduction.md @@ -1,7 +1,7 @@ # Introduction -Task +Task ### Types of Production Planning diff --git a/foundation/www/docs/user/manual/en/manufacturing/operation.md b/foundation/www/docs/user/manual/en/manufacturing/operation.md index 52cd0126..54b934ae 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/operation.md +++ b/foundation/www/docs/user/manual/en/manufacturing/operation.md @@ -9,6 +9,6 @@ You can also create a Operation by: > Manufacturing > Documents > Operation > New -Operation +Operation {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/production-order.md b/foundation/www/docs/user/manual/en/manufacturing/production-order.md index fb823d12..1dde4f76 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/production-order.md +++ b/foundation/www/docs/user/manual/en/manufacturing/production-order.md @@ -1,7 +1,7 @@ # Production Order -Production Order +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 @@ -14,7 +14,7 @@ by: > Manufacturing > Documents > Production Order > New -Production Order +Production Order ### Creating Production Orders @@ -36,11 +36,11 @@ by: * By default the system fetchs workstation and duration for Production Order Operations from the selected BOM. -PO Opeartions +PO Opeartions * If you wish to reassign the workstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order. -PO reassigning Operations +PO reassigning Operations * Select the respective operation, and change its workstation. * You can also change the Operating Time for that operation @@ -57,19 +57,19 @@ by: * Click on 'Start'. -Transfer Materials +Transfer Materials * Mention the quantity of materials to be transfered. -Material Transfer Qty +Material Transfer Qty * Submit the Stock Entry -Stock Entry for PO +Stock Entry for PO * Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry. -Stock Entry for PO +Stock Entry for PO #### Material Transfer through Stock Entry Use cases for this option are: @@ -85,7 +85,7 @@ If this is the case, you can select the Skip Material Transfer check box, which * 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. -Make timesheet against PO +Make timesheet against PO ###Updating Finished Goods @@ -93,11 +93,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'. -Update Finished Goods +Update Finished Goods * Mention the quantity of materials to be transfered. -Update Finished Goods Qty +Update Finished Goods Qty > Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry. @@ -112,7 +112,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' -PO - stop +PO - stop * You can also re-start a stopped Production Order. diff --git a/foundation/www/docs/user/manual/en/manufacturing/production-plan.md b/foundation/www/docs/user/manual/en/manufacturing/production-plan.md new file mode 100644 index 00000000..cdb51645 --- /dev/null +++ b/foundation/www/docs/user/manual/en/manufacturing/production-plan.md @@ -0,0 +1,54 @@ + +# Production Plan + +Production plan helps user to plan production aginst the multiple sales orders or the material requests and also plan for the purchase of the raw materials which will be used in the production. + +To use the Production Plan, go to: + +> Manufacturing > Production > Production Plan + +Production Plan + +## Planning for Production + +#### Production Against Sales Orders + +* Select option as Sales Order from the drop down list of get items from. System will show the filters, using that we can pull the sales orders for the production. + +Sales Order Filters + +* Click on Get Sales Orders to fetch sales orders based on above filters + +Sales Orders + +* Click on Get Items for Production Order to fetch the items from the above sales orders. + +Sales Order Item + * Include Exploded Items :- To include subassembly items of raw materials in the production. + +#### Production Against Material Requests + +* Select option as Material Request from the drop down list of get items from. System will show the filters, using that we can pull the material requests for the production. + +Material Request Filters + +* Click on Get Material Request to fetch material requests based on above filters + +Material Requests + +* Click on Get Items for Production Order to fetch the items from the above material requests. + +Material Request Item + +## Planning for Material Requests +* Click on get raw materials for production button to fetech raw materials required in the production. + +Material Request Plan + + * Include Non Stock Items :- To add non stock items in the material request planning. + * Include Subcontracted Items :- To add subcontracted item's raw materials if include exploded items is disabled + * Ignore Existing Ordered Quantity :- If enabled then system will not check the projected quantity to make material request. + +# Options To Make Production Order and Material Request + +Make PO or MR diff --git a/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md index 1ca2c3fd..4b37a763 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md +++ b/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md @@ -5,7 +5,7 @@ Manufacturing Settings can be found at: `Manufacturing > Setup > Manufacturing Settings` -Manufacturing Settings +Manufacturing Settings ####Disable Capacity Planning and Time Tracking @@ -17,7 +17,7 @@ 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). -Manufacturing Settings +Manufacturing Settings 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. @@ -25,7 +25,7 @@ As per the standard validation, if Operation cannot be completed within working 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. -Manufacturing Settings +Manufacturing Settings ####Over Production Allowance Percentage @@ -35,7 +35,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". -Manufacturing Settings +Manufacturing Settings ####Capacity Planning For (Days) diff --git a/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md b/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md index 7f18912a..1a3d0fce 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md +++ b/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md @@ -18,7 +18,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”. -Sub-Contracting +Sub-Contracting __Step 1:__ Make a Bill of Materials for the processed Item, with the unprocessed @@ -26,24 +26,24 @@ 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. -Sub-Contracting +Sub-Contracting __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. You can also select the warehouse from which the material would be reserved for sub contracting. -Sub-Contracting +Sub-Contracting Once the PO is submitted, you can view the reserved quantity of the item from the item dashboard as well. -Sub-Contracting +Sub-Contracting __Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier. -Sub-Contracting +Sub-Contracting __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. -Sub-Contracting +Sub-Contracting > Note 1: Make sure that the “Rate” of processed Item is the processing rate (excluding the raw material rate). diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md index 5358c611..26c49822 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md +++ b/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md @@ -14,7 +14,7 @@ To use the Production Planning Tool, go to: > Manufacturing > Tools > Production Planning Tool -Production Planing Tool +Production Planing Tool #### Step 1: Specify source to get Production Items @@ -28,7 +28,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. -Production Planing Tool +Production Planing Tool @@ -37,11 +37,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. -Production Planing Tool +Production Planing Tool #### Step 4: Create Production Orders -Production Planing Tool +Production Planing Tool @@ -49,7 +49,7 @@ To use the Production Planning Tool, go to: Create Material Request for Items with projected shortfall. -Production Planing Tool +Production Planing Tool diff --git a/foundation/www/docs/user/manual/en/manufacturing/workstation.md b/foundation/www/docs/user/manual/en/manufacturing/workstation.md index 0806dacf..4f5b50bd 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/workstation.md +++ b/foundation/www/docs/user/manual/en/manufacturing/workstation.md @@ -11,7 +11,7 @@ You can also create a Workstation by: > Manufacturing > Documents > Workstation > New -Workstation +Workstation In workstation specify the workstation working hours under the 'working hour' section. You can also specify the working hours based on shifts. diff --git a/foundation/www/docs/user/manual/en/non_profit/Chapter/chapter.md b/foundation/www/docs/user/manual/en/non_profit/Chapter/chapter.md index 7f8a4e0b..19dfd269 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Chapter/chapter.md +++ b/foundation/www/docs/user/manual/en/non_profit/Chapter/chapter.md @@ -9,7 +9,7 @@ To Create Chapter: > Non Profit > Chapter > New -Chapter +Chapter System User or Chapter Head can add chapter Member directly from the desk or User can join directly by visiting chapter page on website @@ -18,9 +18,9 @@ to join chapter online > My Account on website > Chapter from sidebar > Select Available chapter and click on join chapter button -online Chapter +online Chapter -online Chapter +online Chapter To leave chapter click on leave chapter button diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md b/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md index 631e1f87..0b9d4740 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md +++ b/foundation/www/docs/user/manual/en/non_profit/Donor/donor.md @@ -9,7 +9,7 @@ To create new Donor go to: > Non Profit > Donor > New -Student +Student **Email:** Email field is the id of Member doctype. diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md b/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md index 4ef03034..0fa89d31 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md +++ b/foundation/www/docs/user/manual/en/non_profit/Donor/donor_type.md @@ -11,7 +11,7 @@ To create new donor Type go to: > Non Profit > Donor Type > New -donor type +donor type **Donor Type:** The Donor Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a donor type name that is appropriate to both audiences. It can be changed at a later date diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md b/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md index 6f2d5166..4bb9462a 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md +++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/grant_application.md @@ -8,11 +8,11 @@ To Generate Online Grant Application go to: > My Account on website > Grant Application from sidebar > Apply for new Grant Application. -Online Grant Application row +Online Grant Application row -Online Grant Application +Online Grant Application -Online Grant Application +Online Grant Application To Generate Grant Application go to: @@ -20,7 +20,7 @@ To Generate Grant Application go to: > Non Profit > Grant Application > New. -Grant Application +Grant Application **Email:** Email is a mandatory field. diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/member.md b/foundation/www/docs/user/manual/en/non_profit/Membership/member.md index 4595e9da..df36fe94 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Membership/member.md +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/member.md @@ -9,7 +9,7 @@ To create new Member go to: > Non Profit > Member > New -Student +Student **Email:** Email field is the id of Member doctype. diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md b/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md index cf780ad4..7fa94a64 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/membership.md @@ -10,7 +10,7 @@ To create new Membership go to: > Non Profit > Membership > New -Membership +Membership **Member:** Member is a link field fetch member details from Member doctype. diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md b/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md index 6ec48540..d5c80be8 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/membership_type.md @@ -10,7 +10,7 @@ To create new Membership Type go to: > Non Profit > Membership Type > New -Student +Student **Membership Type:** The Membership Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md index 8b398325..c4dd81dd 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md +++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer.md @@ -9,7 +9,7 @@ To create new Volunteer go to: > Non Profit > Volunteer > New -Volunteer +Volunteer **Email:** Email field is the id of Member doctype. diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md index 63bbc7c2..22a56dbf 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md +++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/volunteer_type.md @@ -9,7 +9,7 @@ To create new volunteer Type go to: > Non Profit > Volunteer Type > New -Volunteer +Volunteer **Volunteer Type:** The Volunteer Type is displayed throughout the system, on both public and backend pages so spend some time thinking about a membership type name that is appropriate to both audiences. It can be changed at a later date diff --git a/foundation/www/docs/user/manual/en/non_profit/index.md b/foundation/www/docs/user/manual/en/non_profit/index.md index d7cab0fd..589e422b 100644 --- a/foundation/www/docs/user/manual/en/non_profit/index.md +++ b/foundation/www/docs/user/manual/en/non_profit/index.md @@ -14,11 +14,11 @@ Donor Management, Event and Grant etc
    Non Profit Domain + src="{{docs_base_url}}/assets/img/non_profit/non_profit_domain.png">
    ### Non Profit Domain -Non Profit +Non Profit {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/activity-cost.md b/foundation/www/docs/user/manual/en/projects/activity-cost.md index 37a84841..5b16bfd7 100644 --- a/foundation/www/docs/user/manual/en/projects/activity-cost.md +++ b/foundation/www/docs/user/manual/en/projects/activity-cost.md @@ -4,4 +4,4 @@ Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type. This rate is pulled by the system while making Time Logs. It is used for Project Costing. -Activity Cost +Activity Cost diff --git a/foundation/www/docs/user/manual/en/projects/activity-type.md b/foundation/www/docs/user/manual/en/projects/activity-type.md index fb1f81c2..87aeace1 100644 --- a/foundation/www/docs/user/manual/en/projects/activity-type.md +++ b/foundation/www/docs/user/manual/en/projects/activity-type.md @@ -3,7 +3,7 @@ Activity Type makes a list of the different types of activities against which a Time Log can be made. -Activity Type +Activity Type By default the following Activity Types are created. diff --git a/foundation/www/docs/user/manual/en/projects/articles/project-costing.md b/foundation/www/docs/user/manual/en/projects/articles/project-costing.md index 55784ca2..d4d741f0 100644 --- a/foundation/www/docs/user/manual/en/projects/articles/project-costing.md +++ b/foundation/www/docs/user/manual/en/projects/articles/project-costing.md @@ -13,17 +13,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. -Activity Cost +Activity Cost #### Time Log Based on Actual Time spent on the Project-Task, Employee will create a time log. -Time Log +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. -[Time Log Costing +[Time Log Costing Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log. @@ -31,10 +31,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. -Costing in Task +Costing in Task Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project. -Costing in Project +Costing in Project \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/project.md b/foundation/www/docs/user/manual/en/projects/project.md index 72150e52..86e91778 100644 --- a/foundation/www/docs/user/manual/en/projects/project.md +++ b/foundation/www/docs/user/manual/en/projects/project.md @@ -3,7 +3,7 @@ Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it. -Project +Project You can also track % Completion of a Project using different methods. @@ -11,34 +11,34 @@ You can also track % Completion of a Project using different methods. 2. Task Progress 3. Task Weight -Project +Project Some examples of how the % Completion is calculated based on Tasks. -Project +Project -Project +Project ### Managing tasks Project can be divided into multiple Tasks. Task can be created via Project document itself or can be created via [Task](/docs/user/manual/en/projects/tasks.html) -Project +Project * To view Task made against a Project click on 'Tasks' -Project - View Task +Project - View Task -Project - Task List +Project - Task List * You can also view the Tasks from the Project document itself -Project - Task Grid +Project - Task Grid * To add Weights to Tasks you can follow the below steps -Project - Task Grid -Project - Task Grid +Project - Task Grid +Project - Task Grid ### Managing time @@ -49,13 +49,13 @@ The Actual Start and End Time along with the costing shall then be updated based * To view Time Log made against a Project click on 'Time Logs' -Project - View Time Log +Project - View Time Log -Project - Time Log List +Project - Time Log List * You can also create a Time Log directlly and link it to the Project. -Project - Link Time Log +Project - Link Time Log ### Managing expenses @@ -64,27 +64,27 @@ The system shall update the total amount from expense claims in the project cost * To view Expense Claims made against a Project click on 'Expense Claims' -Project - View Expense Claim +Project - View Expense Claim * You can also create a Expense Claims directlly and link it to the Project. -Project - Link Expense Claim +Project - Link Expense Claim * Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section -Project - Total Expense Claim +Project - Total Expense Claim ### Cost Center You can make a [Cost Center](/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 - Cost Center +Project - Cost Center ###Project Costing The Project Costing section helps you track the time, expenses and purchases incurred against the project. -Project - Costing +Project - Costing * The Total Cost is composed of the costing amount from timesheets, the total cost from expense claims and the total cost from purchase invoices created against this project. @@ -94,7 +94,7 @@ The Project Costing section helps you track the time, expenses and purchases inc 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. -Project - Sales Order +Project - Sales Order ###Gantt Chart @@ -103,8 +103,8 @@ ERPNext gives you a illustrated view of tasks scheduled against that project in * To view gantt chart against a project, go to that project and click on 'Gantt Chart' -Project - View Gantt Chart +Project - View Gantt Chart -Project - Gantt Chart +Project - Gantt Chart {next} diff --git a/foundation/www/docs/user/manual/en/projects/tasks.md b/foundation/www/docs/user/manual/en/projects/tasks.md index 2fb27723..931d1572 100644 --- a/foundation/www/docs/user/manual/en/projects/tasks.md +++ b/foundation/www/docs/user/manual/en/projects/tasks.md @@ -4,13 +4,13 @@ Project is divided into Tasks. In ERPNext, you can also create a Task independently. -Task +Task ### Status of the Task A Task can have one of the following statuses - Open, Working, Pending Review, Closed, or Cancelled. -Task - Status +Task - Status * By default each new Task created has the status set to 'Open'. @@ -20,7 +20,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. -Depends On +Depends On * You cannot close the parent task until all dependent tasks are closed. @@ -34,13 +34,13 @@ The Actual Start and End Time along with the costing is updated based on the Tim * To view Time Log made against a Task click on 'Time Logs' -Task - View Time Log +Task - View Time Log -Task - Time Log List +Task - Time Log List * You can also create a Time Log directly and link it to the Task. -Task - Link Time Log +Task - Link Time Log ### Managing Expenses @@ -49,14 +49,14 @@ The system shall update the total amount from expense claims in the costing sect * To view Expense Claims made against a Task click on 'Expense Claims' -Task - View Expense Claim +Task - View Expense Claim * You can also create a Expense Claims directly and link it to the Task. -Task - Link Expense Claim +Task - Link Expense Claim * Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section -Task - Total Expense Claim +Task - Total Expense Claim {next} diff --git a/foundation/www/docs/user/manual/en/projects/time-log-batch.md b/foundation/www/docs/user/manual/en/projects/time-log-batch.md index 896a6def..e137056e 100644 --- a/foundation/www/docs/user/manual/en/projects/time-log-batch.md +++ b/foundation/www/docs/user/manual/en/projects/time-log-batch.md @@ -9,17 +9,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. -Time Log - Drag Calender +Time Log - Drag Calender ###Making Sales Invoice * After submitting the Time Sheet, "Make Invoice" button shall appear. -Time Log - Drag Calender +Time Log - Drag Calender * Click on that button to raise a Sales Invoice against the Time Sheet. -Time Log - Drag Calender +Time Log - Drag Calender * When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Sheet and their status will change to "Billed". diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md b/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md index 81c378ca..ce9c16c7 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md @@ -7,7 +7,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. -Sales Invoice +Sales Invoice ####Salary Structure for the Employee @@ -17,17 +17,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. -Sales Invoice +Sales Invoice ####Create Salary Slip from Timesheet To create Salary Slip against Timesheet, open Timesheet and click on "Salary Slip". -Sales Invoice +Sales Invoice 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. -Sales Invoice +Sales Invoice 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. @@ -35,7 +35,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". -Sales Invoice +Sales Invoice
    diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md b/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md index af4e6088..24dc1687 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md @@ -15,7 +15,7 @@ To create new Timesheet, go to: In the Employee field, only ones having ative Salary Structure will be selectable. Further in the Salary Structure , is created for the E on the actual hours worked, Employee can create Timesheet. To be able to create Sales Invoice against this Timesheet, ensure `Billable` field is checked. -Sales Invoice +Sales Invoice #### Step 3:Activity Type @@ -23,7 +23,7 @@ Employee will have to select an Activity Type (like planning, site visit, repair To learn more on how to setup Activity Type and Activity Cost, click [here](/docs/user/manual/en/projects/articles/project-costing). -Sales Invoice +Sales Invoice #### Step 4: Enter Actual Time @@ -31,7 +31,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. -Sales Invoice +Sales Invoice Based on the actual hours worked and Activity Cost of an Employee, Total Billing Amount will be calculated for Timesheet. @@ -47,7 +47,7 @@ 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 Sales Invoice timesheet @@ -55,7 +55,7 @@ In the Timesheet, if "Is Billable" is checked, you will find option to create Sa Sales Invoice has dedicated table for the Timesheet table where Timesheet details will be updated. You can select more Timesheets in this table. -Sales Invoice +Sales Invoice ####Select Customer and Item @@ -68,4 +68,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. -Sales Invoice +Sales Invoice diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md index 9ac61121..6ba2edf1 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md @@ -5,7 +5,7 @@ Creating Timesheet for Production Order helps in capacity planning for the Works 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. -Sales Invoice +Sales Invoice 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. @@ -13,28 +13,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. -Sales Invoice +Sales Invoice On submission on Production Order, Timesheet will be created automatically. -Sales Invoice +Sales Invoice ####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. -Sales Invoice +Sales Invoice After enter From Time and To Time for all the Operations, Total Hours will be calculated. -Sales Invoice +Sales Invoice 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. -Sales Invoice +Sales Invoice ####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. -Sales Invoice +Sales Invoice diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md index 150803b4..87ec4c70 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md @@ -3,7 +3,7 @@ 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. -Sales Invoice +Sales Invoice ####Billable Timesheet diff --git a/foundation/www/docs/assets/img/agriculture/crops_and_land/__init__.py b/foundation/www/docs/user/manual/en/regional/france/__init__.py similarity index 100% rename from foundation/www/docs/assets/img/agriculture/crops_and_land/__init__.py rename to foundation/www/docs/user/manual/en/regional/france/__init__.py diff --git a/foundation/www/docs/user/manual/en/regional/france/_sidebar.json b/foundation/www/docs/user/manual/en/regional/france/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/regional/france/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md b/foundation/www/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md new file mode 100644 index 00000000..efd3585c --- /dev/null +++ b/foundation/www/docs/user/manual/en/regional/france/fichier_des_ecritures_comptables.md @@ -0,0 +1,25 @@ + +# Le Fichier des Écritures Comptables [FEC] + +Since 2014, a legal requirement makes it mandatory for companies operating in France to provide a file of their general accounting postings by fiscal year corresponding to an electronic accounting journal. + +For ERPNext users this file can be generated using a report available if you system's country is France. + + +### Requirements + +To generate the report correctly, your Chart of Account needs to be setup according to the french accounting rules. + +All accounts need to have a number in line with the General Chart of Account (PCG) and a name. + +The SIREN number of your company can be added in the "Company" doctype. + + +### CSV generation + +You can generate the required CSV file by clicking on "Export" in the top right corner of the report. + + +### Testing Instructions + +To test the validity of your file, the tax administration provides a testing tool at the following address: [Outil de test des fichiers des écritures comptables (FEC)](http://www.economie.gouv.fr/dgfip/outil-test-des-fichiers-des-ecritures-comptables-fec) diff --git a/foundation/www/docs/user/manual/en/regional/france/index.txt b/foundation/www/docs/user/manual/en/regional/france/index.txt new file mode 100644 index 00000000..84fcb9e3 --- /dev/null +++ b/foundation/www/docs/user/manual/en/regional/france/index.txt @@ -0,0 +1,2 @@ +fichier_des_ecritures_comptables +local_overrides diff --git a/foundation/www/docs/user/manual/en/regional/france/local_overrides.md b/foundation/www/docs/user/manual/en/regional/france/local_overrides.md new file mode 100644 index 00000000..b6a9cbde --- /dev/null +++ b/foundation/www/docs/user/manual/en/regional/france/local_overrides.md @@ -0,0 +1,8 @@ + +# Sales and Payment Transactions + +In order to be compliant with the latest finance law applicable to POS software, ERPNext automatically registers all sales and payment transactions in a chained log. + +If your country is set to "France", the deletion of sales and payment transactions will also not be permitted, even if the appropriate permissions are given to the user. + +Please note that ERPNext is not yet fully compliant with the 2016 Finance Law. diff --git a/foundation/www/docs/user/manual/en/regional/index.txt b/foundation/www/docs/user/manual/en/regional/index.txt new file mode 100644 index 00000000..1a6cf1b7 --- /dev/null +++ b/foundation/www/docs/user/manual/en/regional/index.txt @@ -0,0 +1,3 @@ +france +india +united_arab_emirates diff --git a/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md b/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md index bffadd49..6c106a5c 100644 --- a/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md +++ b/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md @@ -5,7 +5,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** -GST Settings +GST Settings Here you can click on the "Send GSTIN Update Reminders" button to send email reminders to all your customers @@ -13,10 +13,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: -GST Portal Page +GST Portal Page Here they can update their GSTIN and it will automatically be added to your customer GSTIN record. #### Sample GSTIN Reminder Email -GST Reminder Email +GST Reminder Email diff --git a/foundation/www/docs/user/manual/en/regional/india/gst-setup.md b/foundation/www/docs/user/manual/en/regional/india/gst-setup.md index d3d2bcf1..f46f5336 100644 --- a/foundation/www/docs/user/manual/en/regional/india/gst-setup.md +++ b/foundation/www/docs/user/manual/en/regional/india/gst-setup.md @@ -5,7 +5,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 in Customer +GST in Customer **GST for your Company Address** @@ -13,20 +13,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. -GST in Company +GST in Company **Include GSTIN number in the Address Template** Open Address Template record for India, add GSTIN number and State Code there if not exists. -GST in Company +GST in Company ### 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 -HSN in Item +HSN in Item ### 3. Making Tax Masters @@ -36,7 +36,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. -GST in Customer +GST in Customer ### 4. Make Tax Templates @@ -44,7 +44,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 -GST in Customer +GST in Customer In your **Out of State GST** template, select IGST @@ -60,22 +60,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 -GST Invoice +GST 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. -Sample GST Tax Invoice +Sample GST Tax Invoice ### Reports ERPNext comes with most of your reports you need to prepare your GST Returns. Go to Accounts > GST India head for the list. -GST Menus +GST Menus You can check the impact of your invoice in the **GST Sales Register** and **GST Itemised Sales Register** -GST Itemised Sales Register +GST Itemised Sales Register diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/__init__.py b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md index 2e45b9e7..e0e0793e 100644 --- a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md +++ b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/uae-vat-setup.md @@ -6,20 +6,20 @@ Set tax registation number in the field tax id for the customer, supplier and company 1. For Customer -TRN in Customer +TRN in Customer 2. For Company -TRN in Company +TRN in Company ### 2. Setting up TAX Code for Products Setup tax code in the item master, system will fetch same code in the sales/purchase invoice on selection of an item. -Tax Code in Item +Tax Code in Item ### 3. Default Tax Templates ERPNext provides you default tax template for vat(5%, zero, exempted) and excise(50%, 100%). You can create your own [tax template](/docs/user/manual/en/setting-up/setting-up-taxes.html). -Default Tax Template +Default Tax Template ### 3. Making VAT Ready Invoices @@ -33,14 +33,14 @@ For **Sales Invoice**, 4. Select the template that you have created based on the type of transaction 5. Save and Submit the Invoice -VAT Invoice +VAT Invoice ### 4. Print Tax Invoice ERPNext provides 2 default print foramt 1. Simplified Tax Invoice -Simplified Tax Invoice +Simplified Tax Invoice 2. Detailed Tax Invoice -Detailed Tax Invoice +Detailed Tax Invoice diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/__init__.py b/foundation/www/docs/user/manual/en/schools/Assessment/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/__init__.py b/foundation/www/docs/user/manual/en/schools/Attendance/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/__init__.py b/foundation/www/docs/user/manual/en/schools/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/admission/__init__.py b/foundation/www/docs/user/manual/en/schools/admission/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/fees/__init__.py b/foundation/www/docs/user/manual/en/schools/fees/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/schedule/__init__.py b/foundation/www/docs/user/manual/en/schools/schedule/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/setup/__init__.py b/foundation/www/docs/user/manual/en/schools/setup/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/student/__init__.py b/foundation/www/docs/user/manual/en/schools/student/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md b/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md index f5df998e..087f32a5 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md +++ b/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md @@ -8,7 +8,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. -Item Unit of Measure +Item Unit of Measure ###Setp 2: In the Sale Order, you will find two UoM fields @@ -18,7 +18,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. -Sale order Unit of Measure +Sale order Unit of Measure 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. @@ -27,4 +27,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. -Stock report in UOM +Stock report in UOM diff --git a/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md b/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md index 071da4ec..e864e567 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md +++ b/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md @@ -10,7 +10,7 @@ To setup Pricing Rule, go to: ####Adding Margin in Pricing Rule -Adding Margin in Pricing Rule +Adding Margin in Pricing Rule Total Margin is calculated as follows: `Rate = Price List Rate + Margin Rate` @@ -23,7 +23,7 @@ To add Price List, go to: ####Adding Item Price -Adding Margin in Pricing Rule +Adding Margin in Pricing Rule 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. @@ -35,4 +35,4 @@ add item and scroll down to section where you can find the Margin Type ####Adding Margin in Quotation -Adding Margin in Quotation +Adding Margin in Quotation diff --git a/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md b/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md index d3dc325c..64dac956 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md +++ b/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md @@ -7,7 +7,7 @@ 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. -Discount Percentage +Discount Percentage The feature of Discount (%) is available in all sales and purchase transactions. @@ -17,18 +17,18 @@ You can use Pricing Rule for auto-application of Discount (%). [Click here to le In the "Additional Discount" section, you can apply discount as amount or as percentage. -Discount Percentage +Discount 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 Percentage +Discount Percentage ##### 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. -Discount Percentage +Discount Percentage \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md b/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md index bc4be7a6..5d86e5fa 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md +++ b/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md @@ -3,7 +3,7 @@ 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. -Close SO +Close SO ####Scenario @@ -11,7 +11,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. -Closed SO +Closed SO 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/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md b/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md index bf823234..f379e991 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md +++ b/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md @@ -11,19 +11,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 Item Master +Setup 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. -Setup Drop Shipping on Sales Order Item +Setup Drop Shipping on Sales Order Item #### Create Purchase Order After submitting a Sales Order, create Puchase Order. -Setup Drop Shipping on Sales Order Item +Setup Drop Shipping on Sales Order Item 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. @@ -31,16 +31,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. -Purchase Order for Drop Shipping +Purchase Order for Drop Shipping **_Close_**, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment. -Close Sales Order +Close Sales Order ###Drop Shipping Print Format You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format. -Drop Dhip Print Format +Drop Dhip Print Format ###Video Help on Drop Ship diff --git a/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md index 3540e673..4e39d416 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md +++ b/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md @@ -15,7 +15,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. -Service Item +Service Item 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. diff --git a/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md index fb87b011..2f8ba8bf 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md +++ b/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md @@ -5,13 +5,13 @@ In ERPNext, Sales Person master is maintained in [tree structure](/docs/user/man 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 Customer +Sales Person Customer ####Sales Person Contribution If more than one sales persons are working together on an order, then contribution (%) should be set for each Sales Person. -Sales Person Order +Sales Person Order On saving transaction, based on the Net Total and Contriution (%), `Contribution to Net Total` will be calculated for each Sales Person. @@ -25,7 +25,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 Report +Sales Person Report ####Sales Person wise Commission diff --git a/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md b/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md index 06a23cf4..c7ea46fe 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md +++ b/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md @@ -11,7 +11,7 @@ To setup Shipping Rule, go to: ####Shipping Rule Conditions -Shipping Rule Prices +Shipping Rule Prices 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. @@ -19,16 +19,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 Rule +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 Account +Shipping Account ####Shipping Rule Application Following is an example of how shipping charges is auto-applied on Sales Order based on Shipping Rule. -Shipping Rule Application \ No newline at end of file +Shipping Rule Application \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/quotation.md b/foundation/www/docs/user/manual/en/selling/quotation.md index 4ca10d57..4f0263fd 100644 --- a/foundation/www/docs/user/manual/en/selling/quotation.md +++ b/foundation/www/docs/user/manual/en/selling/quotation.md @@ -8,7 +8,7 @@ Invoice”or a **Quotation**. A typical Selling flow looks like: -Make Quotation from Opportunity +Make Quotation from Opportunity To create a new Quotation navigate to: @@ -18,7 +18,7 @@ To create a new Quotation navigate to: You can also create a Quotation from an Opportunity. -Make Quotation from Opportunity +Make Quotation from Opportunity A Quotation contains details about: @@ -47,7 +47,7 @@ To add taxes to your Quotation, you can select a **Sales Taxes and Charges Templ For e.g -Taxes and Charges +Taxes and Charges To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html). diff --git a/foundation/www/docs/user/manual/en/selling/sales-order.md b/foundation/www/docs/user/manual/en/selling/sales-order.md index 1fc023c2..ea9da6b0 100644 --- a/foundation/www/docs/user/manual/en/selling/sales-order.md +++ b/foundation/www/docs/user/manual/en/selling/sales-order.md @@ -12,7 +12,7 @@ a Sales Order. ### Sales Order Flow-Chart -Sales Order flow +Sales Order flow To create a new Sales Order go to: @@ -22,11 +22,11 @@ To create a new Sales Order go to: You can also create a Sales Order from a submitted Quotation. -Make Sales Order from Quotation +Make Sales Order from Quotation Or you can create a new Sales Order and pull details from an Quotation. -Make Sales Order from Quotation +Make Sales Order from Quotation Most of the information in your Sales Order is the same as the Quotation. There are a few amongst other things that a Sales Order will ask you to @@ -57,7 +57,7 @@ To add taxes to your Quotation, you can select a **Sales Taxes and Charges Templ For e.g -Taxes and Charges +Taxes and Charges To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html). @@ -83,7 +83,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. -Reccuring Sales Order +Reccuring Sales Order ### Next Steps diff --git a/foundation/www/docs/user/manual/en/selling/setup/item-price.md b/foundation/www/docs/user/manual/en/selling/setup/item-price.md index 86696f2e..82a68b4d 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/item-price.md +++ b/foundation/www/docs/user/manual/en/selling/setup/item-price.md @@ -17,7 +17,7 @@ Step 1: Select Price List You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. -+Item Price list ++Item Price list On selection of Price List, its currency and for selling or buying property will be fetched as well. @@ -27,13 +27,13 @@ Step 2: Select Item Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well. -+Item Price list ++Item Price list Step 3: Enter Rate Enter selling/buying rate of an item in Price List currency. -+Item Price list ++Item Price list Step 4: Save Item Price diff --git a/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md b/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md index 4711b830..035aadfe 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md +++ b/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md @@ -12,7 +12,7 @@ To create new Product Bundle, Go to: Selling > Setup > Product Bundle > New -Product Bundle +Product Bundle ###Select Parent Item @@ -34,7 +34,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. -Product Bundle +Product Bundle 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/foundation/www/docs/user/manual/en/selling/setup/sales-partner.md b/foundation/www/docs/user/manual/en/selling/setup/sales-partner.md index f1f1b2d4..260469dc 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/sales-partner.md +++ b/foundation/www/docs/user/manual/en/selling/setup/sales-partner.md @@ -13,7 +13,7 @@ To create a sales partner go to: Sales Partners are saved with Sales Partner name provided by user. -Sales Partner +Sales Partner You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount. @@ -22,13 +22,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. -Sales Partner +Sales Partner To see listing of partner, you should go to: https://example.erpnext.com/partners -Sales Partner +Sales Partner {next} diff --git a/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md index 58f87349..7d89469f 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md +++ b/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md @@ -15,7 +15,7 @@ To allocate target, you should open specific Sales Person master. In the Sales Person master, you will find table called Sales Person Target. -Sales person target +Sales person target In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. @@ -37,7 +37,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. -Target Item Group +Target Item Group 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. @@ -53,7 +53,7 @@ To allocate target to Sales Person based on Territory, you can should select spe In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master. -Sales Person Territory Manager +Sales Person Territory Manager ####2.2 Allocating Target @@ -67,7 +67,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. -Sales Person Territory Report +Sales Person Territory Report --- @@ -79,7 +79,7 @@ To create new Monthly Distriibution, go to: `Accounts > Monthly Distributon` -Target Distribution +Target Distribution You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master. diff --git a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md index 365069d7..5c818898 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md +++ b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md @@ -4,7 +4,7 @@ Selling Setting is where you can define propertiese which will be applied in your selling transactions. Let's check into each property one by one. -Selling Settings +Selling Settings ####1. Customer Naming By diff --git a/foundation/www/docs/user/manual/en/selling/setup/shipping-rule.md b/foundation/www/docs/user/manual/en/selling/setup/shipping-rule.md index b57d9bca..af4b0498 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/shipping-rule.md +++ b/foundation/www/docs/user/manual/en/selling/setup/shipping-rule.md @@ -4,6 +4,6 @@ Using Shipping Rule you can define the cost for delivering the product to the customer and also to the supplier. You can define different shipping rules or a fixed shipping amount for the same item across different territories. -Shipping Rule +Shipping Rule {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/change-password.md b/foundation/www/docs/user/manual/en/setting-up/articles/change-password.md index f9b5ddee..77d59e2a 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/change-password.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/change-password.md @@ -6,11 +6,11 @@ Each ERPNext user can customize password for his/her ERPNext account. Also user ####Step 1: Go to My Setting -Change Password +Change Password ####Step 2: Set New Password -Change Password +Change Password Enter the new password and save the form to save changes. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md index e30d976d..39f53297 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md @@ -13,7 +13,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 -Delete Transactions +Delete Transactions **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/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md b/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md index d42a8de4..48c8b6c4 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/difference-between-system-user-and-website-user.md @@ -17,4 +17,4 @@ How to check if Role is for System User or Website User? In the Role master, if field "Desk Access" is checked, that Role is for System User. If Desk Access field is unchecked, then that Role is for Website User. -Role Desk Permission \ No newline at end of file +Role Desk Permission \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md b/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md index 3e6d90af..aa90d36d 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md @@ -7,19 +7,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. -Cancel Doc +Cancel Doc ####Step 2: Amend the document On cancellation of submitted document, Amend button will be became visible. -Amend Doc +Amend Doc ####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. -Resave and Submit Doc +Resave and Submit Doc
    Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/email-error.md b/foundation/www/docs/user/manual/en/setting-up/articles/email-error.md index 965a90af..7bd5196e 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/email-error.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/email-error.md @@ -3,7 +3,7 @@ In ERPNext, you can customize the Incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account is saved successfully. If not, then you might receive an error as below. -Email Error +Email Error This indicates that using login credentials and other email gateway details provided in the Email Account, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md index b84e449d..3ced7927 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md @@ -17,7 +17,7 @@ Following are the steps to add new Company. Company will be saved with Company Name provided. -New Company +New Company Also, you can define other properties for new company like: @@ -29,12 +29,12 @@ 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. -New Company +New Company ####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. -New Company +New Company \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md index 552ea718..38c1c805 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md @@ -5,7 +5,7 @@ In each document, you can group fields by "levels". Each group of field is denot Perm Level for a field can be defined in the [Customize Form](/docs/user/manual/en/customize-erpnext/customize-form.html). -Perm Level Field +Perm Level Field 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. @@ -15,11 +15,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. -Perm Level Rule +Perm Level Rule 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 Rule 2 +Perm Level Rule 2 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/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md index 0547cd1f..83611e14 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md @@ -25,7 +25,7 @@ Following are the steps to manage and create record in the tree structured maste ####Step 2 : Parent Territory -Default Territories +Default Territories 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. @@ -43,11 +43,11 @@ If Group Node selected as Yes, then this Territory will be created as Parent, wh
    Only child Territory Groups are selectable in another masters and transactions.
    -Default Territories +Default Territories Following is how Child Territories will be listed under a Parent Territory. -Adding new Territories +Adding new Territories Following this steps, you can manage other tree masters as well in ERPNext. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md index 715a86db..598d819f 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md @@ -15,19 +15,19 @@ For example, you have 322 Sales Orders created in your old system with SO00322 a #### Update Series Section -Update Series Section +Update Series Section #### Select Prefix Considering our scenario, prefix for Sales Order will be "SO". -Series Prefix +Series Prefix #### 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. -Series Current Value +Series Current Value With this setting, you will have numbering for the New Sales Orders starting with #323. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md b/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md index 56b3e4b4..4223da8c 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/outgoing-email-gateway.md @@ -3,7 +3,7 @@ In the ERPNext, you can customize incoming and Outgoing Email Gateway. On saving an Email Account, ERPNext tries establishing a connection with your email gateway. If your ERPNext account is able to connect fine, then Email Account master is saved. If not, then you might receive an error as indicated below. -Email Setup Error +Email Setup Error This indicates that using login credentials and other email gateway details provided, ERPNext is not able to connect to your email server. Please ensure that you have entered valid email credentials for your Email Gateway. Once you have configured Email Account successfully, you should be able to send and receive emails from your ERPNext account fine. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md b/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md index 391d37f9..25c00186 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md @@ -15,7 +15,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. -Download Template +Download Template ####Step 2: Prepare Data @@ -23,7 +23,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. -Update Values +Update Values Since we are overwriting only Item Group, only following columns will be mandatory. @@ -37,13 +37,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. -Browse template +Browse template ####Step 4: Upload On clicking Import, Item Group will be over-written. -Upload +Upload 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/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md b/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md index e9a78833..e6b09442 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/print-format-sections.md @@ -3,10 +3,10 @@ **Question:** In the Print Format, I am getting link breaks for each section. How can I disable it? -Email Setup Error +Email Setup Error **Answer:** To disable line breaks for the section breaks, you should uncheck field "Show Line Breaks after Sections" in its Print Format. Print Format Builder > Select Print Format > Edit Settings > Uncheck field "Show Line Breaks after Sections" -Email Setup Error \ No newline at end of file +Email Setup Error \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md b/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md index fc83df5e..74e02d00 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md @@ -15,13 +15,13 @@ Open User to be renamed. From Menu, select Rename. -Rename +Rename #### Step 3: Update Enter valid Email Address and click on Rename. -Update +Update After successful renaming, User will be able login using updated user id. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md b/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md index 7a9dbe00..437644b1 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/report-permission-error.md @@ -1,7 +1,7 @@ **Question:** User has roles like Account User and Account Manager assigned. Still, when accessing  Account Receivable report, User is getting an error message of no permission the territory master. -Report Permission Error +Report Permission Error **Answer:** @@ -13,6 +13,6 @@ As per the permission system in ERPNext, for the User to be able to access a for 3. To resolve this issue, I have assigned Account User permission to Read Territory master. - Permission Manager + Permission Manager As per this permission update, User should be able to access Account Receivable report fine. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md b/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md index d2940d60..e15fd974 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md @@ -13,30 +13,30 @@ Specify the following in System Settings * The expiry time for the QR Code on the server if OTP App is specified * The OTP Issuer Name. -Enable Two Factor Auth +Enable Two Factor Auth On activation of 2FA from setup, it is also activated for the Role "All". In this way, all users including the Administrator have to perform a 2nd level authentication with a token. By unchecking the "Two Factor Authentication" checkbox in the "All" role and enabling it in other roles, the need to login with a token can be limited to specific roles. 2FA does not apply to login by Web Users and API login -Role Enable Two Factor Auth +Role Enable Two Factor Auth If using SMS authentication, please make sure that your SMS settings are updated -SMS Settings +SMS Settings If using Email, make sure that your outgoing Email account settings are updated -Email Settings +Email Settings When the new user tries to log in for the first time in a system that has two-factor authentication enabled and which has the authentication option as OTP App, an email is sent containing a link to the QR Code. -Email Notify Two Factor -QR Code Page +Email Notify Two Factor +QR Code Page Scanning the QR Code with an authentication app like Google Authenticator registers the access for the user and automatically starts to generate tokens that can be used to login -Two Factor Scan App +Two Factor Scan App If either of Email/SMS is used as the authentication method, you get notifications also -Email and SMS \ No newline at end of file +Email and SMS \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md b/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md index 8d50856e..5fa1a776 100644 --- a/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md +++ b/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md @@ -37,7 +37,7 @@ Select approvers Role. It will be Sales Manager role which if assigned to user, Set Above Value. Given the exmaple, Above Value will be set as 10000. -Authorization Rule +Authorization Rule If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message. diff --git a/foundation/www/docs/user/manual/en/setting-up/data/bulk-rename.md b/foundation/www/docs/user/manual/en/setting-up/data/bulk-rename.md index b2a3aee1..bbf2ae6c 100644 --- a/foundation/www/docs/user/manual/en/setting-up/data/bulk-rename.md +++ b/foundation/www/docs/user/manual/en/setting-up/data/bulk-rename.md @@ -13,4 +13,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**. -Bulk Rename \ No newline at end of file +Bulk Rename \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md b/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md index 44e22611..55397b3e 100644 --- a/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md +++ b/foundation/www/docs/user/manual/en/setting-up/data/data-import-tool.md @@ -5,7 +5,7 @@ The Data Import Tool is a great way to upload (or edit) bulk data, specially mas To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button: -Start Import +Start Import The tool has two sections, one to download a template and the second to upload the data. @@ -26,33 +26,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". -Download Template +Download Template ### 2\. Fill in the Template After downloading the template, open it in a spreadsheet application and fill in the data below the column headings. -Download Template +Download Template 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 Template +Download Template ### Download in Excel -Download Template +Download Template ### 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. -Upload +Upload -Upload +Upload #### Notes: diff --git a/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md b/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md index b87cf274..55389c63 100644 --- a/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md +++ b/foundation/www/docs/user/manual/en/setting-up/data/download-backup.md @@ -7,8 +7,8 @@ In the ERPNext, you can manually download database backup. To get the latest dat Backup available for the download is updated in every eight hours. Click on the link to download the backups at a given time. -Download Backup +Download Backup By default three latest backups will be available for the download. If you want to customize no. of backups, then click on "Set Number of Backups". In the System Settings, you can set Number of Backups available for the download at a time. -Download Backup \ No newline at end of file +Download Backup \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-account.md b/foundation/www/docs/user/manual/en/setting-up/email/email-account.md index 5ed19a79..257270c5 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-account.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-account.md @@ -11,7 +11,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. -Defining Criteria +Defining Criteria ### Outgoing Email Accounts @@ -19,19 +19,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. -Outgoing EMail +Outgoing EMail ### Incoming Email Accounts To setup an incoming Email Account, check on **Enable Incoming** and set your POP3 settings, if you are using a popular email service, these will be preset for you. -Incoming EMail +Incoming EMail ### 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. -Incoming EMail Conditions +Incoming EMail Conditions ### How ERPNext handles replies @@ -41,6 +41,6 @@ In ERPNext when you send an email to a contact like a customer, the sender will If you would like ERPNext to notify you if an email is unreplied for a certain amount of time, then you can set **Notify if Unreplied**. Here you can set the number of minutes to wait before notifications are sent and whom the notifications must go to. -Incoming EMail +Incoming EMail {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-alerts.md b/foundation/www/docs/user/manual/en/setting-up/email/email-alerts.md index 5f0ccf9e..e1968f04 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-alerts.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-alerts.md @@ -33,13 +33,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 Subject +Setting Subject ### 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. -Setting Condition +Setting Condition 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. @@ -75,14 +75,14 @@ field. Then you can use that as a condition in the **Condition** rules to ensure emails are not sent multiple times -Setting Property in Email Alert +Setting Property in Email Alert ### Example 1. Defining the Criteria - Defining Criteria + Defining Criteria 1. Setting the Recipients and Message - Set Message + Set Message {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-digest.md b/foundation/www/docs/user/manual/en/setting-up/email/email-digest.md index 887a730a..0820d8e4 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-digest.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-digest.md @@ -13,6 +13,6 @@ To set up Email Digest, go to: Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to. -Email Digest +Email Digest {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-inbox.md b/foundation/www/docs/user/manual/en/setting-up/email/email-inbox.md index 974229e2..45a94104 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-inbox.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-inbox.md @@ -13,7 +13,7 @@ To add new User, go to: `Setup > User > New User` -Email User +Email User #### Step 2: Create Email Domain @@ -23,7 +23,7 @@ To add new Email Domain, go to: `Setup > Emails > Email Domain > New` -Email Domain +Email Domain 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. @@ -44,11 +44,11 @@ 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. -Email Password +Email Password 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. -Email Service +Email Service >If you are creating an Email Account for Email Inbox of a User, then leave Append To field as blank. @@ -58,30 +58,30 @@ For more details on how to setup Email Account, [click here](/docs/user/manual/e 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 User Link +Email User Link ## 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. -Email Inbox +Email Inbox #### 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. -Email Folders +Email Folders #### Actions On the emails in your inbox, you can take various actions like Reply, Forward, Mark as Spam or Trash. -Email Actions +Email Actions #### 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. -Make from Email +Make from Email diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-reports.md b/foundation/www/docs/user/manual/en/setting-up/email/email-reports.md index b9e63043..268ff65f 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/email-reports.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/email-reports.md @@ -15,7 +15,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. -Make Auto Email Report +Make Auto Email Report #### Step 2 @@ -23,11 +23,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 -With Filters +With Filters Click on the table to edit the table -Edit Filters +Edit Filters #### Test @@ -35,4 +35,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 -Report by Email +Report by Email diff --git a/foundation/www/docs/user/manual/en/setting-up/email/sending-email.md b/foundation/www/docs/user/manual/en/setting-up/email/sending-email.md index 8a6a83d1..80db0233 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/sending-email.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/sending-email.md @@ -3,7 +3,7 @@ In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document. -Send Email +Send Email **Note:** You must have outgoing [email accounts](/docs/user/manual/en/setting-up/email/email-account.html) setup for this. diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md b/foundation/www/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md index d3f76b88..d3035c38 100644 --- a/foundation/www/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md +++ b/foundation/www/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md @@ -7,12 +7,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. -Setting Condition +Setting Condition Then, user can enter the feedback request details like email id, message and send the feedback request mail. -Setting Condition +Setting Condition Note. If Feedback Trigger is already configured for the document then system will fetch Feedback Request details (email id, message) diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md b/foundation/www/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md index e4fdc5ea..dfc3f7db 100644 --- a/foundation/www/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md +++ b/foundation/www/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md @@ -3,15 +3,15 @@ We can also Resend the Feedback Request to the Customer/User. -Setting Condition +Setting Condition To resend the Feedback Request we will need to navigate the Communication by clicking the `Details` link on Timeline Feedback. -Setting Condition +Setting Condition 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. -Setting Condition +Setting Condition {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md b/foundation/www/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md index 3060b95b..75e9fd23 100644 --- a/foundation/www/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md +++ b/foundation/www/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md @@ -20,13 +20,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 Subject +Setting Subject ### 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 Condition +Setting Condition ### Setting a Message @@ -46,9 +46,9 @@ You can use both Jinja Tags (`{% raw %}{{ doc.[field_name] }}{% endraw %}`) and ### Example 1. Setting up Feedback Trigger - Defining Criteria + Defining Criteria 1. Setting the Recipients and Message - Set Message + Set Message {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/submit-feedback.md b/foundation/www/docs/user/manual/en/setting-up/feedback/submit-feedback.md index 3794aea7..083fa0ca 100644 --- a/foundation/www/docs/user/manual/en/setting-up/feedback/submit-feedback.md +++ b/foundation/www/docs/user/manual/en/setting-up/feedback/submit-feedback.md @@ -4,17 +4,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. -Setting Condition +Setting Condition 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. -Setting Condition +Setting Condition Also, The Feedback details such as Feedback message and ratings will be shown in the Document's Timeline along with Comment, Email. -Setting Condition +Setting Condition {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/braintree-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/braintree-integration.md new file mode 100644 index 00000000..5ce68c73 --- /dev/null +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/braintree-integration.md @@ -0,0 +1,40 @@ + +# Setting up Braintree + +To setup Braintree, go to `Explore > Integrations > Braintree Settings` + +## Setup Braintree + +To enable Braintree in your ERPNext account, you need to configure the following parameters: + +- Merchant ID +- Public Key +- Private Key + +You can setup several Braintree payment gateways if needed. The choice of payment gateway account will determine which braintree account is used for the payment. + +![Braintree Settings](/docs/assets/img/setup/integrations/braintree_account.png) + +On enabling service, the system will create Payment Gateway record and an Account head in chart of account with account type as Bank. + +![Braintree COA](/docs/assets/img/setup/integrations/braintree_coa.png) + +It will also create a payment gateway account. You can change the default bank account if needed and create a template for the payment request. + +![Payment Gateway Account](/docs/assets/img/setup/integrations/payment_gateway_account_braintree.png) + +After configuring the Payment Gateway Account, your system is able to accept online payments through Braintree. + +## Supporting transaction currencies + +``` +"AED","AMD","AOA","ARS","AUD","AWG","AZN","BAM","BBD","BDT","BGN","BIF","BMD","BND","BOB", +"BRL","BSD","BWP","BYN","BZD","CAD","CHF","CLP","CNY","COP","CRC","CVE","CZK","DJF","DKK", +"DOP","DZD","EGP","ETB","EUR","FJD","FKP","GBP","GEL","GHS","GIP","GMD","GNF","GTQ","GYD", +"HKD","HNL","HRK","HTG","HUF","IDR","ILS","INR","ISK","JMD","JPY","KES","KGS","KHR","KMF", +"KRW","KYD","KZT","LAK","LBP","LKR","LRD","LSL","LTL","MAD","MDL","MKD","MNT","MOP","MUR", +"MVR","MWK","MXN","MYR","MZN","NAD","NGN","NIO","NOK","NPR","NZD","PAB","PEN","PGK","PHP", +"PKR","PLN","PYG","QAR","RON","RSD","RUB","RWF","SAR","SBD","SCR","SEK","SGD","SHP","SLL", +"SOS","SRD","STD","SVC","SYP","SZL","THB","TJS","TOP","TRY","TTD","TWD","TZS","UAH","UGX", +"USD","UYU","UZS","VEF","VND","VUV","WST","XAF","XCD","XOF","XPF","YER","ZAR","ZMK","ZWD" +``` diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md b/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md index 66495178..2b752fdc 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md @@ -8,11 +8,15 @@ You can automate database backup download of your ERPNext account into your Drop To setup Dropbox Backup, `Explore > Integrations > Dropbox Settings` +##Steps are different for ERPnext managed versions and open-source versions + +###ERPnext Managed Version Instructions + ####Step 1: Set Frequency Set Frequency to download backup in your Dropbox account. -set frequency +set frequency ####Step 2: Allow Dropbox Access @@ -22,40 +26,53 @@ After setting frequency and updating other details, click on `Allow Dropbox acce Login to your Dropbox account by entering login credentials. -Login +Login ####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. -Allow +Allow With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it. -##Open Source Users -####Step 1: Go to +##Open Source Version Instructions + +####Step 1: Login to Dropbox Developer area https://www.dropbox.com/developers/apps -####Step 2:Create a new app +####Step 2: Create a new Dropbox app -Create new +Create new -####Step 3: Fill in details for the app +####Step 3: Fill in the details for your new app -Choose Dropbox API and type as APP Folder +Choose Dropbox API and type as APP Folder - -Setup APP Name +Setup APP Name -####Step 4: Setup Redirect URL in app +####Step 4: Insert your custom domain Redirect URI -Set Redirect URL +`https://{yourwebsite.com}/api/method/frappe.integrations.doctype.dropbox_settings.dropbox_settings.dropbox_auth_finish` -####Step 5: Settings in Site Config +Set Redirect URL -After the app is created, note the app key and app secret on Dropbox Settings page or enter in `sites/{sitename}/site_config.json` as follows, +####Step 5: In a new window, open the Dropbox Settings page in your ERPnext installation + +####Step 6: Set backup frequency and email + +Set the frequency to download your site backups to your Dropbox account. + +set frequency + +####Step 7: Input Keys from your Dropbox App window + +From your Dropbox App page, enter the app key and (unhidden) app secret into the ERPnext Dropbox settings page. + +Alternatively, you can enter it manually in `sites/{sitename}/site_config.json` as follows,
    @@ -69,6 +86,18 @@ After the app is created, note the app key and app secret on Dropbox Settings pa
     	
    -####Step 5: Complete Backup +####Step 8: Click Save before continuing!!! -Setup dropbox backups from the backup manager as shown in previous section. \ No newline at end of file +####Step 9: After saving, click "Allow Dropbox Access" + +The Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account. + +####Step 11: Allow Dropbox Access + +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. + +Allow + +####Step 12: Confirm Backups Work + +From the ERPnext Dropbox page, click `Take Backup Now` and then go to you Dropbox files view. You should see a new folder in Dropbox named `Apps` and inside of it your {New App} folder. Inside of it should be backup folders for both files and database. diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md index 2c486e31..fdd9cb33 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md @@ -12,9 +12,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 -LDAP Settings +LDAP Settings After setting up LDAP parameters, on login screen, the system enables **Login Via LDAP** option. -LOGIN via LDAP +LOGIN via LDAP diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md index 9e78752a..d3d58d4c 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md @@ -12,17 +12,17 @@ To setup PayPal , To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature. -PayPal Settings +PayPal Settings 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. -PayPal COA +PayPal COA 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. -Payment Gateway Account +Payment Gateway Account After enabling service and configuring Payment Gateway Account your system is able to accept online payments. @@ -34,20 +34,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. -Payment Request +Payment Request - From this account profile you will get your sandbox api credentials -Payment Request +Payment Request --- #### PayPal Account API Signature - Login to PayPal Account and go to profile -Payment Request +Payment Request - From **My Selling Tools** go to **api Access** -Payment Request +Payment Request - On API Access Page, choose option 2 to generate API credentials -Payment Request +Payment Request diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md index 564410ae..72245f0a 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md @@ -9,21 +9,21 @@ To setup RazorPay, `Explore > Integrations > RazorPay Settings` -Razorpay Settings +Razorpay Settings #### Setup RazorPay To enable RazorPay payment service, you need to configure parameters like API Key, API Secret -Razorpay Settings +Razorpay Settings On enabling service, the system will create Payment Gateway record and Account head in the Chart of Account with account type as Bank. -Razorpay COA +Razorpay COA 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. -Payment Gateway Account +Payment Gateway Account After enabling service and configuring Payment Gateway Account your system is able to accept online payments. diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md index 6bd00e20..4665b84c 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md @@ -7,15 +7,15 @@ To setup Stripe, #### Setup Stripe To enable Stripe payment service, you need to configure parameters like Publishable Key, Secret Key -Razorpay Settings +Razorpay Settings On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank. -Stripe COA +Stripe COA 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. -Payment Gateway Account +Payment Gateway Account After configuring Payment Gateway Account your system is able to accept online payments. diff --git a/foundation/www/docs/user/manual/en/setting-up/pos-setting.md b/foundation/www/docs/user/manual/en/setting-up/pos-setting.md index 74f3450b..d83dbbdc 100644 --- a/foundation/www/docs/user/manual/en/setting-up/pos-setting.md +++ b/foundation/www/docs/user/manual/en/setting-up/pos-setting.md @@ -15,13 +15,13 @@ from: Set default values as defined. -POS Setting +POS Setting To set the default mode of payment, enabled the option default in the mode of payments table -POS Setting +POS Setting User can sale the particular products to the particular customers from the POS by adding item groups, customer groups in the POS Profile. -POS Setting +POS Setting > Important : If you specify a particular User, the POS setting will be applied only to that User. If the User option is left blank, the setting will diff --git a/foundation/www/docs/user/manual/en/setting-up/price-lists.md b/foundation/www/docs/user/manual/en/setting-up/price-lists.md index 66f06b46..ba4672f7 100644 --- a/foundation/www/docs/user/manual/en/setting-up/price-lists.md +++ b/foundation/www/docs/user/manual/en/setting-up/price-lists.md @@ -11,7 +11,7 @@ You can create new Price List > Selling/Buying/Stock > Setup > Price List >> New -Price List +Price List * These Price List will be used when creating Item Price record to track selling or buying price of an item. Click here to learn more about Item Price. diff --git a/foundation/www/docs/user/manual/en/setting-up/print/address-template.md b/foundation/www/docs/user/manual/en/setting-up/print/address-template.md index 2c584db9..68c9955f 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/address-template.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/address-template.md @@ -27,6 +27,6 @@ Here is the default template: ### Example -Print Heading +Print Heading {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/print/cheque-print-template.md b/foundation/www/docs/user/manual/en/setting-up/print/cheque-print-template.md index 56504bf2..5dc013b4 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/cheque-print-template.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/cheque-print-template.md @@ -3,7 +3,7 @@ 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. -Sample Cheque +Sample Cheque 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. @@ -15,13 +15,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. -Sample Cheque +Sample Cheque ####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. -Sample Cheque +Sample Cheque ####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. @@ -29,18 +29,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. -Sample Cheque +Sample 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. -Sample Cheque +Sample Cheque ####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. -Sample Cheque +Sample Cheque diff --git a/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md b/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md index 3d73bbe7..c2edc3ad 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md @@ -7,11 +7,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 @@ -19,17 +19,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 @@ -37,11 +37,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/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md b/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md index 8ee6c7b5..92aa65f9 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md @@ -20,7 +20,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. -Print Heading +Print Heading > If you want to make this the default letter head, click on “Is Default”. @@ -32,7 +32,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. -Print Heading +Print Heading > 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/foundation/www/docs/user/manual/en/setting-up/print/print-format-builder.md b/foundation/www/docs/user/manual/en/setting-up/print/print-format-builder.md index 845ba0b2..901b59d0 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/print-format-builder.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/print-format-builder.md @@ -11,19 +11,19 @@ or Open the document for which you want to make a print format. Click the Printe ### Step 1: Make a new Format -Send Email +Send Email ### Step 2: Add a new Field To add a field, just drag it from the left sidebar and add it in your layout. You can edit the layout by clicking on the settings icon. -Send Email +Send Email ### Step 3 To remove a field, just drag it back into the fields sidebar. -Send Email +Send Email ### Step 4 @@ -31,7 +31,7 @@ You can add customized text, HTML in your print format, just add the **Custom HT Then click on **Edit HTML** to edit your content. -Send Email +Send Email To save your format, just click on the **Save** button on the top. diff --git a/foundation/www/docs/user/manual/en/setting-up/print/print-headings.md b/foundation/www/docs/user/manual/en/setting-up/print/print-headings.md index 0cd53d65..3e07a0ef 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/print-headings.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/print-headings.md @@ -11,10 +11,10 @@ You can create print headings from : #### Figure 1: Save Print Heading -Print Heading +Print Heading Example of a change in print heading is shown below: -Print Heading +Print Heading {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/print/print-settings.md b/foundation/www/docs/user/manual/en/setting-up/print/print-settings.md index 6512c221..fe79abc5 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/print-settings.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/print-settings.md @@ -7,6 +7,6 @@ To edit print settings, go to: > Setup > Printing and Branding > Print Settings -Print Settings +Print Settings {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/print/print-style.md b/foundation/www/docs/user/manual/en/setting-up/print/print-style.md index 6798cb30..2d3990c9 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/print-style.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/print-style.md @@ -11,6 +11,6 @@ To set a default style, you can go to [Print Settings](/docs/setup/print/print-s All Print Format styles are based on Bootstrap (Version 3) CSS Framework. -Print Style +Print Style {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md b/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md index 6ae9f2b3..34a9f3c5 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md @@ -9,13 +9,13 @@ To setup Terms and Condition master, go to: `Selling > Terms and Condition > New` -Terms and Conditions +Terms and Conditions ### 2. Editing in HTML Content of Terms and Condition can be formatted as per your preference, and also insert images where needed. If you have expertise in HTML, you will also find option to edit the content of Terms and Condition in HTML. -Terms and Conditions, Edit HTML +Terms and Conditions, Edit HTML This also allows you to use Terms and Condition master for footer, which otherwise is not 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. @@ -23,6 +23,6 @@ This also allows you to use Terms and Condition master for footer, which otherwi In transactions, you will find section of Terms and Condition where you will be able to search and fetched required Terms and Condition master. -Terms and Conditions, Select in document +Terms and Conditions, Select in document {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setting-company-sales-goal.md b/foundation/www/docs/user/manual/en/setting-up/setting-company-sales-goal.md index 62736e42..1c647e63 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setting-company-sales-goal.md +++ b/foundation/www/docs/user/manual/en/setting-up/setting-company-sales-goal.md @@ -3,14 +3,14 @@ Monthly sales targets can be set for a company via the Company master. By default, the Company master dashboard features past sales stats. -Sales Graph +Sales Graph You can set the **Sales Target** field to track progress to track progress with respect to it. -Setting Sales Goal +Setting Sales Goal The target progress is also shown in notifications: -Sales Notification +Sales Notification {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setting-up-taxes.md b/foundation/www/docs/user/manual/en/setting-up/setting-up-taxes.md index c163a507..d9d51462 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setting-up-taxes.md +++ b/foundation/www/docs/user/manual/en/setting-up/setting-up-taxes.md @@ -25,11 +25,11 @@ sales or purchase tax rate specified by you as default rates. Item Tax table can be found as a section within the Item Master document. -Item Tax +Item Tax * **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive. -Inclusive Tax +Inclusive Tax * **Exception to the rule**: Item tax settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account * **Item tax is overwrite-able**: You can overwrite or change the item tax rate by going to the Item master in the Item tax table. @@ -52,7 +52,7 @@ have to go to: > Setup > Accounts > Sales Taxes and Charge Master -Sales Tax Master +Sales Tax Master When you create a new master, you will have to add a row for each tax type. diff --git a/foundation/www/docs/user/manual/en/setting-up/settings/global-defaults.md b/foundation/www/docs/user/manual/en/setting-up/settings/global-defaults.md index 104f0044..56354011 100644 --- a/foundation/www/docs/user/manual/en/setting-up/settings/global-defaults.md +++ b/foundation/www/docs/user/manual/en/setting-up/settings/global-defaults.md @@ -7,6 +7,6 @@ You can set default values for your documents from Global Defaults Whenever a new document is created, these values will be set as default. -Global Defaults +Global Defaults {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/settings/module-settings.md b/foundation/www/docs/user/manual/en/setting-up/settings/module-settings.md index 3590eb97..2fc26415 100644 --- a/foundation/www/docs/user/manual/en/setting-up/settings/module-settings.md +++ b/foundation/www/docs/user/manual/en/setting-up/settings/module-settings.md @@ -11,6 +11,6 @@ For example if you are in the services business, you want to hide the Manufactur Check / uncheck the items to show / hide. -Module Settings +Module Settings {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/settings/naming-series.md b/foundation/www/docs/user/manual/en/setting-up/settings/naming-series.md index 28ac48cd..d692a5fa 100644 --- a/foundation/www/docs/user/manual/en/setting-up/settings/naming-series.md +++ b/foundation/www/docs/user/manual/en/setting-up/settings/naming-series.md @@ -43,7 +43,7 @@ name and the starting point in the “Update Series” section. See how to set the naming series -Naming Series +Naming Series {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/settings/system-settings.md b/foundation/www/docs/user/manual/en/setting-up/settings/system-settings.md index 39bdb759..05905f08 100644 --- a/foundation/www/docs/user/manual/en/setting-up/settings/system-settings.md +++ b/foundation/www/docs/user/manual/en/setting-up/settings/system-settings.md @@ -9,7 +9,7 @@ To open System Settings, go to: > Setup > Settings > System Settings -System Settings +System Settings ####Two Factor Authentication. Settings for Two Factor Authentication can be configured here. @@ -18,7 +18,7 @@ Settings for Two Factor Authentication can be configured here. * Expiry time for QRCode image if "OTP App" is selected in method * Issuer name of the One Time Password -Two Factor Auth +Two Factor Auth {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/__init__.py b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md index e1dd3e29..04950aed 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-01-language.md @@ -3,7 +3,7 @@ Select your language. ERPNext is available in more than 20 languages. -Language +Language --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md index a9c24ffc..b60a746b 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-02-currency-and-timezone.md @@ -3,7 +3,7 @@ Set your Country Name, Time Zone and Currency. -Currency +Currency ### Default Currency diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md index 94e63952..7c1a0428 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-03-user-details.md @@ -3,7 +3,7 @@ Enter the First User. Give the Full Name, Email Address (as User ID) and Password. This first user will be setup as a System Manager with privileges similar to the Administrator account. -User +User --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md index 7b920922..e979bb78 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-04-select-domain.md @@ -3,7 +3,7 @@ Select the domain(s) that will be enabled after setup. -Domains +Domains --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md index 1a4109f5..7cdbf2f1 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-05-the-brand.md @@ -3,7 +3,7 @@ Enter Company Name, Abbreviation and add a logo. -Company Details +Company Details ### Company Abbreviation diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md index 4291e05a..8cf37fb1 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-06-your-organization.md @@ -5,7 +5,7 @@ Enter in a short sentence of what your company does. This is often a mission sta Add the name of the organization's primary financial institution. This information will populate **Accounts**. -Company Details +Company Details ### Chart of Accounts diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md index 23ab78c5..f54bb4db 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-07-setup-company-complete.md @@ -3,11 +3,11 @@ The initial setup wizard will create all the settings needed including the first system manager user. -Language +Language When complete, the Setup Wizard will go to the Desk and begin a secondary set of steps. This screen shows that the initial setup wizard is complete and begins the secondary setup wizard. -Language +Language --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md index ad093138..f285dd1e 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-08-set-sales-target.md @@ -3,11 +3,11 @@ Set a monthly sales target for the organization in the currency selected during Step 2. -Language +Language If a sales target is not known, then clicking **Mark as Done** will complete the step. -Language +Language --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md index 6bf07c49..bf332107 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-09-customers.md @@ -3,11 +3,11 @@ Add known customers to the system. -Language +Language If customers are not known, then clicking **Mark as Done** will complete the step. -Language +Language --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md index 27ae3fcd..0dd54e55 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-letterhead.md @@ -3,11 +3,11 @@ Add a company logo to be used as a standard letter head on all printed invoices and other document types. Ideally the logo is 900px by 100px. -Language +Language If a letter head logo file is not available, the clicking **Mark as Done** will complete the step. -Language +Language --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md index 311b17bf..e084c1a5 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-suppliers.md @@ -3,11 +3,11 @@ Add known suppliers to the system. -Language +Language If suppliers are not known, then clicking **Mark as Done** will complete the step. -Language +Language ## Step 11a: Other Domain Specific Steps diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md index 72c00a7d..a4618e0d 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-12-users.md @@ -3,11 +3,11 @@ The last step in the secondary setup wizard will prompt to add more users to the system. These users will be regular non-privileged users. -Language +Language If users are not known, then clicking **Mark as Done** will complete the step. -Language +Language --- diff --git a/foundation/www/docs/user/manual/en/setting-up/sms-setting.md b/foundation/www/docs/user/manual/en/setting-up/sms-setting.md index 5940346e..444f6c96 100644 --- a/foundation/www/docs/user/manual/en/setting-up/sms-setting.md +++ b/foundation/www/docs/user/manual/en/setting-up/sms-setting.md @@ -18,7 +18,7 @@ Example URL: http://instant.smses.com/web2sms.php?username=&password;=&to;=&sender;=&message;= -SMS Setting 2 +SMS Setting 2 > Note: the string up to the "?" is the SMS Gateway URL @@ -37,6 +37,6 @@ Note that some parameters in the URL are static.You will get static values from your SMS Provider like username, password etc. These static values should be entered in the Static Parameters table. -SMS Setting +SMS Setting {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md b/foundation/www/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md index 10bc5a9f..0df6c3ad 100644 --- a/foundation/www/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md +++ b/foundation/www/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md @@ -14,7 +14,7 @@ letters assigned to an individual Item. Serialized items are generally high valu Non Serialized items are generally fast moving and low value item, hence doesn't need tracking for each unit. Items like screw, cotton waste, other consumables, stationary products can be categorized as non-serialized. -> Stock Reconciliation option is available for the non serialized Items only. For serialized and batch items, you should create Material Receipt entry in Stock Entry form. +> Stock Reconciliation option is available for the non serialized Items only. For serialized and batch items, you should create Material Receipt (to increase stock) or Material Issue (to decrease stock) via Stock Entry. ### Opening Stocks @@ -30,17 +30,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. -Stock Reconciliation +Stock Reconciliation #### Step 2: Enter Data in csv file. -Stock Reconciliation +Stock Reconciliation 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 -Stock Reconciliation +Stock Reconciliation **Posting Date** @@ -62,11 +62,11 @@ report. The report will show you all types of rates. #### Step 4: Review the reconciliation data -Stock Reconciliation +Stock Reconciliation ### Stock Ledger Report -Stock Reconciliation +Stock Reconciliation **How Stock Reconciliation Works** diff --git a/foundation/www/docs/user/manual/en/setting-up/territory.md b/foundation/www/docs/user/manual/en/setting-up/territory.md index 35c19aaa..5878bf2a 100644 --- a/foundation/www/docs/user/manual/en/setting-up/territory.md +++ b/foundation/www/docs/user/manual/en/setting-up/territory.md @@ -8,6 +8,6 @@ each Item Group and get reports that will show your actual performance in the territory v/s what you had planned. You can also set different pricing for the same product sold across different territories. -Territory Tree +Territory Tree {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md index a34f094b..9bcae8e2 100644 --- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md +++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md @@ -12,7 +12,7 @@ Important is to realize that the email address is the unique key (ID) identifyin ### 1. List of Users -User List +User List To add a new user, click on "New" @@ -23,8 +23,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. -Email Login -Mobile No Login +Email Login +Mobile No Login After adding these details, save the user. @@ -33,19 +33,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. -User Roles +User Roles ### 4. Setting Module Access Users will have access to all modules for which they have role based access. If you want to block certain modules for certain users, un-check the module from the list. -User Block Module +User Block Module ### 5. Security Settings If you wish to give the user access to the system only between office hours, or during weekends, mention it under security settings. -User Security +User Security {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md index 6cb7779a..a8f42a7a 100644 --- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md +++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md @@ -6,7 +6,7 @@ ERPNext has a role-based permission system. It means that you can assign Roles t To start with, go to: > Setup > Permissions > Role Permissions Manager -Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager +Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager Permissions are applied on a combination of: @@ -39,12 +39,12 @@ Permissions are applied on a combination of: Leave Application is a good **example** that encompasses all areas of Permission System. -Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User +Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User 1. **It should be created by an Employee.** For this, Employee Role should be given Read, Write, Create permissions. -Giving Read, Write and Create Permissions to Employee for Leave Application +Giving Read, Write and Create Permissions to Employee for Leave Application 1. **An Employee should only be able to access his/her Leave Application.** Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.) @@ -54,12 +54,12 @@ Leave Application is a good **example** that encompasses all areas of Permission 1. **HR Manager should be able to see all Leave Applications.** Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled. -Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access. +Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access. 2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.** Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.) -Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee. +Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee. 3. **It should be Approved / Rejected only by HR User or Leave Approver.** The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1. @@ -70,6 +70,6 @@ Leave Application is a good **example** that encompasses all areas of Permission 4. **HR User should be able to delegate Leave Applications to his/her subordinates** HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users. -Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application' +Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application' {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md index 33cedcb5..7aedd3ce 100644 --- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md +++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md @@ -6,10 +6,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 -Assign roles to the page +Assign roles to the page ### For Report -Assign roles to the report +Assign roles to the report ## Tool for custom roles assignment @@ -17,10 +17,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 -Tools to assign custom roles to the page +Tools to assign custom roles to the page ### 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. -Reset the default roles +Reset the default roles diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/sharing.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/sharing.md index 602bd244..298060d9 100644 --- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/sharing.md +++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/sharing.md @@ -5,6 +5,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/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md index d9434b40..e55bb5a7 100644 --- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md +++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md @@ -16,7 +16,7 @@ When you create a new record you will have to specify 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) -Creating a new user permission +Creating a new user permission 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. @@ -26,11 +26,11 @@ You can also manually edit the the roles for which you want the user permissions Note that the "Apply User Permissions" is already checked for this role. Then click on "Select Document Types" -Select Document Types to Edit the Setting +Select Document Types to Edit the Setting 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. -Select Document Types to Edit the Setting +Select Document Types to Edit the Setting ### Ignoring User Permissions on Certain Fields @@ -38,7 +38,9 @@ Another way of allowing documents to be seen that have been restricited by User 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" -Ignore User Permissions on specific properties + +Ignore User Permissions on specific properties + ### Strict Permissions @@ -50,4 +52,4 @@ You can change this setting incase you want the user permissions to be assigned 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. -Permitted Documents for User report +Permitted Documents for User report diff --git a/foundation/www/docs/user/manual/en/setting-up/workflows.md b/foundation/www/docs/user/manual/en/setting-up/workflows.md index d887b08f..a574ec45 100644 --- a/foundation/www/docs/user/manual/en/setting-up/workflows.md +++ b/foundation/www/docs/user/manual/en/setting-up/workflows.md @@ -14,7 +14,7 @@ will get an indication that the HR department has Accepted or Rejected. The Manager, who is the approving authority, will either Approve or Reject this request. Accordingly,the user will get his Approved or Rejected status. -Workflow +Workflow To make this Workflow and transition rules go to : @@ -22,11 +22,11 @@ To make this Workflow and transition rules go to : #### Step 1: Enter the different states of Leave Approval Process. -Workflow +Workflow #### Step 2: Enter Transition Rules. -Workflow +Workflow #### Notes: @@ -49,15 +49,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" -Workflow +Workflow 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. -Workflow +Workflow When the Leave Approver opens the Leave Application page, he can finally "Approve" or "Reject" the Leave Application. -Workflow +Workflow {next} diff --git a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md index 25cb7175..40557f51 100644 --- a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md +++ b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md @@ -23,7 +23,7 @@ Steps: `Explore > Accounts > Accounts Settings` - Perpetual Inventory + Perpetual Inventory * 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/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md index 769b5850..072882d7 100644 --- a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md +++ b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md @@ -13,7 +13,7 @@ On receipt of items in a particular warehouse, the balance in the Warehouse Acco > Setup > Company > Stock Settings > "Enable Perpetual Inventory" -Perpetual Inventory +Perpetual Inventory * Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts. @@ -134,11 +134,11 @@ Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of it **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory 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. @@ -150,7 +150,7 @@ On receiving Bill from supplier, for the above Purchase Receipt, you will make P **General Ledger** -Perpetual Inventory +Perpetual Inventory Here "Stock Received But Not Billed" account is debited and nullified the effect of Purchase Receipt. @@ -208,11 +208,11 @@ at $300. Following are the details of Delivery Note: **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory 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 @@ -241,11 +241,11 @@ of the Sales Invoice are same as the above Delivery Note. **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory Here, apart from normal account entries for invoice, "Stores" and "Cost of Goods Sold" accounts are also affected based on the valuation amount. @@ -279,11 +279,11 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory * * * @@ -314,11 +314,11 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory * * * @@ -351,10 +351,10 @@ Goods Sold" accounts are also affected based on the valuation amount. **Stock Ledger** -Perpetual Inventory +Perpetual Inventory **General Ledger** -Perpetual Inventory +Perpetual Inventory {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md index bee69488..22500fc3 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md +++ b/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md @@ -3,7 +3,7 @@ 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 wise Allowance percentage +Item wise Allowance percentage 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. @@ -17,7 +17,7 @@ Update global value for "Allow over delivery or receipt upto this percent" from 3. Save Stock Settings. -Item wise Allowance percentage +Item wise Allowance percentage diff --git a/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md index 1bd7f159..c6a705ef 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md +++ b/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md @@ -5,17 +5,17 @@ To prevent stockouts, you can track item's reorder level. When stock level goes 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. -reorder level +reorder level 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. -reorder level next action +reorder level next action When item's stock reaches reorder level, Material Request is auto-created automatically. You can enable this feature from: `Stock > Setup > Stock Settings` -active auto-material request +active auto-material request A separate Material Request will be created for each item. User with Purchase Manager's role will receive email alert about these Material Requests. diff --git a/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md b/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md index e9ee86d6..f18163eb 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md +++ b/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md @@ -14,7 +14,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. -reorder level +reorder level After updating Valuation Rate for an item, come back to Stock Reconciliation and upload save .csv file. @@ -22,7 +22,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. -reorder level +reorder level ####Stock Reconciliation Help Video diff --git a/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md b/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md index 7c1703e7..87f0ae3a 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md +++ b/foundation/www/docs/user/manual/en/stock/articles/item-valuation-transactions.md @@ -9,10 +9,10 @@ In ERPNext, Item's stock valuation is updated on the creation of one of the foll You can select valuation method based on which item's value will be calculated. Valuation Method can be set globally for all the items from the Stock Settings. -Download Backup +Download Backup You can also set Valuation Method in the item master, especially when a valuation method for an item is different from the default Method. -Download Backup +Download Backup [Click here to learn about the valuation methods available in the ERPNext, and how it works.](https://frappe.io/blog/erpnext-features/inventory-valuation-method-fifo-vs-moving-average) diff --git a/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md b/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md index 47b71eaf..84615a66 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md +++ b/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md @@ -7,7 +7,7 @@ In the item master, you might witness values in the following fields to be froze 1. Has Batch No. 1. Has Serial No. -Item Field Frozen +Item Field Frozen 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/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md index 912aa6eb..dfc3b24f 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md +++ b/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md @@ -5,7 +5,7 @@ Set of items which has same properties and attributes can be group in a single B To maintain batches against an Item you need to mention 'Has Batch No' as yes in the Item Master. -Batch Item +Batch Item You can create a new Batch from: @@ -19,13 +19,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. -Batch in Purchase Receipt +Batch in Purchase Receipt #### 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 in Delivery Note +Batch in Delivery Note #### Batch-wise Stock Balance Report @@ -33,4 +33,4 @@ To check batch-wise stock balance report, go to: Stock > Standard Reports > Batch-wise Balance History -Batchwise Stock Balance +Batchwise Stock Balance diff --git a/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md index a98c75a7..8e4e3aae 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md +++ b/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md @@ -19,7 +19,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. -UoM Must be Whole No +UoM Must be Whole No ####Validation @@ -27,7 +27,7 @@ While creating transaction, if you enter value in fraction for item whos UoM has `Quantity cannot be a fraction at row #` -UoM Validation Message +UoM Validation Message \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md index f229af31..2ac67dfb 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md +++ b/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md @@ -51,7 +51,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. -Difference Account +Difference Account #### Step 9: Save and Submit Stock Entry diff --git a/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md b/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md index 50620b2a..702cffa6 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md +++ b/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md @@ -23,7 +23,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. -Repack Entry +Repack Entry Update Qty for all the items selected. @@ -31,6 +31,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. -Repack Stock Entry +Repack Stock Entry \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md b/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md index 54bbedf7..d06addb6 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md +++ b/foundation/www/docs/user/manual/en/stock/articles/return-rejected-item.md @@ -11,4 +11,4 @@ If you are creating Purchase Return for the items received in the Rejected Wareh For detailed steps on how to create Purchase Return Entry for the Rejected Item, refer to the below example. -Returning Rejected Items \ No newline at end of file +Returning Rejected Items \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md index c8a2b2d9..ba25579a 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md +++ b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md @@ -15,11 +15,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. -Serial Nos Entry +Serial Nos Entry Generated Serial numbers will be updated for each item. -Serial Nos Created +Serial Nos Created ###2. Serializing Manufacturing Item @@ -29,12 +29,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. -Serial Nos Created +Serial Nos Created ####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. -Serial Nos Created +Serial Nos Created \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md index 11c12abe..c330b3ba 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md +++ b/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md @@ -9,7 +9,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. -Material Issue +Material Issue #### 2.Purpose: Material Receipt @@ -17,25 +17,25 @@ 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. -Material Receipt +Material Receipt #### 3.Purpose: Material Transfer Material Transfer entry is created for the inter-warehouse Material Transfer. -Material Transfer +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. -Transfer for Manufacture +Transfer for Manufacture #### 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. -Manufacture +Manufacture #### 5.Purpose: Repack @@ -45,6 +45,6 @@ Repack Entry is created when items purchases in bulk is repacked under smaller p 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.![Check this page to know more about Subcontracting](/docs/user/manual/en/manufacturing/subcontracting.html). -Subcontract +Subcontract \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md index 893ae7bb..a88a6a41 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md +++ b/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md @@ -7,10 +7,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. -Material Transfer +Material Transfer 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. -Material Transfer +Material Transfer \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/batch.md b/foundation/www/docs/user/manual/en/stock/batch.md index b390e7f1..7bb04a62 100644 --- a/foundation/www/docs/user/manual/en/stock/batch.md +++ b/foundation/www/docs/user/manual/en/stock/batch.md @@ -12,7 +12,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" -Item Setup for Batches +Item Setup for Batches ### Creating Batches @@ -26,7 +26,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. -Batch View +Batch View To move the batch from one warehouse to another, you can click on the move button. diff --git a/foundation/www/docs/user/manual/en/stock/delivery-note.md b/foundation/www/docs/user/manual/en/stock/delivery-note.md index 394672ae..b7a66bb4 100644 --- a/foundation/www/docs/user/manual/en/stock/delivery-note.md +++ b/foundation/www/docs/user/manual/en/stock/delivery-note.md @@ -16,7 +16,7 @@ create a new Delivery Note from: or from a “Submitted” Sales Order (that is not already shipped) by clicking on “Make Delivery Note”. -Delivery Note +Delivery Note You can also “fetch” the details from an unshipped Sales Order. diff --git a/foundation/www/docs/user/manual/en/stock/delivery-trip.md b/foundation/www/docs/user/manual/en/stock/delivery-trip.md index 5d4c1489..710fd9b7 100644 --- a/foundation/www/docs/user/manual/en/stock/delivery-trip.md +++ b/foundation/www/docs/user/manual/en/stock/delivery-trip.md @@ -9,10 +9,10 @@ You can make a Delivery directly from: Delivery -Delivery +Delivery Delivery Stops -Delivery +Delivery {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/installation-note.md b/foundation/www/docs/user/manual/en/stock/installation-note.md index 815849e2..9a5e11c6 100644 --- a/foundation/www/docs/user/manual/en/stock/installation-note.md +++ b/foundation/www/docs/user/manual/en/stock/installation-note.md @@ -3,6 +3,6 @@ You can use installation note to record the instalation of a product having a serial number. -Installation Note +Installation Note {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/item/index.md b/foundation/www/docs/user/manual/en/stock/item/index.md index ca768485..a231e7f0 100644 --- a/foundation/www/docs/user/manual/en/stock/item/index.md +++ b/foundation/www/docs/user/manual/en/stock/item/index.md @@ -32,7 +32,7 @@ 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. -Serial No modalBatch No modal +Serial No modalBatch No modal > Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry. @@ -58,9 +58,9 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Purchase Details -Item Purchase Details +Item Purchase Details -Purchase details +Purchase details * **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse. @@ -70,7 +70,7 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ###Supplier Details -Item Supplier Details +Item Supplier Details * **Default Supplier:** Supplier from whom you generally purchase this item. @@ -80,23 +80,23 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Sales Details -Item Sales Details +Item Sales Details * **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. -Sales details +Sales details -Sales details +Sales details ***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. -Sales details +Sales details ### Manufacturing And Website -Manufaturing details +Manufaturing details Visit [Manufacturing](/docs/user/manual/en/manufacturing.html) and [Website ](/docs/user/manual/en/website.html)to understand these topics in detail. diff --git a/foundation/www/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md b/foundation/www/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md index 30974ada..fa9ff234 100644 --- a/foundation/www/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md +++ b/foundation/www/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md @@ -22,7 +22,7 @@ There are two major ways in which ERPNext values your items. * **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y. -FIFO +FIFO * **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/foundation/www/docs/user/manual/en/stock/item/item-variants.md b/foundation/www/docs/user/manual/en/stock/item/item-variants.md index 79fcfd0b..0e857b50 100644 --- a/foundation/www/docs/user/manual/en/stock/item/item-variants.md +++ b/foundation/www/docs/user/manual/en/stock/item/item-variants.md @@ -20,20 +20,20 @@ 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. -Has Variants +Has Variants On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table. In case the attribute has Numeric Values, you can specify the range and increment values here. -Valid Attributes +Valid Attributes > Note: You cannot make Transactions against a 'Template' To create 'Item Variants' against a 'Template' select 'Make Variants' -Make Variants +Make Variants -Make Variants +Make Variants To learn more about setting Attributes Master check [Item Attributes](/docs/user/manual/en/stock/setup/item-attribute.html) @@ -42,12 +42,12 @@ To learn more about setting Attributes Master check [Item Attributes](/docs/user To setup variants based on Manufactueres, in your Item template, set "Variants Based On" as "Manufacturers" Setup Item Variant by Manufacturer + src='{{docs_base_url}}/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 Setup Item Variant by Manufacturer + src='{{docs_base_url}}/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" @@ -56,4 +56,4 @@ To update the value in the variants items from the template item, select the res To set the fields Goto Stock > Item Variant Settings Item Variant Settings + src='{{docs_base_url}}/assets/img/stock/item_variants_settings.png'> diff --git a/foundation/www/docs/user/manual/en/stock/item/purchase-details.md b/foundation/www/docs/user/manual/en/stock/item/purchase-details.md index a1479faf..5d2d8fa3 100644 --- a/foundation/www/docs/user/manual/en/stock/item/purchase-details.md +++ b/foundation/www/docs/user/manual/en/stock/item/purchase-details.md @@ -5,4 +5,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. -Item Warranty \ No newline at end of file +Item Warranty \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/item/reorder.md b/foundation/www/docs/user/manual/en/stock/item/reorder.md index f50add88..3f393f46 100644 --- a/foundation/www/docs/user/manual/en/stock/item/reorder.md +++ b/foundation/www/docs/user/manual/en/stock/item/reorder.md @@ -11,4 +11,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. -Item Reorder \ No newline at end of file +Item Reorder \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/material-request.md b/foundation/www/docs/user/manual/en/stock/material-request.md index 65e991a3..a980c398 100644 --- a/foundation/www/docs/user/manual/en/stock/material-request.md +++ b/foundation/www/docs/user/manual/en/stock/material-request.md @@ -4,7 +4,7 @@ A Material Request is a simple document identifying a requirement of a set of Items (products or services) for a particular reason. -Material Request +Material Request To generate a Material Request manually go to: @@ -12,7 +12,7 @@ To generate a Material Request manually go to: #### Creating Material Request -Material Request +Material Request A Material Request can be generated: diff --git a/foundation/www/docs/user/manual/en/stock/projected-quantity.md b/foundation/www/docs/user/manual/en/stock/projected-quantity.md index a8b2e3e9..15c2520b 100644 --- a/foundation/www/docs/user/manual/en/stock/projected-quantity.md +++ b/foundation/www/docs/user/manual/en/stock/projected-quantity.md @@ -14,7 +14,7 @@ maintained to serve unexpected demands. Having a tight control of the projected inventory is crucial to determine shortages and to calculate the right order quantity. -Projected Quantity +Projected Quantity > Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty - diff --git a/foundation/www/docs/user/manual/en/stock/purchase-receipt.md b/foundation/www/docs/user/manual/en/stock/purchase-receipt.md index aa527e55..1542b262 100644 --- a/foundation/www/docs/user/manual/en/stock/purchase-receipt.md +++ b/foundation/www/docs/user/manual/en/stock/purchase-receipt.md @@ -13,7 +13,7 @@ You can make a Purchase Receipt directly from: or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”. -Purchase Receipt +Purchase Receipt ### Rejections diff --git a/foundation/www/docs/user/manual/en/stock/purchase-return.md b/foundation/www/docs/user/manual/en/stock/purchase-return.md index 8074b1f9..9fdf962f 100644 --- a/foundation/www/docs/user/manual/en/stock/purchase-return.md +++ b/foundation/www/docs/user/manual/en/stock/purchase-return.md @@ -9,16 +9,16 @@ You can create a Purchase Return by simply making a Purchase Receipt with negati First open the original Purchase Receipt, against which supplier delivered the items. -Original Purchase Receipt +Original Purchase Receipt Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount. -Return Against Purchase Receipt +Return Against Purchase Receipt On submission of Return Purchase Return, system will decrease item qty from the mentioned warehouse. To maintain correct stock valuation, stock balance will also go up according to the original purchase rate of the returned items. -Return Stock Ledger +Return Stock Ledger If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger. -Return Stock Ledger \ No newline at end of file +Return Stock Ledger \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/retain-sample-stock.md b/foundation/www/docs/user/manual/en/stock/retain-sample-stock.md index 17cdaa98..c37fcb62 100644 --- a/foundation/www/docs/user/manual/en/stock/retain-sample-stock.md +++ b/foundation/www/docs/user/manual/en/stock/retain-sample-stock.md @@ -7,21 +7,21 @@ A sample of a batch of starting material, packaging material or finished product It is advised to create a new warehouse just for retaining samples and not use it in production. -Sample Retention Warehouse +Sample Retention Warehouse ### Enable Retain Sample in Item master Check Retain Sample and Maximum allowed samples in Item Master for a batch. Please note that Retain Sample is based on Batch hence Has Batch No should be enabled as well. -Retain Sample +Retain Sample ### Stock Entry Whenever a Stock Entry is created with the purpose as Material Receipt, for items which have Retain Sample enabled, the Sample Quantity can be set during that Stock Entry. Sample quantity cannot be more than the Maximum sample quantity set in Item Master. -Retain Sample +Retain Sample On submission of this Stock Entry, button 'Make Retention Stock Entry' will be available to make another Stock Entry for the transfer of sample items from the mentioned batch to the retention warehouse set in Stock Settings. On clicking this button it will direct you to new Stock Entry with all the information, verify the information and click Submit. -Retain Sample \ No newline at end of file +Retain Sample \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/sales-return.md b/foundation/www/docs/user/manual/en/stock/sales-return.md index a8aff584..820a73d1 100644 --- a/foundation/www/docs/user/manual/en/stock/sales-return.md +++ b/foundation/www/docs/user/manual/en/stock/sales-return.md @@ -9,22 +9,22 @@ In ERPNext, you can create a Sales Return by simply making a Delivery Note / Sal First open the original Delivery Note / Sales Invoice, against which customer returned the items. -Original Delivery Note +Original Delivery Note Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount. -Return Against Delivery Note +Return Against Delivery Note You can also create the return entry against original Sales Invoice, to return stock along with credit note, check "Update Stock" option in Return Sales Invoice. -Return Against Sales Invoice +Return Against Sales Invoice On submission of Return Delivery Note / Sales Invoice, system will increase stock balance in the mentioned warehouse. To maintain correct stock valuation, stock balance will go up according to the original purchase rate of the returned items. -Return Stock Ledger +Return Stock Ledger In case of Return Sales Invoice, Customer account will be credited and associated income and tax account will be debited. If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger. -Return Stock Ledger \ No newline at end of file +Return Stock Ledger \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/serial-no.md b/foundation/www/docs/user/manual/en/stock/serial-no.md index 7907eb1f..a93cf22a 100644 --- a/foundation/www/docs/user/manual/en/stock/serial-no.md +++ b/foundation/www/docs/user/manual/en/stock/serial-no.md @@ -23,7 +23,7 @@ Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales Invoice). When a new Serial No is created directly, its warehouse cannot be set. -Serial Number +Serial Number * The Status is set based on Stock Entry. diff --git a/foundation/www/docs/user/manual/en/stock/setup/item-attribute.md b/foundation/www/docs/user/manual/en/stock/setup/item-attribute.md index 850e10f7..634c859c 100644 --- a/foundation/www/docs/user/manual/en/stock/setup/item-attribute.md +++ b/foundation/www/docs/user/manual/en/stock/setup/item-attribute.md @@ -3,17 +3,17 @@ You can define Attributes and attribute values for your Item Variants here. -Attribute Master +Attribute Master #### Non Numeric Attributes * For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table. -Attribute Master +Attribute Master #### Numeric Attributes * If your attribute is Numeric, select Numeric Values * Specify the Range and the Increment Value -Attribute Master +Attribute Master diff --git a/foundation/www/docs/user/manual/en/stock/setup/item-group.md b/foundation/www/docs/user/manual/en/stock/setup/item-group.md index ca4eedeb..d76d6a6d 100644 --- a/foundation/www/docs/user/manual/en/stock/setup/item-group.md +++ b/foundation/www/docs/user/manual/en/stock/setup/item-group.md @@ -8,7 +8,7 @@ product is used as a raw-material, you have to name it under the Raw-material category. In case, your product is used only in trading, you can categorise it under Trading. -Item Group Tree +Item Group Tree ### Create a Item Group @@ -16,7 +16,7 @@ under Trading. * Select 'Add Child' -Add Item Group +Add Item Group ### Delete an Item Group @@ -24,6 +24,6 @@ under Trading. * Select 'delete' -Add Item Group +Add Item Group {next} diff --git a/foundation/www/docs/user/manual/en/stock/setup/stock-settings.md b/foundation/www/docs/user/manual/en/stock/setup/stock-settings.md index 1e161367..81c2e4c5 100644 --- a/foundation/www/docs/user/manual/en/stock/setup/stock-settings.md +++ b/foundation/www/docs/user/manual/en/stock/setup/stock-settings.md @@ -3,7 +3,7 @@ You can set default settings for your stock related transactions here. -Stock Settings +Stock Settings ### Clean HTML Description diff --git a/foundation/www/docs/user/manual/en/stock/stock-entry.md b/foundation/www/docs/user/manual/en/stock/stock-entry.md index 23744e4a..cd5adf79 100644 --- a/foundation/www/docs/user/manual/en/stock/stock-entry.md +++ b/foundation/www/docs/user/manual/en/stock/stock-entry.md @@ -8,7 +8,7 @@ To make a Stock Entry you have to go to: > Stock > Stock Entry > New -Stock Entry +Stock Entry Stock Entries can be made for the following purposes: @@ -30,15 +30,16 @@ If the stock entry is an incoming entry i.e any item is receiving at a target wa To add additional costs, enter the description and amount of the cost in the Additional Costs table. -Stock Entry Additional Costs +Stock Entry Additional Costs The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate. -Stock Entry Item Valuation Rate +Stock Entry Item Valuation Rate If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account. -Additional Costs General Ledger +Additional Costs General Ledger + > **Note:** To update Stock from a spreadsheet, see [Stock Reconciliation]({{doc_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html). {next} diff --git a/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md b/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md index b0e84d29..a245c874 100644 --- a/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md +++ b/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md @@ -23,7 +23,7 @@ You can update landed cost any time in the future via Landed Cost Voucher. In the document, you can select multiple Purchase Receipts and fetch all items from those Purchase Receipts. Then you should add applicable charges in “Taxes and Charges” table. You can easily delete an item if the added charges is not applicable to that item. The added charges are proportionately distributed among all the items based their amount. -Landed Cost Vouher +Landed Cost Vouher ### What happend on submission? diff --git a/foundation/www/docs/user/manual/en/stock/tools/packing-slip.md b/foundation/www/docs/user/manual/en/stock/tools/packing-slip.md index d2c2dfed..c3e97ea0 100644 --- a/foundation/www/docs/user/manual/en/stock/tools/packing-slip.md +++ b/foundation/www/docs/user/manual/en/stock/tools/packing-slip.md @@ -5,6 +5,6 @@ A packing slip is a document listing the items in a shipment. Usually attached t While Shipping a product 'Draft' for Delivery Notes are created. You can make a Packing Slip from these Delivery Notes (Draft) -Packing Slip +Packing Slip {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/tools/quality-inspection.md b/foundation/www/docs/user/manual/en/stock/tools/quality-inspection.md index 7df171c7..3ef9c9aa 100644 --- a/foundation/www/docs/user/manual/en/stock/tools/quality-inspection.md +++ b/foundation/www/docs/user/manual/en/stock/tools/quality-inspection.md @@ -6,6 +6,6 @@ Inspection. To enable ERPNext to perform this function, go to : > Stock > Quality Inspection > New -Quality Inspection +Quality Inspection {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/warehouse.md b/foundation/www/docs/user/manual/en/stock/warehouse.md index b1500ac8..e1c90fbb 100644 --- a/foundation/www/docs/user/manual/en/stock/warehouse.md +++ b/foundation/www/docs/user/manual/en/stock/warehouse.md @@ -15,7 +15,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. -Warehouse +Warehouse 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/foundation/www/docs/user/manual/en/subscription/__init__.py b/foundation/www/docs/user/manual/en/subscription/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/support/issue.md b/foundation/www/docs/user/manual/en/support/issue.md index d41c2a92..5dbc672e 100644 --- a/foundation/www/docs/user/manual/en/support/issue.md +++ b/foundation/www/docs/user/manual/en/support/issue.md @@ -14,7 +14,7 @@ Frappé system. > Support > Issue > New Issue -Issue +Issue #### Discussion Thread diff --git a/foundation/www/docs/user/manual/en/support/maintenance-schedule.md b/foundation/www/docs/user/manual/en/support/maintenance-schedule.md index 747d9908..c1a5c77f 100644 --- a/foundation/www/docs/user/manual/en/support/maintenance-schedule.md +++ b/foundation/www/docs/user/manual/en/support/maintenance-schedule.md @@ -13,7 +13,7 @@ To create a new Maintenance Schedule go to: > Support > Maintenance Schedule > New Maintenance Schedule -Maintenance Schedule +Maintenance Schedule In the Maintenance Schedule, there are two sections: diff --git a/foundation/www/docs/user/manual/en/support/maintenance-visit.md b/foundation/www/docs/user/manual/en/support/maintenance-visit.md index 78e358e3..3c61f79e 100644 --- a/foundation/www/docs/user/manual/en/support/maintenance-visit.md +++ b/foundation/www/docs/user/manual/en/support/maintenance-visit.md @@ -7,7 +7,7 @@ Maintenance Visit from: > Support > Maintenance Visit > New Maintenance Visit -Maintenance Visit +Maintenance Visit The Maintenance Visit contains information about the: diff --git a/foundation/www/docs/user/manual/en/support/support_reports.md b/foundation/www/docs/user/manual/en/support/support_reports.md index 1035d78e..741455e9 100644 --- a/foundation/www/docs/user/manual/en/support/support_reports.md +++ b/foundation/www/docs/user/manual/en/support/support_reports.md @@ -8,4 +8,4 @@ This report provide the information about the time slot along with the count of > Support > Reports > Support Hours -Maintenance Visit +Maintenance Visit diff --git a/foundation/www/docs/user/manual/en/support/warranty-claim.md b/foundation/www/docs/user/manual/en/support/warranty-claim.md index e2f1d4a7..dc8aae89 100644 --- a/foundation/www/docs/user/manual/en/support/warranty-claim.md +++ b/foundation/www/docs/user/manual/en/support/warranty-claim.md @@ -18,7 +18,7 @@ To create a new **Warranty Claim**: > Support > Warranty Claim > New Warranty Claim -![Warranty Claim](/docs/assets/img/support/warranty-claim.png) +![Warranty Claim]({{docs_base_url}}/assets/img/support/warranty-claim.png) If a Customer visit is required to address the issue, you can create a new Maintenance Visit record from this. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/Global-search.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/Global-search.md index ef3d8d9c..c0ab4926 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/Global-search.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/Global-search.md @@ -11,9 +11,9 @@ Global Search helps users find information quickly. It’s located in the upper ### Using Awesome bar for Global Search. -Global Search +Global Search ### Enable Global Search for fields in a Doctype. -Global Search +Global Search diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md index a45080f9..93152ae3 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md @@ -5,6 +5,6 @@ ERPNext has in-built file manager. Click [here](/docs/user/videos/learn/file-man 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. -Emailing Attachments +Emailing Attachments \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md index 034ab449..169181e4 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md @@ -9,11 +9,11 @@ There are several ways to attach file to the document. ####From Browser -Sales Order File Attachment +Sales Order File Attachment ####By drag and drop -Sales Order File Attachment +Sales Order File Attachment Click on Attach to browse and select the file. @@ -21,7 +21,7 @@ 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. -Sales Order Select File +Sales Order Select File `For hosted users, limit of 5 MB is applied on file size.` diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md index de46aee2..609da8b8 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md @@ -11,7 +11,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. -Data File +Data File #### Step 2: Upload Data File @@ -21,7 +21,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. -![Upload Data](/docs/assets/img/articles/Selection_0173436a8.png) +![Upload Data]({{docs_base_url}}/assets/img/articles/Selection_0173436a8.png) {next} diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md index a5e4e361..b242a363 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md @@ -3,7 +3,7 @@ Links option shows one document is linked to which other documents. Check Menu for the Links options. -Cancel Doc +Cancel Doc ####Scenario @@ -19,6 +19,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. -Cancel Doc +Cancel Doc \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md index 648dcf19..ae52b886 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md @@ -13,18 +13,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. -Cancel Doc +Cancel Doc ####Step 2: Delete Document After cancellation, go to Menu and click on Delete. -Delete Doc +Delete Doc ####Step 3: Deleting from List For bulk deletion, you can select multiple Cancelled records and delete at once from the List View. -Delete Doc from List +Delete Doc from List \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md index b20e894a..5bc89ea3 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md @@ -11,6 +11,6 @@ You will find Copy option under: `Menu > Copy` -Duplicate +Duplicate \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md index be9197e3..258900cb 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/letter-head-in-the-report.md @@ -5,11 +5,11 @@ In the reports, Letter Head is fetched from the Company master. To have company' `Explore > Accounts > Company` -Company Letter +Company Letter In a Company master, if no Letter Head is set as default, then in the reports, Letter Head having Default field checked will be fetched. -Default Letter Head +Default Letter Head If you are managing multiple companies in a single ERPNext account, then ensure that for each Company, default Letter Head is set in the Company master. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md index 7a7e95c7..807954c5 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md @@ -13,7 +13,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. -Sales Order File Attachment +Sales Order File Attachment #### Step 3: Merge Account @@ -21,7 +21,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. -Sales Order File Attachment +Sales Order File Attachment ###Effect of Merging diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md index 74391b2f..162bf2d6 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md @@ -5,7 +5,7 @@ POS (point of sale) view renders form in a different layout, optimized for the q 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. -POS View +POS View For creating POS Invoice, check following help video. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md index d83692ca..9e5e1327 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md @@ -9,7 +9,7 @@ Using Renaming feature, you can change ID of a master documents like Item, Wareh #### 2. Rename -Renamed Item +Renamed Item ###Effect of Renaming diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md index 18f58279..20bd6bd2 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md @@ -9,20 +9,20 @@ Each filter option has three fields. Select field of the document based on which you wish to filter records. -Search Filter Field +Search Filter Field #### 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: -Search Filter Based On +Search Filter Based On #### 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. -Search Filter Based On +Search Filter Based On You can apply multiple filters at a time. To remove specific filter, just click on cancelled (X) sign ahead of it. @@ -31,6 +31,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. -Renamed Item +Renamed Item diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md index 5c068f75..29e9e450 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md @@ -13,12 +13,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. -Account +Account #### 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. -Renamed Account +Renamed Account \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/assignment.md b/foundation/www/docs/user/manual/en/using-erpnext/assignment.md index 77479f31..c7e746be 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/assignment.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/assignment.md @@ -13,13 +13,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. -Assign +Assign #### Step 2: Assign to User In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time. -Assign +Assign With assignment, you can also leave a comment for the review of assignee. @@ -27,13 +27,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. -Assign +Assign ####Removing Assignment User will be able to remove assignment by clicking on "Assignment Completed" button in the document. -Assign +Assign Once assignment is set as completed, the Status of its ToDo record will be set as Closed. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/calendar.md b/foundation/www/docs/user/manual/en/using-erpnext/calendar.md index 908fc110..cf387849 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/calendar.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/calendar.md @@ -5,7 +5,7 @@ The Calendar is a tool where you can create and share Events and also see auto-g You can switch calendar view based on Month, Week and Day. -Calendar +Calendar ### Creating Events in Calendar @@ -15,7 +15,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. -Calendar +Calendar 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. @@ -23,7 +23,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. -Lead Event +Lead Event #### Birthday Event @@ -34,7 +34,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". -Calendar Recurring Event +Calendar Recurring Event ### Event Reminders @@ -44,7 +44,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. -Calendar Recurring Event +Calendar Recurring Event #### Create Email Digest @@ -54,6 +54,6 @@ Email Digest can be set from: `Setup > Email > Email Digest` -Calendar Recurring Event +Calendar Recurring Event {next} diff --git a/foundation/www/docs/user/manual/en/using-erpnext/chat.md b/foundation/www/docs/user/manual/en/using-erpnext/chat.md index 7cbc7d42..d15c156e 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/chat.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/chat.md @@ -8,10 +8,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. -Assign +Assign You can choose to send message to all the users, or to specific user. -Assign +Assign {next} diff --git a/foundation/www/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/foundation/www/docs/user/manual/en/using-erpnext/collaborating-around-forms.md index febf372c..36182f6f 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/collaborating-around-forms.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/collaborating-around-forms.md @@ -12,13 +12,13 @@ If some document requires an action from User, you can Assign that document to t Comments are a great way to add information about a transaction that is not a part of the transactions. Like some background information etc. -Assign +Assign ###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. -Assign +Assign ### Tags diff --git a/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md b/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md index 62fdf459..927d1aa0 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md @@ -7,16 +7,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. -Enable Versioning +Enable Versioning ####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 Links +Version Links ####Version Details In the Version document, you will find log of all the fields and values changes in it. -Version Details \ No newline at end of file +Version Details \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/notes.md b/foundation/www/docs/user/manual/en/using-erpnext/notes.md index 9c52ef1e..db2d3076 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/notes.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/notes.md @@ -9,12 +9,12 @@ You can store your long notes under this section. It can contain your partner li Enter Title and Context. -Note New +Note New ####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. -Note New +Note New {next} diff --git a/foundation/www/docs/user/manual/en/using-erpnext/restore-deleted-docs.md b/foundation/www/docs/user/manual/en/using-erpnext/restore-deleted-docs.md index d2ea2021..062f73e4 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/restore-deleted-docs.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/restore-deleted-docs.md @@ -3,7 +3,7 @@ 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. -Delete a Docuemnt +Delete a Docuemnt If you have deleted an entry by mistake and wish to restore it back into your ERPNext account. @@ -15,18 +15,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. -Deleted Docs List +Deleted Docs List ####Step 2: Open Doc and Restore Open the document to be restored from the list. Click on Restore button. -Restored Doc +Restored Doc ####Step 3: Restored Once a document is restored, you will be able to use it for creating entries in your ERPNext account. -Restored Doc +Restored Doc > If canceled document is deleted, then it will not be restored. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/tags.md b/foundation/www/docs/user/manual/en/using-erpnext/tags.md index c8b14e9b..61be1147 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/tags.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/tags.md @@ -3,10 +3,10 @@ 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. -Assign +Assign ERPNext will also show you all the important tags in the document list. -Assign +Assign {next} diff --git a/foundation/www/docs/user/manual/en/using-erpnext/to-do.md b/foundation/www/docs/user/manual/en/using-erpnext/to-do.md index 8eadc472..c1aba1ad 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/to-do.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/to-do.md @@ -3,10 +3,10 @@ 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. -Assign +Assign 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. -Assign +Assign {next} diff --git a/foundation/www/docs/user/manual/en/website/add-products-to-website.md b/foundation/www/docs/user/manual/en/website/add-products-to-website.md index 59ad41b3..ed0525c9 100644 --- a/foundation/www/docs/user/manual/en/website/add-products-to-website.md +++ b/foundation/www/docs/user/manual/en/website/add-products-to-website.md @@ -14,14 +14,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**. -![New Website Item 01](/docs/assets/img/articles/new-item-for-website-01.png) +![New Website Item 01]({{docs_base_url}}/assets/img/articles/new-item-for-website-01.png) #### 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. -![New Website Item 02](/docs/assets/img/articles/new-item-for-website-02.png) +![New Website Item 02]({{docs_base_url}}/assets/img/articles/new-item-for-website-02.png) #### Step 3: Check the 'Show in Website' box @@ -29,17 +29,17 @@ Under the Website section near the bottom of the form, check the box that says * * Give the page a route on the website. -![New Website Item 03](/docs/assets/img/articles/new-item-for-website-03.png) +![New Website Item 03]({{docs_base_url}}/assets/img/articles/new-item-for-website-03.png) #### 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. -![New Website Item 04](/docs/assets/img/articles/new-item-for-website-04.png) +![New Website Item 04]({{docs_base_url}}/assets/img/articles/new-item-for-website-04.png) 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. -![New Website Item 05](/docs/assets/img/articles/new-item-for-website-05.png) +![New Website Item 05]({{docs_base_url}}/assets/img/articles/new-item-for-website-05.png) ### Item Groups @@ -50,17 +50,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**. -![New Website Item 06](/docs/assets/img/articles/new-item-for-website-06.png) +![New Website Item 06]({{docs_base_url}}/assets/img/articles/new-item-for-website-06.png) * 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**. -![New Website Item 07](/docs/assets/img/articles/new-item-for-website-07.png) +![New Website Item 07]({{docs_base_url}}/assets/img/articles/new-item-for-website-07.png) To see on the website, go back to the `Item Group` and then click **See on website**. -![New Website Item 08](/docs/assets/img/articles/new-item-for-website-08.png) +![New Website Item 08]({{docs_base_url}}/assets/img/articles/new-item-for-website-08.png) {next} diff --git a/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md index c4c92d85..dda24ae6 100644 --- a/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md +++ b/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md @@ -3,7 +3,7 @@ Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page. -Website User Signup +Website User Signup As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext. diff --git a/foundation/www/docs/user/manual/en/website/articles/website-banner.md b/foundation/www/docs/user/manual/en/website/articles/website-banner.md index db24efa9..637f85c8 100644 --- a/foundation/www/docs/user/manual/en/website/articles/website-banner.md +++ b/foundation/www/docs/user/manual/en/website/articles/website-banner.md @@ -7,4 +7,4 @@ Each ERPNext account website automatically generated from it. On a website, logo For the exact steps on how to upload a Website Banner and resize it, please refer to the help given below. -Website Banner image \ No newline at end of file +Website Banner image \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/website/articles/website-home-page.md b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md index a39f8bcf..c11c626b 100644 --- a/foundation/www/docs/user/manual/en/website/articles/website-home-page.md +++ b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md @@ -19,7 +19,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. -![Website Setting Home](/docs/assets/img/articles/Selection_021.png) +![Website Setting Home]({{docs_base_url}}/assets/img/articles/Selection_021.png) #### **Step 4: Save Website Settings Form.** diff --git a/foundation/www/docs/user/manual/en/website/articles/website-security.md b/foundation/www/docs/user/manual/en/website/articles/website-security.md index cfe6071c..4be1c595 100644 --- a/foundation/www/docs/user/manual/en/website/articles/website-security.md +++ b/foundation/www/docs/user/manual/en/website/articles/website-security.md @@ -5,8 +5,8 @@ One can easily generate a website using ERPNext. We can list our Products on the 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/foundation/www/docs/user/manual/en/website/blog-post.md b/foundation/www/docs/user/manual/en/website/blog-post.md index 05de52d2..17683766 100644 --- a/foundation/www/docs/user/manual/en/website/blog-post.md +++ b/foundation/www/docs/user/manual/en/website/blog-post.md @@ -11,13 +11,13 @@ To create a new blog, just create a new Blog from: > Website > Blog > New Blog -Blog Post +Blog Post You can format a blog using the Markdown format.You can also access your blog by going to the page “blog.html”. #### A sample blog-page. -Blog Sample +Blog Sample {next} diff --git a/foundation/www/docs/user/manual/en/website/blogger.md b/foundation/www/docs/user/manual/en/website/blogger.md index f43c2f3d..34493acb 100644 --- a/foundation/www/docs/user/manual/en/website/blogger.md +++ b/foundation/www/docs/user/manual/en/website/blogger.md @@ -4,6 +4,6 @@ Blogger is a user who can post blogs. You can mention a short bio about the blogger and also set a avatar here. -Blogger +Blogger {next} diff --git a/foundation/www/docs/user/manual/en/website/setup/website-settings.md b/foundation/www/docs/user/manual/en/website/setup/website-settings.md index be47a376..09f36135 100644 --- a/foundation/www/docs/user/manual/en/website/setup/website-settings.md +++ b/foundation/www/docs/user/manual/en/website/setup/website-settings.md @@ -3,7 +3,7 @@ Most of the website related settings can be defined here. -Website Settings +Website Settings ####Landing Page @@ -17,7 +17,7 @@ Most of the website related settings can be defined here. Select the theme for the website. You can create new Theme for you website also. -Website Theme +Website Theme * Select 'create new website theme' if you wish to customize the default website theme. @@ -26,13 +26,13 @@ Select the theme for the website. You can create new Theme for you website also. You can add a banner/ logo to your website here. Attach the image and click on set banner from Image. An HTML code will be generated by the system under Banner HTML. -Banner +Banner ####Top Bar You can set the menus items in the Top Bar here. -Top Bar +Top Bar * Similarlly you can also set sidebar and footer links. @@ -40,7 +40,7 @@ You can set the menus items in the Top Bar here. You can integrate the website using Google Analytics and enable social media sharing for post shared on the website. -Integrations +Integrations * You can disable public signup to your ERPNext account by checking 'disable signup' diff --git a/foundation/www/docs/user/manual/en/website/shopping-cart.md b/foundation/www/docs/user/manual/en/website/shopping-cart.md index bed7ef63..f07b2b63 100644 --- a/foundation/www/docs/user/manual/en/website/shopping-cart.md +++ b/foundation/www/docs/user/manual/en/website/shopping-cart.md @@ -17,7 +17,7 @@ To set up a shopping cart, go to the website module. #### Enter Company Details and Checkout Details. -Shopping Cart Settings +Shopping Cart Settings To make item available on website go to Item master. @@ -25,11 +25,11 @@ To make item available on website go to Item master. #### Enable Item for website. -Item +Item #### Enter Website Specifications for Item. -Website Specifications +Website Specifications ### Shop using Shopping Cart @@ -38,20 +38,20 @@ To make item available on website go to Item master. Click on "Add to Cart" to add item to shopping cart. -Website Specifications +Website Specifications #### Goto Checkout Click on "Go to Cart" to checkout or on "Cart" which is on upper right side of the screen. -Website Specifications +Website Specifications #### Checkout Change quantity, select Shipping and Billing Address and click on "Place Order" to place the order. -Website Specifications +Website Specifications {next} diff --git a/foundation/www/docs/user/manual/en/website/web-form.md b/foundation/www/docs/user/manual/en/website/web-form.md index fe26f9be..176a9e7f 100644 --- a/foundation/www/docs/user/manual/en/website/web-form.md +++ b/foundation/www/docs/user/manual/en/website/web-form.md @@ -18,7 +18,7 @@ To create a new **Web Form** go to: 1. Select if you require the user to login, edit records, manage multiple records etc. 1. Add the fields you want in the record. -Web Form +Web Form --- @@ -26,7 +26,7 @@ To create a new **Web Form** go to: Once you create the web form, you can view it on the url and test it out! -Web form +Web form --- diff --git a/foundation/www/docs/user/manual/en/website/web-page.md b/foundation/www/docs/user/manual/en/website/web-page.md index ad25cea8..a09e88a6 100644 --- a/foundation/www/docs/user/manual/en/website/web-page.md +++ b/foundation/www/docs/user/manual/en/website/web-page.md @@ -7,7 +7,7 @@ To create a new Web Page, go to: > Website > Web Page > New -Web Page +Web Page #### Title diff --git a/foundation/www/docs/user/manual/es/accounts/accounting-reports.md b/foundation/www/docs/user/manual/es/accounts/accounting-reports.md index c58d6782..62f24af9 100644 --- a/foundation/www/docs/user/manual/es/accounts/accounting-reports.md +++ b/foundation/www/docs/user/manual/es/accounts/accounting-reports.md @@ -15,7 +15,7 @@ actualizado de todas las entradas que existan para una cuetna dada en un periodo determinado. Libro Mayor + src="{{docs_base_url}}/assets/img/accounts/general-ledger.png"> ### Balance Contable @@ -27,7 +27,7 @@ en una fecha particular. Para cada cuenta proporciona: * Creditos * Cierre -Balance Contable +Balance Contable La suma de todos los balances de cierre en el Balance Contable debe ser igual a cero. @@ -36,7 +36,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. -Accounts Receivable +Accounts Receivable ### Registro de Ventas y Compras @@ -44,7 +44,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, -Sales Register +Sales Register **Trabajo en progreso.** diff --git a/foundation/www/docs/user/manual/es/accounts/advance-payment-entry.md b/foundation/www/docs/user/manual/es/accounts/advance-payment-entry.md index 5f4d00ec..4e4ddd0a 100644 --- a/foundation/www/docs/user/manual/es/accounts/advance-payment-entry.md +++ b/foundation/www/docs/user/manual/es/accounts/advance-payment-entry.md @@ -27,7 +27,7 @@ the row "Is Advance" click 'Yes'. #### Figure 1 : Journal Entry -Advance Entry -Advace Payment +Advace Payment ### Double Entry Accounting @@ -44,7 +44,7 @@ will be credited because it has given value. #### Figure 2: Transaction and Difference Entry -Advace Payment +Advace Payment Save and submit the JV. If this document is not saved it will not be pulled in other accounting documents. @@ -58,7 +58,7 @@ advance in the advances table. The accounting will be adjusted accordingly. #### Figure 3: Receive Advance -Advace Payment +Advace Payment Save and submit the Sales Invoice. diff --git a/foundation/www/docs/user/manual/es/education/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_criteria.md index 98487eee..0df19d72 100644 --- a/foundation/www/docs/user/manual/es/education/Assessment/assessment_criteria.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_criteria.md @@ -3,12 +3,12 @@ Criterios de evaluación es el parámetro basado en el que se evalúa el estudiante. -Assessment Criteria +Assessment Criteria Después de la evaluación para un curso, las calificaciones obtenidas se ingresan en base a los criterios de evaluación. Por ejemplo, si la evaluación se llevó a cabo para el tema de la ciencia, entonces usted puede evaluar al estudiante en ciencia en varios criterios como la escritura, prácticas, presentación, etc Los Criterios de Evaluación se usan al programar el Plan de Evaluación para el Grupo de Estudiantes y el Curso. -Assessment Plan Criteria +Assessment Plan Criteria {next} diff --git a/foundation/www/docs/user/manual/es/education/Assessment/assessment_group.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_group.md index a6aaca3c..eef55c86 100644 --- a/foundation/www/docs/user/manual/es/education/Assessment/assessment_group.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_group.md @@ -5,10 +5,10 @@ La estructura del grupo de evaluación es un maestro donde se puede definir la j Por ejemplo, si realiza dos evaluaciones en un año académico, configure el Grupo de evaluación de la siguiente manera. -Assessment Group Term +Assessment Group Term En la misma línea, también puede definir varios Grupo de Evaluación basado sobre la evaluación llevada a cabo en su instituto. -Assessment Group Term +Assessment Group Term {next} diff --git a/foundation/www/docs/user/manual/es/education/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_plan.md index 92dd6af6..1b8fab53 100644 --- a/foundation/www/docs/user/manual/es/education/Assessment/assessment_plan.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_plan.md @@ -11,10 +11,10 @@ Para programar una evaluación/examinación para un Grupo de Estudiantes, para u 4. Examinador y Supervisor -Assessment Plan Details +Assessment Plan Details 5. Los Criterios de Evaluación son la lista de criterios basados ​​en que cada estudiante en será evaluado y los grados serán asignados. -Assessment Plan Criteria +Assessment Plan Criteria {next} diff --git a/foundation/www/docs/user/manual/es/education/Assessment/assessment_result.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_result.md index 076d6766..f2990e9c 100644 --- a/foundation/www/docs/user/manual/es/education/Assessment/assessment_result.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_result.md @@ -3,6 +3,6 @@ El resultado de la evaluación es un registro de las calificaciones obtenidas por el estudiante para una evaluación específica. El resultado de la evaluación se crea en el backend en base a los puntos en [Herramienta de Resultados de Evaluación](/docs/user/manual/es/education/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result {next} diff --git a/foundation/www/docs/user/manual/es/education/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/es/education/Assessment/assessment_result_tool.md index 126c42db..31c4005a 100644 --- a/foundation/www/docs/user/manual/es/education/Assessment/assessment_result_tool.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/assessment_result_tool.md @@ -4,7 +4,7 @@ Herramienta de resultados de evaluación le ayuda a ingresar las calificaciones obtenidas por los estudiantes para un curso específico. En esta herramienta, basada en el plan de evaluación, todos los estudiantes van a ser filtrados dentro de la herramienta de resultados de la evaluación. También, Columnas para los Criterios de Evaluación serán donde las calificaciones ganadas pueden ser ingresadas para cada Estudiante. -Assessment Result Tool +Assessment Result Tool A medida que vaya introduciendo las notas para un Estudiante y cambie al siguiente alumno, en el backend, el registro de Resultados del Estudiante se creará automáticamente para ese Estudiante. diff --git a/foundation/www/docs/user/manual/es/education/Assessment/grading_scale.md b/foundation/www/docs/user/manual/es/education/Assessment/grading_scale.md index ad3fff9a..f0389ea3 100644 --- a/foundation/www/docs/user/manual/es/education/Assessment/grading_scale.md +++ b/foundation/www/docs/user/manual/es/education/Assessment/grading_scale.md @@ -3,6 +3,6 @@ En la escala de calificación, puedes definir varios grados y límites para los estudiantes. Basado en la calificación obtenida por el estudiante en la evaluación, el grado (Grade) será asignado. -Grading Scale +Grading Scale {next} diff --git a/foundation/www/docs/user/manual/es/education/admission/program-enrollment.md b/foundation/www/docs/user/manual/es/education/admission/program-enrollment.md index adda6a27..b91a67a4 100644 --- a/foundation/www/docs/user/manual/es/education/admission/program-enrollment.md +++ b/foundation/www/docs/user/manual/es/education/admission/program-enrollment.md @@ -3,6 +3,6 @@ Este formulario te permite inscribir un estudiante a un programa. Un estudiante puede ser inscrito en multiples programas. -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/foundation/www/docs/user/manual/es/education/admission/student-applicant.md b/foundation/www/docs/user/manual/es/education/admission/student-applicant.md index e1631d25..bc7b666d 100644 --- a/foundation/www/docs/user/manual/es/education/admission/student-applicant.md +++ b/foundation/www/docs/user/manual/es/education/admission/student-applicant.md @@ -4,7 +4,7 @@ Un registro de Aplicación de Estudiante necesita ser creado cuando un estudiante aplica para un programa en su institución. Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicación de un estudiante puedes agregarlos al master de estudiantes. -Student Applicant +Student Applicant ### Estados de la Aplicación @@ -24,6 +24,6 @@ Puedes Aprobar o Rechazar una aplicación de estudiante. Aceptando una aplicaci Una vez aprobada una Aplicación de Estudiante, puedes inscribirlo a un programa. Cuando le das click al butón 'Inscribir', el sistema creará un estudiante usando esa aplicación y le va a redireccionar a el [Formulario de Inscripción al Programa](/docs/user/manual/es/education/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/foundation/www/docs/user/manual/es/education/fees/fee-category.md b/foundation/www/docs/user/manual/es/education/fees/fee-category.md index 4e9e107c..1d30226f 100644 --- a/foundation/www/docs/user/manual/es/education/fees/fee-category.md +++ b/foundation/www/docs/user/manual/es/education/fees/fee-category.md @@ -3,6 +3,6 @@ Todos los tipos diferentes de cuotas que se cobran -Fees Category +Fees Category {next} diff --git a/foundation/www/docs/user/manual/es/education/fees/fee-structure.md b/foundation/www/docs/user/manual/es/education/fees/fee-structure.md index 96d31619..28cf6315 100644 --- a/foundation/www/docs/user/manual/es/education/fees/fee-structure.md +++ b/foundation/www/docs/user/manual/es/education/fees/fee-structure.md @@ -3,6 +3,6 @@ Una Estructura de Cuota es una plantilla que puede ser usada cuando se hacen registros de cuotas. -Fees Structure +Fees Structure {next} diff --git a/foundation/www/docs/user/manual/es/education/fees/fees.md b/foundation/www/docs/user/manual/es/education/fees/fees.md index c5f4923a..fc2d51f9 100644 --- a/foundation/www/docs/user/manual/es/education/fees/fees.md +++ b/foundation/www/docs/user/manual/es/education/fees/fees.md @@ -4,6 +4,6 @@ Mantiene un registro de todas las cuotas recolectadas de los estudiantes. La [Estructura de Cuota](/docs/user/manual/es/education/fees/fee-structure.html) es seleccionada basada en el programa seleccionada y los Términos Académicos. -Fees +Fees {next} diff --git a/foundation/www/docs/user/manual/es/education/fees/index.md b/foundation/www/docs/user/manual/es/education/fees/index.md index ab670246..fb22c116 100644 --- a/foundation/www/docs/user/manual/es/education/fees/index.md +++ b/foundation/www/docs/user/manual/es/education/fees/index.md @@ -3,7 +3,7 @@ Esta sección contiene todos los documentos relacionado a las 'Cuota' -Fees Section +Fees Section ### Temas diff --git a/foundation/www/docs/user/manual/es/education/index.md b/foundation/www/docs/user/manual/es/education/index.md index 347f2f63..d547cbf2 100644 --- a/foundation/www/docs/user/manual/es/education/index.md +++ b/foundation/www/docs/user/manual/es/education/index.md @@ -4,6 +4,6 @@ Los módulos de School estan diseñados para satisfacer los requerimientos de Escuelas, Colegios e Institutos Educacionales. -Fees Section +Fees Section {index} diff --git a/foundation/www/docs/user/manual/es/education/schedule/course-schedule.md b/foundation/www/docs/user/manual/es/education/schedule/course-schedule.md index d1bfd41a..c33c794f 100644 --- a/foundation/www/docs/user/manual/es/education/schedule/course-schedule.md +++ b/foundation/www/docs/user/manual/es/education/schedule/course-schedule.md @@ -4,13 +4,13 @@ El Horario de Curso es el horario de una sesión de un profesor para un Curso en particular. Puedes ver un resumen del horario del curso en la vista de Calendario. -Course Schedule +Course Schedule ### Marcando asistencia Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Curso. -Course Schedule Attendance +Course Schedule Attendance - Para hacer la asistencia, expandir la sección de asistencia. - Selecciona los estudiantes que estaban presentes para esa sesión. @@ -21,6 +21,6 @@ Puedes pasar la asistencia para un grupo de estudiantes usando el Horario de Cur Una vez hayas marcado la asistencia usando la sección de asistencia en el Horario de un Curso, esta sección debería estar oculta. Un botón de Ver Asistencia debería aparecer. Click en el botón para ver todos los registros de asistencia creados para ese Horario de Curso. -Course Schedule Attendance +Course Schedule Attendance {next} diff --git a/foundation/www/docs/user/manual/es/education/schedule/examination.md b/foundation/www/docs/user/manual/es/education/schedule/examination.md index d82b2c7a..d49374fc 100644 --- a/foundation/www/docs/user/manual/es/education/schedule/examination.md +++ b/foundation/www/docs/user/manual/es/education/schedule/examination.md @@ -3,7 +3,7 @@ El registro de examinación puede ser usado para hacer el seguimiento del horario de los examenes y los resultados de los mismos. -Examination +Examination {next} diff --git a/foundation/www/docs/user/manual/es/education/schedule/index.md b/foundation/www/docs/user/manual/es/education/schedule/index.md index e9f8a5c3..2418dcbb 100644 --- a/foundation/www/docs/user/manual/es/education/schedule/index.md +++ b/foundation/www/docs/user/manual/es/education/schedule/index.md @@ -1,7 +1,7 @@ # Horario -Schedule Section +Schedule Section ### Temas diff --git a/foundation/www/docs/user/manual/es/education/schedule/scheduling-tool.md b/foundation/www/docs/user/manual/es/education/schedule/scheduling-tool.md index 70400127..dcb2231a 100644 --- a/foundation/www/docs/user/manual/es/education/schedule/scheduling-tool.md +++ b/foundation/www/docs/user/manual/es/education/schedule/scheduling-tool.md @@ -3,7 +3,7 @@ Esta herramienta puede ser usada para crear los Horarios de los Cursos. -Scheduling Tool +Scheduling Tool ### Creando Horarios de Cursos diff --git a/foundation/www/docs/user/manual/es/education/schedule/student-attendance.md b/foundation/www/docs/user/manual/es/education/schedule/student-attendance.md index 888ab85d..213c7d3f 100644 --- a/foundation/www/docs/user/manual/es/education/schedule/student-attendance.md +++ b/foundation/www/docs/user/manual/es/education/schedule/student-attendance.md @@ -3,6 +3,6 @@ Mantiene los registros de la asistencia del estudiante. Los registros de asistencia pueden ser creados sobre los horarios de los cursos (Course Schedules). -Student Attendance +Student Attendance {next} diff --git a/foundation/www/docs/user/manual/es/education/setup/academic-term.md b/foundation/www/docs/user/manual/es/education/setup/academic-term.md index fb2e7744..a9923355 100644 --- a/foundation/www/docs/user/manual/es/education/setup/academic-term.md +++ b/foundation/www/docs/user/manual/es/education/setup/academic-term.md @@ -1,7 +1,7 @@ # Término Académico -Academic Term +Academic Term {next} diff --git a/foundation/www/docs/user/manual/es/education/setup/academic-year.md b/foundation/www/docs/user/manual/es/education/setup/academic-year.md index 3c425dcd..01b343dc 100644 --- a/foundation/www/docs/user/manual/es/education/setup/academic-year.md +++ b/foundation/www/docs/user/manual/es/education/setup/academic-year.md @@ -1,6 +1,6 @@ # Año Académico -Academic Year +Academic Year {next} diff --git a/foundation/www/docs/user/manual/es/education/setup/course.md b/foundation/www/docs/user/manual/es/education/setup/course.md index 64559c87..6f33c28b 100644 --- a/foundation/www/docs/user/manual/es/education/setup/course.md +++ b/foundation/www/docs/user/manual/es/education/setup/course.md @@ -1,6 +1,6 @@ # Curso -Course +Course {next} diff --git a/foundation/www/docs/user/manual/es/education/setup/index.md b/foundation/www/docs/user/manual/es/education/setup/index.md index 619755be..11a10831 100644 --- a/foundation/www/docs/user/manual/es/education/setup/index.md +++ b/foundation/www/docs/user/manual/es/education/setup/index.md @@ -1,7 +1,7 @@ # Configuración -Setup Section +Setup Section ### Temas diff --git a/foundation/www/docs/user/manual/es/education/setup/instructor.md b/foundation/www/docs/user/manual/es/education/setup/instructor.md index f5477167..a06e39f9 100644 --- a/foundation/www/docs/user/manual/es/education/setup/instructor.md +++ b/foundation/www/docs/user/manual/es/education/setup/instructor.md @@ -1,6 +1,6 @@ # Instructor -Instructor +Instructor {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/setup/program.md b/foundation/www/docs/user/manual/es/education/setup/program.md index 3e03bef7..ef261d3a 100644 --- a/foundation/www/docs/user/manual/es/education/setup/program.md +++ b/foundation/www/docs/user/manual/es/education/setup/program.md @@ -1,6 +1,6 @@ # Programa -Program +Program {next} diff --git a/foundation/www/docs/user/manual/es/education/setup/room.md b/foundation/www/docs/user/manual/es/education/setup/room.md index 755e0142..1ccbdce2 100644 --- a/foundation/www/docs/user/manual/es/education/setup/room.md +++ b/foundation/www/docs/user/manual/es/education/setup/room.md @@ -2,6 +2,6 @@ # Aula -Room +Room {next} diff --git a/foundation/www/docs/user/manual/es/education/student/student-batch.md b/foundation/www/docs/user/manual/es/education/student/student-batch.md index 4606f363..3dfe6b5b 100644 --- a/foundation/www/docs/user/manual/es/education/student/student-batch.md +++ b/foundation/www/docs/user/manual/es/education/student/student-batch.md @@ -4,6 +4,6 @@ Un lote de estudiantes es una colección de estudiantes desde los Grupos de Estudiantes. -Student +Student {next} diff --git a/foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md index 220fc0e1..1f6d6589 100644 --- a/foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md +++ b/foundation/www/docs/user/manual/es/education/student/student-group-creation-tool.md @@ -4,6 +4,6 @@ Esta herramienta te permite crear grupos de estudiantes. Puedes especificar multiples parámetros para crearlos. -Student Group Creation Tool +Student Group Creation Tool {next} diff --git a/foundation/www/docs/user/manual/es/education/student/student-group.md b/foundation/www/docs/user/manual/es/education/student/student-group.md index bdd7c3a1..1fa03b7e 100644 --- a/foundation/www/docs/user/manual/es/education/student/student-group.md +++ b/foundation/www/docs/user/manual/es/education/student/student-group.md @@ -4,6 +4,6 @@ Un Grupo de Estudiante es una colección de estudiantes tomando el mismo curso. Puedes crear calendarios para los cursos y examinaciones para un Grupo de Estudiante. Un Grupo de Estudiante necesita ser creado para cada curso en un año o término académico en particular. -Student Group +Student Group {next} diff --git a/foundation/www/docs/user/manual/es/education/student/student-log.md b/foundation/www/docs/user/manual/es/education/student/student-log.md index c48f8e90..e765e0ce 100644 --- a/foundation/www/docs/user/manual/es/education/student/student-log.md +++ b/foundation/www/docs/user/manual/es/education/student/student-log.md @@ -4,6 +4,6 @@ Puedes crear una nota de una actividad de un estudiante usando la bitácora de estudiante (log) Los registros de bitágora pueden ser categorizadas como 'General', 'Academic', 'Medical' or 'Achievement' -Student +Student {next} diff --git a/foundation/www/docs/user/manual/es/education/student/student.md b/foundation/www/docs/user/manual/es/education/student/student.md index b95a76c8..7c00b337 100644 --- a/foundation/www/docs/user/manual/es/education/student/student.md +++ b/foundation/www/docs/user/manual/es/education/student/student.md @@ -6,6 +6,6 @@ El doctype de Estudiante mantiene los detalles personales de los estudiantes. Puedes ver todo lo relacionado a un estudiante en particular en esta página. Ejemplo: Pagos, Grupo de Estudiante, etc. -Student +Student {next} diff --git a/foundation/www/docs/user/manual/es/introduction/key-workflows.md b/foundation/www/docs/user/manual/es/introduction/key-workflows.md index cff815ea..ec49ca40 100644 --- a/foundation/www/docs/user/manual/es/introduction/key-workflows.md +++ b/foundation/www/docs/user/manual/es/introduction/key-workflows.md @@ -7,7 +7,7 @@ Este diagrama no cubre toda la funcionalidad o características de ERPNext. ![](/docs/assets/old_images/erpnext/overview.png) -Workflow +Workflow _Nota: No todos los pasos son obligatorios. ERPNext te permite pasar algunos pasos si deseas simplificar el proceso._ diff --git a/foundation/www/docs/user/manual/es/introduction/the-champion.md b/foundation/www/docs/user/manual/es/introduction/the-champion.md index 2c75e807..edb0be3a 100644 --- a/foundation/www/docs/user/manual/es/introduction/the-champion.md +++ b/foundation/www/docs/user/manual/es/introduction/the-champion.md @@ -5,7 +5,7 @@

    El campeón

    -Champion +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/foundation/www/docs/user/manual/es/projects/activity-cost.md b/foundation/www/docs/user/manual/es/projects/activity-cost.md index 95db500c..3e890485 100644 --- a/foundation/www/docs/user/manual/es/projects/activity-cost.md +++ b/foundation/www/docs/user/manual/es/projects/activity-cost.md @@ -4,4 +4,4 @@ El costo de la actividad registra la tasa de facturación por hora y la tasa de costos de un empleado en comparación con un tipo de actividad. El sistema hace uso de esta tasa mientras hace registros de tiempo. Se usa para Costeo de proyectos. -Activity Cost +Activity Cost diff --git a/foundation/www/docs/user/manual/es/projects/activity-type.md b/foundation/www/docs/user/manual/es/projects/activity-type.md index 1348eb6f..96bca785 100644 --- a/foundation/www/docs/user/manual/es/projects/activity-type.md +++ b/foundation/www/docs/user/manual/es/projects/activity-type.md @@ -3,7 +3,7 @@ Los tipos de actividad son la lista de los diferentes tipos de actividades sobre las que se hacen registro de tiempo. -Activity Type +Activity Type Por defecto, los siguientes tipos de actividades son creados. diff --git a/foundation/www/docs/user/manual/es/projects/articles/project-costing.md b/foundation/www/docs/user/manual/es/projects/articles/project-costing.md index a7f4142c..d47e20ef 100644 --- a/foundation/www/docs/user/manual/es/projects/articles/project-costing.md +++ b/foundation/www/docs/user/manual/es/projects/articles/project-costing.md @@ -14,17 +14,17 @@ Tipo de actividad es un maestro de los servicios ofrecidos por su personal. Pued Costo de actividad es un maestro donde puedes hacer el seguimiento de los montos de facturación y costo de cada empleado, y por cada tipo de Tipo de Actividad. -Activity Cost +Activity Cost #### Registro de Tiempo Basados en el tiempo actual invertido en una Tarea del Proyecto, El empleado va a crear un registro de tiempo. -Time Log +Time Log Al momento de seleccionar el Tipo de Actividad en el Registro de tiempo, el monto de Facturación y Costo del empleado va a ser traído de su respectivo registro en el master de Costo de Actividad. -Time Log Costing +Time Log Costing Multiplicando esos montos con el total de número de horas en el registro de tiempo, nos da el monto de costos y Facturación para el registro de tiempo específico. @@ -32,10 +32,10 @@ Multiplicando esos montos con el total de número de horas en el registro de tie Basados en el total de registros de tiempos creados por una tarea en específico, su costo va a ser actualizado en el registro maestro de la tarea, o sea, en el detalle de la tarea. -Costing in Task +Costing in Task De la misma manera, el detalle del Proyecto va a actualizar su costo basado en el total de registros de tiempo a ese proyecto, y las tareas asociadas a ese proyecto. -Costing in Project +Costing in Project \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/project.md b/foundation/www/docs/user/manual/es/projects/project.md index 33394522..4c763bce 100644 --- a/foundation/www/docs/user/manual/es/projects/project.md +++ b/foundation/www/docs/user/manual/es/projects/project.md @@ -3,7 +3,7 @@ El manejo de proyectos en ERPNext se hace a traves de tareas. Puedes crear un proyecto y asignar varias tareas al mismo. -Project +Project También puedes hacer el seguimiento del % completado del proyecto usando diferentes métodos. @@ -11,35 +11,35 @@ También puedes hacer el seguimiento del % completado del proyecto usando difere 2. Progreso de tareas 3. Peso de tarea -Project +Project Algunos ejemplos de como el % completado es cálculado basado en tareas. -Project +Project -Project +Project ### Manejando tareas Los proyecto pueden ser divididos en multiples tareas. Las tareas pueden ser creadas a traves del documento de Proyecto o pueden ser creadas via [Tarea](/docs/user/manual/en/projects/tasks.html) -Project +Project * Para ver las tareas creadas a un proyecto click en 'Tasks' -Project - View Task +Project - View Task -Project - Task List +Project - Task List * También puedes ver las tareas desde la misma vista del proyecto. -Project - Task Grid +Project - Task Grid * Para agregar peso a las tareas puedes seguir los pasos siguientes -Project - Task Grid -Project - Task Grid +Project - Task Grid +Project - Task Grid ### Manejando tiempo @@ -50,13 +50,13 @@ El tiempo actual de inicio y finalización junto con el costo deben ser actualiz * Para ver los Registros de Tiempo realizados a un proyecto, dar click en 'Time Logs' -Project - View Time Log +Project - View Time Log -Project - Time Log List +Project - Time Log List * Puedes agregar un registro de tiempo directamente y luego asociarlo con el proyecto. -Project - Link Time Log +Project - Link Time Log ### Gestión de gastos @@ -65,27 +65,27 @@ El sistema actualizará el monto total de las reclamaciones de gastos en la secc * Para ver las reclamaciones de gastos realizadas en un proyecto, haga clic en 'Reclamaciones de gastos' -Project - View Expense Claim +Project - View Expense Claim * También puede crear un Reclamo de gastos directamente y vincularlo al Proyecto. -Project - Link Expense Claim +Project - Link Expense Claim * El monto total de los Reclamos de gastos reservados contra un proyecto se muestra en 'Reclamo de gastos totales' en la Sección de Costos del proyecto -Project - Total Expense Claim +Project - Total Expense Claim ### Centro de Costo Puedes crear un [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) sobre un proyecto o usar un centro de costo existente para hacer el seguimiento de todos los gastos realizados al proyecto. -Project - Cost Center +Project - Cost Center ###Costeo del proyecto La sección Costeo del proyecto le ayuda a rastrear el tiempo y los gastos incurridos en relación con el proyecto. -Project - Costing +Project - Costing * La sección de cálculo de costos se actualiza según los registros de tiempo realizados. @@ -95,7 +95,7 @@ La sección Costeo del proyecto le ayuda a rastrear el tiempo y los gastos incur Puedes crear/enlazar una [Sales Order](/docs/user/manual/en/selling/sales-order.html) a un proyecto. Una vez asociada puedes usar el módulo de ventas para facturar a un cliente sobre el proyecto. -Project - Sales Order +Project - Sales Order ###Gantt Chart @@ -104,8 +104,8 @@ ERPNext te provee con una vista para visualizar las tareas de forma calendarizad * Para visualizar el gantt chart de un proyecto, ve hasta el proyecto y dar click en 'Gantt Chart' -Project - View Gantt Chart +Project - View Gantt Chart -Project - Gantt Chart +Project - Gantt Chart {next} diff --git a/foundation/www/docs/user/manual/es/projects/tasks.md b/foundation/www/docs/user/manual/es/projects/tasks.md index 40669d64..505ef5d0 100644 --- a/foundation/www/docs/user/manual/es/projects/tasks.md +++ b/foundation/www/docs/user/manual/es/projects/tasks.md @@ -4,13 +4,13 @@ Proyecto es dividido en Tareas. En ERPNext, puedes crear las tareas de forma independiente. -Task +Task ### Estado de una Tarea Una tarea puede tener uno de los siguientes estados - Abierto, Trabajando, Pendiente de Revisión, Cerrado, o Cancelado. -Task - Status +Task - Status * Por defecto, cada nueva tarea creada se le establece el estado 'Abierto'. @@ -20,7 +20,7 @@ Una tarea puede tener uno de los siguientes estados - Abierto, Trabajando, Pendi Puedes especificar una lista de tareas dependientes en la sección 'Depende de' -Depends On +Depends On * No puedes cerrar una tarea padre hasta que todas las tareas dependientes esten cerradas. @@ -34,13 +34,13 @@ El tiempo de inicio y fin actual junto con el costo es actualizado en base al Re * Para ver el Registro de tiempo realizado a una tarea, dar click en 'Time Logs' -Task - View Time Log +Task - View Time Log -Task - Time Log List +Task - Time Log List * Puedes también crear un Registro de Tiempo directamente y luego asociarlo a una Tarea. -Task - Link Time Log +Task - Link Time Log ### Gestión de gastos @@ -49,14 +49,14 @@ El sistema actualizará el monto total de las reclamaciones de gastos en la secc * Para ver las reclamaciones de gastos realizadas en un proyecto, haga clic en 'Reclamaciones de gastos' -Task - View Expense Claim +Task - View Expense Claim * También puede crear un Reclamo de gastos directamente y vincularlo al Proyecto. -Task - Link Expense Claim +Task - Link Expense Claim * El monto total de los Reclamos de gastos reservados contra un proyecto se muestra en 'Reclamo de gastos totales' en la Sección de Costos del proyecto -Task - Total Expense Claim +Task - Total Expense Claim {next} diff --git a/foundation/www/docs/user/manual/es/projects/time-log-batch.md b/foundation/www/docs/user/manual/es/projects/time-log-batch.md index 5d1e744d..156c5006 100644 --- a/foundation/www/docs/user/manual/es/projects/time-log-batch.md +++ b/foundation/www/docs/user/manual/es/projects/time-log-batch.md @@ -9,17 +9,17 @@ O Simplemente abra su lista de registro de tiempo y marque los elementos que desea agregar al registro de tiempo. A continuación, haga clic en el botón "Crear hoja de tiempo" y se seleccionarán estos registros de tiempo. -Time Log - Drag Calender +Time Log - Drag Calender ###Creando Factura de Venta * Despues de crear la Hoja de Tiempo/Horario, el botón "Crear Factura" debe aparecer. -Time Log - Drag Calender +Time Log - Drag Calender * Haga clic en ese botón para hacer una factura de venta usando la hoja de tiempo. -Time Log - Drag Calender +Time Log - Drag Calender * Cuando "Presente" la Factura de Ventas, el número de Factura de Ventas se actualizará en los Registros de Tiempo y la Hoja de Horario y su estado cambiará a "Facturado". diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/__init__.py b/foundation/www/docs/user/manual/es/schools/Assessment/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/__init__.py b/foundation/www/docs/user/manual/es/schools/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/admission/__init__.py b/foundation/www/docs/user/manual/es/schools/admission/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/fees/__init__.py b/foundation/www/docs/user/manual/es/schools/fees/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/schedule/__init__.py b/foundation/www/docs/user/manual/es/schools/schedule/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/setup/__init__.py b/foundation/www/docs/user/manual/es/schools/setup/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/student/__init__.py b/foundation/www/docs/user/manual/es/schools/student/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/videos/learn/index.md b/foundation/www/docs/user/videos/learn/index.md index f96f5f21..9a915999 100644 --- a/foundation/www/docs/user/videos/learn/index.md +++ b/foundation/www/docs/user/videos/learn/index.md @@ -242,10 +242,6 @@ Employees 1:59 -
  • - Processing Payroll - 4:00 -
  • Leave Management 2:50 diff --git a/foundation/www/docs/user/videos/learn/index.txt b/foundation/www/docs/user/videos/learn/index.txt index 5510922a..e0d8003d 100644 --- a/foundation/www/docs/user/videos/learn/index.txt +++ b/foundation/www/docs/user/videos/learn/index.txt @@ -19,7 +19,6 @@ opening-account-balances opening-stock point-of-sale printing-and-branding -processing-payroll product-bundle production-order production-planning diff --git a/foundation/www/docs/user/videos/learn/processing-payroll.md b/foundation/www/docs/user/videos/learn/processing-payroll.md deleted file mode 100644 index 7035e179..00000000 --- a/foundation/www/docs/user/videos/learn/processing-payroll.md +++ /dev/null @@ -1,8 +0,0 @@ - -# Processing Payroll - - - -**Duration: 4:00** - -This video walks you through processing payroll for Employees. You can maintain Salary Structure for each Employee. Based on it, you can create Salary Slips individually, or in bulk for all the Employees.