diff --git a/foundation/templates/includes/custom.css b/foundation/templates/includes/custom.css index 5d89d3af..73bfb7d3 100644 --- a/foundation/templates/includes/custom.css +++ b/foundation/templates/includes/custom.css @@ -22,23 +22,11 @@ section p, section li, section .media-body { line-height: 1.6em; } -.page_content { - font-size: 15px; - line-height: 1.6em; -} h1 { font-size: 32px; } -h1, h2, h3, h4 { - font-weight: 300; -} - -.container { - max-width: 870px; -} - .page_content { min-height: 400px; } diff --git a/foundation/www/docs/__init__.py b/foundation/www/docs/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/pos-setting/default_mop.png b/foundation/www/docs/assets/img/pos-setting/default_mop.png new file mode 100644 index 00000000..bd1e7a07 Binary files /dev/null and b/foundation/www/docs/assets/img/pos-setting/default_mop.png differ diff --git a/foundation/www/docs/assets/img/pos-setting/item_customer_group.png b/foundation/www/docs/assets/img/pos-setting/item_customer_group.png new file mode 100644 index 00000000..6117a8f2 Binary files /dev/null and b/foundation/www/docs/assets/img/pos-setting/item_customer_group.png differ diff --git a/foundation/www/docs/assets/img/pos-setting/pos-setting.png b/foundation/www/docs/assets/img/pos-setting/pos-setting.png deleted file mode 100644 index 60611992..00000000 Binary files a/foundation/www/docs/assets/img/pos-setting/pos-setting.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/pos-setting/pos_profile.png b/foundation/www/docs/assets/img/pos-setting/pos_profile.png new file mode 100644 index 00000000..a8bd4aca Binary files /dev/null and b/foundation/www/docs/assets/img/pos-setting/pos_profile.png differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-permission-company.png b/foundation/www/docs/assets/img/users-and-permissions/user-permission-company.png deleted file mode 100644 index eb529f17..00000000 Binary files a/foundation/www/docs/assets/img/users-and-permissions/user-permission-company.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-permission-quotation.png b/foundation/www/docs/assets/img/users-and-permissions/user-permission-quotation.png deleted file mode 100644 index ee7a19b5..00000000 Binary files a/foundation/www/docs/assets/img/users-and-permissions/user-permission-quotation.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png b/foundation/www/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png deleted file mode 100644 index 0aececd0..00000000 Binary files a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png b/foundation/www/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png deleted file mode 100644 index 5f55e37b..00000000 Binary files a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png b/foundation/www/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png deleted file mode 100644 index 23564faf..00000000 Binary files a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-new.gif b/foundation/www/docs/assets/img/users-and-permissions/user-permissions-new.gif deleted file mode 100644 index 609bf257..00000000 Binary files a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-new.gif and /dev/null differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png b/foundation/www/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png deleted file mode 100644 index dd9ed49d..00000000 Binary files a/foundation/www/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/ignore-user-permissions.png b/foundation/www/docs/assets/img/users-and-permissions/user-perms/ignore-user-permissions.png new file mode 100644 index 00000000..56e0d44b Binary files /dev/null and b/foundation/www/docs/assets/img/users-and-permissions/user-perms/ignore-user-permissions.png differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png b/foundation/www/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png new file mode 100644 index 00000000..d2762dd7 Binary files /dev/null and b/foundation/www/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/permitted-documents.png b/foundation/www/docs/assets/img/users-and-permissions/user-perms/permitted-documents.png new file mode 100644 index 00000000..2558b62d Binary files /dev/null and b/foundation/www/docs/assets/img/users-and-permissions/user-perms/permitted-documents.png differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/select-document-types.png b/foundation/www/docs/assets/img/users-and-permissions/user-perms/select-document-types.png new file mode 100644 index 00000000..b54d36ac Binary files /dev/null and b/foundation/www/docs/assets/img/users-and-permissions/user-perms/select-document-types.png differ diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/view-selected-documents.png b/foundation/www/docs/assets/img/users-and-permissions/user-perms/view-selected-documents.png new file mode 100644 index 00000000..bc2ce785 Binary files /dev/null and b/foundation/www/docs/assets/img/users-and-permissions/user-perms/view-selected-documents.png differ 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 37910967..68af6df0 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 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - - - erpnext.config.docs.get_context - (context) -

-

No docs

-
-
- - - \ No newline at end of file diff --git a/foundation/www/docs/current/api/config/erpnext.config.hr.html b/foundation/www/docs/current/api/config/erpnext.config.hr.html index 5e15d728..02520841 100644 --- a/foundation/www/docs/current/api/config/erpnext.config.hr.html +++ b/foundation/www/docs/current/api/config/erpnext.config.hr.html @@ -3,7 +3,7 @@
- Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - 8.6.3 + 8.6.5 diff --git a/foundation/www/docs/current/models/accounts/account.html b/foundation/www/docs/current/models/accounts/account.html index 5dc0bce8..0056f7c2 100644 --- a/foundation/www/docs/current/models/accounts/account.html +++ b/foundation/www/docs/current/models/accounts/account.html @@ -9,7 +9,7 @@
- Version 8.6.3 + Version 8.6.5 Company +Company @@ -158,7 +158,7 @@ Profit and Loss -Currency +Currency @@ -191,7 +191,7 @@ Profit and Loss -Account +Account @@ -706,7 +706,7 @@ Credit
  • -Account +Account
    • @@ -715,7 +715,7 @@ Credit
  • -Asset Category Account +Asset Category Account
    • @@ -724,7 +724,7 @@ Credit
  • -Bank Guarantee +Bank Guarantee
    • @@ -733,7 +733,7 @@ Credit
  • -Bank Reconciliation +Bank Reconciliation
    • @@ -742,7 +742,7 @@ Credit
  • -Budget Account +Budget Account
    • @@ -751,7 +751,7 @@ Credit
  • -Company +Company
    • @@ -760,7 +760,7 @@ Credit
  • -Delivery Note Item +Delivery Note Item
    • @@ -769,7 +769,7 @@ Credit
  • -Employee Loan +Employee Loan
    • @@ -778,7 +778,7 @@ Credit
  • -Expense Claim +Expense Claim
    • @@ -787,7 +787,7 @@ Credit
  • -Expense Claim Account +Expense Claim Account
    • @@ -796,7 +796,7 @@ Credit
  • -Expense Claim Detail +Expense Claim Detail
    • @@ -805,7 +805,7 @@ Credit
  • -GL Entry +GL Entry
    • @@ -814,7 +814,7 @@ Credit
  • -Item +Item
    • @@ -823,7 +823,7 @@ Credit
  • -Item Group +Item Group
    • @@ -832,7 +832,7 @@ Credit
  • -Item Tax +Item Tax
    • @@ -841,7 +841,7 @@ Credit
  • -Journal Entry Account +Journal Entry Account
    • @@ -850,7 +850,7 @@ Credit
  • -Mode of Payment Account +Mode of Payment Account
    • @@ -859,7 +859,7 @@ Credit
  • -Party Account +Party Account
    • @@ -868,7 +868,7 @@ Credit
  • -Payment Entry +Payment Entry
    • @@ -877,7 +877,7 @@ Credit
  • -Payment Entry Deduction +Payment Entry Deduction
    • @@ -886,7 +886,7 @@ Credit
  • -Payment Gateway Account +Payment Gateway Account
    • @@ -895,7 +895,7 @@ Credit
  • -Payment Reconciliation +Payment Reconciliation
    • @@ -904,7 +904,7 @@ Credit
  • -Period Closing Voucher +Period Closing Voucher
    • @@ -913,7 +913,7 @@ Credit
  • -POS Profile +POS Profile
    • @@ -922,7 +922,7 @@ Credit
  • -Process Payroll +Process Payroll
    • @@ -931,7 +931,7 @@ Credit
  • -Purchase Invoice +Purchase Invoice
    • @@ -940,7 +940,7 @@ Credit
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -949,7 +949,7 @@ Credit
  • -Purchase Taxes and Charges +Purchase Taxes and Charges
    • @@ -958,7 +958,7 @@ Credit
  • -Salary Component Account +Salary Component Account
    • @@ -967,7 +967,7 @@ Credit
  • -Salary Structure +Salary Structure
    • @@ -976,7 +976,7 @@ Credit
  • -Sales Invoice +Sales Invoice
    • @@ -985,7 +985,7 @@ Credit
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -994,7 +994,7 @@ Credit
  • -Sales Invoice Payment +Sales Invoice Payment
    • @@ -1003,7 +1003,7 @@ Credit
  • -Sales Taxes and Charges +Sales Taxes and Charges
    • @@ -1012,7 +1012,7 @@ Credit
  • -Shipping Rule +Shipping Rule
    • @@ -1021,7 +1021,7 @@ Credit
  • -Stock Entry Detail +Stock Entry Detail
    • @@ -1030,7 +1030,7 @@ Credit
  • -Stock Reconciliation +Stock Reconciliation
    • @@ -1039,7 +1039,7 @@ Credit
  • -Warehouse +Warehouse
    • diff --git a/foundation/www/docs/current/models/accounts/accounts_settings.html b/foundation/www/docs/current/models/accounts/accounts_settings.html index 95f5d759..a39a49b7 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 8.6.3 + Version 8.6.5 Role +Role @@ -113,7 +113,7 @@ Settings for Accounts -Role +Role diff --git a/foundation/www/docs/current/models/accounts/asset.html b/foundation/www/docs/current/models/accounts/asset.html index 33b15da8..353f75d7 100644 --- a/foundation/www/docs/current/models/accounts/asset.html +++ b/foundation/www/docs/current/models/accounts/asset.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -101,7 +101,7 @@ -Asset Category +Asset Category @@ -165,7 +165,7 @@ Scrapped -Company +Company @@ -186,7 +186,7 @@ Scrapped -Warehouse +Warehouse @@ -231,7 +231,7 @@ Scrapped -Supplier +Supplier @@ -252,7 +252,7 @@ Scrapped -Purchase Invoice +Purchase Invoice @@ -285,7 +285,7 @@ Scrapped -Journal Entry +Journal Entry @@ -463,7 +463,7 @@ Manual -Depreciation Schedule +Depreciation Schedule @@ -484,7 +484,7 @@ Manual -Asset +Asset @@ -796,7 +796,7 @@ Manual
  • -Asset +Asset
    • @@ -805,7 +805,7 @@ Manual
  • -Asset Movement +Asset Movement
    • @@ -814,7 +814,7 @@ Manual
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -823,7 +823,7 @@ Manual
  • -Sales Invoice Item +Sales Invoice Item
    • diff --git a/foundation/www/docs/current/models/accounts/asset_category.html b/foundation/www/docs/current/models/accounts/asset_category.html index ac0e7fe2..f5a87bfa 100644 --- a/foundation/www/docs/current/models/accounts/asset_category.html +++ b/foundation/www/docs/current/models/accounts/asset_category.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Asset Category Account +Asset Category Account @@ -188,7 +188,7 @@ Double Declining Balance
  • -Asset +Asset
    • @@ -197,7 +197,7 @@ Double Declining Balance
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/accounts/asset_category_account.html b/foundation/www/docs/current/models/accounts/asset_category_account.html index 7ad916e5..5e196ad3 100644 --- a/foundation/www/docs/current/models/accounts/asset_category_account.html +++ b/foundation/www/docs/current/models/accounts/asset_category_account.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -75,7 +75,7 @@ -Account +Account @@ -96,7 +96,7 @@ -Account +Account @@ -117,7 +117,7 @@ -Account +Account @@ -136,7 +136,7 @@
  • -Asset Category +Asset Category
    • diff --git a/foundation/www/docs/current/models/accounts/asset_movement.html b/foundation/www/docs/current/models/accounts/asset_movement.html index 9beb5633..54df9104 100644 --- a/foundation/www/docs/current/models/accounts/asset_movement.html +++ b/foundation/www/docs/current/models/accounts/asset_movement.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Asset +Asset @@ -87,7 +87,7 @@ -Company +Company @@ -120,7 +120,7 @@ -Warehouse +Warehouse @@ -141,7 +141,7 @@ -Warehouse +Warehouse @@ -162,7 +162,7 @@ -Asset Movement +Asset Movement @@ -290,7 +290,7 @@
  • -Asset Movement +Asset Movement
    • diff --git a/foundation/www/docs/current/models/accounts/bank_guarantee.html b/foundation/www/docs/current/models/accounts/bank_guarantee.html index ba958f19..d43e7336 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 8.6.3 + Version 8.6.5 Customer +Customer @@ -75,7 +75,7 @@ -Project +Project @@ -96,7 +96,7 @@ -Account +Account @@ -213,7 +213,7 @@ -Bank Guarantee +Bank Guarantee @@ -257,7 +257,7 @@
  • -Bank Guarantee +Bank Guarantee
    • diff --git a/foundation/www/docs/current/models/accounts/bank_reconciliation.html b/foundation/www/docs/current/models/accounts/bank_reconciliation.html index 63836441..d30fa356 100644 --- a/foundation/www/docs/current/models/accounts/bank_reconciliation.html +++ b/foundation/www/docs/current/models/accounts/bank_reconciliation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Account +Account @@ -74,7 +74,7 @@ -Currency +Currency @@ -143,7 +143,7 @@ -Bank Reconciliation Detail +Bank Reconciliation Detail diff --git a/foundation/www/docs/current/models/accounts/bank_reconciliation_detail.html b/foundation/www/docs/current/models/accounts/bank_reconciliation_detail.html index 6b3c0831..93119106 100644 --- a/foundation/www/docs/current/models/accounts/bank_reconciliation_detail.html +++ b/foundation/www/docs/current/models/accounts/bank_reconciliation_detail.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 DocType +DocType @@ -171,7 +171,7 @@
  • -Bank Reconciliation +Bank Reconciliation
    • diff --git a/foundation/www/docs/current/models/accounts/budget.html b/foundation/www/docs/current/models/accounts/budget.html index 4da536f0..efcf1875 100644 --- a/foundation/www/docs/current/models/accounts/budget.html +++ b/foundation/www/docs/current/models/accounts/budget.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Company +Company @@ -91,7 +91,7 @@ Project -Cost Center +Cost Center @@ -112,7 +112,7 @@ Project -Project +Project @@ -133,7 +133,7 @@ Project -Fiscal Year +Fiscal Year @@ -200,7 +200,7 @@ Ignore -Monthly Distribution +Monthly Distribution @@ -221,7 +221,7 @@ Ignore -Budget +Budget @@ -254,7 +254,7 @@ Ignore -Budget Account +Budget Account @@ -478,7 +478,7 @@ Ignore
  • -Budget +Budget
    • diff --git a/foundation/www/docs/current/models/accounts/budget_account.html b/foundation/www/docs/current/models/accounts/budget_account.html index f6c0c876..fb244a53 100644 --- a/foundation/www/docs/current/models/accounts/budget_account.html +++ b/foundation/www/docs/current/models/accounts/budget_account.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Account +Account @@ -87,7 +87,7 @@
  • -Budget +Budget
    • diff --git a/foundation/www/docs/current/models/accounts/c_form.html b/foundation/www/docs/current/models/accounts/c_form.html index 17709124..774f30db 100644 --- a/foundation/www/docs/current/models/accounts/c_form.html +++ b/foundation/www/docs/current/models/accounts/c_form.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Customer +Customer @@ -137,7 +137,7 @@ -Company +Company @@ -214,7 +214,7 @@ IV -C-Form Invoice Detail +C-Form Invoice Detail @@ -249,7 +249,7 @@ IV -C-Form +C-Form @@ -394,7 +394,7 @@ IV
  • -C-Form +C-Form
    • @@ -403,7 +403,7 @@ IV
  • -Sales Invoice +Sales Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/c_form_invoice_detail.html b/foundation/www/docs/current/models/accounts/c_form_invoice_detail.html index 58bc2996..f908dc4a 100644 --- a/foundation/www/docs/current/models/accounts/c_form_invoice_detail.html +++ b/foundation/www/docs/current/models/accounts/c_form_invoice_detail.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Sales Invoice +Sales Invoice @@ -87,7 +87,7 @@ -Territory +Territory @@ -134,7 +134,7 @@
  • -C-Form +C-Form
    • 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 143d344c..be2817e8 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 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Cost Center +Cost Center @@ -99,7 +99,7 @@ Track separate Income and Expense for product verticals or divisions. -Company +Company @@ -168,7 +168,7 @@ Track separate Income and Expense for product verticals or divisions. -Cost Center +Cost Center @@ -338,7 +338,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Budget +Budget
    • @@ -347,7 +347,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Company +Company
    • @@ -356,7 +356,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Cost Center +Cost Center
    • @@ -365,7 +365,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Delivery Note Item +Delivery Note Item
    • @@ -374,7 +374,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Expense Claim +Expense Claim
    • @@ -383,7 +383,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -GL Entry +GL Entry
    • @@ -392,7 +392,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Item +Item
    • @@ -401,7 +401,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Item Group +Item Group
    • @@ -410,7 +410,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Journal Entry Account +Journal Entry Account
    • @@ -419,7 +419,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Payment Entry Deduction +Payment Entry Deduction
    • @@ -428,7 +428,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -POS Profile +POS Profile
    • @@ -437,7 +437,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Process Payroll +Process Payroll
    • @@ -446,7 +446,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Project +Project
    • @@ -455,7 +455,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Purchase Invoice +Purchase Invoice
    • @@ -464,7 +464,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -473,7 +473,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -482,7 +482,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Purchase Taxes and Charges +Purchase Taxes and Charges
    • @@ -491,7 +491,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Sales Invoice +Sales Invoice
    • @@ -500,7 +500,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -509,7 +509,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Sales Taxes and Charges +Sales Taxes and Charges
    • @@ -518,7 +518,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Shipping Rule +Shipping Rule
    • @@ -527,7 +527,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Stock Entry Detail +Stock Entry Detail
    • @@ -536,7 +536,7 @@ Track separate Income and Expense for product verticals or divisions.
  • -Stock Reconciliation +Stock Reconciliation
    • diff --git a/foundation/www/docs/current/models/accounts/depreciation_schedule.html b/foundation/www/docs/current/models/accounts/depreciation_schedule.html index bd054064..a4e5a533 100644 --- a/foundation/www/docs/current/models/accounts/depreciation_schedule.html +++ b/foundation/www/docs/current/models/accounts/depreciation_schedule.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Journal Entry +Journal Entry @@ -137,7 +137,7 @@
  • -Asset +Asset
    • diff --git a/foundation/www/docs/current/models/accounts/fiscal_year.html b/foundation/www/docs/current/models/accounts/fiscal_year.html index 5d0858e1..bc68f2ab 100644 --- a/foundation/www/docs/current/models/accounts/fiscal_year.html +++ b/foundation/www/docs/current/models/accounts/fiscal_year.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Fiscal Year Company +Fiscal Year Company @@ -267,7 +267,7 @@
  • -Budget +Budget
    • @@ -276,7 +276,7 @@
  • -GL Entry +GL Entry
    • @@ -285,7 +285,7 @@
  • -Global Defaults +Global Defaults
    • @@ -294,7 +294,7 @@
  • -Monthly Distribution +Monthly Distribution
    • @@ -303,7 +303,7 @@
  • -Period Closing Voucher +Period Closing Voucher
    • @@ -312,7 +312,7 @@
  • -Request for Quotation +Request for Quotation
    • @@ -321,7 +321,7 @@
  • -Target Detail +Target Detail
    • diff --git a/foundation/www/docs/current/models/accounts/fiscal_year_company.html b/foundation/www/docs/current/models/accounts/fiscal_year_company.html index 6830e050..a6338cd6 100644 --- a/foundation/www/docs/current/models/accounts/fiscal_year_company.html +++ b/foundation/www/docs/current/models/accounts/fiscal_year_company.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -73,7 +73,7 @@
  • -Fiscal Year +Fiscal Year
    • diff --git a/foundation/www/docs/current/models/accounts/gl_entry.html b/foundation/www/docs/current/models/accounts/gl_entry.html index 3d91c82f..711da9e7 100644 --- a/foundation/www/docs/current/models/accounts/gl_entry.html +++ b/foundation/www/docs/current/models/accounts/gl_entry.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Account +Account @@ -99,7 +99,7 @@ -DocType +DocType @@ -134,7 +134,7 @@ -Cost Center +Cost Center @@ -183,7 +183,7 @@ -Currency +Currency @@ -244,7 +244,7 @@ -DocType +DocType @@ -279,7 +279,7 @@ -DocType +DocType @@ -314,7 +314,7 @@ -Project +Project @@ -377,7 +377,7 @@ Yes -Fiscal Year +Fiscal Year @@ -398,7 +398,7 @@ Yes -Company +Company diff --git a/foundation/www/docs/current/models/accounts/index.html b/foundation/www/docs/current/models/accounts/index.html index 9f055e2c..dd7ee6b4 100644 --- a/foundation/www/docs/current/models/accounts/index.html +++ b/foundation/www/docs/current/models/accounts/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Company +Company @@ -177,7 +177,7 @@ Depreciation Entry -Journal Entry Account +Journal Entry Account @@ -324,7 +324,7 @@ Depreciation Entry -Currency +Currency @@ -560,7 +560,7 @@ Accounts Payable -Letter Head +Letter Head @@ -581,7 +581,7 @@ Accounts Payable -Print Heading +Print Heading @@ -643,7 +643,7 @@ Yes -Stock Entry +Stock Entry @@ -664,7 +664,7 @@ Yes -Journal Entry +Journal Entry @@ -1406,7 +1406,7 @@ Yes
  • -Asset +Asset
    • @@ -1415,7 +1415,7 @@ Yes
  • -Depreciation Schedule +Depreciation Schedule
    • @@ -1424,7 +1424,7 @@ Yes
  • -Journal Entry +Journal Entry
    • @@ -1433,7 +1433,7 @@ Yes
  • -Salary Slip +Salary Slip
    • @@ -1442,7 +1442,7 @@ Yes
  • -Stock Entry +Stock Entry
    • diff --git a/foundation/www/docs/current/models/accounts/journal_entry_account.html b/foundation/www/docs/current/models/accounts/journal_entry_account.html index 8c5ac56f..9b8baafa 100644 --- a/foundation/www/docs/current/models/accounts/journal_entry_account.html +++ b/foundation/www/docs/current/models/accounts/journal_entry_account.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Account +Account @@ -102,7 +102,7 @@ -Cost Center +Cost Center @@ -135,7 +135,7 @@ -DocType +DocType @@ -196,7 +196,7 @@ -Currency +Currency @@ -369,7 +369,7 @@ Employee Loan -Project +Project @@ -427,7 +427,7 @@ Yes
  • -Journal Entry +Journal Entry
    • diff --git a/foundation/www/docs/current/models/accounts/mode_of_payment.html b/foundation/www/docs/current/models/accounts/mode_of_payment.html index 205b3173..51489b5d 100644 --- a/foundation/www/docs/current/models/accounts/mode_of_payment.html +++ b/foundation/www/docs/current/models/accounts/mode_of_payment.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Mode of Payment Account +Mode of Payment Account @@ -168,7 +168,7 @@ General
  • -Employee Loan +Employee Loan
    • @@ -177,7 +177,7 @@ General
  • -Expense Claim +Expense Claim
    • @@ -186,7 +186,7 @@ General
  • -Payment Entry +Payment Entry
    • @@ -195,7 +195,7 @@ General
  • -Purchase Invoice +Purchase Invoice
    • @@ -204,7 +204,7 @@ General
  • -Salary Structure +Salary Structure
    • @@ -213,7 +213,7 @@ General
  • -Sales Invoice Payment +Sales Invoice Payment
    • diff --git a/foundation/www/docs/current/models/accounts/mode_of_payment_account.html b/foundation/www/docs/current/models/accounts/mode_of_payment_account.html index 18c0f094..1097b61a 100644 --- a/foundation/www/docs/current/models/accounts/mode_of_payment_account.html +++ b/foundation/www/docs/current/models/accounts/mode_of_payment_account.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -76,7 +76,7 @@ -Account +Account @@ -95,7 +95,7 @@
  • -Mode of Payment +Mode of Payment
    • diff --git a/foundation/www/docs/current/models/accounts/monthly_distribution.html b/foundation/www/docs/current/models/accounts/monthly_distribution.html index a5b330f9..ab51ca57 100644 --- a/foundation/www/docs/current/models/accounts/monthly_distribution.html +++ b/foundation/www/docs/current/models/accounts/monthly_distribution.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Fiscal Year +Fiscal Year @@ -88,7 +88,7 @@ -Monthly Distribution Percentage +Monthly Distribution Percentage @@ -160,7 +160,7 @@
  • -Budget +Budget
    • @@ -169,7 +169,7 @@
  • -Sales Partner +Sales Partner
    • @@ -178,7 +178,7 @@
  • -Sales Person +Sales Person
    • @@ -187,7 +187,7 @@
  • -Territory +Territory
    • diff --git a/foundation/www/docs/current/models/accounts/monthly_distribution_percentage.html b/foundation/www/docs/current/models/accounts/monthly_distribution_percentage.html index d4f249b0..52261c82 100644 --- a/foundation/www/docs/current/models/accounts/monthly_distribution_percentage.html +++ b/foundation/www/docs/current/models/accounts/monthly_distribution_percentage.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Monthly Distribution +Monthly Distribution diff --git a/foundation/www/docs/current/models/accounts/party_account.html b/foundation/www/docs/current/models/accounts/party_account.html index 402cf333..c8d90a6b 100644 --- a/foundation/www/docs/current/models/accounts/party_account.html +++ b/foundation/www/docs/current/models/accounts/party_account.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -75,7 +75,7 @@ -Account +Account @@ -94,28 +94,28 @@
  • -Customer +Customer
  • -Customer Group +Customer Group
  • -Supplier +Supplier
  • -Supplier Type +Supplier Type
    • diff --git a/foundation/www/docs/current/models/accounts/payment_entry.html b/foundation/www/docs/current/models/accounts/payment_entry.html index 4c5c95ee..4459cb4c 100644 --- a/foundation/www/docs/current/models/accounts/payment_entry.html +++ b/foundation/www/docs/current/models/accounts/payment_entry.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Company +Company @@ -141,7 +141,7 @@ Internal Transfer -Mode of Payment +Mode of Payment @@ -174,7 +174,7 @@ Internal Transfer -DocType +DocType @@ -257,7 +257,7 @@ Internal Transfer -Account +Account @@ -278,7 +278,7 @@ Internal Transfer -Currency +Currency @@ -325,7 +325,7 @@ Internal Transfer -Account +Account @@ -346,7 +346,7 @@ Internal Transfer -Currency +Currency @@ -509,7 +509,7 @@ Internal Transfer -Payment Entry Reference +Payment Entry Reference @@ -642,7 +642,7 @@ Internal Transfer -Payment Entry Deduction +Payment Entry Deduction @@ -735,7 +735,7 @@ Internal Transfer -Project +Project @@ -780,7 +780,7 @@ Internal Transfer -Letter Head +Letter Head @@ -801,7 +801,7 @@ Internal Transfer -Print Heading +Print Heading @@ -822,7 +822,7 @@ Internal Transfer -Payment Entry +Payment Entry @@ -1481,7 +1481,7 @@ Internal Transfer
  • -Payment Entry +Payment Entry
    • 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 95a8d990..d8080eb5 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 8.6.3 + Version 8.6.5 Account +Account @@ -75,7 +75,7 @@ -Cost Center +Cost Center @@ -106,7 +106,7 @@
  • -Payment Entry +Payment Entry
    • diff --git a/foundation/www/docs/current/models/accounts/payment_entry_reference.html b/foundation/www/docs/current/models/accounts/payment_entry_reference.html index f922b1ea..06fb9bf3 100644 --- a/foundation/www/docs/current/models/accounts/payment_entry_reference.html +++ b/foundation/www/docs/current/models/accounts/payment_entry_reference.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 DocType +DocType @@ -159,7 +159,7 @@
  • -Payment Entry +Payment Entry
    • diff --git a/foundation/www/docs/current/models/accounts/payment_gateway_account.html b/foundation/www/docs/current/models/accounts/payment_gateway_account.html index 59b2c655..1e62b262 100644 --- a/foundation/www/docs/current/models/accounts/payment_gateway_account.html +++ b/foundation/www/docs/current/models/accounts/payment_gateway_account.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Payment Gateway +Payment Gateway @@ -99,7 +99,7 @@ -Account +Account @@ -249,7 +249,7 @@
  • -Payment Request +Payment Request
    • @@ -258,7 +258,7 @@
  • -Shopping Cart Settings +Shopping Cart Settings
    • diff --git a/foundation/www/docs/current/models/accounts/payment_reconciliation.html b/foundation/www/docs/current/models/accounts/payment_reconciliation.html index 8aaa6d77..312ea840 100644 --- a/foundation/www/docs/current/models/accounts/payment_reconciliation.html +++ b/foundation/www/docs/current/models/accounts/payment_reconciliation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -73,7 +73,7 @@ -DocType +DocType @@ -108,7 +108,7 @@ -Account +Account @@ -129,7 +129,7 @@ -Account +Account @@ -234,7 +234,7 @@ -Payment Reconciliation Payment +Payment Reconciliation Payment @@ -279,7 +279,7 @@ -Payment Reconciliation Invoice +Payment Reconciliation Invoice diff --git a/foundation/www/docs/current/models/accounts/payment_reconciliation_invoice.html b/foundation/www/docs/current/models/accounts/payment_reconciliation_invoice.html index 7798728b..ce5bf78c 100644 --- a/foundation/www/docs/current/models/accounts/payment_reconciliation_invoice.html +++ b/foundation/www/docs/current/models/accounts/payment_reconciliation_invoice.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5
  • -Payment Reconciliation +Payment Reconciliation
    • diff --git a/foundation/www/docs/current/models/accounts/payment_reconciliation_payment.html b/foundation/www/docs/current/models/accounts/payment_reconciliation_payment.html index 1bd87e2a..1f9fafcc 100644 --- a/foundation/www/docs/current/models/accounts/payment_reconciliation_payment.html +++ b/foundation/www/docs/current/models/accounts/payment_reconciliation_payment.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 DocType +DocType @@ -195,7 +195,7 @@
  • -Payment Reconciliation +Payment Reconciliation
    • diff --git a/foundation/www/docs/current/models/accounts/payment_request.html b/foundation/www/docs/current/models/accounts/payment_request.html index c3ec3f3f..8a338af0 100644 --- a/foundation/www/docs/current/models/accounts/payment_request.html +++ b/foundation/www/docs/current/models/accounts/payment_request.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Payment Gateway Account +Payment Gateway Account @@ -149,7 +149,7 @@ -Currency +Currency @@ -328,7 +328,7 @@ Cancelled -DocType +DocType @@ -363,7 +363,7 @@ Cancelled -Payment Request +Payment Request @@ -825,7 +825,7 @@ Cancelled
  • -Payment Request +Payment Request
    • diff --git a/foundation/www/docs/current/models/accounts/period_closing_voucher.html b/foundation/www/docs/current/models/accounts/period_closing_voucher.html index 323ebd46..791c3ae5 100644 --- a/foundation/www/docs/current/models/accounts/period_closing_voucher.html +++ b/foundation/www/docs/current/models/accounts/period_closing_voucher.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Fiscal Year +Fiscal Year @@ -111,7 +111,7 @@ -Period Closing Voucher +Period Closing Voucher @@ -132,7 +132,7 @@ -Company +Company @@ -166,7 +166,7 @@ -Account +Account @@ -320,7 +320,7 @@
  • -Period Closing Voucher +Period Closing Voucher
    • diff --git a/foundation/www/docs/current/models/accounts/pos_customer_group.html b/foundation/www/docs/current/models/accounts/pos_customer_group.html index 320a1510..2c0f8aef 100644 --- a/foundation/www/docs/current/models/accounts/pos_customer_group.html +++ b/foundation/www/docs/current/models/accounts/pos_customer_group.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Customer Group +Customer Group @@ -73,7 +73,7 @@
  • -POS Profile +POS Profile
    • diff --git a/foundation/www/docs/current/models/accounts/pos_item_group.html b/foundation/www/docs/current/models/accounts/pos_item_group.html index c10b6df9..20ffa0e4 100644 --- a/foundation/www/docs/current/models/accounts/pos_item_group.html +++ b/foundation/www/docs/current/models/accounts/pos_item_group.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item Group +Item Group @@ -73,7 +73,7 @@
  • -POS Profile +POS Profile
    • diff --git a/foundation/www/docs/current/models/accounts/pos_profile.html b/foundation/www/docs/current/models/accounts/pos_profile.html index 3bb3783f..6fc00987 100644 --- a/foundation/www/docs/current/models/accounts/pos_profile.html +++ b/foundation/www/docs/current/models/accounts/pos_profile.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 User +User @@ -101,7 +101,7 @@ -Warehouse +Warehouse @@ -122,7 +122,7 @@ -Campaign +Campaign @@ -155,7 +155,7 @@ -Customer +Customer @@ -176,7 +176,7 @@ -Company +Company @@ -211,7 +211,7 @@ -Currency +Currency @@ -280,7 +280,7 @@ -Sales Invoice Payment +Sales Invoice Payment @@ -313,7 +313,7 @@ -POS Item Group +POS Item Group @@ -346,7 +346,7 @@ -POS Customer Group +POS Customer Group @@ -379,7 +379,7 @@ -Print Format +Print Format @@ -400,7 +400,7 @@ -Letter Head +Letter Head @@ -421,7 +421,7 @@ -Print Heading +Print Heading @@ -442,7 +442,7 @@ -Terms and Conditions +Terms and Conditions @@ -475,7 +475,7 @@ -Territory +Territory @@ -496,7 +496,7 @@ -Price List +Price List @@ -556,7 +556,7 @@ Net Total -Account +Account @@ -577,7 +577,7 @@ Net Total -Cost Center +Cost Center @@ -598,7 +598,7 @@ Net Total -Account +Account @@ -619,7 +619,7 @@ Net Total -Sales Taxes and Charges Template +Sales Taxes and Charges Template @@ -652,7 +652,7 @@ Net Total -Account +Account @@ -673,7 +673,7 @@ Net Total -Account +Account @@ -694,7 +694,7 @@ Net Total -Cost Center +Cost Center @@ -740,6 +740,20 @@ Net Total +

    + + + check_default_payment + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -824,6 +838,20 @@ Net Total +

    + + + validate_customer_territory_group + (self) +

    +

    No docs

    +
    +
    + + + + +

    @@ -868,7 +896,7 @@ Net Total

  • -Sales Invoice +Sales Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/pricing_rule.html b/foundation/www/docs/current/models/accounts/pricing_rule.html index f2615ad7..518493d8 100644 --- a/foundation/www/docs/current/models/accounts/pricing_rule.html +++ b/foundation/www/docs/current/models/accounts/pricing_rule.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Item +Item @@ -116,7 +116,7 @@ Brand -Brand +Brand @@ -137,7 +137,7 @@ Brand -Item Group +Item Group @@ -286,7 +286,7 @@ Supplier Type -Customer +Customer @@ -307,7 +307,7 @@ Supplier Type -Customer Group +Customer Group @@ -328,7 +328,7 @@ Supplier Type -Territory +Territory @@ -349,7 +349,7 @@ Supplier Type -Sales Partner +Sales Partner @@ -370,7 +370,7 @@ Supplier Type -Campaign +Campaign @@ -391,7 +391,7 @@ Supplier Type -Supplier +Supplier @@ -412,7 +412,7 @@ Supplier Type -Supplier Type +Supplier Type @@ -529,7 +529,7 @@ Supplier Type -Company +Company @@ -666,7 +666,7 @@ Discount Percentage -Price List +Price List @@ -1030,7 +1030,7 @@ Discount Percentage
  • -Delivery Note Item +Delivery Note Item
    • @@ -1039,7 +1039,7 @@ Discount Percentage
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -1048,7 +1048,7 @@ Discount Percentage
  • -Purchase Order Item +Purchase Order Item
    • @@ -1057,7 +1057,7 @@ Discount Percentage
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -1066,7 +1066,7 @@ Discount Percentage
  • -Quotation Item +Quotation Item
    • @@ -1075,7 +1075,7 @@ Discount Percentage
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -1084,7 +1084,7 @@ Discount Percentage
  • -Sales Order Item +Sales Order Item
    • @@ -1093,7 +1093,7 @@ Discount Percentage
  • -Supplier Quotation Item +Supplier Quotation Item
    • diff --git a/foundation/www/docs/current/models/accounts/purchase_invoice.html b/foundation/www/docs/current/models/accounts/purchase_invoice.html index 03ac8525..470b527b 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 8.6.3 + Version 8.6.5 -Supplier +Supplier @@ -150,7 +150,7 @@ PINV-RET- -Company +Company @@ -207,7 +207,7 @@ PINV-RET- -Purchase Invoice +Purchase Invoice @@ -300,7 +300,7 @@ PINV-RET- -Purchase Invoice +Purchase Invoice @@ -333,7 +333,7 @@ PINV-RET- -Address +Address @@ -366,7 +366,7 @@ PINV-RET- -Contact +Contact @@ -435,7 +435,7 @@ PINV-RET- -Address +Address @@ -482,7 +482,7 @@ PINV-RET- -Currency +Currency @@ -527,7 +527,7 @@ PINV-RET- -Price List +Price List @@ -548,7 +548,7 @@ PINV-RET- -Currency +Currency @@ -619,7 +619,7 @@ PINV-RET- -Purchase Invoice Item +Purchase Invoice Item @@ -734,7 +734,7 @@ PINV-RET- -Purchase Taxes and Charges Template +Purchase Taxes and Charges Template @@ -755,7 +755,7 @@ PINV-RET- -Purchase Taxes and Charges +Purchase Taxes and Charges @@ -1106,7 +1106,7 @@ Net Total -Mode of Payment +Mode of Payment @@ -1127,7 +1127,7 @@ Net Total -Account +Account @@ -1240,7 +1240,7 @@ Net Total -Account +Account @@ -1261,7 +1261,7 @@ Net Total -Cost Center +Cost Center @@ -1308,7 +1308,7 @@ Net Total -Purchase Invoice Advance +Purchase Invoice Advance @@ -1343,7 +1343,7 @@ Net Total -Terms and Conditions +Terms and Conditions @@ -1403,7 +1403,7 @@ Yes -Warehouse +Warehouse @@ -1424,7 +1424,7 @@ Yes -Purchase Receipt Item Supplied +Purchase Receipt Item Supplied @@ -1457,7 +1457,7 @@ Yes -Letter Head +Letter Head @@ -1478,7 +1478,7 @@ Yes -Print Heading +Print Heading @@ -1525,7 +1525,7 @@ Yes -Account +Account @@ -1546,7 +1546,7 @@ Yes -Currency +Currency @@ -1641,7 +1641,7 @@ Cancelled -Warehouse +Warehouse @@ -1833,7 +1833,7 @@ Yearly -Print Format +Print Format @@ -2389,7 +2389,7 @@ Yearly
  • -Asset +Asset
    • @@ -2398,7 +2398,7 @@ Yearly
  • -Purchase Invoice +Purchase Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/purchase_invoice_advance.html b/foundation/www/docs/current/models/accounts/purchase_invoice_advance.html index 0e3ac619..2bb8534c 100644 --- a/foundation/www/docs/current/models/accounts/purchase_invoice_advance.html +++ b/foundation/www/docs/current/models/accounts/purchase_invoice_advance.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 DocType +DocType @@ -151,7 +151,7 @@
  • -Purchase Invoice +Purchase Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/purchase_invoice_item.html b/foundation/www/docs/current/models/accounts/purchase_invoice_item.html index 6d600c26..38c91443 100644 --- a/foundation/www/docs/current/models/accounts/purchase_invoice_item.html +++ b/foundation/www/docs/current/models/accounts/purchase_invoice_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -197,7 +197,7 @@ -UOM +UOM @@ -230,7 +230,7 @@ -UOM +UOM @@ -419,7 +419,7 @@ -Pricing Rule +Pricing Rule @@ -532,7 +532,7 @@ -Warehouse +Warehouse @@ -553,7 +553,7 @@ -Warehouse +Warehouse @@ -574,7 +574,7 @@ -Quality Inspection +Quality Inspection @@ -595,7 +595,7 @@ -Batch +Batch @@ -664,7 +664,7 @@ -Account +Account @@ -697,7 +697,7 @@ -Project +Project @@ -718,7 +718,7 @@ -Cost Center +Cost Center @@ -775,7 +775,7 @@ -Item Group +Item Group @@ -824,7 +824,7 @@ Used for Taxes and Charges

    -Purchase Order +Purchase Order @@ -845,7 +845,7 @@ Used for Taxes and Charges

    -BOM +BOM @@ -890,7 +890,7 @@ Used for Taxes and Charges

    -Asset +Asset @@ -923,7 +923,7 @@ Used for Taxes and Charges

    -Purchase Receipt +Purchase Receipt @@ -1006,7 +1006,7 @@ Used for Taxes and Charges

  • -Purchase Invoice +Purchase Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges.html b/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges.html index 2fc6f332..cf8e264f 100644 --- a/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges.html +++ b/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Account +Account @@ -161,7 +161,7 @@ On Previous Row Total -Cost Center +Cost Center @@ -348,35 +348,35 @@ On Previous Row Total
  • -Purchase Invoice +Purchase Invoice
  • -Purchase Order +Purchase Order
  • -Purchase Receipt +Purchase Receipt
  • -Purchase Taxes and Charges Template +Purchase Taxes and Charges Template
  • -Supplier Quotation +Supplier Quotation
    • diff --git a/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges_template.html b/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges_template.html index 980b2078..f4ff7b62 100644 --- a/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges_template.html +++ b/foundation/www/docs/current/models/accounts/purchase_taxes_and_charges_template.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -155,7 +155,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If -Purchase Taxes and Charges +Purchase Taxes and Charges @@ -213,7 +213,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Purchase Invoice +Purchase Invoice
    • @@ -222,7 +222,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Purchase Order +Purchase Order
    • @@ -231,7 +231,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Purchase Receipt +Purchase Receipt
    • @@ -240,7 +240,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Supplier Quotation +Supplier Quotation
    • @@ -249,7 +249,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Tax Rule +Tax Rule
    • diff --git a/foundation/www/docs/current/models/accounts/salary_component_account.html b/foundation/www/docs/current/models/accounts/salary_component_account.html index fb364f9b..d3c9f012 100644 --- a/foundation/www/docs/current/models/accounts/salary_component_account.html +++ b/foundation/www/docs/current/models/accounts/salary_component_account.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -76,7 +76,7 @@ -Account +Account @@ -95,7 +95,7 @@
  • -Salary Component +Salary Component
    • diff --git a/foundation/www/docs/current/models/accounts/sales_invoice.html b/foundation/www/docs/current/models/accounts/sales_invoice.html index c385aba9..f1baea59 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Customer +Customer @@ -140,7 +140,7 @@ SINV-RET- -Project +Project @@ -185,7 +185,7 @@ SINV-RET- -POS Profile +POS Profile @@ -218,7 +218,7 @@ SINV-RET- -Company +Company @@ -287,7 +287,7 @@ SINV-RET- -Sales Invoice +Sales Invoice @@ -332,7 +332,7 @@ SINV-RET- -Sales Invoice +Sales Invoice @@ -365,7 +365,7 @@ SINV-RET- -Address +Address @@ -398,7 +398,7 @@ SINV-RET- -Contact +Contact @@ -457,7 +457,7 @@ SINV-RET- -Territory +Territory @@ -490,7 +490,7 @@ SINV-RET- -Address +Address @@ -523,7 +523,7 @@ SINV-RET- -Address +Address @@ -568,7 +568,7 @@ SINV-RET- -Currency +Currency @@ -614,7 +614,7 @@ SINV-RET- -Price List +Price List @@ -635,7 +635,7 @@ SINV-RET- -Currency +Currency @@ -707,7 +707,7 @@ SINV-RET- -Sales Invoice Item +Sales Invoice Item @@ -742,7 +742,7 @@ SINV-RET- -Packed Item +Packed Item @@ -787,7 +787,7 @@ SINV-RET- -Sales Invoice Timesheet +Sales Invoice Timesheet @@ -914,7 +914,7 @@ SINV-RET- -Sales Taxes and Charges Template +Sales Taxes and Charges Template @@ -947,7 +947,7 @@ SINV-RET- -Shipping Rule +Shipping Rule @@ -980,7 +980,7 @@ SINV-RET- -Sales Taxes and Charges +Sales Taxes and Charges @@ -1318,7 +1318,7 @@ Net Total -Sales Invoice Advance +Sales Invoice Advance @@ -1353,7 +1353,7 @@ Net Total -Account +Account @@ -1374,7 +1374,7 @@ Net Total -Sales Invoice Payment +Sales Invoice Payment @@ -1499,7 +1499,7 @@ Net Total -Account +Account @@ -1584,7 +1584,7 @@ Net Total -Account +Account @@ -1605,7 +1605,7 @@ Net Total -Cost Center +Cost Center @@ -1638,7 +1638,7 @@ Net Total -Terms and Conditions +Terms and Conditions @@ -1683,7 +1683,7 @@ Net Total -Letter Head +Letter Head @@ -1728,7 +1728,7 @@ Net Total -Print Heading +Print Heading @@ -1761,7 +1761,7 @@ Net Total -Customer Group +Customer Group @@ -1782,7 +1782,7 @@ Net Total -Campaign +Campaign @@ -1837,7 +1837,7 @@ Cancelled -Lead Source +Lead Source @@ -1872,7 +1872,7 @@ Cancelled -Account +Account @@ -1893,7 +1893,7 @@ Cancelled -Currency +Currency @@ -1944,7 +1944,7 @@ Yes -C-Form +C-Form @@ -2003,7 +2003,7 @@ Yes -Sales Partner +Sales Partner @@ -2074,7 +2074,7 @@ Yes -Sales Team +Sales Team @@ -2133,7 +2133,7 @@ Yes -Sales Invoice +Sales Invoice @@ -2234,7 +2234,7 @@ Yearly -Print Format +Print Format @@ -3253,7 +3253,7 @@ Yearly
  • -C-Form Invoice Detail +C-Form Invoice Detail
    • @@ -3262,7 +3262,7 @@ Yearly
  • -Delivery Note Item +Delivery Note Item
    • @@ -3271,7 +3271,7 @@ Yearly
  • -Sales Invoice +Sales Invoice
    • @@ -3280,7 +3280,7 @@ Yearly
  • -Serial No +Serial No
    • @@ -3289,7 +3289,7 @@ Yearly
  • -Stock Entry +Stock Entry
    • @@ -3298,7 +3298,7 @@ Yearly
  • -Timesheet +Timesheet
    • @@ -3307,7 +3307,7 @@ Yearly
  • -Timesheet Detail +Timesheet Detail
    • 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 47d9160f..f4c43eeb 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 8.6.3 + Version 8.6.5 DocType +DocType @@ -151,7 +151,7 @@
  • -Sales Invoice +Sales Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/sales_invoice_item.html b/foundation/www/docs/current/models/accounts/sales_invoice_item.html index a4c90d06..062f936d 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_item.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -209,7 +209,7 @@ -UOM +UOM @@ -242,7 +242,7 @@ -UOM +UOM @@ -483,7 +483,7 @@ Amount -Pricing Rule +Pricing Rule @@ -620,7 +620,7 @@ Amount -Account +Account @@ -641,7 +641,7 @@ Amount -Account +Account @@ -674,7 +674,7 @@ Amount -Cost Center +Cost Center @@ -707,7 +707,7 @@ Amount -Warehouse +Warehouse @@ -728,7 +728,7 @@ Amount -Warehouse +Warehouse @@ -749,7 +749,7 @@ Amount -Quality Inspection +Quality Inspection @@ -770,7 +770,7 @@ Amount -Batch +Batch @@ -827,7 +827,7 @@ Amount -Item Group +Item Group @@ -908,7 +908,7 @@ Amount -Sales Order +Sales Order @@ -953,7 +953,7 @@ Amount -Delivery Note +Delivery Note @@ -1010,7 +1010,7 @@ Amount -Asset +Asset @@ -1053,7 +1053,7 @@ Amount
  • -Sales Invoice +Sales Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/sales_invoice_payment.html b/foundation/www/docs/current/models/accounts/sales_invoice_payment.html index f41c385c..2ce8e67b 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_payment.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_payment.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Mode of Payment +Mode of Payment @@ -101,7 +101,7 @@ -Account +Account @@ -148,14 +148,14 @@
  • -POS Profile +POS Profile
  • -Sales Invoice +Sales Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/sales_invoice_timesheet.html b/foundation/www/docs/current/models/accounts/sales_invoice_timesheet.html index 7ab5360e..e7ed689f 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_timesheet.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_timesheet.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Timesheet +Timesheet @@ -109,7 +109,7 @@
  • -Sales Invoice +Sales Invoice
    • diff --git a/foundation/www/docs/current/models/accounts/sales_taxes_and_charges.html b/foundation/www/docs/current/models/accounts/sales_taxes_and_charges.html index b9df6ef1..9560410b 100644 --- a/foundation/www/docs/current/models/accounts/sales_taxes_and_charges.html +++ b/foundation/www/docs/current/models/accounts/sales_taxes_and_charges.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Account +Account @@ -105,7 +105,7 @@ On Previous Row Total -Cost Center +Cost Center @@ -317,35 +317,35 @@ On Previous Row Total
  • -Delivery Note +Delivery Note
  • -Quotation +Quotation
  • -Sales Invoice +Sales Invoice
  • -Sales Order +Sales Order
  • -Sales Taxes and Charges Template +Sales Taxes and Charges Template
    • diff --git a/foundation/www/docs/current/models/accounts/sales_taxes_and_charges_template.html b/foundation/www/docs/current/models/accounts/sales_taxes_and_charges_template.html index a8b833e4..12f24945 100644 --- a/foundation/www/docs/current/models/accounts/sales_taxes_and_charges_template.html +++ b/foundation/www/docs/current/models/accounts/sales_taxes_and_charges_template.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -155,7 +155,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If -Sales Taxes and Charges +Sales Taxes and Charges @@ -259,7 +259,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Delivery Note +Delivery Note
    • @@ -268,7 +268,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -POS Profile +POS Profile
    • @@ -277,7 +277,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Quotation +Quotation
    • @@ -286,7 +286,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Sales Invoice +Sales Invoice
    • @@ -295,7 +295,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Sales Order +Sales Order
    • @@ -304,7 +304,7 @@ The tax rate you define here will be the standard tax rate for all **Items**. If
  • -Tax Rule +Tax Rule
    • diff --git a/foundation/www/docs/current/models/accounts/shipping_rule.html b/foundation/www/docs/current/models/accounts/shipping_rule.html index 392bd577..90d27e1d 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 8.6.3 + Version 8.6.5 -Shipping Rule Condition +Shipping Rule Condition @@ -151,7 +151,7 @@ Net Weight -Shipping Rule Country +Shipping Rule Country @@ -184,7 +184,7 @@ Net Weight -Company +Company @@ -217,7 +217,7 @@ Net Weight -Account +Account @@ -238,7 +238,7 @@ Net Weight -Cost Center +Cost Center @@ -383,7 +383,7 @@ Net Weight
  • -Delivery Note +Delivery Note
    • @@ -392,7 +392,7 @@ Net Weight
  • -Quotation +Quotation
    • @@ -401,7 +401,7 @@ Net Weight
  • -Sales Invoice +Sales Invoice
    • @@ -410,7 +410,7 @@ Net Weight
  • -Sales Order +Sales Order
    • diff --git a/foundation/www/docs/current/models/accounts/shipping_rule_condition.html b/foundation/www/docs/current/models/accounts/shipping_rule_condition.html index a3a4e1ad..d70e92d7 100644 --- a/foundation/www/docs/current/models/accounts/shipping_rule_condition.html +++ b/foundation/www/docs/current/models/accounts/shipping_rule_condition.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Shipping Rule +Shipping Rule diff --git a/foundation/www/docs/current/models/accounts/shipping_rule_country.html b/foundation/www/docs/current/models/accounts/shipping_rule_country.html index dee3771f..0212c15c 100644 --- a/foundation/www/docs/current/models/accounts/shipping_rule_country.html +++ b/foundation/www/docs/current/models/accounts/shipping_rule_country.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Country +Country @@ -73,7 +73,7 @@
  • -Shipping Rule +Shipping Rule
    • diff --git a/foundation/www/docs/current/models/accounts/tax_rule.html b/foundation/www/docs/current/models/accounts/tax_rule.html index 58c81f5b..d9135f3e 100644 --- a/foundation/www/docs/current/models/accounts/tax_rule.html +++ b/foundation/www/docs/current/models/accounts/tax_rule.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Sales Taxes and Charges Template +Sales Taxes and Charges Template @@ -114,7 +114,7 @@ Purchase -Purchase Taxes and Charges Template +Purchase Taxes and Charges Template @@ -147,7 +147,7 @@ Purchase -Customer +Customer @@ -168,7 +168,7 @@ Purchase -Supplier +Supplier @@ -225,7 +225,7 @@ Purchase -Country +Country @@ -258,7 +258,7 @@ Purchase -Customer Group +Customer Group @@ -279,7 +279,7 @@ Purchase -Supplier Type +Supplier Type @@ -336,7 +336,7 @@ Purchase -Country +Country @@ -441,7 +441,7 @@ Purchase -Company +Company diff --git a/foundation/www/docs/current/models/buying/buying_settings.html b/foundation/www/docs/current/models/buying/buying_settings.html index 538dd938..41428fe1 100644 --- a/foundation/www/docs/current/models/buying/buying_settings.html +++ b/foundation/www/docs/current/models/buying/buying_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Supplier Type +Supplier Type @@ -88,7 +88,7 @@ Naming Series -Price List +Price List diff --git a/foundation/www/docs/current/models/buying/index.html b/foundation/www/docs/current/models/buying/index.html index c3f3ad77..9e9a3f05 100644 --- a/foundation/www/docs/current/models/buying/index.html +++ b/foundation/www/docs/current/models/buying/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Supplier +Supplier @@ -178,7 +178,7 @@ Yes -Purchase Order +Purchase Order @@ -199,7 +199,7 @@ Yes -Company +Company @@ -232,7 +232,7 @@ Yes -Customer +Customer @@ -277,7 +277,7 @@ Yes -Contact +Contact @@ -348,7 +348,7 @@ Yes -Address +Address @@ -369,7 +369,7 @@ Yes -Contact +Contact @@ -450,7 +450,7 @@ Yes -Address +Address @@ -497,7 +497,7 @@ Yes -Currency +Currency @@ -542,7 +542,7 @@ Yes -Price List +Price List @@ -563,7 +563,7 @@ Yes -Currency +Currency @@ -622,7 +622,7 @@ Yes -Purchase Order Item +Purchase Order Item @@ -761,7 +761,7 @@ Yes -Purchase Taxes and Charges Template +Purchase Taxes and Charges Template @@ -782,7 +782,7 @@ Yes -Purchase Taxes and Charges +Purchase Taxes and Charges @@ -1136,7 +1136,7 @@ Net Total -Terms and Conditions +Terms and Conditions @@ -1215,7 +1215,7 @@ Delivered -Currency +Currency @@ -1284,7 +1284,7 @@ Delivered -Letter Head +Letter Head @@ -1305,7 +1305,7 @@ Delivered -Print Heading +Print Heading @@ -1376,7 +1376,7 @@ Delivered -Purchase Order Item Supplied +Purchase Order Item Supplied @@ -1435,7 +1435,7 @@ Delivered -Purchase Order +Purchase Order @@ -1535,7 +1535,7 @@ Yearly -Print Format +Print Format @@ -2013,7 +2013,7 @@ Yearly
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -2022,7 +2022,7 @@ Yearly
  • -Purchase Order +Purchase Order
    • @@ -2031,7 +2031,7 @@ Yearly
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -2040,7 +2040,7 @@ Yearly
  • -Stock Entry +Stock Entry
    • 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 7943d4f2..8a7caddc 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 8.6.3 + Version 8.6.5 Item +Item @@ -221,7 +221,7 @@ -UOM +UOM @@ -254,7 +254,7 @@ -UOM +UOM @@ -431,7 +431,7 @@ -Pricing Rule +Pricing Rule @@ -544,7 +544,7 @@ -Warehouse +Warehouse @@ -565,7 +565,7 @@ -Project +Project @@ -586,7 +586,7 @@ -Material Request +Material Request @@ -619,7 +619,7 @@ -Sales Order +Sales Order @@ -652,7 +652,7 @@ -Supplier Quotation +Supplier Quotation @@ -673,7 +673,7 @@ -Supplier Quotation Item +Supplier Quotation Item @@ -718,7 +718,7 @@ -Item Group +Item Group @@ -739,7 +739,7 @@ -Brand +Brand @@ -760,7 +760,7 @@ -BOM +BOM @@ -855,7 +855,7 @@ Used for Taxes and Charges

  • -Purchase Order +Purchase Order
    • diff --git a/foundation/www/docs/current/models/buying/purchase_order_item_supplied.html b/foundation/www/docs/current/models/buying/purchase_order_item_supplied.html index 9e63ce78..eed20700 100644 --- a/foundation/www/docs/current/models/buying/purchase_order_item_supplied.html +++ b/foundation/www/docs/current/models/buying/purchase_order_item_supplied.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 UOM +UOM @@ -173,7 +173,7 @@
  • -Purchase Order +Purchase Order
    • diff --git a/foundation/www/docs/current/models/buying/purchase_receipt_item_supplied.html b/foundation/www/docs/current/models/buying/purchase_receipt_item_supplied.html index 2dbc7471..fa96ebab 100644 --- a/foundation/www/docs/current/models/buying/purchase_receipt_item_supplied.html +++ b/foundation/www/docs/current/models/buying/purchase_receipt_item_supplied.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Batch +Batch @@ -159,7 +159,7 @@ -UOM +UOM @@ -254,14 +254,14 @@
  • -Purchase Invoice +Purchase Invoice
  • -Purchase Receipt +Purchase Receipt
    • diff --git a/foundation/www/docs/current/models/buying/request_for_quotation.html b/foundation/www/docs/current/models/buying/request_for_quotation.html index 169e535a..007012b7 100644 --- a/foundation/www/docs/current/models/buying/request_for_quotation.html +++ b/foundation/www/docs/current/models/buying/request_for_quotation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -90,7 +90,7 @@ -Supplier +Supplier @@ -147,7 +147,7 @@ -Request for Quotation Supplier +Request for Quotation Supplier @@ -194,7 +194,7 @@ -Request for Quotation Item +Request for Quotation Item @@ -239,7 +239,7 @@ -Standard Reply +Standard Reply @@ -286,7 +286,7 @@ -Terms and Conditions +Terms and Conditions @@ -331,7 +331,7 @@ -Print Heading +Print Heading @@ -352,7 +352,7 @@ -Letter Head +Letter Head @@ -404,7 +404,7 @@ Cancelled -Fiscal Year +Fiscal Year @@ -437,7 +437,7 @@ Cancelled -Request for Quotation +Request for Quotation @@ -891,7 +891,7 @@ Cancelled
  • -Request for Quotation +Request for Quotation
    • @@ -900,7 +900,7 @@ Cancelled
  • -Supplier Quotation Item +Supplier Quotation Item
    • diff --git a/foundation/www/docs/current/models/buying/request_for_quotation_item.html b/foundation/www/docs/current/models/buying/request_for_quotation_item.html index e868a8d2..7e68f3ec 100644 --- a/foundation/www/docs/current/models/buying/request_for_quotation_item.html +++ b/foundation/www/docs/current/models/buying/request_for_quotation_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -221,7 +221,7 @@ -UOM +UOM @@ -254,7 +254,7 @@ -Warehouse +Warehouse @@ -275,7 +275,7 @@ -Project +Project @@ -296,7 +296,7 @@ -Material Request +Material Request @@ -341,7 +341,7 @@ -Brand +Brand @@ -362,7 +362,7 @@ -Item Group +Item Group @@ -393,7 +393,7 @@
  • -Request for Quotation +Request for Quotation
    • diff --git a/foundation/www/docs/current/models/buying/request_for_quotation_supplier.html b/foundation/www/docs/current/models/buying/request_for_quotation_supplier.html index afb5a960..3984dba2 100644 --- a/foundation/www/docs/current/models/buying/request_for_quotation_supplier.html +++ b/foundation/www/docs/current/models/buying/request_for_quotation_supplier.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Supplier +Supplier @@ -99,7 +99,7 @@ -Contact +Contact @@ -170,7 +170,7 @@
  • -Request for Quotation +Request for Quotation
    • diff --git a/foundation/www/docs/current/models/buying/supplier.html b/foundation/www/docs/current/models/buying/supplier.html index 3b8c07c9..56004dfb 100644 --- a/foundation/www/docs/current/models/buying/supplier.html +++ b/foundation/www/docs/current/models/buying/supplier.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Country +Country @@ -151,7 +151,7 @@ Supplier of Goods or Services. -Supplier Type +Supplier Type @@ -172,7 +172,7 @@ Supplier of Goods or Services. -Language +Language @@ -265,7 +265,7 @@ Supplier of Goods or Services. -Currency +Currency @@ -298,7 +298,7 @@ Supplier of Goods or Services. -Price List +Price List @@ -422,7 +422,7 @@ Last Day of the Next Month -Party Account +Party Account @@ -627,7 +627,7 @@ Last Day of the Next Month
  • -Asset +Asset
    • @@ -636,7 +636,7 @@ Last Day of the Next Month
  • -Batch +Batch
    • @@ -645,7 +645,7 @@ Last Day of the Next Month
  • -Item +Item
    • @@ -654,7 +654,7 @@ Last Day of the Next Month
  • -Item Supplier +Item Supplier
    • @@ -663,7 +663,7 @@ Last Day of the Next Month
  • -Landed Cost Purchase Receipt +Landed Cost Purchase Receipt
    • @@ -672,7 +672,7 @@ Last Day of the Next Month
  • -Pricing Rule +Pricing Rule
    • @@ -681,7 +681,7 @@ Last Day of the Next Month
  • -Purchase Invoice +Purchase Invoice
    • @@ -690,7 +690,7 @@ Last Day of the Next Month
  • -Purchase Order +Purchase Order
    • @@ -699,7 +699,7 @@ Last Day of the Next Month
  • -Purchase Receipt +Purchase Receipt
    • @@ -708,7 +708,7 @@ Last Day of the Next Month
  • -Request for Quotation +Request for Quotation
    • @@ -717,7 +717,7 @@ Last Day of the Next Month
  • -Request for Quotation Supplier +Request for Quotation Supplier
    • @@ -726,7 +726,7 @@ Last Day of the Next Month
  • -Sales Order Item +Sales Order Item
    • @@ -735,7 +735,7 @@ Last Day of the Next Month
  • -Serial No +Serial No
    • @@ -744,7 +744,7 @@ Last Day of the Next Month
  • -SMS Center +SMS Center
    • @@ -753,7 +753,7 @@ Last Day of the Next Month
  • -Stock Entry +Stock Entry
    • @@ -762,7 +762,7 @@ Last Day of the Next Month
  • -Supplier Quotation +Supplier Quotation
    • @@ -771,7 +771,7 @@ Last Day of the Next Month
  • -Supplier Scorecard +Supplier Scorecard
    • @@ -780,7 +780,7 @@ Last Day of the Next Month
  • -Supplier Scorecard Period +Supplier Scorecard Period
    • @@ -789,7 +789,7 @@ Last Day of the Next Month
  • -Tax Rule +Tax Rule
    • @@ -798,7 +798,7 @@ Last Day of the Next Month
  • -Training Event +Training Event
    • @@ -807,7 +807,7 @@ Last Day of the Next Month
  • -Vehicle Log +Vehicle Log
    • diff --git a/foundation/www/docs/current/models/buying/supplier_quotation.html b/foundation/www/docs/current/models/buying/supplier_quotation.html index 279aac16..b15e011a 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 8.6.3 + Version 8.6.5 Supplier +Supplier @@ -151,7 +151,7 @@ -Supplier Quotation +Supplier Quotation @@ -172,7 +172,7 @@ -Company +Company @@ -205,7 +205,7 @@ -Address +Address @@ -226,7 +226,7 @@ -Contact +Contact @@ -311,7 +311,7 @@ -Currency +Currency @@ -356,7 +356,7 @@ -Price List +Price List @@ -377,7 +377,7 @@ -Currency +Currency @@ -436,7 +436,7 @@ -Supplier Quotation Item +Supplier Quotation Item @@ -563,7 +563,7 @@ -Purchase Taxes and Charges Template +Purchase Taxes and Charges Template @@ -584,7 +584,7 @@ -Purchase Taxes and Charges +Purchase Taxes and Charges @@ -923,7 +923,7 @@ Net Total -Terms and Conditions +Terms and Conditions @@ -968,7 +968,7 @@ Net Total -Print Heading +Print Heading @@ -989,7 +989,7 @@ Net Total -Letter Head +Letter Head @@ -1094,7 +1094,7 @@ No -Opportunity +Opportunity @@ -1260,7 +1260,7 @@ No
  • -Purchase Order Item +Purchase Order Item
    • @@ -1269,7 +1269,7 @@ No
  • -Quotation +Quotation
    • @@ -1278,7 +1278,7 @@ No
  • -Supplier Quotation +Supplier Quotation
    • diff --git a/foundation/www/docs/current/models/buying/supplier_quotation_item.html b/foundation/www/docs/current/models/buying/supplier_quotation_item.html index 7276cc41..c47371b4 100644 --- a/foundation/www/docs/current/models/buying/supplier_quotation_item.html +++ b/foundation/www/docs/current/models/buying/supplier_quotation_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -209,7 +209,7 @@ -UOM +UOM @@ -268,7 +268,7 @@ -UOM +UOM @@ -395,7 +395,7 @@ -Pricing Rule +Pricing Rule @@ -506,7 +506,7 @@ -Warehouse +Warehouse @@ -527,7 +527,7 @@ -Project +Project @@ -560,7 +560,7 @@ -Material Request +Material Request @@ -581,7 +581,7 @@ -Request for Quotation +Request for Quotation @@ -638,7 +638,7 @@ -Brand +Brand @@ -659,7 +659,7 @@ -Item Group +Item Group @@ -728,7 +728,7 @@ Used for Taxes and Charges

  • -Supplier Quotation +Supplier Quotation
    • diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard.html b/foundation/www/docs/current/models/buying/supplier_scorecard.html index 09e1921b..a9a4766c 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 8.6.3 + Version 8.6.5 Supplier +Supplier @@ -167,7 +167,7 @@ Per Year -Supplier Scorecard Scoring Standing +Supplier Scorecard Scoring Standing @@ -200,7 +200,7 @@ Per Year -Supplier Scorecard Scoring Criteria +Supplier Scorecard Scoring Criteria @@ -221,7 +221,7 @@ Per Year -Supplier Scorecard Scoring Variable +Supplier Scorecard Scoring Variable @@ -338,7 +338,7 @@ Per Year -Employee +Employee @@ -566,7 +566,7 @@ Per Year
  • -Supplier Scorecard Period +Supplier Scorecard Period
    • diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard_criteria.html b/foundation/www/docs/current/models/buying/supplier_scorecard_criteria.html index cf518049..a1ad2fb8 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard_criteria.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard_criteria.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Supplier Scorecard Scoring Criteria +Supplier Scorecard Scoring Criteria diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard_period.html b/foundation/www/docs/current/models/buying/supplier_scorecard_period.html index ced24ee0..c5e1572f 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard_period.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard_period.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Supplier +Supplier @@ -149,7 +149,7 @@ -Supplier Scorecard Scoring Criteria +Supplier Scorecard Scoring Criteria @@ -170,7 +170,7 @@ -Supplier Scorecard Scoring Variable +Supplier Scorecard Scoring Variable @@ -203,7 +203,7 @@ -Supplier Scorecard +Supplier Scorecard diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_criteria.html b/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_criteria.html index 31cb352f..0da112d6 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_criteria.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_criteria.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Supplier Scorecard Criteria +Supplier Scorecard Criteria @@ -157,14 +157,14 @@
  • -Supplier Scorecard +Supplier Scorecard
  • -Supplier Scorecard Period +Supplier Scorecard Period
    • diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_standing.html b/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_standing.html index c9da341b..4a35c903 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_standing.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_standing.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Supplier Scorecard Standing +Supplier Scorecard Standing @@ -238,7 +238,7 @@ Red -Employee +Employee @@ -257,7 +257,7 @@ Red
  • -Supplier Scorecard +Supplier Scorecard
    • diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_variable.html b/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_variable.html index f2d79faa..4e0f0223 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_variable.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard_scoring_variable.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Supplier Scorecard Variable +Supplier Scorecard Variable @@ -133,14 +133,14 @@
  • -Supplier Scorecard +Supplier Scorecard
  • -Supplier Scorecard Period +Supplier Scorecard Period
    • diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard_standing.html b/foundation/www/docs/current/models/buying/supplier_scorecard_standing.html index 1ff168e4..0cddbb60 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard_standing.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard_standing.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Employee +Employee @@ -273,7 +273,7 @@ Red
  • -Supplier Scorecard Scoring Standing +Supplier Scorecard Scoring Standing
    • diff --git a/foundation/www/docs/current/models/buying/supplier_scorecard_variable.html b/foundation/www/docs/current/models/buying/supplier_scorecard_variable.html index 03675f74..c0898b62 100644 --- a/foundation/www/docs/current/models/buying/supplier_scorecard_variable.html +++ b/foundation/www/docs/current/models/buying/supplier_scorecard_variable.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Supplier Scorecard Scoring Variable +Supplier Scorecard Scoring Variable diff --git a/foundation/www/docs/current/models/crm/index.html b/foundation/www/docs/current/models/crm/index.html index fa812124..21825799 100644 --- a/foundation/www/docs/current/models/crm/index.html +++ b/foundation/www/docs/current/models/crm/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Salutation +Salutation @@ -115,7 +115,7 @@ -Gender +Gender @@ -184,7 +184,7 @@ Do Not Contact -Lead Source +Lead Source @@ -217,7 +217,7 @@ Do Not Contact -Customer +Customer @@ -238,7 +238,7 @@ Do Not Contact -Campaign +Campaign @@ -283,7 +283,7 @@ Do Not Contact -User +User @@ -316,7 +316,7 @@ Do Not Contact -User +User @@ -448,7 +448,7 @@ Do Not Contact -Territory +Territory @@ -517,7 +517,7 @@ Upper Income -Industry Type +Industry Type @@ -568,7 +568,7 @@ Other -Company +Company @@ -878,7 +878,7 @@ Other
  • -Customer +Customer
    • @@ -887,7 +887,7 @@ Other
  • -Issue +Issue
    • @@ -896,7 +896,7 @@ Other
  • -Opportunity +Opportunity
    • @@ -905,7 +905,7 @@ Other
  • -Quotation +Quotation
    • diff --git a/foundation/www/docs/current/models/crm/opportunity.html b/foundation/www/docs/current/models/crm/opportunity.html index 6b60e0dd..a3eeef86 100644 --- a/foundation/www/docs/current/models/crm/opportunity.html +++ b/foundation/www/docs/current/models/crm/opportunity.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Customer +Customer @@ -119,7 +119,7 @@ Customer -Lead +Lead @@ -260,7 +260,7 @@ Closed -Opportunity Item +Opportunity Item @@ -295,7 +295,7 @@ Closed -Address +Address @@ -328,7 +328,7 @@ Closed -Territory +Territory @@ -349,7 +349,7 @@ Closed -Customer Group +Customer Group @@ -382,7 +382,7 @@ Closed -Contact +Contact @@ -453,7 +453,7 @@ Closed -Lead Source +Lead Source @@ -475,7 +475,7 @@ Closed -Campaign +Campaign @@ -508,7 +508,7 @@ Closed -Company +Company @@ -554,7 +554,7 @@ Closed -User +User @@ -612,7 +612,7 @@ Closed -Opportunity +Opportunity @@ -926,7 +926,7 @@ Closed
  • -Opportunity +Opportunity
    • @@ -935,7 +935,7 @@ Closed
  • -Supplier Quotation +Supplier Quotation
    • diff --git a/foundation/www/docs/current/models/crm/opportunity_item.html b/foundation/www/docs/current/models/crm/opportunity_item.html index 78d9a6a6..f6f27a73 100644 --- a/foundation/www/docs/current/models/crm/opportunity_item.html +++ b/foundation/www/docs/current/models/crm/opportunity_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -99,7 +99,7 @@ -Item Group +Item Group @@ -120,7 +120,7 @@ -Brand +Brand @@ -153,7 +153,7 @@ -UOM +UOM @@ -248,7 +248,7 @@
  • -Opportunity +Opportunity
    • diff --git a/foundation/www/docs/current/models/erpnext_integrations/index.html b/foundation/www/docs/current/models/erpnext_integrations/index.html index 23153a31..31071c08 100644 --- a/foundation/www/docs/current/models/erpnext_integrations/index.html +++ b/foundation/www/docs/current/models/erpnext_integrations/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Appraisal Template +Appraisal Template @@ -101,7 +101,7 @@ -Employee +Employee @@ -202,7 +202,7 @@ Cancelled -Appraisal Goal +Appraisal Goal @@ -286,7 +286,7 @@ Cancelled -Company +Company @@ -319,7 +319,7 @@ Cancelled -Appraisal +Appraisal @@ -479,7 +479,7 @@ Cancelled
  • -Appraisal +Appraisal
    • diff --git a/foundation/www/docs/current/models/hr/appraisal_goal.html b/foundation/www/docs/current/models/hr/appraisal_goal.html index 9da15a2d..0085d89a 100644 --- a/foundation/www/docs/current/models/hr/appraisal_goal.html +++ b/foundation/www/docs/current/models/hr/appraisal_goal.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Appraisal +Appraisal diff --git a/foundation/www/docs/current/models/hr/appraisal_template.html b/foundation/www/docs/current/models/hr/appraisal_template.html index 45feff1b..bc24075a 100644 --- a/foundation/www/docs/current/models/hr/appraisal_template.html +++ b/foundation/www/docs/current/models/hr/appraisal_template.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Appraisal Template Goal +Appraisal Template Goal @@ -150,7 +150,7 @@
  • -Appraisal +Appraisal
    • diff --git a/foundation/www/docs/current/models/hr/appraisal_template_goal.html b/foundation/www/docs/current/models/hr/appraisal_template_goal.html index 9c57317c..8a322cd8 100644 --- a/foundation/www/docs/current/models/hr/appraisal_template_goal.html +++ b/foundation/www/docs/current/models/hr/appraisal_template_goal.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Appraisal Template +Appraisal Template diff --git a/foundation/www/docs/current/models/hr/attendance.html b/foundation/www/docs/current/models/hr/attendance.html index ec12691e..f671f08e 100644 --- a/foundation/www/docs/current/models/hr/attendance.html +++ b/foundation/www/docs/current/models/hr/attendance.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -133,7 +133,7 @@ Half Day -Leave Type +Leave Type @@ -178,7 +178,7 @@ Half Day -Company +Company @@ -199,7 +199,7 @@ Half Day -Attendance +Attendance @@ -313,7 +313,7 @@ Half Day
  • -Attendance +Attendance
    • diff --git a/foundation/www/docs/current/models/hr/branch.html b/foundation/www/docs/current/models/hr/branch.html index 8d715785..59823289 100644 --- a/foundation/www/docs/current/models/hr/branch.html +++ b/foundation/www/docs/current/models/hr/branch.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Employee +Employee @@ -98,7 +98,7 @@
  • -Employee Attendance Tool +Employee Attendance Tool
    • @@ -107,7 +107,7 @@
  • -Employee Internal Work History +Employee Internal Work History
    • @@ -116,7 +116,7 @@
  • -Leave Control Panel +Leave Control Panel
    • @@ -125,7 +125,7 @@
  • -Process Payroll +Process Payroll
    • @@ -134,7 +134,7 @@
  • -SMS Center +SMS Center
    • diff --git a/foundation/www/docs/current/models/hr/daily_work_summary.html b/foundation/www/docs/current/models/hr/daily_work_summary.html index 5034481a..1bc8e20e 100644 --- a/foundation/www/docs/current/models/hr/daily_work_summary.html +++ b/foundation/www/docs/current/models/hr/daily_work_summary.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company 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 index dab4ece7..01b51982 100644 --- a/foundation/www/docs/current/models/hr/daily_work_summary_settings.html +++ b/foundation/www/docs/current/models/hr/daily_work_summary_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Daily Work Summary Settings Company +Daily Work Summary Settings Company 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_settings_company.html index b6181e53..d307fd26 100644 --- a/foundation/www/docs/current/models/hr/daily_work_summary_settings_company.html +++ b/foundation/www/docs/current/models/hr/daily_work_summary_settings_company.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -110,7 +110,7 @@
  • -Daily Work Summary Settings +Daily Work Summary Settings
    • diff --git a/foundation/www/docs/current/models/hr/department.html b/foundation/www/docs/current/models/hr/department.html index f586c19f..5933865c 100644 --- a/foundation/www/docs/current/models/hr/department.html +++ b/foundation/www/docs/current/models/hr/department.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Leave Block List +Leave Block List @@ -111,7 +111,7 @@
  • -Course +Course
    • @@ -120,7 +120,7 @@
  • -Employee +Employee
    • @@ -129,7 +129,7 @@
  • -Employee Attendance Tool +Employee Attendance Tool
    • @@ -138,7 +138,7 @@
  • -Employee Internal Work History +Employee Internal Work History
    • @@ -147,7 +147,7 @@
  • -Instructor +Instructor
    • @@ -156,7 +156,7 @@
  • -Leave Control Panel +Leave Control Panel
    • @@ -165,7 +165,7 @@
  • -Process Payroll +Process Payroll
    • @@ -174,7 +174,7 @@
  • -Program +Program
    • @@ -183,7 +183,7 @@
  • -SMS Center +SMS Center
    • diff --git a/foundation/www/docs/current/models/hr/designation.html b/foundation/www/docs/current/models/hr/designation.html index 99af7bf4..da10768e 100644 --- a/foundation/www/docs/current/models/hr/designation.html +++ b/foundation/www/docs/current/models/hr/designation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Authorization Rule +Authorization Rule @@ -110,7 +110,7 @@
  • -Employee +Employee
    • @@ -119,7 +119,7 @@
  • -Employee Internal Work History +Employee Internal Work History
    • @@ -128,7 +128,7 @@
  • -Leave Control Panel +Leave Control Panel
    • @@ -137,7 +137,7 @@
  • -Offer Letter +Offer Letter
    • @@ -146,7 +146,7 @@
  • -Process Payroll +Process Payroll
    • diff --git a/foundation/www/docs/current/models/hr/employee.html b/foundation/www/docs/current/models/hr/employee.html index edf0ae64..63c72210 100644 --- a/foundation/www/docs/current/models/hr/employee.html +++ b/foundation/www/docs/current/models/hr/employee.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Salutation +Salutation @@ -125,7 +125,7 @@ -Company +Company @@ -147,7 +147,7 @@ -User +User @@ -241,7 +241,7 @@ -Gender +Gender @@ -290,7 +290,7 @@ Left -Employment Type +Employment Type @@ -312,7 +312,7 @@ Left -Holiday List +Holiday List @@ -405,7 +405,7 @@ Left -Branch +Branch @@ -426,7 +426,7 @@ Left -Department +Department @@ -447,7 +447,7 @@ Left -Designation +Designation @@ -560,7 +560,7 @@ Cheque -Employee +Employee @@ -582,7 +582,7 @@ Cheque -Employee Leave Approver +Employee Leave Approver @@ -963,7 +963,7 @@ O- -Employee Education +Employee Education @@ -998,7 +998,7 @@ O- -Employee External Work History +Employee External Work History @@ -1033,7 +1033,7 @@ O- -Employee Internal Work History +Employee Internal Work History @@ -1601,7 +1601,7 @@ Health Concerns
  • -Activity Cost +Activity Cost
    • @@ -1610,7 +1610,7 @@ Health Concerns
  • -Appraisal +Appraisal
    • @@ -1619,7 +1619,7 @@ Health Concerns
  • -Attendance +Attendance
    • @@ -1628,7 +1628,7 @@ Health Concerns
  • -Authorization Rule +Authorization Rule
    • @@ -1637,7 +1637,7 @@ Health Concerns
  • -Employee +Employee
    • @@ -1646,7 +1646,7 @@ Health Concerns
  • -Employee Loan +Employee Loan
    • @@ -1655,7 +1655,7 @@ Health Concerns
  • -Employee Loan Application +Employee Loan Application
    • @@ -1664,7 +1664,7 @@ Health Concerns
  • -Expense Claim +Expense Claim
    • @@ -1673,7 +1673,7 @@ Health Concerns
  • -Instructor +Instructor
    • @@ -1682,7 +1682,7 @@ Health Concerns
  • -Leave Allocation +Leave Allocation
    • @@ -1691,7 +1691,7 @@ Health Concerns
  • -Leave Application +Leave Application
    • @@ -1700,7 +1700,7 @@ Health Concerns
  • -Salary Slip +Salary Slip
    • @@ -1709,7 +1709,7 @@ Health Concerns
  • -Salary Structure Employee +Salary Structure Employee
    • @@ -1718,7 +1718,7 @@ Health Concerns
  • -Sales Person +Sales Person
    • @@ -1727,7 +1727,7 @@ Health Concerns
  • -Supplier Scorecard +Supplier Scorecard
    • @@ -1736,7 +1736,7 @@ Health Concerns
  • -Supplier Scorecard Scoring Standing +Supplier Scorecard Scoring Standing
    • @@ -1745,7 +1745,7 @@ Health Concerns
  • -Supplier Scorecard Standing +Supplier Scorecard Standing
    • @@ -1754,7 +1754,7 @@ Health Concerns
  • -Timesheet +Timesheet
    • @@ -1763,7 +1763,7 @@ Health Concerns
  • -Training Event Employee +Training Event Employee
    • @@ -1772,7 +1772,7 @@ Health Concerns
  • -Training Feedback +Training Feedback
    • @@ -1781,7 +1781,7 @@ Health Concerns
  • -Training Result Employee +Training Result Employee
    • @@ -1790,7 +1790,7 @@ Health Concerns
  • -Vehicle +Vehicle
    • @@ -1799,7 +1799,7 @@ Health Concerns
  • -Vehicle Log +Vehicle Log
    • diff --git a/foundation/www/docs/current/models/hr/employee_attendance_tool.html b/foundation/www/docs/current/models/hr/employee_attendance_tool.html index ceff1fd6..210ee97e 100644 --- a/foundation/www/docs/current/models/hr/employee_attendance_tool.html +++ b/foundation/www/docs/current/models/hr/employee_attendance_tool.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Department +Department @@ -97,7 +97,7 @@ -Branch +Branch @@ -118,7 +118,7 @@ -Company +Company diff --git a/foundation/www/docs/current/models/hr/employee_education.html b/foundation/www/docs/current/models/hr/employee_education.html index f75bdcc0..8a40c148 100644 --- a/foundation/www/docs/current/models/hr/employee_education.html +++ b/foundation/www/docs/current/models/hr/employee_education.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5
  • -Employee +Employee
    • diff --git a/foundation/www/docs/current/models/hr/employee_external_work_history.html b/foundation/www/docs/current/models/hr/employee_external_work_history.html index 3b04e66b..bf7a8925 100644 --- a/foundation/www/docs/current/models/hr/employee_external_work_history.html +++ b/foundation/www/docs/current/models/hr/employee_external_work_history.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Employee +Employee diff --git a/foundation/www/docs/current/models/hr/employee_internal_work_history.html b/foundation/www/docs/current/models/hr/employee_internal_work_history.html index ecda1dd0..07e0c34a 100644 --- a/foundation/www/docs/current/models/hr/employee_internal_work_history.html +++ b/foundation/www/docs/current/models/hr/employee_internal_work_history.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Branch +Branch @@ -75,7 +75,7 @@ -Department +Department @@ -96,7 +96,7 @@ -Designation +Designation @@ -139,7 +139,7 @@
  • -Employee +Employee
    • diff --git a/foundation/www/docs/current/models/hr/employee_leave_approver.html b/foundation/www/docs/current/models/hr/employee_leave_approver.html index 217ecf19..3a588c1c 100644 --- a/foundation/www/docs/current/models/hr/employee_leave_approver.html +++ b/foundation/www/docs/current/models/hr/employee_leave_approver.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 User +User @@ -73,7 +73,7 @@ Users who can approve a specific employee's leave applications
  • -Employee +Employee
    • diff --git a/foundation/www/docs/current/models/hr/employee_loan.html b/foundation/www/docs/current/models/hr/employee_loan.html index 33a9f0f2..7618838b 100644 --- a/foundation/www/docs/current/models/hr/employee_loan.html +++ b/foundation/www/docs/current/models/hr/employee_loan.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -89,7 +89,7 @@ -Employee Loan Application +Employee Loan Application @@ -110,7 +110,7 @@ -Loan Type +Loan Type @@ -155,7 +155,7 @@ -Company +Company @@ -323,7 +323,7 @@ Repay Over Number of Periods -Mode of Payment +Mode of Payment @@ -344,7 +344,7 @@ Repay Over Number of Periods -Account +Account @@ -377,7 +377,7 @@ Repay Over Number of Periods -Account +Account @@ -398,7 +398,7 @@ Repay Over Number of Periods -Account +Account @@ -431,7 +431,7 @@ Repay Over Number of Periods -Repayment Schedule +Repayment Schedule @@ -504,7 +504,7 @@ Repay Over Number of Periods -Employee Loan +Employee Loan @@ -702,7 +702,7 @@ Repay Over Number of Periods
  • -Employee Loan +Employee Loan
    • 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 809bae6d..1003658c 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 8.6.3 + Version 8.6.5 Employee +Employee @@ -129,7 +129,7 @@ Rejected -Company +Company @@ -162,7 +162,7 @@ Rejected -Loan Type +Loan Type @@ -341,7 +341,7 @@ Repay Over Number of Periods -Employee Loan Application +Employee Loan Application @@ -459,7 +459,7 @@ Repay Over Number of Periods
  • -Employee Loan +Employee Loan
    • @@ -468,7 +468,7 @@ Repay Over Number of Periods
  • -Employee Loan Application +Employee Loan Application
    • diff --git a/foundation/www/docs/current/models/hr/employment_type.html b/foundation/www/docs/current/models/hr/employment_type.html index 4c527173..66cc1afd 100644 --- a/foundation/www/docs/current/models/hr/employment_type.html +++ b/foundation/www/docs/current/models/hr/employment_type.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Employee +Employee @@ -98,7 +98,7 @@
  • -Leave Control Panel +Leave Control Panel
    • diff --git a/foundation/www/docs/current/models/hr/expense_claim.html b/foundation/www/docs/current/models/hr/expense_claim.html index b8bc143e..7a65ea76 100644 --- a/foundation/www/docs/current/models/hr/expense_claim.html +++ b/foundation/www/docs/current/models/hr/expense_claim.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -User +User @@ -170,7 +170,7 @@ Rejected -Expense Claim Detail +Expense Claim Detail @@ -217,7 +217,7 @@ Rejected -Employee +Employee @@ -250,7 +250,7 @@ Rejected -Vehicle Log +Vehicle Log @@ -271,7 +271,7 @@ Rejected -Project +Project @@ -292,7 +292,7 @@ Rejected -Task +Task @@ -387,7 +387,7 @@ Rejected -Company +Company @@ -408,7 +408,7 @@ Rejected -Mode of Payment +Mode of Payment @@ -441,7 +441,7 @@ Rejected -Account +Account @@ -462,7 +462,7 @@ Rejected -Cost Center +Cost Center @@ -514,7 +514,7 @@ Cancelled -Expense Claim +Expense Claim @@ -867,7 +867,7 @@ Cancelled
  • -Expense Claim +Expense Claim
    • 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 89c8b159..c40cc032 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 8.6.3 + Version 8.6.5 Company +Company @@ -75,7 +75,7 @@ -Account +Account @@ -94,7 +94,7 @@
  • -Expense Claim Type +Expense Claim Type
    • diff --git a/foundation/www/docs/current/models/hr/expense_claim_detail.html b/foundation/www/docs/current/models/hr/expense_claim_detail.html index f85c5515..5c03b783 100644 --- a/foundation/www/docs/current/models/hr/expense_claim_detail.html +++ b/foundation/www/docs/current/models/hr/expense_claim_detail.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Expense Claim Type +Expense Claim Type @@ -99,7 +99,7 @@ -Account +Account @@ -194,7 +194,7 @@
  • -Expense Claim +Expense Claim
    • diff --git a/foundation/www/docs/current/models/hr/expense_claim_type.html b/foundation/www/docs/current/models/hr/expense_claim_type.html index c67c0cdf..e8d537cb 100644 --- a/foundation/www/docs/current/models/hr/expense_claim_type.html +++ b/foundation/www/docs/current/models/hr/expense_claim_type.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Expense Claim Account +Expense Claim Account @@ -164,7 +164,7 @@
  • -Expense Claim Detail +Expense Claim Detail
    • diff --git a/foundation/www/docs/current/models/hr/holiday.html b/foundation/www/docs/current/models/hr/holiday.html index 0907c123..adddd608 100644 --- a/foundation/www/docs/current/models/hr/holiday.html +++ b/foundation/www/docs/current/models/hr/holiday.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Holiday List +Holiday List diff --git a/foundation/www/docs/current/models/hr/holiday_list.html b/foundation/www/docs/current/models/hr/holiday_list.html index 5fb86808..b7e2d1fa 100644 --- a/foundation/www/docs/current/models/hr/holiday_list.html +++ b/foundation/www/docs/current/models/hr/holiday_list.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Holiday +Holiday @@ -308,7 +308,7 @@ Saturday
  • -Company +Company
    • @@ -317,7 +317,7 @@ Saturday
  • -Employee +Employee
    • @@ -326,7 +326,7 @@ Saturday
  • -Workstation +Workstation
    • diff --git a/foundation/www/docs/current/models/hr/hr_settings.html b/foundation/www/docs/current/models/hr/hr_settings.html index 2ab17db0..7a5f226d 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 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Guardian Interest +Guardian Interest diff --git a/foundation/www/docs/current/models/hr/job_applicant.html b/foundation/www/docs/current/models/hr/job_applicant.html index 226dcf02..498cd9b8 100644 --- a/foundation/www/docs/current/models/hr/job_applicant.html +++ b/foundation/www/docs/current/models/hr/job_applicant.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Job Opening +Job Opening @@ -260,7 +260,7 @@ Hold
  • -Offer Letter +Offer Letter
    • diff --git a/foundation/www/docs/current/models/hr/job_opening.html b/foundation/www/docs/current/models/hr/job_opening.html index 5789f7ab..0ab07797 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 8.6.3 + Version 8.6.5
  • -Job Applicant +Job Applicant
    • diff --git a/foundation/www/docs/current/models/hr/leave_allocation.html b/foundation/www/docs/current/models/hr/leave_allocation.html index bc96ec6c..09a5eff8 100644 --- a/foundation/www/docs/current/models/hr/leave_allocation.html +++ b/foundation/www/docs/current/models/hr/leave_allocation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -149,7 +149,7 @@ -Leave Type +Leave Type @@ -254,7 +254,7 @@ -Leave Allocation +Leave Allocation @@ -547,7 +547,7 @@
  • -Leave Allocation +Leave Allocation
    • diff --git a/foundation/www/docs/current/models/hr/leave_application.html b/foundation/www/docs/current/models/hr/leave_application.html index eb32a225..b7a1b7db 100644 --- a/foundation/www/docs/current/models/hr/leave_application.html +++ b/foundation/www/docs/current/models/hr/leave_application.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Leave Type +Leave Type @@ -237,7 +237,7 @@ Rejected -Employee +Employee @@ -282,7 +282,7 @@ Rejected -User +User @@ -363,7 +363,7 @@ Rejected -Company +Company @@ -384,7 +384,7 @@ Rejected -Letter Head +Letter Head @@ -405,7 +405,7 @@ Rejected -Leave Application +Leave Application @@ -1018,7 +1018,7 @@ Rejected
  • -Leave Application +Leave Application
    • 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 dc922ec7..cd655e04 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 8.6.3 + Version 8.6.5 Company +Company @@ -113,7 +113,7 @@ Block Holidays on important days. -Leave Block List Date +Leave Block List Date @@ -147,7 +147,7 @@ Block Holidays on important days. -Leave Block List Allow +Leave Block List Allow @@ -255,7 +255,7 @@ Block Holidays on important days.
  • -Department +Department
    • diff --git a/foundation/www/docs/current/models/hr/leave_block_list_allow.html b/foundation/www/docs/current/models/hr/leave_block_list_allow.html index 996abbb1..423eda0c 100644 --- a/foundation/www/docs/current/models/hr/leave_block_list_allow.html +++ b/foundation/www/docs/current/models/hr/leave_block_list_allow.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 User +User @@ -73,7 +73,7 @@
  • -Leave Block List +Leave Block List
    • diff --git a/foundation/www/docs/current/models/hr/leave_block_list_date.html b/foundation/www/docs/current/models/hr/leave_block_list_date.html index 23c59fc1..47eb5a29 100644 --- a/foundation/www/docs/current/models/hr/leave_block_list_date.html +++ b/foundation/www/docs/current/models/hr/leave_block_list_date.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Leave Block List +Leave Block List diff --git a/foundation/www/docs/current/models/hr/leave_control_panel.html b/foundation/www/docs/current/models/hr/leave_control_panel.html index e4414131..110032ae 100644 --- a/foundation/www/docs/current/models/hr/leave_control_panel.html +++ b/foundation/www/docs/current/models/hr/leave_control_panel.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -86,7 +86,7 @@ -Employment Type +Employment Type @@ -108,7 +108,7 @@ -Branch +Branch @@ -130,7 +130,7 @@ -Department +Department @@ -152,7 +152,7 @@ -Designation +Designation @@ -209,7 +209,7 @@ -Leave Type +Leave Type diff --git a/foundation/www/docs/current/models/hr/leave_type.html b/foundation/www/docs/current/models/hr/leave_type.html index f2208af9..95d0094d 100644 --- a/foundation/www/docs/current/models/hr/leave_type.html +++ b/foundation/www/docs/current/models/hr/leave_type.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Attendance +Attendance @@ -170,7 +170,7 @@
  • -Leave Allocation +Leave Allocation
    • @@ -179,7 +179,7 @@
  • -Leave Application +Leave Application
    • @@ -188,7 +188,7 @@
  • -Leave Control Panel +Leave Control Panel
    • diff --git a/foundation/www/docs/current/models/hr/loan_type.html b/foundation/www/docs/current/models/hr/loan_type.html index 94ed1f9a..38d08b89 100644 --- a/foundation/www/docs/current/models/hr/loan_type.html +++ b/foundation/www/docs/current/models/hr/loan_type.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Employee Loan +Employee Loan @@ -160,7 +160,7 @@
  • -Employee Loan Application +Employee Loan Application
    • diff --git a/foundation/www/docs/current/models/hr/offer_letter.html b/foundation/www/docs/current/models/hr/offer_letter.html index ed43c57c..f117d991 100644 --- a/foundation/www/docs/current/models/hr/offer_letter.html +++ b/foundation/www/docs/current/models/hr/offer_letter.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Job Applicant +Job Applicant @@ -129,7 +129,7 @@ Rejected -Designation +Designation @@ -150,7 +150,7 @@ Rejected -Company +Company @@ -183,7 +183,7 @@ Rejected -Offer Letter Term +Offer Letter Term @@ -216,7 +216,7 @@ Rejected -Terms and Conditions +Terms and Conditions @@ -249,7 +249,7 @@ Rejected -Offer Letter +Offer Letter @@ -311,7 +311,7 @@ Rejected
  • -Offer Letter +Offer Letter
    • diff --git a/foundation/www/docs/current/models/hr/offer_letter_term.html b/foundation/www/docs/current/models/hr/offer_letter_term.html index d0abfcd9..bb4b80f7 100644 --- a/foundation/www/docs/current/models/hr/offer_letter_term.html +++ b/foundation/www/docs/current/models/hr/offer_letter_term.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Offer Term +Offer Term @@ -97,7 +97,7 @@
  • -Offer Letter +Offer Letter
    • diff --git a/foundation/www/docs/current/models/hr/offer_term.html b/foundation/www/docs/current/models/hr/offer_term.html index 8db42455..23668436 100644 --- a/foundation/www/docs/current/models/hr/offer_term.html +++ b/foundation/www/docs/current/models/hr/offer_term.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Offer Letter Term +Offer Letter Term diff --git a/foundation/www/docs/current/models/hr/process_payroll.html b/foundation/www/docs/current/models/hr/process_payroll.html index b9d5a50b..56039a05 100644 --- a/foundation/www/docs/current/models/hr/process_payroll.html +++ b/foundation/www/docs/current/models/hr/process_payroll.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -140,7 +140,7 @@ Daily -Branch +Branch @@ -161,7 +161,7 @@ Daily -Department +Department @@ -182,7 +182,7 @@ Daily -Designation +Designation @@ -287,7 +287,7 @@ Daily -Cost Center +Cost Center @@ -320,7 +320,7 @@ Daily -Project +Project @@ -416,7 +416,7 @@ Daily -Account +Account diff --git a/foundation/www/docs/current/models/hr/repayment_schedule.html b/foundation/www/docs/current/models/hr/repayment_schedule.html index 45e07378..ba3b1995 100644 --- a/foundation/www/docs/current/models/hr/repayment_schedule.html +++ b/foundation/www/docs/current/models/hr/repayment_schedule.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 - + + 
    Company:company:default_currency
    + @@ -73,7 +75,9 @@ Interest Amount - + + 
    Company:company:default_currency
    + @@ -85,7 +89,9 @@ Total Payment - + + 
    Company:company:default_currency
    + @@ -97,7 +103,9 @@ Balance Loan Amount - + + 
    Company:company:default_currency
    + @@ -112,7 +120,7 @@
  • -Employee Loan +Employee Loan
    • diff --git a/foundation/www/docs/current/models/hr/salary_component.html b/foundation/www/docs/current/models/hr/salary_component.html index 4ddd6813..e38c7a44 100644 --- a/foundation/www/docs/current/models/hr/salary_component.html +++ b/foundation/www/docs/current/models/hr/salary_component.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Salary Component Account +Salary Component Account @@ -189,7 +189,7 @@ Deduction
  • -Salary Detail +Salary Detail
    • @@ -198,7 +198,7 @@ Deduction
  • -Salary Structure +Salary Structure
    • diff --git a/foundation/www/docs/current/models/hr/salary_detail.html b/foundation/www/docs/current/models/hr/salary_detail.html index 9a7cfbd0..62b38a56 100644 --- a/foundation/www/docs/current/models/hr/salary_detail.html +++ b/foundation/www/docs/current/models/hr/salary_detail.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Salary Component +Salary Component @@ -224,14 +224,14 @@
  • -Salary Slip +Salary Slip
  • -Salary Structure +Salary Structure
    • diff --git a/foundation/www/docs/current/models/hr/salary_slip.html b/foundation/www/docs/current/models/hr/salary_slip.html index 92e86212..c63db54a 100644 --- a/foundation/www/docs/current/models/hr/salary_slip.html +++ b/foundation/www/docs/current/models/hr/salary_slip.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -183,7 +183,7 @@ Cancelled -Journal Entry +Journal Entry @@ -204,7 +204,7 @@ Cancelled -Company +Company @@ -225,7 +225,7 @@ Cancelled -Letter Head +Letter Head @@ -306,7 +306,7 @@ Cancelled -Salary Structure +Salary Structure @@ -394,7 +394,7 @@ Daily -Salary Slip Timesheet +Salary Slip Timesheet @@ -501,7 +501,7 @@ Daily -Salary Slip +Salary Slip @@ -546,7 +546,7 @@ Daily -Salary Detail +Salary Detail @@ -579,7 +579,7 @@ Daily -Salary Detail +Salary Detail @@ -1241,7 +1241,7 @@ Daily
  • -Salary Slip +Salary Slip
    • @@ -1250,7 +1250,7 @@ Daily
  • -Timesheet +Timesheet
    • diff --git a/foundation/www/docs/current/models/hr/salary_slip_timesheet.html b/foundation/www/docs/current/models/hr/salary_slip_timesheet.html index 2169acce..8349be70 100644 --- a/foundation/www/docs/current/models/hr/salary_slip_timesheet.html +++ b/foundation/www/docs/current/models/hr/salary_slip_timesheet.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Timesheet +Timesheet @@ -85,7 +85,7 @@
  • -Salary Slip +Salary Slip
    • diff --git a/foundation/www/docs/current/models/hr/salary_structure.html b/foundation/www/docs/current/models/hr/salary_structure.html index 6901f72e..6af630d5 100644 --- a/foundation/www/docs/current/models/hr/salary_structure.html +++ b/foundation/www/docs/current/models/hr/salary_structure.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -87,7 +87,7 @@ -Letter Head +Letter Head @@ -183,7 +183,7 @@ No -Salary Structure Employee +Salary Structure Employee @@ -241,7 +241,7 @@ No -Salary Component +Salary Component @@ -301,7 +301,7 @@ No -Salary Detail +Salary Detail @@ -334,7 +334,7 @@ No -Salary Detail +Salary Detail @@ -435,7 +435,7 @@ No -Mode of Payment +Mode of Payment @@ -468,7 +468,7 @@ No -Account +Account @@ -604,7 +604,7 @@ No
  • -Salary Slip +Salary Slip
    • diff --git a/foundation/www/docs/current/models/hr/salary_structure_employee.html b/foundation/www/docs/current/models/hr/salary_structure_employee.html index 9dfc2e49..14730946 100644 --- a/foundation/www/docs/current/models/hr/salary_structure_employee.html +++ b/foundation/www/docs/current/models/hr/salary_structure_employee.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -139,7 +139,7 @@
  • -Salary Structure +Salary Structure
    • diff --git a/foundation/www/docs/current/models/hr/training_event.html b/foundation/www/docs/current/models/hr/training_event.html index b6e852b9..4c97cfbf 100644 --- a/foundation/www/docs/current/models/hr/training_event.html +++ b/foundation/www/docs/current/models/hr/training_event.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Supplier +Supplier @@ -206,7 +206,7 @@ Internet -Course +Course @@ -324,7 +324,7 @@ Internet -Training Event Employee +Training Event Employee @@ -345,7 +345,7 @@ Internet -Training Event +Training Event @@ -431,7 +431,7 @@ Internet
  • -Training Event +Training Event
    • @@ -440,7 +440,7 @@ Internet
  • -Training Feedback +Training Feedback
    • @@ -449,7 +449,7 @@ Internet
  • -Training Result +Training Result
    • diff --git a/foundation/www/docs/current/models/hr/training_event_employee.html b/foundation/www/docs/current/models/hr/training_event_employee.html index 45d3abe7..20f0b931 100644 --- a/foundation/www/docs/current/models/hr/training_event_employee.html +++ b/foundation/www/docs/current/models/hr/training_event_employee.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -117,7 +117,7 @@ Withdrawn
  • -Training Event +Training Event
    • diff --git a/foundation/www/docs/current/models/hr/training_feedback.html b/foundation/www/docs/current/models/hr/training_feedback.html index 77f9f6f1..d0755d6a 100644 --- a/foundation/www/docs/current/models/hr/training_feedback.html +++ b/foundation/www/docs/current/models/hr/training_feedback.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -89,7 +89,7 @@ -Course +Course @@ -122,7 +122,7 @@ -Training Event +Training Event @@ -191,7 +191,7 @@ -Training Feedback +Training Feedback @@ -235,7 +235,7 @@
  • -Training Feedback +Training Feedback
    • diff --git a/foundation/www/docs/current/models/hr/training_result.html b/foundation/www/docs/current/models/hr/training_result.html index 408caf8f..fb1aabab 100644 --- a/foundation/www/docs/current/models/hr/training_result.html +++ b/foundation/www/docs/current/models/hr/training_result.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Training Event +Training Event @@ -87,7 +87,7 @@ -Training Result Employee +Training Result Employee @@ -108,7 +108,7 @@ -Training Result +Training Result @@ -198,7 +198,7 @@
  • -Training Result +Training Result
    • diff --git a/foundation/www/docs/current/models/hr/training_result_employee.html b/foundation/www/docs/current/models/hr/training_result_employee.html index bd513eaa..ce14627f 100644 --- a/foundation/www/docs/current/models/hr/training_result_employee.html +++ b/foundation/www/docs/current/models/hr/training_result_employee.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -159,7 +159,7 @@
  • -Training Result +Training Result
    • diff --git a/foundation/www/docs/current/models/hr/upload_attendance.html b/foundation/www/docs/current/models/hr/upload_attendance.html index 2d09a507..8973a2d0 100644 --- a/foundation/www/docs/current/models/hr/upload_attendance.html +++ b/foundation/www/docs/current/models/hr/upload_attendance.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -308,7 +308,7 @@ Electric -UOM +UOM @@ -389,7 +389,7 @@ Electric -Vehicle +Vehicle @@ -447,7 +447,7 @@ Electric
  • -Vehicle +Vehicle
    • @@ -456,7 +456,7 @@ Electric
  • -Vehicle Log +Vehicle Log
    • diff --git a/foundation/www/docs/current/models/hr/vehicle_log.html b/foundation/www/docs/current/models/hr/vehicle_log.html index 13f1391b..30abd612 100644 --- a/foundation/www/docs/current/models/hr/vehicle_log.html +++ b/foundation/www/docs/current/models/hr/vehicle_log.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Vehicle +Vehicle @@ -103,7 +103,7 @@ -Employee +Employee @@ -256,7 +256,7 @@ -Supplier +Supplier @@ -301,7 +301,7 @@ -Vehicle Service +Vehicle Service @@ -322,7 +322,7 @@ -Vehicle Log +Vehicle Log @@ -430,7 +430,7 @@
  • -Expense Claim +Expense Claim
    • @@ -439,7 +439,7 @@
  • -Vehicle Log +Vehicle Log
    • diff --git a/foundation/www/docs/current/models/hr/vehicle_service.html b/foundation/www/docs/current/models/hr/vehicle_service.html index 6420f6f8..31c4678d 100644 --- a/foundation/www/docs/current/models/hr/vehicle_service.html +++ b/foundation/www/docs/current/models/hr/vehicle_service.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5
  • -Vehicle Log +Vehicle Log
    • diff --git a/foundation/www/docs/current/models/hub_node/hub_settings.html b/foundation/www/docs/current/models/hub_node/hub_settings.html index 32acf926..9d2ada99 100644 --- a/foundation/www/docs/current/models/hub_node/hub_settings.html +++ b/foundation/www/docs/current/models/hub_node/hub_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Country +Country diff --git a/foundation/www/docs/current/models/hub_node/index.html b/foundation/www/docs/current/models/hub_node/index.html index c90496c1..fbeb0515 100644 --- a/foundation/www/docs/current/models/hub_node/index.html +++ b/foundation/www/docs/current/models/hub_node/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Customer +Customer @@ -158,7 +158,7 @@ Cancelled -Maintenance Schedule Item +Maintenance Schedule Item @@ -205,7 +205,7 @@ Cancelled -Maintenance Schedule Detail +Maintenance Schedule Detail @@ -250,7 +250,7 @@ Cancelled -Contact +Contact @@ -319,7 +319,7 @@ Cancelled -Address +Address @@ -352,7 +352,7 @@ Cancelled -Territory +Territory @@ -373,7 +373,7 @@ Cancelled -Customer Group +Customer Group @@ -394,7 +394,7 @@ Cancelled -Company +Company @@ -415,7 +415,7 @@ Cancelled -Maintenance Schedule +Maintenance Schedule @@ -687,7 +687,7 @@ Cancelled
  • -Maintenance Schedule +Maintenance Schedule
    • diff --git a/foundation/www/docs/current/models/maintenance/maintenance_schedule_detail.html b/foundation/www/docs/current/models/maintenance/maintenance_schedule_detail.html index f17aa66f..382b6378 100644 --- a/foundation/www/docs/current/models/maintenance/maintenance_schedule_detail.html +++ b/foundation/www/docs/current/models/maintenance/maintenance_schedule_detail.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -111,7 +111,7 @@ -Sales Person +Sales Person @@ -142,7 +142,7 @@
  • -Maintenance Schedule +Maintenance Schedule
    • diff --git a/foundation/www/docs/current/models/maintenance/maintenance_schedule_item.html b/foundation/www/docs/current/models/maintenance/maintenance_schedule_item.html index f8b8798d..f371f00f 100644 --- a/foundation/www/docs/current/models/maintenance/maintenance_schedule_item.html +++ b/foundation/www/docs/current/models/maintenance/maintenance_schedule_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -167,7 +167,7 @@ Random -Sales Person +Sales Person @@ -212,7 +212,7 @@ Random -Sales Order +Sales Order @@ -231,7 +231,7 @@ Random
  • -Maintenance Schedule +Maintenance Schedule
    • diff --git a/foundation/www/docs/current/models/maintenance/maintenance_visit.html b/foundation/www/docs/current/models/maintenance/maintenance_visit.html index 097ad0d6..b85d9784 100644 --- a/foundation/www/docs/current/models/maintenance/maintenance_visit.html +++ b/foundation/www/docs/current/models/maintenance/maintenance_visit.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Customer +Customer @@ -284,7 +284,7 @@ Breakdown -Maintenance Visit Purpose +Maintenance Visit Purpose @@ -360,7 +360,7 @@ Submitted -Maintenance Visit +Maintenance Visit @@ -381,7 +381,7 @@ Submitted -Company +Company @@ -416,7 +416,7 @@ Submitted -Address +Address @@ -437,7 +437,7 @@ Submitted -Contact +Contact @@ -470,7 +470,7 @@ Submitted -Territory +Territory @@ -491,7 +491,7 @@ Submitted -Customer Group +Customer Group @@ -647,7 +647,7 @@ Submitted
  • -Maintenance Visit +Maintenance Visit
    • diff --git a/foundation/www/docs/current/models/maintenance/maintenance_visit_purpose.html b/foundation/www/docs/current/models/maintenance/maintenance_visit_purpose.html index b46091cf..bdfec9cb 100644 --- a/foundation/www/docs/current/models/maintenance/maintenance_visit_purpose.html +++ b/foundation/www/docs/current/models/maintenance/maintenance_visit_purpose.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -123,7 +123,7 @@ -Sales Person +Sales Person @@ -156,7 +156,7 @@ -DocType +DocType @@ -201,7 +201,7 @@
  • -Maintenance Visit +Maintenance Visit
    • diff --git a/foundation/www/docs/current/models/manufacturing/bom.html b/foundation/www/docs/current/models/manufacturing/bom.html index 83c37569..5fa88277 100644 --- a/foundation/www/docs/current/models/manufacturing/bom.html +++ b/foundation/www/docs/current/models/manufacturing/bom.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -166,7 +166,7 @@ Price List -Price List +Price List @@ -199,7 +199,7 @@ Price List -Currency +Currency @@ -257,7 +257,7 @@ Price List -BOM Operation +BOM Operation @@ -290,7 +290,7 @@ Price List -BOM Item +BOM Item @@ -323,7 +323,7 @@ Price List -BOM Scrap Item +BOM Scrap Item @@ -516,7 +516,7 @@ Price List -Project +Project @@ -537,7 +537,7 @@ Price List -Company +Company @@ -558,7 +558,7 @@ Price List -BOM +BOM @@ -591,7 +591,7 @@ Price List -UOM +UOM @@ -686,7 +686,7 @@ Price List -BOM Explosion Item +BOM Explosion Item @@ -1457,7 +1457,7 @@ Price List
  • -BOM +BOM
    • @@ -1466,7 +1466,7 @@ Price List
  • -BOM Item +BOM Item
    • @@ -1475,7 +1475,7 @@ Price List
  • -BOM Replace Tool +BOM Replace Tool
    • @@ -1484,7 +1484,7 @@ Price List
  • -Item +Item
    • @@ -1493,7 +1493,7 @@ Price List
  • -Production Order +Production Order
    • @@ -1502,7 +1502,7 @@ Price List
  • -Production Order Operation +Production Order Operation
    • @@ -1511,7 +1511,7 @@ Price List
  • -Production Plan Item +Production Plan Item
    • @@ -1520,7 +1520,7 @@ Price List
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -1529,7 +1529,7 @@ Price List
  • -Purchase Order Item +Purchase Order Item
    • @@ -1538,7 +1538,7 @@ Price List
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -1547,7 +1547,7 @@ Price List
  • -Stock Entry +Stock Entry
    • @@ -1556,7 +1556,7 @@ Price List
  • -Stock Entry Detail +Stock Entry Detail
    • 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 d498170e..5d5333d3 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 8.6.3 + Version 8.6.5 Item +Item @@ -99,7 +99,7 @@ -Warehouse +Warehouse @@ -244,7 +244,7 @@ -UOM +UOM @@ -277,7 +277,7 @@
  • -BOM +BOM
    • diff --git a/foundation/www/docs/current/models/manufacturing/bom_item.html b/foundation/www/docs/current/models/manufacturing/bom_item.html index 1f1fed5c..1390f901 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_item.html +++ b/foundation/www/docs/current/models/manufacturing/bom_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -99,7 +99,7 @@ -BOM +BOM @@ -120,7 +120,7 @@ -Warehouse +Warehouse @@ -227,7 +227,7 @@ -UOM +UOM @@ -284,7 +284,7 @@ -UOM +UOM @@ -396,7 +396,7 @@
  • -BOM +BOM
    • diff --git a/foundation/www/docs/current/models/manufacturing/bom_operation.html b/foundation/www/docs/current/models/manufacturing/bom_operation.html index 816978e7..dc0fa202 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_operation.html +++ b/foundation/www/docs/current/models/manufacturing/bom_operation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Operation +Operation @@ -75,7 +75,7 @@ -Workstation +Workstation @@ -199,7 +199,7 @@
  • -BOM +BOM
    • diff --git a/foundation/www/docs/current/models/manufacturing/bom_replace_tool.html b/foundation/www/docs/current/models/manufacturing/bom_replace_tool.html index bccd521a..24971e5c 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_replace_tool.html +++ b/foundation/www/docs/current/models/manufacturing/bom_replace_tool.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 BOM +BOM @@ -75,7 +75,7 @@ Replace a particular BOM in all other BOMs where it is used. It will replace the -BOM +BOM diff --git a/foundation/www/docs/current/models/manufacturing/bom_scrap_item.html b/foundation/www/docs/current/models/manufacturing/bom_scrap_item.html index 4a9642f7..95a46eb8 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_scrap_item.html +++ b/foundation/www/docs/current/models/manufacturing/bom_scrap_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -151,7 +151,7 @@ -UOM +UOM @@ -198,7 +198,7 @@
  • -BOM +BOM
    • 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 24170054..d343b2f1 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 8.6.3 + Version 8.6.5 Item +Item diff --git a/foundation/www/docs/current/models/manufacturing/bom_website_operation.html b/foundation/www/docs/current/models/manufacturing/bom_website_operation.html index 584e6f23..978138af 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_website_operation.html +++ b/foundation/www/docs/current/models/manufacturing/bom_website_operation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Operation +Operation @@ -75,7 +75,7 @@ -Workstation +Workstation diff --git a/foundation/www/docs/current/models/manufacturing/index.html b/foundation/www/docs/current/models/manufacturing/index.html index c8d37d68..44e5e62c 100644 --- a/foundation/www/docs/current/models/manufacturing/index.html +++ b/foundation/www/docs/current/models/manufacturing/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Warehouse +Warehouse @@ -212,7 +212,7 @@ Material Transferred for Manufacture -Warehouse +Warehouse diff --git a/foundation/www/docs/current/models/manufacturing/operation.html b/foundation/www/docs/current/models/manufacturing/operation.html index aafe29c4..0e2ef7c8 100644 --- a/foundation/www/docs/current/models/manufacturing/operation.html +++ b/foundation/www/docs/current/models/manufacturing/operation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Workstation +Workstation @@ -136,7 +136,7 @@
  • -BOM Operation +BOM Operation
    • @@ -145,7 +145,7 @@
  • -BOM Website Operation +BOM Website Operation
    • @@ -154,7 +154,7 @@
  • -Production Order Operation +Production Order Operation
    • @@ -163,7 +163,7 @@
  • -Timesheet Detail +Timesheet Detail
    • diff --git a/foundation/www/docs/current/models/manufacturing/production_order.html b/foundation/www/docs/current/models/manufacturing/production_order.html index c4c6e860..09db7239 100644 --- a/foundation/www/docs/current/models/manufacturing/production_order.html +++ b/foundation/www/docs/current/models/manufacturing/production_order.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Item +Item @@ -124,7 +124,7 @@ Cancelled -BOM +BOM @@ -206,7 +206,7 @@ Cancelled -Sales Order +Sales Order @@ -227,7 +227,7 @@ Cancelled -Project +Project @@ -275,7 +275,7 @@ Cancelled -Warehouse +Warehouse @@ -296,7 +296,7 @@ Cancelled -Warehouse +Warehouse @@ -329,7 +329,7 @@ Cancelled -Warehouse +Warehouse @@ -362,7 +362,7 @@ Cancelled -Production Order Item +Production Order Item @@ -483,7 +483,7 @@ Cancelled -Production Order Operation +Production Order Operation @@ -610,7 +610,7 @@ Cancelled -UOM +UOM @@ -631,7 +631,7 @@ Cancelled -Company +Company @@ -665,7 +665,7 @@ Cancelled -Material Request +Material Request @@ -698,7 +698,7 @@ Cancelled -Production Order +Production Order @@ -1419,7 +1419,7 @@ Cancelled erpnext.manufacturing.doctype.production_order.production_order.make_timesheet - (production_order) + (production_order, company)

    No docs

    @@ -1473,7 +1473,7 @@ Cancelled
  • -Production Order +Production Order
    • @@ -1482,7 +1482,7 @@ Cancelled
  • -Stock Entry +Stock Entry
    • @@ -1491,7 +1491,7 @@ Cancelled
  • -Timesheet +Timesheet
    • 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 15f4fb77..0d4a799d 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 8.6.3 + Version 8.6.5 Item +Item @@ -75,7 +75,7 @@ -Warehouse +Warehouse @@ -202,7 +202,7 @@
  • -Production Order +Production Order
    • diff --git a/foundation/www/docs/current/models/manufacturing/production_order_operation.html b/foundation/www/docs/current/models/manufacturing/production_order_operation.html index 559b5f92..342c000c 100644 --- a/foundation/www/docs/current/models/manufacturing/production_order_operation.html +++ b/foundation/www/docs/current/models/manufacturing/production_order_operation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Operation +Operation @@ -87,7 +87,7 @@ -BOM +BOM @@ -161,7 +161,7 @@ Completed -Workstation +Workstation @@ -345,7 +345,7 @@ Updated via 'Time Log'

  • -Production Order +Production Order
    • 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 57e0e0d1..ea7c8d6c 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 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -75,7 +75,7 @@ -BOM +BOM @@ -133,7 +133,7 @@ -Warehouse +Warehouse @@ -154,7 +154,7 @@ -Sales Order +Sales Order @@ -175,7 +175,7 @@ -Material Request +Material Request @@ -208,7 +208,7 @@ -UOM +UOM @@ -251,7 +251,7 @@
  • -Production Planning Tool +Production Planning Tool
    • 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 db2648af..03132896 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 8.6.3 + Version 8.6.5 Material Request +Material Request @@ -97,7 +97,7 @@
  • -Production Planning Tool +Production Planning Tool
    • 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 21ef833e..a357f797 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 8.6.3 + Version 8.6.5 Sales Order +Sales Order @@ -99,7 +99,7 @@ -Customer +Customer @@ -130,7 +130,7 @@
  • -Production Planning Tool +Production Planning Tool
    • diff --git a/foundation/www/docs/current/models/manufacturing/production_planning_tool.html b/foundation/www/docs/current/models/manufacturing/production_planning_tool.html index 120f9301..1e7b65e9 100644 --- a/foundation/www/docs/current/models/manufacturing/production_planning_tool.html +++ b/foundation/www/docs/current/models/manufacturing/production_planning_tool.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Item +Item @@ -101,7 +101,7 @@ Material Request -Customer +Customer @@ -122,7 +122,7 @@ Material Request -Warehouse +Warehouse @@ -143,7 +143,7 @@ Material Request -Company +Company @@ -200,7 +200,7 @@ Material Request -Project +Project @@ -246,7 +246,7 @@ Material Request -Production Plan Sales Order +Production Plan Sales Order @@ -292,7 +292,7 @@ Material Request -Production Plan Material Request +Production Plan Material Request @@ -338,7 +338,7 @@ Material Request -Production Plan Item +Production Plan Item @@ -396,7 +396,7 @@ Material Request -Warehouse +Warehouse diff --git a/foundation/www/docs/current/models/manufacturing/workstation.html b/foundation/www/docs/current/models/manufacturing/workstation.html index e4b4dc18..e2c88e99 100644 --- a/foundation/www/docs/current/models/manufacturing/workstation.html +++ b/foundation/www/docs/current/models/manufacturing/workstation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Workstation Working Hour +Workstation Working Hour @@ -212,7 +212,7 @@ -Holiday List +Holiday List @@ -423,7 +423,7 @@
  • -BOM Operation +BOM Operation
    • @@ -432,7 +432,7 @@
  • -BOM Website Operation +BOM Website Operation
    • @@ -441,7 +441,7 @@
  • -Operation +Operation
    • @@ -450,7 +450,7 @@
  • -Production Order Operation +Production Order Operation
    • @@ -459,7 +459,7 @@
  • -Timesheet Detail +Timesheet Detail
    • diff --git a/foundation/www/docs/current/models/manufacturing/workstation_working_hour.html b/foundation/www/docs/current/models/manufacturing/workstation_working_hour.html index 08a6334d..7d0785b3 100644 --- a/foundation/www/docs/current/models/manufacturing/workstation_working_hour.html +++ b/foundation/www/docs/current/models/manufacturing/workstation_working_hour.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Workstation +Workstation diff --git a/foundation/www/docs/current/models/portal/homepage.html b/foundation/www/docs/current/models/portal/homepage.html index 6d9b47e8..f1547ebc 100644 --- a/foundation/www/docs/current/models/portal/homepage.html +++ b/foundation/www/docs/current/models/portal/homepage.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -136,7 +136,7 @@ -Homepage Featured Product +Homepage Featured Product diff --git a/foundation/www/docs/current/models/portal/homepage_featured_product.html b/foundation/www/docs/current/models/portal/homepage_featured_product.html index a5ecd687..8980df0a 100644 --- a/foundation/www/docs/current/models/portal/homepage_featured_product.html +++ b/foundation/www/docs/current/models/portal/homepage_featured_product.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -181,7 +181,7 @@
  • -Homepage +Homepage
    • diff --git a/foundation/www/docs/current/models/portal/index.html b/foundation/www/docs/current/models/portal/index.html index 575517be..08c4a79d 100644 --- a/foundation/www/docs/current/models/portal/index.html +++ b/foundation/www/docs/current/models/portal/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Activity Type +Activity Type @@ -87,7 +87,7 @@ -Employee +Employee diff --git a/foundation/www/docs/current/models/projects/activity_type.html b/foundation/www/docs/current/models/projects/activity_type.html index 2291605a..ac246de4 100644 --- a/foundation/www/docs/current/models/projects/activity_type.html +++ b/foundation/www/docs/current/models/projects/activity_type.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 + + 5 + disabled + + Check + + Disabled + + + + + @@ -125,7 +137,7 @@
  • -Activity Cost +Activity Cost
    • @@ -134,7 +146,7 @@
  • -Timesheet Detail +Timesheet Detail
    • diff --git a/foundation/www/docs/current/models/projects/dependent_task.html b/foundation/www/docs/current/models/projects/dependent_task.html index 723c324e..ad017d70 100644 --- a/foundation/www/docs/current/models/projects/dependent_task.html +++ b/foundation/www/docs/current/models/projects/dependent_task.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Task +Task diff --git a/foundation/www/docs/current/models/projects/index.html b/foundation/www/docs/current/models/projects/index.html index 9e70f42f..e5916d1a 100644 --- a/foundation/www/docs/current/models/projects/index.html +++ b/foundation/www/docs/current/models/projects/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Project Type +Project Type @@ -212,7 +212,7 @@ High -Customer +Customer @@ -245,7 +245,7 @@ High -Sales Order +Sales Order @@ -279,7 +279,7 @@ High -Project User +Project User @@ -314,7 +314,7 @@ High -Project Task +Project Task @@ -485,7 +485,7 @@ High -Company +Company @@ -506,7 +506,7 @@ High -Cost Center +Cost Center @@ -996,7 +996,7 @@ High
  • -Bank Guarantee +Bank Guarantee
    • @@ -1005,7 +1005,7 @@ High
  • -BOM +BOM
    • @@ -1014,7 +1014,7 @@ High
  • -Budget +Budget
    • @@ -1023,7 +1023,7 @@ High
  • -Delivery Note +Delivery Note
    • @@ -1032,7 +1032,7 @@ High
  • -Expense Claim +Expense Claim
    • @@ -1041,7 +1041,7 @@ High
  • -GL Entry +GL Entry
    • @@ -1050,7 +1050,7 @@ High
  • -Issue +Issue
    • @@ -1059,7 +1059,7 @@ High
  • -Journal Entry Account +Journal Entry Account
    • @@ -1068,7 +1068,7 @@ High
  • -Material Request Item +Material Request Item
    • @@ -1077,7 +1077,7 @@ High
  • -Payment Entry +Payment Entry
    • @@ -1086,7 +1086,7 @@ High
  • -Process Payroll +Process Payroll
    • @@ -1095,7 +1095,7 @@ High
  • -Production Order +Production Order
    • @@ -1104,7 +1104,7 @@ High
  • -Production Planning Tool +Production Planning Tool
    • @@ -1113,7 +1113,7 @@ High
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -1122,7 +1122,7 @@ High
  • -Purchase Order Item +Purchase Order Item
    • @@ -1131,7 +1131,7 @@ High
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -1140,7 +1140,7 @@ High
  • -Request for Quotation Item +Request for Quotation Item
    • @@ -1149,7 +1149,7 @@ High
  • -Sales Invoice +Sales Invoice
    • @@ -1158,7 +1158,7 @@ High
  • -Sales Order +Sales Order
    • @@ -1167,7 +1167,7 @@ High
  • -Stock Entry +Stock Entry
    • @@ -1176,7 +1176,7 @@ High
  • -Stock Ledger Entry +Stock Ledger Entry
    • @@ -1185,7 +1185,7 @@ High
  • -Supplier Quotation Item +Supplier Quotation Item
    • @@ -1194,7 +1194,7 @@ High
  • -Task +Task
    • @@ -1203,7 +1203,7 @@ High
  • -Timesheet Detail +Timesheet Detail
    • diff --git a/foundation/www/docs/current/models/projects/project_task.html b/foundation/www/docs/current/models/projects/project_task.html index 22fb70ae..e29735a8 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 8.6.3 + Version 8.6.5 -Task +Task @@ -187,7 +187,7 @@ Cancelled
  • -Project +Project
    • diff --git a/foundation/www/docs/current/models/projects/project_type.html b/foundation/www/docs/current/models/projects/project_type.html index 0eb5e846..4bf7a8fb 100644 --- a/foundation/www/docs/current/models/projects/project_type.html +++ b/foundation/www/docs/current/models/projects/project_type.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Project +Project diff --git a/foundation/www/docs/current/models/projects/project_user.html b/foundation/www/docs/current/models/projects/project_user.html index cb471ba7..eb74c616 100644 --- a/foundation/www/docs/current/models/projects/project_user.html +++ b/foundation/www/docs/current/models/projects/project_user.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 User +User @@ -85,7 +85,7 @@
  • -Project +Project
    • diff --git a/foundation/www/docs/current/models/projects/task.html b/foundation/www/docs/current/models/projects/task.html index bf8a294f..9c188a68 100644 --- a/foundation/www/docs/current/models/projects/task.html +++ b/foundation/www/docs/current/models/projects/task.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Project +Project @@ -269,7 +269,7 @@ Urgent -Task Depends On +Task Depends On @@ -474,7 +474,7 @@ Urgent -Company +Company @@ -819,7 +819,7 @@ Urgent
  • -Dependent Task +Dependent Task
    • @@ -828,7 +828,7 @@ Urgent
  • -Expense Claim +Expense Claim
    • @@ -837,7 +837,7 @@ Urgent
  • -Project Task +Project Task
    • @@ -846,7 +846,7 @@ Urgent
  • -Task Depends On +Task Depends On
    • @@ -855,7 +855,7 @@ Urgent
  • -Timesheet Detail +Timesheet Detail
    • diff --git a/foundation/www/docs/current/models/projects/task_depends_on.html b/foundation/www/docs/current/models/projects/task_depends_on.html index efb5a940..66e53d05 100644 --- a/foundation/www/docs/current/models/projects/task_depends_on.html +++ b/foundation/www/docs/current/models/projects/task_depends_on.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Task +Task @@ -109,7 +109,7 @@
  • -Task +Task
    • diff --git a/foundation/www/docs/current/models/projects/timesheet.html b/foundation/www/docs/current/models/projects/timesheet.html index 8a7d49e6..e1e98ecf 100644 --- a/foundation/www/docs/current/models/projects/timesheet.html +++ b/foundation/www/docs/current/models/projects/timesheet.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Company +Company @@ -90,7 +90,7 @@ TLB- -Sales Invoice +Sales Invoice @@ -123,7 +123,7 @@ TLB- -Salary Slip +Salary Slip @@ -175,7 +175,7 @@ Cancelled -Employee +Employee @@ -208,7 +208,7 @@ Cancelled -User +User @@ -277,7 +277,7 @@ Cancelled -Production Order +Production Order @@ -310,7 +310,7 @@ Cancelled -Timesheet Detail +Timesheet Detail @@ -475,7 +475,7 @@ Cancelled -Timesheet +Timesheet @@ -845,6 +845,20 @@ Cancelled +

    + + + update_time_rates + (self, ts_detail) +

    +

    No docs

    +
    +
    + + + + +

    @@ -1123,7 +1137,7 @@ Cancelled

  • -Salary Slip Timesheet +Salary Slip Timesheet
    • @@ -1132,7 +1146,7 @@ Cancelled
  • -Sales Invoice Timesheet +Sales Invoice Timesheet
    • @@ -1141,7 +1155,7 @@ Cancelled
  • -Timesheet +Timesheet
    • diff --git a/foundation/www/docs/current/models/projects/timesheet_detail.html b/foundation/www/docs/current/models/projects/timesheet_detail.html index d967d093..8217a2f7 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 8.6.3 + Version 8.6.5 Activity Type +Activity Type @@ -147,7 +147,7 @@ -Workstation +Workstation @@ -180,7 +180,7 @@ -Operation +Operation @@ -225,7 +225,7 @@ -Project +Project @@ -258,7 +258,7 @@ -Task +Task @@ -411,7 +411,7 @@ -Sales Invoice +Sales Invoice @@ -430,7 +430,7 @@
  • -Timesheet +Timesheet
    • diff --git a/foundation/www/docs/current/models/regional/gst_hsn_code.html b/foundation/www/docs/current/models/regional/gst_hsn_code.html index 807f1a67..75c3672d 100644 --- a/foundation/www/docs/current/models/regional/gst_hsn_code.html +++ b/foundation/www/docs/current/models/regional/gst_hsn_code.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Academic Year +Academic Year @@ -190,7 +190,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -199,7 +199,7 @@
  • -Fee Structure +Fee Structure
    • @@ -208,7 +208,7 @@
  • -Fees +Fees
    • @@ -217,7 +217,7 @@
  • -Program Enrollment +Program Enrollment
    • @@ -226,7 +226,7 @@
  • -Program Enrollment Fee +Program Enrollment Fee
    • @@ -235,7 +235,7 @@
  • -Program Fee +Program Fee
    • @@ -244,7 +244,7 @@
  • -School Settings +School Settings
    • @@ -253,7 +253,7 @@
  • -Student Group +Student Group
    • @@ -262,7 +262,7 @@
  • -Student Group Creation Tool +Student Group Creation Tool
    • @@ -271,7 +271,7 @@
  • -Student Log +Student Log
    • diff --git a/foundation/www/docs/current/models/schools/academic_year.html b/foundation/www/docs/current/models/schools/academic_year.html index 4a81f8c1..439e5fd5 100644 --- a/foundation/www/docs/current/models/schools/academic_year.html +++ b/foundation/www/docs/current/models/schools/academic_year.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Academic Term +Academic Term @@ -136,7 +136,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -145,7 +145,7 @@
  • -Fees +Fees
    • @@ -154,7 +154,7 @@
  • -Program Enrollment +Program Enrollment
    • @@ -163,7 +163,7 @@
  • -Program Enrollment Tool +Program Enrollment Tool
    • @@ -172,7 +172,7 @@
  • -School Settings +School Settings
    • @@ -181,7 +181,7 @@
  • -Student Admission +Student Admission
    • @@ -190,7 +190,7 @@
  • -Student Applicant +Student Applicant
    • @@ -199,7 +199,7 @@
  • -Student Batch Creation Tool +Student Batch Creation Tool
    • @@ -208,7 +208,7 @@
  • -Student Group +Student Group
    • @@ -217,7 +217,7 @@
  • -Student Group Creation Tool +Student Group Creation Tool
    • @@ -226,7 +226,7 @@
  • -Student Log +Student Log
    • diff --git a/foundation/www/docs/current/models/schools/assessment_criteria.html b/foundation/www/docs/current/models/schools/assessment_criteria.html index 642244bc..ffafbe26 100644 --- a/foundation/www/docs/current/models/schools/assessment_criteria.html +++ b/foundation/www/docs/current/models/schools/assessment_criteria.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Assessment Criteria Group +Assessment Criteria Group @@ -110,7 +110,7 @@
  • -Assessment Plan Criteria +Assessment Plan Criteria
    • @@ -119,7 +119,7 @@
  • -Assessment Result Detail +Assessment Result Detail
    • @@ -128,7 +128,7 @@
  • -Course Assessment Criteria +Course Assessment Criteria
    • diff --git a/foundation/www/docs/current/models/schools/assessment_criteria_group.html b/foundation/www/docs/current/models/schools/assessment_criteria_group.html index 9c1602c6..b9f5c6d3 100644 --- a/foundation/www/docs/current/models/schools/assessment_criteria_group.html +++ b/foundation/www/docs/current/models/schools/assessment_criteria_group.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Assessment Criteria +Assessment Criteria diff --git a/foundation/www/docs/current/models/schools/assessment_group.html b/foundation/www/docs/current/models/schools/assessment_group.html index 8693abb0..dc17a7b5 100644 --- a/foundation/www/docs/current/models/schools/assessment_group.html +++ b/foundation/www/docs/current/models/schools/assessment_group.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Assessment Group +Assessment Group @@ -135,7 +135,7 @@ -Assessment Group +Assessment Group @@ -179,7 +179,7 @@
  • -Assessment Group +Assessment Group
    • @@ -188,7 +188,7 @@
  • -Assessment Plan +Assessment Plan
    • diff --git a/foundation/www/docs/current/models/schools/assessment_plan.html b/foundation/www/docs/current/models/schools/assessment_plan.html index 4bd928ff..b7c89c44 100644 --- a/foundation/www/docs/current/models/schools/assessment_plan.html +++ b/foundation/www/docs/current/models/schools/assessment_plan.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student Group +Student Group @@ -87,7 +87,7 @@ -Course +Course @@ -120,7 +120,7 @@ -Assessment Group +Assessment Group @@ -153,7 +153,7 @@ -Grading Scale +Grading Scale @@ -198,7 +198,7 @@ -Room +Room @@ -219,7 +219,7 @@ -Instructor +Instructor @@ -288,7 +288,7 @@ -Instructor +Instructor @@ -333,7 +333,7 @@ -Assessment Plan Criteria +Assessment Plan Criteria @@ -354,7 +354,7 @@ -Assessment Plan +Assessment Plan @@ -454,7 +454,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -463,7 +463,7 @@
  • -Assessment Result +Assessment Result
    • @@ -472,7 +472,7 @@
  • -Assessment Result Tool +Assessment Result Tool
    • diff --git a/foundation/www/docs/current/models/schools/assessment_plan_criteria.html b/foundation/www/docs/current/models/schools/assessment_plan_criteria.html index e81bb7f4..5be41873 100644 --- a/foundation/www/docs/current/models/schools/assessment_plan_criteria.html +++ b/foundation/www/docs/current/models/schools/assessment_plan_criteria.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Assessment Criteria +Assessment Criteria @@ -97,7 +97,7 @@
  • -Assessment Plan +Assessment Plan
    • diff --git a/foundation/www/docs/current/models/schools/assessment_result.html b/foundation/www/docs/current/models/schools/assessment_result.html index 3ed83341..02a2d74b 100644 --- a/foundation/www/docs/current/models/schools/assessment_result.html +++ b/foundation/www/docs/current/models/schools/assessment_result.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student +Student @@ -99,7 +99,7 @@ -Assessment Plan +Assessment Plan @@ -120,7 +120,7 @@ -Grading Scale +Grading Scale @@ -153,7 +153,7 @@ -Assessment Result Detail +Assessment Result Detail @@ -258,7 +258,7 @@ -Assessment Result +Assessment Result @@ -344,7 +344,7 @@
  • -Assessment Result +Assessment Result
    • diff --git a/foundation/www/docs/current/models/schools/assessment_result_detail.html b/foundation/www/docs/current/models/schools/assessment_result_detail.html index 71a73582..28a7166d 100644 --- a/foundation/www/docs/current/models/schools/assessment_result_detail.html +++ b/foundation/www/docs/current/models/schools/assessment_result_detail.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Assessment Criteria +Assessment Criteria @@ -121,7 +121,7 @@
  • -Assessment Result +Assessment Result
    • diff --git a/foundation/www/docs/current/models/schools/assessment_result_tool.html b/foundation/www/docs/current/models/schools/assessment_result_tool.html index a68abfb5..5da69e69 100644 --- a/foundation/www/docs/current/models/schools/assessment_result_tool.html +++ b/foundation/www/docs/current/models/schools/assessment_result_tool.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Assessment Plan +Assessment Plan @@ -85,7 +85,7 @@ -Student Group +Student Group diff --git a/foundation/www/docs/current/models/schools/course.html b/foundation/www/docs/current/models/schools/course.html index 321b914e..a1a54a77 100644 --- a/foundation/www/docs/current/models/schools/course.html +++ b/foundation/www/docs/current/models/schools/course.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Department +Department @@ -171,7 +171,7 @@ -Grading Scale +Grading Scale @@ -192,7 +192,7 @@ -Course Assessment Criteria +Course Assessment Criteria @@ -264,7 +264,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -273,7 +273,7 @@
  • -Course Schedule +Course Schedule
    • @@ -282,7 +282,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -291,7 +291,7 @@
  • -Discussion +Discussion
    • @@ -300,7 +300,7 @@
  • -Program Course +Program Course
    • @@ -309,7 +309,7 @@
  • -Program Enrollment Course +Program Enrollment Course
    • @@ -318,7 +318,7 @@
  • -Student Group +Student Group
    • @@ -327,7 +327,7 @@
  • -Student Group Creation Tool Course +Student Group Creation Tool Course
    • @@ -336,7 +336,7 @@
  • -Topic +Topic
    • @@ -345,7 +345,7 @@
  • -Training Event +Training Event
    • @@ -354,7 +354,7 @@
  • -Training Feedback +Training Feedback
    • diff --git a/foundation/www/docs/current/models/schools/course_assessment_criteria.html b/foundation/www/docs/current/models/schools/course_assessment_criteria.html index d9e5ad48..d2013d96 100644 --- a/foundation/www/docs/current/models/schools/course_assessment_criteria.html +++ b/foundation/www/docs/current/models/schools/course_assessment_criteria.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Assessment Criteria +Assessment Criteria @@ -97,7 +97,7 @@
  • -Course +Course
    • diff --git a/foundation/www/docs/current/models/schools/course_schedule.html b/foundation/www/docs/current/models/schools/course_schedule.html index 0e41bbaf..838bc787 100644 --- a/foundation/www/docs/current/models/schools/course_schedule.html +++ b/foundation/www/docs/current/models/schools/course_schedule.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student Group +Student Group @@ -75,7 +75,7 @@ -Instructor +Instructor @@ -136,7 +136,7 @@ -Course +Course @@ -181,7 +181,7 @@ -Room +Room @@ -343,7 +343,7 @@
  • -Student Attendance +Student Attendance
    • @@ -352,7 +352,7 @@
  • -Student Attendance Tool +Student Attendance Tool
    • diff --git a/foundation/www/docs/current/models/schools/course_scheduling_tool.html b/foundation/www/docs/current/models/schools/course_scheduling_tool.html index e5cb9f8c..5f19b9a1 100644 --- a/foundation/www/docs/current/models/schools/course_scheduling_tool.html +++ b/foundation/www/docs/current/models/schools/course_scheduling_tool.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student Group +Student Group @@ -73,7 +73,7 @@ -Course +Course @@ -94,7 +94,7 @@ -Program +Program @@ -127,7 +127,7 @@ -Academic Year +Academic Year @@ -148,7 +148,7 @@ -Academic Term +Academic Term @@ -181,7 +181,7 @@ -Instructor +Instructor @@ -228,7 +228,7 @@ -Room +Room diff --git a/foundation/www/docs/current/models/schools/fee_category.html b/foundation/www/docs/current/models/schools/fee_category.html index e64e6696..390ebec2 100644 --- a/foundation/www/docs/current/models/schools/fee_category.html +++ b/foundation/www/docs/current/models/schools/fee_category.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Fee Component +Fee Component diff --git a/foundation/www/docs/current/models/schools/fee_component.html b/foundation/www/docs/current/models/schools/fee_component.html index 7005475d..a2c2400d 100644 --- a/foundation/www/docs/current/models/schools/fee_component.html +++ b/foundation/www/docs/current/models/schools/fee_component.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Fee Category +Fee Category @@ -97,14 +97,14 @@
  • -Fee Structure +Fee Structure
  • -Fees +Fees
    • diff --git a/foundation/www/docs/current/models/schools/fee_structure.html b/foundation/www/docs/current/models/schools/fee_structure.html index e75da859..4621a2ab 100644 --- a/foundation/www/docs/current/models/schools/fee_structure.html +++ b/foundation/www/docs/current/models/schools/fee_structure.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Program +Program @@ -101,7 +101,7 @@ -Academic Term +Academic Term @@ -122,7 +122,7 @@ -Student Category +Student Category @@ -155,7 +155,7 @@ -Fee Component +Fee Component @@ -251,7 +251,7 @@
  • -Fees +Fees
    • @@ -260,7 +260,7 @@
  • -Program Enrollment Fee +Program Enrollment Fee
    • @@ -269,7 +269,7 @@
  • -Program Fee +Program Fee
    • diff --git a/foundation/www/docs/current/models/schools/fees.html b/foundation/www/docs/current/models/schools/fees.html index af6106b7..5f6cd231 100644 --- a/foundation/www/docs/current/models/schools/fees.html +++ b/foundation/www/docs/current/models/schools/fees.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student +Student @@ -75,7 +75,7 @@ -Academic Year +Academic Year @@ -96,7 +96,7 @@ -Academic Term +Academic Term @@ -117,7 +117,7 @@ -Fee Structure +Fee Structure @@ -188,7 +188,7 @@ -Program +Program @@ -209,7 +209,7 @@ -Program Enrollment +Program Enrollment @@ -230,7 +230,7 @@ -Student Category +Student Category @@ -263,7 +263,7 @@ -Fee Component +Fee Component @@ -296,7 +296,7 @@ -Fees +Fees @@ -448,7 +448,7 @@
  • -Fees +Fees
    • diff --git a/foundation/www/docs/current/models/schools/grading_scale.html b/foundation/www/docs/current/models/schools/grading_scale.html index 9c8c875b..f84e77c0 100644 --- a/foundation/www/docs/current/models/schools/grading_scale.html +++ b/foundation/www/docs/current/models/schools/grading_scale.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Grading Scale Interval +Grading Scale Interval @@ -111,7 +111,7 @@ -Grading Scale +Grading Scale @@ -169,7 +169,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -178,7 +178,7 @@
  • -Assessment Result +Assessment Result
    • @@ -187,7 +187,7 @@
  • -Course +Course
    • @@ -196,7 +196,7 @@
  • -Grading Scale +Grading Scale
    • diff --git a/foundation/www/docs/current/models/schools/grading_scale_interval.html b/foundation/www/docs/current/models/schools/grading_scale_interval.html index 26b06282..6a0e83dd 100644 --- a/foundation/www/docs/current/models/schools/grading_scale_interval.html +++ b/foundation/www/docs/current/models/schools/grading_scale_interval.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Grading Scale +Grading Scale diff --git a/foundation/www/docs/current/models/schools/guardian.html b/foundation/www/docs/current/models/schools/guardian.html index 5ee217b7..dc11b432 100644 --- a/foundation/www/docs/current/models/schools/guardian.html +++ b/foundation/www/docs/current/models/schools/guardian.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Guardian Student +Guardian Student @@ -231,7 +231,7 @@ -Guardian Interest +Guardian Interest @@ -331,7 +331,7 @@
  • -Student Guardian +Student Guardian
    • diff --git a/foundation/www/docs/current/models/schools/guardian_interest.html b/foundation/www/docs/current/models/schools/guardian_interest.html index 8002da67..fef64699 100644 --- a/foundation/www/docs/current/models/schools/guardian_interest.html +++ b/foundation/www/docs/current/models/schools/guardian_interest.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Interest +Interest @@ -73,7 +73,7 @@
  • -Guardian +Guardian
    • diff --git a/foundation/www/docs/current/models/schools/guardian_student.html b/foundation/www/docs/current/models/schools/guardian_student.html index 258cb6b4..72389c43 100644 --- a/foundation/www/docs/current/models/schools/guardian_student.html +++ b/foundation/www/docs/current/models/schools/guardian_student.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student +Student @@ -97,7 +97,7 @@
  • -Guardian +Guardian
    • diff --git a/foundation/www/docs/current/models/schools/index.html b/foundation/www/docs/current/models/schools/index.html index 19b8e08d..927464ae 100644 --- a/foundation/www/docs/current/models/schools/index.html +++ b/foundation/www/docs/current/models/schools/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Employee +Employee @@ -113,7 +113,7 @@ -Department +Department @@ -169,7 +169,7 @@
  • -Announcement +Announcement
    • @@ -178,7 +178,7 @@
  • -Assessment Plan +Assessment Plan
    • @@ -187,7 +187,7 @@
  • -Course Schedule +Course Schedule
    • @@ -196,7 +196,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -205,7 +205,7 @@
  • -Student Group Instructor +Student Group Instructor
    • diff --git a/foundation/www/docs/current/models/schools/program.html b/foundation/www/docs/current/models/schools/program.html index e487784b..cf8cc918 100644 --- a/foundation/www/docs/current/models/schools/program.html +++ b/foundation/www/docs/current/models/schools/program.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Department +Department @@ -135,7 +135,7 @@ -Program Course +Program Course @@ -168,7 +168,7 @@ -Program Fee +Program Fee @@ -212,7 +212,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -221,7 +221,7 @@
  • -Fee Structure +Fee Structure
    • @@ -230,7 +230,7 @@
  • -Fees +Fees
    • @@ -239,7 +239,7 @@
  • -Program Enrollment +Program Enrollment
    • @@ -248,7 +248,7 @@
  • -Program Enrollment Tool +Program Enrollment Tool
    • @@ -257,7 +257,7 @@
  • -Student Admission +Student Admission
    • @@ -266,7 +266,7 @@
  • -Student Applicant +Student Applicant
    • @@ -275,7 +275,7 @@
  • -Student Batch Creation Tool +Student Batch Creation Tool
    • @@ -284,7 +284,7 @@
  • -Student Group +Student Group
    • @@ -293,7 +293,7 @@
  • -Student Group Creation Tool +Student Group Creation Tool
    • @@ -302,7 +302,7 @@
  • -Student Log +Student Log
    • diff --git a/foundation/www/docs/current/models/schools/program_course.html b/foundation/www/docs/current/models/schools/program_course.html index 0c1d3d26..6fde76f8 100644 --- a/foundation/www/docs/current/models/schools/program_course.html +++ b/foundation/www/docs/current/models/schools/program_course.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Course +Course @@ -111,7 +111,7 @@
  • -Program +Program
    • diff --git a/foundation/www/docs/current/models/schools/program_enrollment.html b/foundation/www/docs/current/models/schools/program_enrollment.html index b58df763..8debbcc5 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment.html +++ b/foundation/www/docs/current/models/schools/program_enrollment.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student +Student @@ -89,7 +89,7 @@ -Student Category +Student Category @@ -110,7 +110,7 @@ -School House +School House @@ -156,7 +156,7 @@ -Program +Program @@ -177,7 +177,7 @@ -Student Batch Name +Student Batch Name @@ -198,7 +198,7 @@ -Academic Year +Academic Year @@ -219,7 +219,7 @@ -Academic Term +Academic Term @@ -319,7 +319,7 @@ Pick/Drop by Guardian -Program Enrollment Course +Program Enrollment Course @@ -352,7 +352,7 @@ Pick/Drop by Guardian -Program Fee +Program Fee @@ -373,7 +373,7 @@ Pick/Drop by Guardian -Program Enrollment +Program Enrollment @@ -549,7 +549,7 @@ Pick/Drop by Guardian
  • -Fees +Fees
    • @@ -558,7 +558,7 @@ Pick/Drop by Guardian
  • -Program Enrollment +Program Enrollment
    • diff --git a/foundation/www/docs/current/models/schools/program_enrollment_course.html b/foundation/www/docs/current/models/schools/program_enrollment_course.html index 72947af5..589c9083 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment_course.html +++ b/foundation/www/docs/current/models/schools/program_enrollment_course.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Course +Course @@ -87,7 +87,7 @@
  • -Program Enrollment +Program Enrollment
    • diff --git a/foundation/www/docs/current/models/schools/program_enrollment_fee.html b/foundation/www/docs/current/models/schools/program_enrollment_fee.html index efa29196..f2fac87c 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment_fee.html +++ b/foundation/www/docs/current/models/schools/program_enrollment_fee.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Academic Term +Academic Term @@ -75,7 +75,7 @@ -Fee Structure +Fee Structure diff --git a/foundation/www/docs/current/models/schools/program_enrollment_tool.html b/foundation/www/docs/current/models/schools/program_enrollment_tool.html index 39271cec..654eee1c 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment_tool.html +++ b/foundation/www/docs/current/models/schools/program_enrollment_tool.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Program +Program @@ -89,7 +89,7 @@ Program Enrollments -Academic Year +Academic Year @@ -134,7 +134,7 @@ Program Enrollments -Program Enrollment Tool Student +Program Enrollment Tool Student @@ -167,7 +167,7 @@ Program Enrollments -Program +Program @@ -188,7 +188,7 @@ Program Enrollments -Academic Year +Academic Year diff --git a/foundation/www/docs/current/models/schools/program_enrollment_tool_student.html b/foundation/www/docs/current/models/schools/program_enrollment_tool_student.html index ea6de160..185fa584 100644 --- a/foundation/www/docs/current/models/schools/program_enrollment_tool_student.html +++ b/foundation/www/docs/current/models/schools/program_enrollment_tool_student.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student Applicant +Student Applicant @@ -75,7 +75,7 @@ -Student +Student @@ -118,7 +118,7 @@
  • -Program Enrollment Tool +Program Enrollment Tool
    • diff --git a/foundation/www/docs/current/models/schools/program_fee.html b/foundation/www/docs/current/models/schools/program_fee.html index f5974069..e03b73e5 100644 --- a/foundation/www/docs/current/models/schools/program_fee.html +++ b/foundation/www/docs/current/models/schools/program_fee.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Academic Term +Academic Term @@ -75,7 +75,7 @@ -Fee Structure +Fee Structure @@ -96,7 +96,7 @@ -Student Category +Student Category @@ -151,14 +151,14 @@
  • -Program +Program
  • -Program Enrollment +Program Enrollment
    • diff --git a/foundation/www/docs/current/models/schools/room.html b/foundation/www/docs/current/models/schools/room.html index f3dcef6c..142c3022 100644 --- a/foundation/www/docs/current/models/schools/room.html +++ b/foundation/www/docs/current/models/schools/room.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Assessment Plan +Assessment Plan @@ -122,7 +122,7 @@
  • -Course Schedule +Course Schedule
    • @@ -131,7 +131,7 @@
  • -Course Scheduling Tool +Course Scheduling Tool
    • diff --git a/foundation/www/docs/current/models/schools/school_house.html b/foundation/www/docs/current/models/schools/school_house.html index 204b40ff..eb13c0af 100644 --- a/foundation/www/docs/current/models/schools/school_house.html +++ b/foundation/www/docs/current/models/schools/school_house.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Program Enrollment +Program Enrollment diff --git a/foundation/www/docs/current/models/schools/school_settings.html b/foundation/www/docs/current/models/schools/school_settings.html index 1e07aa4e..b87c77ac 100644 --- a/foundation/www/docs/current/models/schools/school_settings.html +++ b/foundation/www/docs/current/models/schools/school_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Academic Year +Academic Year @@ -73,7 +73,7 @@ -Academic Term +Academic Term diff --git a/foundation/www/docs/current/models/schools/student.html b/foundation/www/docs/current/models/schools/student.html index 4f236e36..b4f943f3 100644 --- a/foundation/www/docs/current/models/schools/student.html +++ b/foundation/www/docs/current/models/schools/student.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Student Applicant +Student Applicant @@ -404,7 +404,7 @@ Other -Student Guardian +Student Guardian @@ -439,7 +439,7 @@ Other -Student Sibling +Student Sibling @@ -627,7 +627,7 @@ Other
  • -Announcement +Announcement
    • @@ -636,7 +636,7 @@ Other
  • -Assessment Result +Assessment Result
    • @@ -645,7 +645,7 @@ Other
  • -Fees +Fees
    • @@ -654,7 +654,7 @@ Other
  • -Guardian Student +Guardian Student
    • @@ -663,7 +663,7 @@ Other
  • -Program Enrollment +Program Enrollment
    • @@ -672,7 +672,7 @@ Other
  • -Program Enrollment Tool Student +Program Enrollment Tool Student
    • @@ -681,7 +681,7 @@ Other
  • -Student Attendance +Student Attendance
    • @@ -690,7 +690,7 @@ Other
  • -Student Group Student +Student Group Student
    • @@ -699,7 +699,7 @@ Other
  • -Student Leave Application +Student Leave Application
    • @@ -708,7 +708,7 @@ Other
  • -Student Log +Student Log
    • @@ -717,7 +717,7 @@ Other
  • -Student Sibling +Student Sibling
    • diff --git a/foundation/www/docs/current/models/schools/student_admission.html b/foundation/www/docs/current/models/schools/student_admission.html index 689c45c7..ce4782c4 100644 --- a/foundation/www/docs/current/models/schools/student_admission.html +++ b/foundation/www/docs/current/models/schools/student_admission.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Academic Year +Academic Year @@ -147,7 +147,7 @@ -Program +Program @@ -182,7 +182,7 @@ -Currency +Currency @@ -344,7 +344,7 @@
  • -Student Applicant +Student Applicant
    • diff --git a/foundation/www/docs/current/models/schools/student_applicant.html b/foundation/www/docs/current/models/schools/student_applicant.html index 945b609b..e5a8145c 100644 --- a/foundation/www/docs/current/models/schools/student_applicant.html +++ b/foundation/www/docs/current/models/schools/student_applicant.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Program +Program @@ -178,7 +178,7 @@ Admitted -Academic Year +Academic Year @@ -199,7 +199,7 @@ Admitted -Student Admission +Student Admission @@ -438,7 +438,7 @@ AB- -Student Guardian +Student Guardian @@ -471,7 +471,7 @@ AB- -Student Sibling +Student Sibling @@ -516,7 +516,7 @@ AB- -Student Applicant +Student Applicant @@ -616,7 +616,7 @@ AB-
  • -Program Enrollment Tool Student +Program Enrollment Tool Student
    • @@ -625,7 +625,7 @@ AB-
  • -Student +Student
    • @@ -634,7 +634,7 @@ AB-
  • -Student Applicant +Student Applicant
    • diff --git a/foundation/www/docs/current/models/schools/student_attendance.html b/foundation/www/docs/current/models/schools/student_attendance.html index 95960bdd..ff81343a 100644 --- a/foundation/www/docs/current/models/schools/student_attendance.html +++ b/foundation/www/docs/current/models/schools/student_attendance.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student +Student @@ -75,7 +75,7 @@ -Course Schedule +Course Schedule @@ -134,7 +134,7 @@ -Student Group +Student Group diff --git a/foundation/www/docs/current/models/schools/student_attendance_tool.html b/foundation/www/docs/current/models/schools/student_attendance_tool.html index f6760034..26171ea8 100644 --- a/foundation/www/docs/current/models/schools/student_attendance_tool.html +++ b/foundation/www/docs/current/models/schools/student_attendance_tool.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Student Group +Student Group @@ -116,7 +116,7 @@ Activity -Course Schedule +Course Schedule diff --git a/foundation/www/docs/current/models/schools/student_batch_name.html b/foundation/www/docs/current/models/schools/student_batch_name.html index bc00fc73..7ed50742 100644 --- a/foundation/www/docs/current/models/schools/student_batch_name.html +++ b/foundation/www/docs/current/models/schools/student_batch_name.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Program Enrollment +Program Enrollment @@ -98,7 +98,7 @@
  • -Student Batch Creation Tool +Student Batch Creation Tool
    • @@ -107,7 +107,7 @@
  • -Student Group +Student Group
    • @@ -116,7 +116,7 @@
  • -Student Group Creation Tool Course +Student Group Creation Tool Course
    • @@ -125,7 +125,7 @@
  • -Student Log +Student Log
    • diff --git a/foundation/www/docs/current/models/schools/student_category.html b/foundation/www/docs/current/models/schools/student_category.html index f8524836..f2dba18d 100644 --- a/foundation/www/docs/current/models/schools/student_category.html +++ b/foundation/www/docs/current/models/schools/student_category.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Fee Structure +Fee Structure @@ -98,7 +98,7 @@
  • -Fees +Fees
    • @@ -107,7 +107,7 @@
  • -Program Enrollment +Program Enrollment
    • @@ -116,7 +116,7 @@
  • -Program Fee +Program Fee
    • diff --git a/foundation/www/docs/current/models/schools/student_group.html b/foundation/www/docs/current/models/schools/student_group.html index 5fb5c618..1f166a75 100644 --- a/foundation/www/docs/current/models/schools/student_group.html +++ b/foundation/www/docs/current/models/schools/student_group.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Academic Year +Academic Year @@ -129,7 +129,7 @@ Activity -Academic Term +Academic Term @@ -150,7 +150,7 @@ Activity -Program +Program @@ -171,7 +171,7 @@ Activity -Student Batch Name +Student Batch Name @@ -192,7 +192,7 @@ Activity -Course +Course @@ -237,7 +237,7 @@ Activity -Student Group Student +Student Group Student @@ -270,7 +270,7 @@ Activity -Student Group Instructor +Student Group Instructor @@ -436,7 +436,7 @@ Activity
  • -Announcement +Announcement
    • @@ -445,7 +445,7 @@ Activity
  • -Assessment Plan +Assessment Plan
    • @@ -454,7 +454,7 @@ Activity
  • -Assessment Result Tool +Assessment Result Tool
    • @@ -463,7 +463,7 @@ Activity
  • -Course Schedule +Course Schedule
    • @@ -472,7 +472,7 @@ Activity
  • -Course Scheduling Tool +Course Scheduling Tool
    • @@ -481,7 +481,7 @@ Activity
  • -Student Attendance +Student Attendance
    • @@ -490,7 +490,7 @@ Activity
  • -Student Attendance Tool +Student Attendance Tool
    • diff --git a/foundation/www/docs/current/models/schools/student_group_creation_tool.html b/foundation/www/docs/current/models/schools/student_group_creation_tool.html index 1642daff..710aa014 100644 --- a/foundation/www/docs/current/models/schools/student_group_creation_tool.html +++ b/foundation/www/docs/current/models/schools/student_group_creation_tool.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Academic Year +Academic Year @@ -74,7 +74,7 @@ -Academic Term +Academic Term @@ -119,7 +119,7 @@ -Program +Program @@ -165,7 +165,7 @@ -Student Group Creation Tool Course +Student Group Creation Tool Course diff --git a/foundation/www/docs/current/models/schools/student_group_creation_tool_course.html b/foundation/www/docs/current/models/schools/student_group_creation_tool_course.html index 74d284e5..bf3e6f3d 100644 --- a/foundation/www/docs/current/models/schools/student_group_creation_tool_course.html +++ b/foundation/www/docs/current/models/schools/student_group_creation_tool_course.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Course +Course @@ -91,7 +91,7 @@ Course -Student Batch Name +Student Batch Name @@ -160,7 +160,7 @@ Course
  • -Student Group Creation Tool +Student Group Creation Tool
    • diff --git a/foundation/www/docs/current/models/schools/student_group_instructor.html b/foundation/www/docs/current/models/schools/student_group_instructor.html index 8757e360..7060c4e3 100644 --- a/foundation/www/docs/current/models/schools/student_group_instructor.html +++ b/foundation/www/docs/current/models/schools/student_group_instructor.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Instructor +Instructor @@ -99,7 +99,7 @@
  • -Student Group +Student Group
    • diff --git a/foundation/www/docs/current/models/schools/student_group_student.html b/foundation/www/docs/current/models/schools/student_group_student.html index f7bd92bf..f993744a 100644 --- a/foundation/www/docs/current/models/schools/student_group_student.html +++ b/foundation/www/docs/current/models/schools/student_group_student.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student +Student @@ -121,7 +121,7 @@
  • -Student Group +Student Group
    • diff --git a/foundation/www/docs/current/models/schools/student_guardian.html b/foundation/www/docs/current/models/schools/student_guardian.html index 9f58eac5..732b9258 100644 --- a/foundation/www/docs/current/models/schools/student_guardian.html +++ b/foundation/www/docs/current/models/schools/student_guardian.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Guardian +Guardian @@ -102,14 +102,14 @@ Others
  • -Student +Student
  • -Student Applicant +Student Applicant
    • diff --git a/foundation/www/docs/current/models/schools/student_language.html b/foundation/www/docs/current/models/schools/student_language.html index a974046c..3073a859 100644 --- a/foundation/www/docs/current/models/schools/student_language.html +++ b/foundation/www/docs/current/models/schools/student_language.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Student +Student @@ -162,7 +162,7 @@ -Student Leave Application +Student Leave Application @@ -206,7 +206,7 @@
  • -Student Leave Application +Student Leave Application
    • diff --git a/foundation/www/docs/current/models/schools/student_log.html b/foundation/www/docs/current/models/schools/student_log.html index 658c97ac..d841f239 100644 --- a/foundation/www/docs/current/models/schools/student_log.html +++ b/foundation/www/docs/current/models/schools/student_log.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Student +Student @@ -130,7 +130,7 @@ Achievement -Academic Year +Academic Year @@ -151,7 +151,7 @@ Achievement -Academic Term +Academic Term @@ -172,7 +172,7 @@ Achievement -Program +Program @@ -193,7 +193,7 @@ Achievement -Student Batch Name +Student Batch Name diff --git a/foundation/www/docs/current/models/schools/student_sibling.html b/foundation/www/docs/current/models/schools/student_sibling.html index a83894ab..f2f0db94 100644 --- a/foundation/www/docs/current/models/schools/student_sibling.html +++ b/foundation/www/docs/current/models/schools/student_sibling.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Student +Student @@ -164,14 +164,14 @@ Female
  • -Student +Student
  • -Student Applicant +Student Applicant
    • diff --git a/foundation/www/docs/current/models/schools/student_siblings.html b/foundation/www/docs/current/models/schools/student_siblings.html index 31bb8dd0..c152980d 100644 --- a/foundation/www/docs/current/models/schools/student_siblings.html +++ b/foundation/www/docs/current/models/schools/student_siblings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Delivery Note +Delivery Note @@ -150,7 +150,7 @@ Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc
  • -Lead +Lead
    • @@ -159,7 +159,7 @@ Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc
  • -Opportunity +Opportunity
    • @@ -168,7 +168,7 @@ Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc
  • -POS Profile +POS Profile
    • @@ -177,7 +177,7 @@ Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc
  • -Pricing Rule +Pricing Rule
    • @@ -186,7 +186,7 @@ Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc
  • -Quotation +Quotation
    • @@ -195,7 +195,7 @@ Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc
  • -Sales Invoice +Sales Invoice
    • @@ -204,7 +204,7 @@ Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc
  • -Sales Order +Sales Order
    • diff --git a/foundation/www/docs/current/models/selling/customer.html b/foundation/www/docs/current/models/selling/customer.html index 79cd06a8..1818f33f 100644 --- a/foundation/www/docs/current/models/selling/customer.html +++ b/foundation/www/docs/current/models/selling/customer.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Salutation +Salutation @@ -115,7 +115,7 @@ Buyer of Goods and Services. -Gender +Gender @@ -151,7 +151,7 @@ Individual -Lead +Lead @@ -196,7 +196,7 @@ Individual -Customer Group +Customer Group @@ -217,7 +217,7 @@ Individual -Territory +Territory @@ -274,7 +274,7 @@ Individual -Currency +Currency @@ -295,7 +295,7 @@ Individual -Price List +Price List @@ -328,7 +328,7 @@ Individual -Language +Language @@ -424,7 +424,7 @@ Individual -Party Account +Party Account @@ -550,7 +550,7 @@ Last Day of the Next Month -Sales Partner +Sales Partner @@ -595,7 +595,7 @@ Last Day of the Next Month -Sales Team +Sales Team @@ -912,7 +912,7 @@ Last Day of the Next Month
  • -Bank Guarantee +Bank Guarantee
    • @@ -921,7 +921,7 @@ Last Day of the Next Month
  • -C-Form +C-Form
    • @@ -930,7 +930,7 @@ Last Day of the Next Month
  • -Delivery Note +Delivery Note
    • @@ -939,7 +939,7 @@ Last Day of the Next Month
  • -Installation Note +Installation Note
    • @@ -948,7 +948,7 @@ Last Day of the Next Month
  • -Issue +Issue
    • @@ -957,7 +957,7 @@ Last Day of the Next Month
  • -Item Customer Detail +Item Customer Detail
    • @@ -966,7 +966,7 @@ Last Day of the Next Month
  • -Lead +Lead
    • @@ -975,7 +975,7 @@ Last Day of the Next Month
  • -Maintenance Schedule +Maintenance Schedule
    • @@ -984,7 +984,7 @@ Last Day of the Next Month
  • -Maintenance Visit +Maintenance Visit
    • @@ -993,7 +993,7 @@ Last Day of the Next Month
  • -Opportunity +Opportunity
    • @@ -1002,7 +1002,7 @@ Last Day of the Next Month
  • -POS Profile +POS Profile
    • @@ -1011,7 +1011,7 @@ Last Day of the Next Month
  • -Pricing Rule +Pricing Rule
    • @@ -1020,7 +1020,7 @@ Last Day of the Next Month
  • -Production Plan Sales Order +Production Plan Sales Order
    • @@ -1029,7 +1029,7 @@ Last Day of the Next Month
  • -Production Planning Tool +Production Planning Tool
    • @@ -1038,7 +1038,7 @@ Last Day of the Next Month
  • -Project +Project
    • @@ -1047,7 +1047,7 @@ Last Day of the Next Month
  • -Purchase Order +Purchase Order
    • @@ -1056,7 +1056,7 @@ Last Day of the Next Month
  • -Quotation +Quotation
    • @@ -1065,7 +1065,7 @@ Last Day of the Next Month
  • -Sales Invoice +Sales Invoice
    • @@ -1074,7 +1074,7 @@ Last Day of the Next Month
  • -Sales Order +Sales Order
    • @@ -1083,7 +1083,7 @@ Last Day of the Next Month
  • -Serial No +Serial No
    • @@ -1092,7 +1092,7 @@ Last Day of the Next Month
  • -SMS Center +SMS Center
    • @@ -1101,7 +1101,7 @@ Last Day of the Next Month
  • -Stock Entry +Stock Entry
    • @@ -1110,7 +1110,7 @@ Last Day of the Next Month
  • -Tax Rule +Tax Rule
    • @@ -1119,7 +1119,7 @@ Last Day of the Next Month
  • -Warranty Claim +Warranty Claim
    • diff --git a/foundation/www/docs/current/models/selling/index.html b/foundation/www/docs/current/models/selling/index.html index 5dc5b159..7488b262 100644 --- a/foundation/www/docs/current/models/selling/index.html +++ b/foundation/www/docs/current/models/selling/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Lead +Lead diff --git a/foundation/www/docs/current/models/selling/installation_note.html b/foundation/www/docs/current/models/selling/installation_note.html index a1d5eb6c..bdb80ccc 100644 --- a/foundation/www/docs/current/models/selling/installation_note.html +++ b/foundation/www/docs/current/models/selling/installation_note.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Customer +Customer @@ -113,7 +113,7 @@ -Address +Address @@ -134,7 +134,7 @@ -Contact +Contact @@ -217,7 +217,7 @@ -Territory +Territory @@ -238,7 +238,7 @@ -Customer Group +Customer Group @@ -311,7 +311,7 @@ Cancelled -Company +Company @@ -332,7 +332,7 @@ Cancelled -Installation Note +Installation Note @@ -379,7 +379,7 @@ Cancelled -Installation Note Item +Installation Note Item @@ -591,7 +591,7 @@ Cancelled
  • -Installation Note +Installation Note
    • diff --git a/foundation/www/docs/current/models/selling/installation_note_item.html b/foundation/www/docs/current/models/selling/installation_note_item.html index a04653ac..1ae79b90 100644 --- a/foundation/www/docs/current/models/selling/installation_note_item.html +++ b/foundation/www/docs/current/models/selling/installation_note_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -145,7 +145,7 @@
  • -Installation Note +Installation Note
    • diff --git a/foundation/www/docs/current/models/selling/lead_source.html b/foundation/www/docs/current/models/selling/lead_source.html index b1feba2d..ff2e3719 100644 --- a/foundation/www/docs/current/models/selling/lead_source.html +++ b/foundation/www/docs/current/models/selling/lead_source.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Delivery Note +Delivery Note @@ -110,7 +110,7 @@
  • -Lead +Lead
    • @@ -119,7 +119,7 @@
  • -Opportunity +Opportunity
    • @@ -128,7 +128,7 @@
  • -Quotation +Quotation
    • @@ -137,7 +137,7 @@
  • -Sales Invoice +Sales Invoice
    • @@ -146,7 +146,7 @@
  • -Sales Order +Sales Order
    • diff --git a/foundation/www/docs/current/models/selling/product_bundle.html b/foundation/www/docs/current/models/selling/product_bundle.html index 6495145a..2371fd88 100644 --- a/foundation/www/docs/current/models/selling/product_bundle.html +++ b/foundation/www/docs/current/models/selling/product_bundle.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -106,7 +106,7 @@ Note: BOM = Bill of Materials -Product Bundle Item +Product Bundle Item diff --git a/foundation/www/docs/current/models/selling/product_bundle_item.html b/foundation/www/docs/current/models/selling/product_bundle_item.html index dbcedccf..6e7be014 100644 --- a/foundation/www/docs/current/models/selling/product_bundle_item.html +++ b/foundation/www/docs/current/models/selling/product_bundle_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -111,7 +111,7 @@ -UOM +UOM @@ -130,7 +130,7 @@
  • -Product Bundle +Product Bundle
    • diff --git a/foundation/www/docs/current/models/selling/quotation.html b/foundation/www/docs/current/models/selling/quotation.html index ee112d00..e8092680 100644 --- a/foundation/www/docs/current/models/selling/quotation.html +++ b/foundation/www/docs/current/models/selling/quotation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Customer +Customer @@ -131,7 +131,7 @@ Customer -Lead +Lead @@ -176,7 +176,7 @@ Customer -Quotation +Quotation @@ -197,7 +197,7 @@ Customer -Company +Company @@ -273,7 +273,7 @@ Shopping Cart -Address +Address @@ -306,7 +306,7 @@ Shopping Cart -Contact +Contact @@ -377,7 +377,7 @@ Shopping Cart -Address +Address @@ -410,7 +410,7 @@ Shopping Cart -Customer Group +Customer Group @@ -431,7 +431,7 @@ Shopping Cart -Territory +Territory @@ -466,7 +466,7 @@ Shopping Cart -Currency +Currency @@ -512,7 +512,7 @@ Shopping Cart -Price List +Price List @@ -533,7 +533,7 @@ Shopping Cart -Currency +Currency @@ -593,7 +593,7 @@ Shopping Cart -Quotation Item +Quotation Item @@ -708,7 +708,7 @@ Shopping Cart -Sales Taxes and Charges Template +Sales Taxes and Charges Template @@ -741,7 +741,7 @@ Shopping Cart -Shipping Rule +Shipping Rule @@ -774,7 +774,7 @@ Shopping Cart -Sales Taxes and Charges +Sales Taxes and Charges @@ -1072,7 +1072,7 @@ Net Total -Terms and Conditions +Terms and Conditions @@ -1117,7 +1117,7 @@ Net Total -Letter Head +Letter Head @@ -1138,7 +1138,7 @@ Net Total -Print Heading +Print Heading @@ -1197,7 +1197,7 @@ Net Total -Campaign +Campaign @@ -1218,7 +1218,7 @@ Net Total -Lead Source +Lead Source @@ -1295,7 +1295,7 @@ Replied -Supplier Quotation +Supplier Quotation @@ -1573,7 +1573,7 @@ Replied
  • -Quotation +Quotation
    • @@ -1582,7 +1582,7 @@ Replied
  • -Sales Order Item +Sales Order Item
    • diff --git a/foundation/www/docs/current/models/selling/quotation_item.html b/foundation/www/docs/current/models/selling/quotation_item.html index ad05c326..f2320baa 100644 --- a/foundation/www/docs/current/models/selling/quotation_item.html +++ b/foundation/www/docs/current/models/selling/quotation_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -197,7 +197,7 @@ -UOM +UOM @@ -230,7 +230,7 @@ -UOM +UOM @@ -523,7 +523,7 @@ Amount -Pricing Rule +Pricing Rule @@ -556,7 +556,7 @@ Amount -Warehouse +Warehouse @@ -637,7 +637,7 @@ Amount -DocType +DocType @@ -708,7 +708,7 @@ Amount -Item Group +Item Group @@ -729,7 +729,7 @@ Amount -Brand +Brand @@ -748,7 +748,7 @@ Amount
  • -Quotation +Quotation
    • diff --git a/foundation/www/docs/current/models/selling/sales_order.html b/foundation/www/docs/current/models/selling/sales_order.html index ad6c3e5b..4bb7a069 100644 --- a/foundation/www/docs/current/models/selling/sales_order.html +++ b/foundation/www/docs/current/models/selling/sales_order.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Customer +Customer @@ -168,7 +168,7 @@ Shopping Cart -Sales Order +Sales Order @@ -189,7 +189,7 @@ Shopping Cart -Company +Company @@ -284,7 +284,7 @@ Shopping Cart -Address +Address @@ -317,7 +317,7 @@ Shopping Cart -Contact +Contact @@ -388,7 +388,7 @@ Shopping Cart -Address +Address @@ -421,7 +421,7 @@ Shopping Cart -Customer Group +Customer Group @@ -442,7 +442,7 @@ Shopping Cart -Territory +Territory @@ -477,7 +477,7 @@ Shopping Cart -Currency +Currency @@ -523,7 +523,7 @@ Shopping Cart -Price List +Price List @@ -544,7 +544,7 @@ Shopping Cart -Currency +Currency @@ -604,7 +604,7 @@ Shopping Cart -Sales Order Item +Sales Order Item @@ -731,7 +731,7 @@ Shopping Cart -Sales Taxes and Charges Template +Sales Taxes and Charges Template @@ -764,7 +764,7 @@ Shopping Cart -Shipping Rule +Shipping Rule @@ -797,7 +797,7 @@ Shopping Cart -Sales Taxes and Charges +Sales Taxes and Charges @@ -1109,7 +1109,7 @@ Net Total -Packed Item +Packed Item @@ -1144,7 +1144,7 @@ Net Total -Terms and Conditions +Terms and Conditions @@ -1192,7 +1192,7 @@ Net Total -Project +Project @@ -1213,7 +1213,7 @@ Net Total -Currency +Currency @@ -1246,7 +1246,7 @@ Net Total -Lead Source +Lead Source @@ -1267,7 +1267,7 @@ Net Total -Campaign +Campaign @@ -1312,7 +1312,7 @@ Net Total -Letter Head +Letter Head @@ -1345,7 +1345,7 @@ Net Total -Print Heading +Print Heading @@ -1498,7 +1498,7 @@ Closed -Sales Partner +Sales Partner @@ -1569,7 +1569,7 @@ Closed -Sales Team +Sales Team @@ -1628,7 +1628,7 @@ Closed -Sales Order +Sales Order @@ -1729,7 +1729,7 @@ Yearly -Print Format +Print Format @@ -2482,7 +2482,7 @@ Yearly
  • -Delivery Note Item +Delivery Note Item
    • @@ -2491,7 +2491,7 @@ Yearly
  • -Maintenance Schedule Item +Maintenance Schedule Item
    • @@ -2500,7 +2500,7 @@ Yearly
  • -Material Request Item +Material Request Item
    • @@ -2509,7 +2509,7 @@ Yearly
  • -Production Order +Production Order
    • @@ -2518,7 +2518,7 @@ Yearly
  • -Production Plan Item +Production Plan Item
    • @@ -2527,7 +2527,7 @@ Yearly
  • -Production Plan Sales Order +Production Plan Sales Order
    • @@ -2536,7 +2536,7 @@ Yearly
  • -Project +Project
    • @@ -2545,7 +2545,7 @@ Yearly
  • -Purchase Order Item +Purchase Order Item
    • @@ -2554,7 +2554,7 @@ Yearly
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -2563,7 +2563,7 @@ Yearly
  • -Sales Order +Sales Order
    • 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 979c1a0d..4586b11d 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 8.6.3 + Version 8.6.5 Item +Item @@ -209,7 +209,7 @@ -UOM +UOM @@ -242,7 +242,7 @@ -UOM +UOM @@ -483,7 +483,7 @@ Amount -Pricing Rule +Pricing Rule @@ -608,7 +608,7 @@ Amount -Supplier +Supplier @@ -641,7 +641,7 @@ Amount -Warehouse +Warehouse @@ -662,7 +662,7 @@ Amount -Warehouse +Warehouse @@ -683,7 +683,7 @@ Amount -Quotation +Quotation @@ -704,7 +704,7 @@ Amount -Brand +Brand @@ -725,7 +725,7 @@ Amount -Item Group +Item Group @@ -921,7 +921,7 @@ Amount
  • -Sales Order +Sales Order
    • diff --git a/foundation/www/docs/current/models/selling/sales_team.html b/foundation/www/docs/current/models/selling/sales_team.html index 77a0a5d4..88828ee4 100644 --- a/foundation/www/docs/current/models/selling/sales_team.html +++ b/foundation/www/docs/current/models/selling/sales_team.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Sales Person +Sales Person @@ -125,28 +125,28 @@
  • -Customer +Customer
  • -Delivery Note +Delivery Note
  • -Sales Invoice +Sales Invoice
  • -Sales Order +Sales Order
    • diff --git a/foundation/www/docs/current/models/selling/selling_settings.html b/foundation/www/docs/current/models/selling/selling_settings.html index 2e288106..76ec67df 100644 --- a/foundation/www/docs/current/models/selling/selling_settings.html +++ b/foundation/www/docs/current/models/selling/selling_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Customer Group +Customer Group @@ -103,7 +103,7 @@ Naming Series -Territory +Territory @@ -124,7 +124,7 @@ Naming Series -Price List +Price List diff --git a/foundation/www/docs/current/models/selling/sms_center.html b/foundation/www/docs/current/models/selling/sms_center.html index b0353dc7..eddd4a49 100644 --- a/foundation/www/docs/current/models/selling/sms_center.html +++ b/foundation/www/docs/current/models/selling/sms_center.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Customer +Customer @@ -106,7 +106,7 @@ All Sales Person -Supplier +Supplier @@ -127,7 +127,7 @@ All Sales Person -Sales Partner +Sales Partner @@ -148,7 +148,7 @@ All Sales Person -Department +Department @@ -169,7 +169,7 @@ All Sales Person -Branch +Branch diff --git a/foundation/www/docs/current/models/setup/authorization_control.html b/foundation/www/docs/current/models/setup/authorization_control.html index b6eabeb1..6b34b9f4 100644 --- a/foundation/www/docs/current/models/setup/authorization_control.html +++ b/foundation/www/docs/current/models/setup/authorization_control.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Company +Company @@ -193,7 +193,7 @@ Item -Role +Role @@ -214,7 +214,7 @@ Item -Employee +Employee @@ -247,7 +247,7 @@ Item -User +User @@ -268,7 +268,7 @@ Item -Designation +Designation @@ -301,7 +301,7 @@ Item -Role +Role @@ -334,7 +334,7 @@ Item -User +User diff --git a/foundation/www/docs/current/models/setup/brand.html b/foundation/www/docs/current/models/setup/brand.html index b27bf5e4..dbcf85ca 100644 --- a/foundation/www/docs/current/models/setup/brand.html +++ b/foundation/www/docs/current/models/setup/brand.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Delivery Note Item +Delivery Note Item @@ -110,7 +110,7 @@
  • -Item +Item
    • @@ -119,7 +119,7 @@
  • -Material Request Item +Material Request Item
    • @@ -128,7 +128,7 @@
  • -Opportunity Item +Opportunity Item
    • @@ -137,7 +137,7 @@
  • -Pricing Rule +Pricing Rule
    • @@ -146,7 +146,7 @@
  • -Purchase Order Item +Purchase Order Item
    • @@ -155,7 +155,7 @@
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -164,7 +164,7 @@
  • -Quotation Item +Quotation Item
    • @@ -173,7 +173,7 @@
  • -Request for Quotation Item +Request for Quotation Item
    • @@ -182,7 +182,7 @@
  • -Sales Order Item +Sales Order Item
    • @@ -191,7 +191,7 @@
  • -Serial No +Serial No
    • @@ -200,7 +200,7 @@
  • -Supplier Quotation Item +Supplier Quotation Item
    • diff --git a/foundation/www/docs/current/models/setup/company.html b/foundation/www/docs/current/models/setup/company.html index a0c3f94d..a0aff43c 100644 --- a/foundation/www/docs/current/models/setup/company.html +++ b/foundation/www/docs/current/models/setup/company.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Letter Head +Letter Head @@ -166,7 +166,7 @@ Other -Holiday List +Holiday List @@ -187,7 +187,7 @@ Other -Terms and Conditions +Terms and Conditions @@ -208,7 +208,7 @@ Other -Currency +Currency @@ -241,7 +241,7 @@ Other -Country +Country @@ -290,7 +290,7 @@ Existing Company -Company +Company @@ -387,7 +387,7 @@ Existing Company -Account +Account @@ -408,7 +408,7 @@ Existing Company -Account +Account @@ -429,7 +429,7 @@ Existing Company -Account +Account @@ -450,7 +450,7 @@ Existing Company -Account +Account @@ -471,7 +471,7 @@ Existing Company -Account +Account @@ -492,7 +492,7 @@ Existing Company -Account +Account @@ -525,7 +525,7 @@ Existing Company -Account +Account @@ -546,7 +546,7 @@ Existing Company -Account +Account @@ -567,7 +567,7 @@ Existing Company -Account +Account @@ -588,7 +588,7 @@ Existing Company -Account +Account @@ -609,7 +609,7 @@ Existing Company -Cost Center +Cost Center @@ -642,7 +642,7 @@ Existing Company -Cost Center +Cost Center @@ -741,7 +741,7 @@ Last Day of the Next Month -Account +Account @@ -762,7 +762,7 @@ Last Day of the Next Month -Account +Account @@ -795,7 +795,7 @@ Last Day of the Next Month -Account +Account @@ -816,7 +816,7 @@ Last Day of the Next Month -Account +Account @@ -849,7 +849,7 @@ Last Day of the Next Month -Account +Account @@ -870,7 +870,7 @@ Last Day of the Next Month -Account +Account @@ -903,7 +903,7 @@ Last Day of the Next Month -Account +Account @@ -924,7 +924,7 @@ Last Day of the Next Month -Cost Center +Cost Center @@ -1459,7 +1459,7 @@ Last Day of the Next Month
  • -Account +Account
    • @@ -1468,7 +1468,7 @@ Last Day of the Next Month
  • -Appraisal +Appraisal
    • @@ -1477,7 +1477,7 @@ Last Day of the Next Month
  • -Asset +Asset
    • @@ -1486,7 +1486,7 @@ Last Day of the Next Month
  • -Asset Category Account +Asset Category Account
    • @@ -1495,7 +1495,7 @@ Last Day of the Next Month
  • -Asset Movement +Asset Movement
    • @@ -1504,7 +1504,7 @@ Last Day of the Next Month
  • -Attendance +Attendance
    • @@ -1513,7 +1513,7 @@ Last Day of the Next Month
  • -Authorization Rule +Authorization Rule
    • @@ -1522,7 +1522,7 @@ Last Day of the Next Month
  • -BOM +BOM
    • @@ -1531,7 +1531,7 @@ Last Day of the Next Month
  • -Budget +Budget
    • @@ -1540,7 +1540,7 @@ Last Day of the Next Month
  • -C-Form +C-Form
    • @@ -1549,7 +1549,7 @@ Last Day of the Next Month
  • -Company +Company
    • @@ -1558,7 +1558,7 @@ Last Day of the Next Month
  • -Cost Center +Cost Center
    • @@ -1567,7 +1567,7 @@ Last Day of the Next Month
  • -Daily Work Summary +Daily Work Summary
    • @@ -1576,7 +1576,7 @@ Last Day of the Next Month
  • -Daily Work Summary Settings Company +Daily Work Summary Settings Company
    • @@ -1585,7 +1585,7 @@ Last Day of the Next Month
  • -Delivery Note +Delivery Note
    • @@ -1594,7 +1594,7 @@ Last Day of the Next Month
  • -Email Digest +Email Digest
    • @@ -1603,7 +1603,7 @@ Last Day of the Next Month
  • -Employee +Employee
    • @@ -1612,7 +1612,7 @@ Last Day of the Next Month
  • -Employee Attendance Tool +Employee Attendance Tool
    • @@ -1621,7 +1621,7 @@ Last Day of the Next Month
  • -Employee Loan +Employee Loan
    • @@ -1630,7 +1630,7 @@ Last Day of the Next Month
  • -Employee Loan Application +Employee Loan Application
    • @@ -1639,7 +1639,7 @@ Last Day of the Next Month
  • -Expense Claim +Expense Claim
    • @@ -1648,7 +1648,7 @@ Last Day of the Next Month
  • -Expense Claim Account +Expense Claim Account
    • @@ -1657,7 +1657,7 @@ Last Day of the Next Month
  • -Fiscal Year Company +Fiscal Year Company
    • @@ -1666,7 +1666,7 @@ Last Day of the Next Month
  • -GL Entry +GL Entry
    • @@ -1675,7 +1675,7 @@ Last Day of the Next Month
  • -Global Defaults +Global Defaults
    • @@ -1684,7 +1684,7 @@ Last Day of the Next Month
  • -Homepage +Homepage
    • @@ -1693,7 +1693,7 @@ Last Day of the Next Month
  • -Installation Note +Installation Note
    • @@ -1702,7 +1702,7 @@ Last Day of the Next Month
  • -Issue +Issue
    • @@ -1711,7 +1711,7 @@ Last Day of the Next Month
  • -Journal Entry +Journal Entry
    • @@ -1720,7 +1720,7 @@ Last Day of the Next Month
  • -Landed Cost Voucher +Landed Cost Voucher
    • @@ -1729,7 +1729,7 @@ Last Day of the Next Month
  • -Lead +Lead
    • @@ -1738,7 +1738,7 @@ Last Day of the Next Month
  • -Leave Application +Leave Application
    • @@ -1747,7 +1747,7 @@ Last Day of the Next Month
  • -Leave Block List +Leave Block List
    • @@ -1756,7 +1756,7 @@ Last Day of the Next Month
  • -Leave Control Panel +Leave Control Panel
    • @@ -1765,7 +1765,7 @@ Last Day of the Next Month
  • -Maintenance Schedule +Maintenance Schedule
    • @@ -1774,7 +1774,7 @@ Last Day of the Next Month
  • -Maintenance Visit +Maintenance Visit
    • @@ -1783,7 +1783,7 @@ Last Day of the Next Month
  • -Material Request +Material Request
    • @@ -1792,7 +1792,7 @@ Last Day of the Next Month
  • -Mode of Payment Account +Mode of Payment Account
    • @@ -1801,7 +1801,7 @@ Last Day of the Next Month
  • -Offer Letter +Offer Letter
    • @@ -1810,7 +1810,7 @@ Last Day of the Next Month
  • -Opportunity +Opportunity
    • @@ -1819,7 +1819,7 @@ Last Day of the Next Month
  • -Party Account +Party Account
    • @@ -1828,7 +1828,7 @@ Last Day of the Next Month
  • -Payment Entry +Payment Entry
    • @@ -1837,7 +1837,7 @@ Last Day of the Next Month
  • -Payment Reconciliation +Payment Reconciliation
    • @@ -1846,7 +1846,7 @@ Last Day of the Next Month
  • -Period Closing Voucher +Period Closing Voucher
    • @@ -1855,7 +1855,7 @@ Last Day of the Next Month
  • -POS Profile +POS Profile
    • @@ -1864,7 +1864,7 @@ Last Day of the Next Month
  • -Pricing Rule +Pricing Rule
    • @@ -1873,7 +1873,7 @@ Last Day of the Next Month
  • -Process Payroll +Process Payroll
    • @@ -1882,7 +1882,7 @@ Last Day of the Next Month
  • -Production Order +Production Order
    • @@ -1891,7 +1891,7 @@ Last Day of the Next Month
  • -Production Planning Tool +Production Planning Tool
    • @@ -1900,7 +1900,7 @@ Last Day of the Next Month
  • -Project +Project
    • @@ -1909,7 +1909,7 @@ Last Day of the Next Month
  • -Purchase Invoice +Purchase Invoice
    • @@ -1918,7 +1918,7 @@ Last Day of the Next Month
  • -Purchase Order +Purchase Order
    • @@ -1927,7 +1927,7 @@ Last Day of the Next Month
  • -Purchase Receipt +Purchase Receipt
    • @@ -1936,7 +1936,7 @@ Last Day of the Next Month
  • -Purchase Taxes and Charges Template +Purchase Taxes and Charges Template
    • @@ -1945,7 +1945,7 @@ Last Day of the Next Month
  • -Quotation +Quotation
    • @@ -1954,7 +1954,7 @@ Last Day of the Next Month
  • -Request for Quotation +Request for Quotation
    • @@ -1963,7 +1963,7 @@ Last Day of the Next Month
  • -Salary Component Account +Salary Component Account
    • @@ -1972,7 +1972,7 @@ Last Day of the Next Month
  • -Salary Slip +Salary Slip
    • @@ -1981,7 +1981,7 @@ Last Day of the Next Month
  • -Salary Structure +Salary Structure
    • @@ -1990,7 +1990,7 @@ Last Day of the Next Month
  • -Sales Invoice +Sales Invoice
    • @@ -1999,7 +1999,7 @@ Last Day of the Next Month
  • -Sales Order +Sales Order
    • @@ -2008,7 +2008,7 @@ Last Day of the Next Month
  • -Sales Taxes and Charges Template +Sales Taxes and Charges Template
    • @@ -2017,7 +2017,7 @@ Last Day of the Next Month
  • -Serial No +Serial No
    • @@ -2026,7 +2026,7 @@ Last Day of the Next Month
  • -Shipping Rule +Shipping Rule
    • @@ -2035,7 +2035,7 @@ Last Day of the Next Month
  • -Shopping Cart Settings +Shopping Cart Settings
    • @@ -2044,7 +2044,7 @@ Last Day of the Next Month
  • -Stock Entry +Stock Entry
    • @@ -2053,7 +2053,7 @@ Last Day of the Next Month
  • -Stock Ledger Entry +Stock Ledger Entry
    • @@ -2062,7 +2062,7 @@ Last Day of the Next Month
  • -Stock Reconciliation +Stock Reconciliation
    • @@ -2071,7 +2071,7 @@ Last Day of the Next Month
  • -Supplier Quotation +Supplier Quotation
    • @@ -2080,7 +2080,7 @@ Last Day of the Next Month
  • -Task +Task
    • @@ -2089,7 +2089,7 @@ Last Day of the Next Month
  • -Tax Rule +Tax Rule
    • @@ -2098,7 +2098,7 @@ Last Day of the Next Month
  • -Timesheet +Timesheet
    • @@ -2107,7 +2107,7 @@ Last Day of the Next Month
  • -Warehouse +Warehouse
    • @@ -2116,7 +2116,7 @@ Last Day of the Next Month
  • -Warranty Claim +Warranty Claim
    • diff --git a/foundation/www/docs/current/models/setup/currency_exchange.html b/foundation/www/docs/current/models/setup/currency_exchange.html index 4e701077..433d1851 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 8.6.3 + Version 8.6.5 Currency +Currency @@ -87,7 +87,7 @@ Specify Exchange Rate to convert one currency into another -Currency +Currency diff --git a/foundation/www/docs/current/models/setup/customer_group.html b/foundation/www/docs/current/models/setup/customer_group.html index 0b48bcfe..9b9f24f2 100644 --- a/foundation/www/docs/current/models/setup/customer_group.html +++ b/foundation/www/docs/current/models/setup/customer_group.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Customer Group +Customer Group @@ -112,7 +112,7 @@ -Price List +Price List @@ -197,7 +197,7 @@ Last Day of the Next Month -Customer Group +Customer Group @@ -231,7 +231,7 @@ Last Day of the Next Month -Party Account +Party Account @@ -303,7 +303,7 @@ Last Day of the Next Month
  • -Customer +Customer
    • @@ -312,7 +312,7 @@ Last Day of the Next Month
  • -Customer Group +Customer Group
    • @@ -321,7 +321,7 @@ Last Day of the Next Month
  • -Delivery Note +Delivery Note
    • @@ -330,7 +330,7 @@ Last Day of the Next Month
  • -Installation Note +Installation Note
    • @@ -339,7 +339,7 @@ Last Day of the Next Month
  • -Maintenance Schedule +Maintenance Schedule
    • @@ -348,7 +348,7 @@ Last Day of the Next Month
  • -Maintenance Visit +Maintenance Visit
    • @@ -357,7 +357,7 @@ Last Day of the Next Month
  • -Opportunity +Opportunity
    • @@ -366,7 +366,7 @@ Last Day of the Next Month
  • -POS Customer Group +POS Customer Group
    • @@ -375,7 +375,7 @@ Last Day of the Next Month
  • -Pricing Rule +Pricing Rule
    • @@ -384,7 +384,7 @@ Last Day of the Next Month
  • -Quotation +Quotation
    • @@ -393,7 +393,7 @@ Last Day of the Next Month
  • -Sales Invoice +Sales Invoice
    • @@ -402,7 +402,7 @@ Last Day of the Next Month
  • -Sales Order +Sales Order
    • @@ -411,7 +411,7 @@ Last Day of the Next Month
  • -Selling Settings +Selling Settings
    • @@ -420,7 +420,7 @@ Last Day of the Next Month
  • -Shopping Cart Settings +Shopping Cart Settings
    • @@ -429,7 +429,7 @@ Last Day of the Next Month
  • -Tax Rule +Tax Rule
    • @@ -438,7 +438,7 @@ Last Day of the Next Month
  • -Warranty Claim +Warranty Claim
    • diff --git a/foundation/www/docs/current/models/setup/email_digest.html b/foundation/www/docs/current/models/setup/email_digest.html index bfcf1171..6a96f6f8 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 8.6.3 + Version 8.6.5 Company +Company diff --git a/foundation/www/docs/current/models/setup/global_defaults.html b/foundation/www/docs/current/models/setup/global_defaults.html index c8dcb163..5f7772f7 100644 --- a/foundation/www/docs/current/models/setup/global_defaults.html +++ b/foundation/www/docs/current/models/setup/global_defaults.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -73,7 +73,7 @@ -Fiscal Year +Fiscal Year @@ -94,7 +94,7 @@ -Country +Country @@ -127,7 +127,7 @@ -Currency +Currency diff --git a/foundation/www/docs/current/models/setup/index.html b/foundation/www/docs/current/models/setup/index.html index e1ddf4c9..84c41836 100644 --- a/foundation/www/docs/current/models/setup/index.html +++ b/foundation/www/docs/current/models/setup/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Item Group +Item Group @@ -124,7 +124,7 @@ Item Classification -Account +Account @@ -145,7 +145,7 @@ Item Classification -Account +Account @@ -166,7 +166,7 @@ Item Classification -Cost Center +Cost Center @@ -225,7 +225,7 @@ Item Classification -Website Slideshow +Website Slideshow @@ -259,7 +259,7 @@ Item Classification -Item Website Specification +Item Website Specification @@ -304,7 +304,7 @@ Item Classification -Item Group +Item Group @@ -558,7 +558,7 @@ Item Classification
  • -Delivery Note Item +Delivery Note Item
    • @@ -567,7 +567,7 @@ Item Classification
  • -Item +Item
    • @@ -576,7 +576,7 @@ Item Classification
  • -Item Group +Item Group
    • @@ -585,7 +585,7 @@ Item Classification
  • -Material Request Item +Material Request Item
    • @@ -594,7 +594,7 @@ Item Classification
  • -Opportunity Item +Opportunity Item
    • @@ -603,7 +603,7 @@ Item Classification
  • -POS Item Group +POS Item Group
    • @@ -612,7 +612,7 @@ Item Classification
  • -Pricing Rule +Pricing Rule
    • @@ -621,7 +621,7 @@ Item Classification
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -630,7 +630,7 @@ Item Classification
  • -Purchase Order Item +Purchase Order Item
    • @@ -639,7 +639,7 @@ Item Classification
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -648,7 +648,7 @@ Item Classification
  • -Quotation Item +Quotation Item
    • @@ -657,7 +657,7 @@ Item Classification
  • -Request for Quotation Item +Request for Quotation Item
    • @@ -666,7 +666,7 @@ Item Classification
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -675,7 +675,7 @@ Item Classification
  • -Sales Order Item +Sales Order Item
    • @@ -684,7 +684,7 @@ Item Classification
  • -Serial No +Serial No
    • @@ -693,7 +693,7 @@ Item Classification
  • -Stock Settings +Stock Settings
    • @@ -702,7 +702,7 @@ Item Classification
  • -Supplier Quotation Item +Supplier Quotation Item
    • @@ -711,7 +711,7 @@ Item Classification
  • -Target Detail +Target Detail
    • @@ -720,7 +720,7 @@ Item Classification
  • -Website Item Group +Website Item Group
    • diff --git a/foundation/www/docs/current/models/setup/naming_series.html b/foundation/www/docs/current/models/setup/naming_series.html index b50f937b..5717f06b 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 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 DocType +DocType diff --git a/foundation/www/docs/current/models/setup/print_heading.html b/foundation/www/docs/current/models/setup/print_heading.html index f77521e4..478f7547 100644 --- a/foundation/www/docs/current/models/setup/print_heading.html +++ b/foundation/www/docs/current/models/setup/print_heading.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Delivery Note +Delivery Note @@ -110,7 +110,7 @@
  • -Journal Entry +Journal Entry
    • @@ -119,7 +119,7 @@
  • -Material Request +Material Request
    • @@ -128,7 +128,7 @@
  • -Payment Entry +Payment Entry
    • @@ -137,7 +137,7 @@
  • -POS Profile +POS Profile
    • @@ -146,7 +146,7 @@
  • -Purchase Invoice +Purchase Invoice
    • @@ -155,7 +155,7 @@
  • -Purchase Order +Purchase Order
    • @@ -164,7 +164,7 @@
  • -Purchase Receipt +Purchase Receipt
    • @@ -173,7 +173,7 @@
  • -Quotation +Quotation
    • @@ -182,7 +182,7 @@
  • -Request for Quotation +Request for Quotation
    • @@ -191,7 +191,7 @@
  • -Sales Invoice +Sales Invoice
    • @@ -200,7 +200,7 @@
  • -Sales Order +Sales Order
    • @@ -209,7 +209,7 @@
  • -Stock Entry +Stock Entry
    • @@ -218,7 +218,7 @@
  • -Supplier Quotation +Supplier Quotation
    • diff --git a/foundation/www/docs/current/models/setup/quotation_lost_reason.html b/foundation/www/docs/current/models/setup/quotation_lost_reason.html index 84b878b1..ea584b44 100644 --- a/foundation/www/docs/current/models/setup/quotation_lost_reason.html +++ b/foundation/www/docs/current/models/setup/quotation_lost_reason.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Territory +Territory @@ -216,7 +216,7 @@ Reseller -Target Detail +Target Detail @@ -238,7 +238,7 @@ Reseller -Monthly Distribution +Monthly Distribution @@ -458,7 +458,7 @@ Reseller
  • -Customer +Customer
    • @@ -467,7 +467,7 @@ Reseller
  • -Delivery Note +Delivery Note
    • @@ -476,7 +476,7 @@ Reseller
  • -Pricing Rule +Pricing Rule
    • @@ -485,7 +485,7 @@ Reseller
  • -Sales Invoice +Sales Invoice
    • @@ -494,7 +494,7 @@ Reseller
  • -Sales Order +Sales Order
    • @@ -503,7 +503,7 @@ Reseller
  • -SMS Center +SMS Center
    • diff --git a/foundation/www/docs/current/models/setup/sales_person.html b/foundation/www/docs/current/models/setup/sales_person.html index f4cea35e..e7563368 100644 --- a/foundation/www/docs/current/models/setup/sales_person.html +++ b/foundation/www/docs/current/models/setup/sales_person.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Sales Person +Sales Person @@ -126,7 +126,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that -Employee +Employee @@ -210,7 +210,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that -Target Detail +Target Detail @@ -232,7 +232,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that -Monthly Distribution +Monthly Distribution @@ -332,7 +332,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that
  • -Maintenance Schedule Detail +Maintenance Schedule Detail
    • @@ -341,7 +341,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that
  • -Maintenance Schedule Item +Maintenance Schedule Item
    • @@ -350,7 +350,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that
  • -Maintenance Visit Purpose +Maintenance Visit Purpose
    • @@ -359,7 +359,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that
  • -Sales Person +Sales Person
    • @@ -368,7 +368,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that
  • -Sales Team +Sales Team
    • @@ -377,7 +377,7 @@ All Sales Transactions can be tagged against multiple **Sales Persons** so that
  • -Territory +Territory
    • diff --git a/foundation/www/docs/current/models/setup/sms_parameter.html b/foundation/www/docs/current/models/setup/sms_parameter.html index 642f810c..6192b6d0 100644 --- a/foundation/www/docs/current/models/setup/sms_parameter.html +++ b/foundation/www/docs/current/models/setup/sms_parameter.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -SMS Settings +SMS Settings diff --git a/foundation/www/docs/current/models/setup/sms_settings.html b/foundation/www/docs/current/models/setup/sms_settings.html index f86313e5..6fce961f 100644 --- a/foundation/www/docs/current/models/setup/sms_settings.html +++ b/foundation/www/docs/current/models/setup/sms_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 SMS Parameter +SMS Parameter diff --git a/foundation/www/docs/current/models/setup/supplier_type.html b/foundation/www/docs/current/models/setup/supplier_type.html index 172b792d..12ffb640 100644 --- a/foundation/www/docs/current/models/setup/supplier_type.html +++ b/foundation/www/docs/current/models/setup/supplier_type.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Party Account +Party Account @@ -163,7 +163,7 @@ Last Day of the Next Month
  • -Buying Settings +Buying Settings
    • @@ -172,7 +172,7 @@ Last Day of the Next Month
  • -Pricing Rule +Pricing Rule
    • @@ -181,7 +181,7 @@ Last Day of the Next Month
  • -Supplier +Supplier
    • @@ -190,7 +190,7 @@ Last Day of the Next Month
  • -Tax Rule +Tax Rule
    • diff --git a/foundation/www/docs/current/models/setup/target_detail.html b/foundation/www/docs/current/models/setup/target_detail.html index 6c8580fc..a3f2b725 100644 --- a/foundation/www/docs/current/models/setup/target_detail.html +++ b/foundation/www/docs/current/models/setup/target_detail.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item Group +Item Group @@ -75,7 +75,7 @@ -Fiscal Year +Fiscal Year @@ -118,21 +118,21 @@
  • -Sales Partner +Sales Partner
  • -Sales Person +Sales Person
  • -Territory +Territory
    • diff --git a/foundation/www/docs/current/models/setup/terms_and_conditions.html b/foundation/www/docs/current/models/setup/terms_and_conditions.html index 1c9ba753..d6aff27e 100644 --- a/foundation/www/docs/current/models/setup/terms_and_conditions.html +++ b/foundation/www/docs/current/models/setup/terms_and_conditions.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Company +Company @@ -178,7 +178,7 @@ Examples:
  • -Delivery Note +Delivery Note
    • @@ -187,7 +187,7 @@ Examples:
  • -Material Request +Material Request
    • @@ -196,7 +196,7 @@ Examples:
  • -Offer Letter +Offer Letter
    • @@ -205,7 +205,7 @@ Examples:
  • -POS Profile +POS Profile
    • @@ -214,7 +214,7 @@ Examples:
  • -Purchase Invoice +Purchase Invoice
    • @@ -223,7 +223,7 @@ Examples:
  • -Purchase Order +Purchase Order
    • @@ -232,7 +232,7 @@ Examples:
  • -Purchase Receipt +Purchase Receipt
    • @@ -241,7 +241,7 @@ Examples:
  • -Quotation +Quotation
    • @@ -250,7 +250,7 @@ Examples:
  • -Request for Quotation +Request for Quotation
    • @@ -259,7 +259,7 @@ Examples:
  • -Sales Invoice +Sales Invoice
    • @@ -268,7 +268,7 @@ Examples:
  • -Sales Order +Sales Order
    • @@ -277,7 +277,7 @@ Examples:
  • -Supplier Quotation +Supplier Quotation
    • diff --git a/foundation/www/docs/current/models/setup/territory.html b/foundation/www/docs/current/models/setup/territory.html index e7e93c4e..d803ca1c 100644 --- a/foundation/www/docs/current/models/setup/territory.html +++ b/foundation/www/docs/current/models/setup/territory.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Territory +Territory @@ -113,7 +113,7 @@ Classification of Customers by region -Sales Person +Sales Person @@ -158,7 +158,7 @@ Classification of Customers by region -Territory +Territory @@ -192,7 +192,7 @@ Classification of Customers by region -Target Detail +Target Detail @@ -214,7 +214,7 @@ Classification of Customers by region -Monthly Distribution +Monthly Distribution @@ -286,7 +286,7 @@ Classification of Customers by region
  • -C-Form Invoice Detail +C-Form Invoice Detail
    • @@ -295,7 +295,7 @@ Classification of Customers by region
  • -Customer +Customer
    • @@ -304,7 +304,7 @@ Classification of Customers by region
  • -Delivery Note +Delivery Note
    • @@ -313,7 +313,7 @@ Classification of Customers by region
  • -Installation Note +Installation Note
    • @@ -322,7 +322,7 @@ Classification of Customers by region
  • -Lead +Lead
    • @@ -331,7 +331,7 @@ Classification of Customers by region
  • -Maintenance Schedule +Maintenance Schedule
    • @@ -340,7 +340,7 @@ Classification of Customers by region
  • -Maintenance Visit +Maintenance Visit
    • @@ -349,7 +349,7 @@ Classification of Customers by region
  • -Opportunity +Opportunity
    • @@ -358,7 +358,7 @@ Classification of Customers by region
  • -POS Profile +POS Profile
    • @@ -367,7 +367,7 @@ Classification of Customers by region
  • -Pricing Rule +Pricing Rule
    • @@ -376,7 +376,7 @@ Classification of Customers by region
  • -Quotation +Quotation
    • @@ -385,7 +385,7 @@ Classification of Customers by region
  • -Sales Invoice +Sales Invoice
    • @@ -394,7 +394,7 @@ Classification of Customers by region
  • -Sales Order +Sales Order
    • @@ -403,7 +403,7 @@ Classification of Customers by region
  • -Sales Partner +Sales Partner
    • @@ -412,7 +412,7 @@ Classification of Customers by region
  • -Selling Settings +Selling Settings
    • @@ -421,7 +421,7 @@ Classification of Customers by region
  • -Territory +Territory
    • @@ -430,7 +430,7 @@ Classification of Customers by region
  • -Warranty Claim +Warranty Claim
    • diff --git a/foundation/www/docs/current/models/setup/uom.html b/foundation/www/docs/current/models/setup/uom.html index 130ce81c..00d9aac3 100644 --- a/foundation/www/docs/current/models/setup/uom.html +++ b/foundation/www/docs/current/models/setup/uom.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Bin +Bin @@ -111,7 +111,7 @@
  • -BOM +BOM
    • @@ -120,7 +120,7 @@
  • -BOM Explosion Item +BOM Explosion Item
    • @@ -129,7 +129,7 @@
  • -BOM Item +BOM Item
    • @@ -138,7 +138,7 @@
  • -BOM Scrap Item +BOM Scrap Item
    • @@ -147,7 +147,7 @@
  • -Delivery Note Item +Delivery Note Item
    • @@ -156,7 +156,7 @@
  • -Item +Item
    • @@ -165,7 +165,7 @@
  • -Material Request Item +Material Request Item
    • @@ -174,7 +174,7 @@
  • -Opportunity Item +Opportunity Item
    • @@ -183,7 +183,7 @@
  • -Packed Item +Packed Item
    • @@ -192,7 +192,7 @@
  • -Packing Slip +Packing Slip
    • @@ -201,7 +201,7 @@
  • -Packing Slip Item +Packing Slip Item
    • @@ -210,7 +210,7 @@
  • -Product Bundle Item +Product Bundle Item
    • @@ -219,7 +219,7 @@
  • -Production Order +Production Order
    • @@ -228,7 +228,7 @@
  • -Production Plan Item +Production Plan Item
    • @@ -237,7 +237,7 @@
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -246,7 +246,7 @@
  • -Purchase Order Item +Purchase Order Item
    • @@ -255,7 +255,7 @@
  • -Purchase Order Item Supplied +Purchase Order Item Supplied
    • @@ -264,7 +264,7 @@
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -273,7 +273,7 @@
  • -Purchase Receipt Item Supplied +Purchase Receipt Item Supplied
    • @@ -282,7 +282,7 @@
  • -Quotation Item +Quotation Item
    • @@ -291,7 +291,7 @@
  • -Request for Quotation Item +Request for Quotation Item
    • @@ -300,7 +300,7 @@
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -309,7 +309,7 @@
  • -Sales Order Item +Sales Order Item
    • @@ -318,7 +318,7 @@
  • -Stock Entry Detail +Stock Entry Detail
    • @@ -327,7 +327,7 @@
  • -Stock Ledger Entry +Stock Ledger Entry
    • @@ -336,7 +336,7 @@
  • -Stock Settings +Stock Settings
    • @@ -345,7 +345,7 @@
  • -Supplier Quotation Item +Supplier Quotation Item
    • @@ -354,7 +354,7 @@
  • -UOM Conversion Detail +UOM Conversion Detail
    • @@ -363,7 +363,7 @@
  • -Vehicle +Vehicle
    • diff --git a/foundation/www/docs/current/models/setup/website_item_group.html b/foundation/www/docs/current/models/setup/website_item_group.html index 444476c2..01a20f46 100644 --- a/foundation/www/docs/current/models/setup/website_item_group.html +++ b/foundation/www/docs/current/models/setup/website_item_group.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item Group +Item Group @@ -73,7 +73,7 @@ Cross Listing of Item in multiple groups
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/shopping_cart/index.html b/foundation/www/docs/current/models/shopping_cart/index.html index e3f3ef4c..2b3d23aa 100644 --- a/foundation/www/docs/current/models/shopping_cart/index.html +++ b/foundation/www/docs/current/models/shopping_cart/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Company +Company @@ -123,7 +123,7 @@ Default settings for Shopping Cart -Price List +Price List @@ -168,7 +168,7 @@ Default settings for Shopping Cart -Customer Group +Customer Group @@ -255,7 +255,7 @@ My Account -Payment Gateway Account +Payment Gateway Account diff --git a/foundation/www/docs/current/models/stock/batch.html b/foundation/www/docs/current/models/stock/batch.html index 5c867326..179a601f 100644 --- a/foundation/www/docs/current/models/stock/batch.html +++ b/foundation/www/docs/current/models/stock/batch.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -99,7 +99,7 @@ -Batch +Batch @@ -156,7 +156,7 @@ -Supplier +Supplier @@ -189,7 +189,7 @@ -DocType +DocType @@ -440,7 +440,7 @@
  • -Batch +Batch
    • @@ -449,7 +449,7 @@
  • -Delivery Note Item +Delivery Note Item
    • @@ -458,7 +458,7 @@
  • -Packed Item +Packed Item
    • @@ -467,7 +467,7 @@
  • -Packing Slip Item +Packing Slip Item
    • @@ -476,7 +476,7 @@
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -485,7 +485,7 @@
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -494,7 +494,7 @@
  • -Purchase Receipt Item Supplied +Purchase Receipt Item Supplied
    • @@ -503,7 +503,7 @@
  • -Quality Inspection +Quality Inspection
    • @@ -512,7 +512,7 @@
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -521,7 +521,7 @@
  • -Stock Entry Detail +Stock Entry Detail
    • diff --git a/foundation/www/docs/current/models/stock/bin.html b/foundation/www/docs/current/models/stock/bin.html index 50473c5d..2d0f1cba 100644 --- a/foundation/www/docs/current/models/stock/bin.html +++ b/foundation/www/docs/current/models/stock/bin.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Warehouse +Warehouse @@ -75,7 +75,7 @@ -Item +Item @@ -192,7 +192,7 @@ -UOM +UOM 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 6fef4c83..d9852fa2 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 8.6.3 + Version 8.6.5 -Item +Item diff --git a/foundation/www/docs/current/models/stock/delivery_note.html b/foundation/www/docs/current/models/stock/delivery_note.html index 227af806..a2379c58 100644 --- a/foundation/www/docs/current/models/stock/delivery_note.html +++ b/foundation/www/docs/current/models/stock/delivery_note.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Customer +Customer @@ -152,7 +152,7 @@ DN-RET- -Delivery Note +Delivery Note @@ -173,7 +173,7 @@ DN-RET- -Company +Company @@ -266,7 +266,7 @@ DN-RET- -Delivery Note +Delivery Note @@ -301,7 +301,7 @@ DN-RET- -Address +Address @@ -334,7 +334,7 @@ DN-RET- -Contact +Contact @@ -405,7 +405,7 @@ DN-RET- -Address +Address @@ -450,7 +450,7 @@ DN-RET- -Customer Group +Customer Group @@ -471,7 +471,7 @@ DN-RET- -Territory +Territory @@ -506,7 +506,7 @@ DN-RET- -Currency +Currency @@ -552,7 +552,7 @@ DN-RET- -Price List +Price List @@ -573,7 +573,7 @@ DN-RET- -Currency +Currency @@ -633,7 +633,7 @@ DN-RET- -Delivery Note Item +Delivery Note Item @@ -668,7 +668,7 @@ DN-RET- -Packed Item +Packed Item @@ -796,7 +796,7 @@ DN-RET- -Sales Taxes and Charges Template +Sales Taxes and Charges Template @@ -829,7 +829,7 @@ DN-RET- -Shipping Rule +Shipping Rule @@ -862,7 +862,7 @@ DN-RET- -Sales Taxes and Charges +Sales Taxes and Charges @@ -1161,7 +1161,7 @@ Net Total -Terms and Conditions +Terms and Conditions @@ -1271,7 +1271,7 @@ Net Total -Project +Project @@ -1292,7 +1292,7 @@ Net Total -Campaign +Campaign @@ -1313,7 +1313,7 @@ Net Total -Lead Source +Lead Source @@ -1370,7 +1370,7 @@ Net Total -Letter Head +Letter Head @@ -1391,7 +1391,7 @@ Net Total -Print Heading +Print Heading @@ -1517,7 +1517,7 @@ Closed -Warehouse +Warehouse @@ -1576,7 +1576,7 @@ Closed -Sales Partner +Sales Partner @@ -1647,7 +1647,7 @@ Closed -Sales Team +Sales Team @@ -2083,7 +2083,7 @@ Closed
  • -Delivery Note +Delivery Note
    • @@ -2092,7 +2092,7 @@ Closed
  • -Packing Slip +Packing Slip
    • @@ -2101,7 +2101,7 @@ Closed
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -2110,7 +2110,7 @@ Closed
  • -Stock Entry +Stock Entry
    • 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 01d50a4b..dc065149 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 8.6.3 + Version 8.6.5 Item +Item @@ -209,7 +209,7 @@ -UOM +UOM @@ -242,7 +242,7 @@ -UOM +UOM @@ -483,7 +483,7 @@ Amount -Pricing Rule +Pricing Rule @@ -596,7 +596,7 @@ Amount -Warehouse +Warehouse @@ -617,7 +617,7 @@ Amount -Warehouse +Warehouse @@ -638,7 +638,7 @@ Amount -Quality Inspection +Quality Inspection @@ -683,7 +683,7 @@ Amount -Batch +Batch @@ -728,7 +728,7 @@ Amount -Item Group +Item Group @@ -749,7 +749,7 @@ Amount -Brand +Brand @@ -794,7 +794,7 @@ Amount -Account +Account @@ -815,7 +815,7 @@ Amount -Cost Center +Cost Center @@ -848,7 +848,7 @@ Amount -Sales Order +Sales Order @@ -869,7 +869,7 @@ Amount -Sales Invoice +Sales Invoice @@ -950,7 +950,7 @@ Amount
  • -Delivery Note +Delivery Note
    • diff --git a/foundation/www/docs/current/models/stock/index.html b/foundation/www/docs/current/models/stock/index.html index eb55665d..eae3c993 100644 --- a/foundation/www/docs/current/models/stock/index.html +++ b/foundation/www/docs/current/models/stock/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 Item +Item @@ -140,7 +140,7 @@ A Product or a Service that is bought, sold or kept in stock. -Item Group +Item Group @@ -161,7 +161,7 @@ A Product or a Service that is bought, sold or kept in stock. -UOM +UOM @@ -266,7 +266,7 @@ A Product or a Service that is bought, sold or kept in stock. -Asset Category +Asset Category @@ -325,7 +325,7 @@ A Product or a Service that is bought, sold or kept in stock. -Brand +Brand @@ -372,7 +372,7 @@ A Product or a Service that is bought, sold or kept in stock. -Warehouse +Warehouse @@ -474,7 +474,7 @@ Moving Average -UOM +UOM @@ -510,7 +510,7 @@ Moving Average -Item Reorder +Item Reorder @@ -544,7 +544,7 @@ Moving Average -UOM Conversion Detail +UOM Conversion Detail @@ -679,7 +679,7 @@ Manufacturer -Item Variant Attribute +Item Variant Attribute @@ -763,7 +763,7 @@ Manufacturer -Cost Center +Cost Center @@ -784,7 +784,7 @@ Manufacturer -Account +Account @@ -829,7 +829,7 @@ Manufacturer -Supplier +Supplier @@ -862,7 +862,7 @@ Manufacturer -Manufacturer +Manufacturer @@ -907,7 +907,7 @@ Manufacturer -Item Supplier +Item Supplier @@ -940,7 +940,7 @@ Manufacturer -Country +Country @@ -973,7 +973,7 @@ Manufacturer -Customs Tariff Number +Customs Tariff Number @@ -1045,7 +1045,7 @@ Manufacturer -Account +Account @@ -1066,7 +1066,7 @@ Manufacturer -Cost Center +Cost Center @@ -1099,7 +1099,7 @@ Manufacturer -Item Customer Detail +Item Customer Detail @@ -1147,7 +1147,7 @@ Manufacturer -Item Tax +Item Tax @@ -1207,7 +1207,7 @@ Manufacturer -Item Quality Inspection Parameter +Item Quality Inspection Parameter @@ -1242,7 +1242,7 @@ Manufacturer -BOM +BOM @@ -1364,7 +1364,7 @@ Manufacturer -Website Slideshow +Website Slideshow @@ -1423,7 +1423,7 @@ Manufacturer -Warehouse +Warehouse @@ -1445,7 +1445,7 @@ Manufacturer -Website Item Group +Website Item Group @@ -1490,7 +1490,7 @@ Manufacturer -Item Website Specification +Item Website Specification @@ -2289,7 +2289,7 @@ Manufacturer
  • -Asset +Asset
    • @@ -2298,7 +2298,7 @@ Manufacturer
  • -Batch +Batch
    • @@ -2307,7 +2307,7 @@ Manufacturer
  • -Bin +Bin
    • @@ -2316,7 +2316,7 @@ Manufacturer
  • -BOM +BOM
    • @@ -2325,7 +2325,7 @@ Manufacturer
  • -BOM Explosion Item +BOM Explosion Item
    • @@ -2334,7 +2334,7 @@ Manufacturer
  • -BOM Item +BOM Item
    • @@ -2343,7 +2343,7 @@ Manufacturer
  • -BOM Scrap Item +BOM Scrap Item
    • @@ -2352,7 +2352,7 @@ Manufacturer
  • -BOM Website Item +BOM Website Item
    • @@ -2361,7 +2361,7 @@ Manufacturer
  • -Delivery Note Item +Delivery Note Item
    • @@ -2370,7 +2370,7 @@ Manufacturer
  • -Homepage Featured Product +Homepage Featured Product
    • @@ -2379,7 +2379,7 @@ Manufacturer
  • -Installation Note Item +Installation Note Item
    • @@ -2388,7 +2388,7 @@ Manufacturer
  • -Item +Item
    • @@ -2397,7 +2397,7 @@ Manufacturer
  • -Item Price +Item Price
    • @@ -2406,7 +2406,7 @@ Manufacturer
  • -Landed Cost Item +Landed Cost Item
    • @@ -2415,7 +2415,7 @@ Manufacturer
  • -Maintenance Schedule Detail +Maintenance Schedule Detail
    • @@ -2424,7 +2424,7 @@ Manufacturer
  • -Maintenance Schedule Item +Maintenance Schedule Item
    • @@ -2433,7 +2433,7 @@ Manufacturer
  • -Maintenance Visit Purpose +Maintenance Visit Purpose
    • @@ -2442,7 +2442,7 @@ Manufacturer
  • -Material Request Item +Material Request Item
    • @@ -2451,7 +2451,7 @@ Manufacturer
  • -Opportunity Item +Opportunity Item
    • @@ -2460,7 +2460,7 @@ Manufacturer
  • -Packed Item +Packed Item
    • @@ -2469,7 +2469,7 @@ Manufacturer
  • -Packing Slip Item +Packing Slip Item
    • @@ -2478,7 +2478,7 @@ Manufacturer
  • -Pricing Rule +Pricing Rule
    • @@ -2487,7 +2487,7 @@ Manufacturer
  • -Product Bundle +Product Bundle
    • @@ -2496,7 +2496,7 @@ Manufacturer
  • -Product Bundle Item +Product Bundle Item
    • @@ -2505,7 +2505,7 @@ Manufacturer
  • -Production Order +Production Order
    • @@ -2514,7 +2514,7 @@ Manufacturer
  • -Production Order Item +Production Order Item
    • @@ -2523,7 +2523,7 @@ Manufacturer
  • -Production Plan Item +Production Plan Item
    • @@ -2532,7 +2532,7 @@ Manufacturer
  • -Production Planning Tool +Production Planning Tool
    • @@ -2541,7 +2541,7 @@ Manufacturer
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -2550,7 +2550,7 @@ Manufacturer
  • -Purchase Order Item +Purchase Order Item
    • @@ -2559,7 +2559,7 @@ Manufacturer
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -2568,7 +2568,7 @@ Manufacturer
  • -Quality Inspection +Quality Inspection
    • @@ -2577,7 +2577,7 @@ Manufacturer
  • -Quotation Item +Quotation Item
    • @@ -2586,7 +2586,7 @@ Manufacturer
  • -Request for Quotation Item +Request for Quotation Item
    • @@ -2595,7 +2595,7 @@ Manufacturer
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -2604,7 +2604,7 @@ Manufacturer
  • -Sales Order Item +Sales Order Item
    • @@ -2613,7 +2613,7 @@ Manufacturer
  • -Serial No +Serial No
    • @@ -2622,7 +2622,7 @@ Manufacturer
  • -Stock Entry Detail +Stock Entry Detail
    • @@ -2631,7 +2631,7 @@ Manufacturer
  • -Stock Ledger Entry +Stock Ledger Entry
    • @@ -2640,7 +2640,7 @@ Manufacturer
  • -Stock Reconciliation Item +Stock Reconciliation Item
    • @@ -2649,7 +2649,7 @@ Manufacturer
  • -Supplier Quotation Item +Supplier Quotation Item
    • @@ -2658,7 +2658,7 @@ Manufacturer
  • -Warranty Claim +Warranty Claim
    • diff --git a/foundation/www/docs/current/models/stock/item_attribute.html b/foundation/www/docs/current/models/stock/item_attribute.html index ab5bbcbf..0fcab9dc 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 8.6.3 + Version 8.6.5 Item Attribute Value +Item Attribute Value @@ -293,7 +293,7 @@
  • -Item Variant +Item Variant
    • @@ -302,7 +302,7 @@
  • -Item Variant Attribute +Item Variant Attribute
    • diff --git a/foundation/www/docs/current/models/stock/item_attribute_value.html b/foundation/www/docs/current/models/stock/item_attribute_value.html index 65f9ae1b..b817d248 100644 --- a/foundation/www/docs/current/models/stock/item_attribute_value.html +++ b/foundation/www/docs/current/models/stock/item_attribute_value.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Item Attribute +Item Attribute 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 5669528e..6b88d218 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 8.6.3 + Version 8.6.5 Customer +Customer @@ -85,7 +85,7 @@ For the convenience of customers, these codes can be used in print formats like
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/stock/item_price.html b/foundation/www/docs/current/models/stock/item_price.html index c4de9d72..830ed478 100644 --- a/foundation/www/docs/current/models/stock/item_price.html +++ b/foundation/www/docs/current/models/stock/item_price.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Price List +Price List @@ -139,7 +139,7 @@ Multiple Item prices. -Currency +Currency @@ -160,7 +160,7 @@ Multiple Item prices. -Item +Item diff --git a/foundation/www/docs/current/models/stock/item_quality_inspection_parameter.html b/foundation/www/docs/current/models/stock/item_quality_inspection_parameter.html index 121e62d1..ea7d28e1 100644 --- a/foundation/www/docs/current/models/stock/item_quality_inspection_parameter.html +++ b/foundation/www/docs/current/models/stock/item_quality_inspection_parameter.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Item +Item diff --git a/foundation/www/docs/current/models/stock/item_reorder.html b/foundation/www/docs/current/models/stock/item_reorder.html index dcb435de..d62dd045 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 8.6.3 + Version 8.6.5 Warehouse +Warehouse @@ -75,7 +75,7 @@ -Warehouse +Warehouse @@ -135,7 +135,7 @@ Manufacture
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/stock/item_supplier.html b/foundation/www/docs/current/models/stock/item_supplier.html index 54c317d9..4ba3763d 100644 --- a/foundation/www/docs/current/models/stock/item_supplier.html +++ b/foundation/www/docs/current/models/stock/item_supplier.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Supplier +Supplier @@ -85,7 +85,7 @@
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/stock/item_tax.html b/foundation/www/docs/current/models/stock/item_tax.html index edc21390..b6328469 100644 --- a/foundation/www/docs/current/models/stock/item_tax.html +++ b/foundation/www/docs/current/models/stock/item_tax.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Account +Account @@ -85,7 +85,7 @@
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/stock/item_variant.html b/foundation/www/docs/current/models/stock/item_variant.html index f4440f86..9d5d8603 100644 --- a/foundation/www/docs/current/models/stock/item_variant.html +++ b/foundation/www/docs/current/models/stock/item_variant.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item Attribute +Item Attribute diff --git a/foundation/www/docs/current/models/stock/item_variant_attribute.html b/foundation/www/docs/current/models/stock/item_variant_attribute.html index 7e24feaf..03c01495 100644 --- a/foundation/www/docs/current/models/stock/item_variant_attribute.html +++ b/foundation/www/docs/current/models/stock/item_variant_attribute.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item Attribute +Item Attribute @@ -169,7 +169,7 @@
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/stock/item_website_specification.html b/foundation/www/docs/current/models/stock/item_website_specification.html index 82ef489b..09201458 100644 --- a/foundation/www/docs/current/models/stock/item_website_specification.html +++ b/foundation/www/docs/current/models/stock/item_website_specification.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Item +Item
  • -Item Group +Item Group
    • diff --git a/foundation/www/docs/current/models/stock/landed_cost_item.html b/foundation/www/docs/current/models/stock/landed_cost_item.html index 19a5c6b0..aa692105 100644 --- a/foundation/www/docs/current/models/stock/landed_cost_item.html +++ b/foundation/www/docs/current/models/stock/landed_cost_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -192,7 +192,7 @@ Purchase Receipt
  • -Landed Cost Voucher +Landed Cost Voucher
    • diff --git a/foundation/www/docs/current/models/stock/landed_cost_purchase_receipt.html b/foundation/www/docs/current/models/stock/landed_cost_purchase_receipt.html index 95b4de3a..3624100f 100644 --- a/foundation/www/docs/current/models/stock/landed_cost_purchase_receipt.html +++ b/foundation/www/docs/current/models/stock/landed_cost_purchase_receipt.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Supplier +Supplier @@ -139,7 +139,7 @@ Purchase Receipt
  • -Landed Cost Voucher +Landed Cost Voucher
    • diff --git a/foundation/www/docs/current/models/stock/landed_cost_taxes_and_charges.html b/foundation/www/docs/current/models/stock/landed_cost_taxes_and_charges.html index f9b4ca2a..02fb7741 100644 --- a/foundation/www/docs/current/models/stock/landed_cost_taxes_and_charges.html +++ b/foundation/www/docs/current/models/stock/landed_cost_taxes_and_charges.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Landed Cost Voucher +Landed Cost Voucher
  • -Stock Entry +Stock Entry
    • diff --git a/foundation/www/docs/current/models/stock/landed_cost_voucher.html b/foundation/www/docs/current/models/stock/landed_cost_voucher.html index 804dfb62..b3453321 100644 --- a/foundation/www/docs/current/models/stock/landed_cost_voucher.html +++ b/foundation/www/docs/current/models/stock/landed_cost_voucher.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -89,7 +89,7 @@ -Landed Cost Purchase Receipt +Landed Cost Purchase Receipt @@ -134,7 +134,7 @@ -Landed Cost Item +Landed Cost Item @@ -167,7 +167,7 @@ -Landed Cost Taxes and Charges +Landed Cost Taxes and Charges @@ -242,7 +242,7 @@ Amount -Landed Cost Voucher +Landed Cost Voucher @@ -450,7 +450,7 @@ Amount
  • -Landed Cost Voucher +Landed Cost Voucher
    • diff --git a/foundation/www/docs/current/models/stock/manufacturer.html b/foundation/www/docs/current/models/stock/manufacturer.html index dab94ede..42bd7ff2 100644 --- a/foundation/www/docs/current/models/stock/manufacturer.html +++ b/foundation/www/docs/current/models/stock/manufacturer.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Country +Country @@ -159,7 +159,7 @@ Manufacturers used in Items
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/stock/material_request.html b/foundation/www/docs/current/models/stock/material_request.html index 3a0ebb3f..e6f9e653 100644 --- a/foundation/www/docs/current/models/stock/material_request.html +++ b/foundation/www/docs/current/models/stock/material_request.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Material Request +Material Request @@ -144,7 +144,7 @@ Manufacture -Company +Company @@ -179,7 +179,7 @@ Manufacture -Material Request Item +Material Request Item @@ -297,7 +297,7 @@ Transferred -Letter Head +Letter Head @@ -318,7 +318,7 @@ Transferred -Print Heading +Print Heading @@ -353,7 +353,7 @@ Transferred -Terms and Conditions +Terms and Conditions @@ -807,7 +807,7 @@ Transferred
  • -Material Request +Material Request
    • @@ -816,7 +816,7 @@ Transferred
  • -Production Order +Production Order
    • @@ -825,7 +825,7 @@ Transferred
  • -Production Plan Item +Production Plan Item
    • @@ -834,7 +834,7 @@ Transferred
  • -Production Plan Material Request +Production Plan Material Request
    • @@ -843,7 +843,7 @@ Transferred
  • -Purchase Order Item +Purchase Order Item
    • @@ -852,7 +852,7 @@ Transferred
  • -Request for Quotation Item +Request for Quotation Item
    • @@ -861,7 +861,7 @@ Transferred
  • -Stock Entry Detail +Stock Entry Detail
    • @@ -870,7 +870,7 @@ Transferred
  • -Supplier Quotation Item +Supplier Quotation Item
    • 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 bd4ad334..62921b92 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 8.6.3 + Version 8.6.5 Item +Item @@ -171,7 +171,7 @@ -UOM +UOM @@ -192,7 +192,7 @@ -Warehouse +Warehouse @@ -249,7 +249,7 @@ -Item Group +Item Group @@ -270,7 +270,7 @@ -Brand +Brand @@ -303,7 +303,7 @@ -Sales Order +Sales Order @@ -324,7 +324,7 @@ -Project +Project @@ -415,7 +415,7 @@
  • -Material Request +Material Request
    • diff --git a/foundation/www/docs/current/models/stock/packed_item.html b/foundation/www/docs/current/models/stock/packed_item.html index c0992287..c1c6a510 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 8.6.3 + Version 8.6.5 Item +Item @@ -75,7 +75,7 @@ -Item +Item @@ -144,7 +144,7 @@ -Warehouse +Warehouse @@ -165,7 +165,7 @@ -Warehouse +Warehouse @@ -246,7 +246,7 @@ -Batch +Batch @@ -315,7 +315,7 @@ -UOM +UOM @@ -370,21 +370,21 @@
  • -Delivery Note +Delivery Note
  • -Sales Invoice +Sales Invoice
  • -Sales Order +Sales Order
    • diff --git a/foundation/www/docs/current/models/stock/packing_slip.html b/foundation/www/docs/current/models/stock/packing_slip.html index e6d02bc8..5772efdf 100644 --- a/foundation/www/docs/current/models/stock/packing_slip.html +++ b/foundation/www/docs/current/models/stock/packing_slip.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Delivery Note +Delivery Note @@ -212,7 +212,7 @@ Generate packing slips for packages to be delivered. Used to notify package numb -Packing Slip Item +Packing Slip Item @@ -258,7 +258,7 @@ Generate packing slips for packages to be delivered. Used to notify package numb -UOM +UOM @@ -304,7 +304,7 @@ Generate packing slips for packages to be delivered. Used to notify package numb -UOM +UOM @@ -337,7 +337,7 @@ Generate packing slips for packages to be delivered. Used to notify package numb -Letter Head +Letter Head @@ -370,7 +370,7 @@ Generate packing slips for packages to be delivered. Used to notify package numb -Packing Slip +Packing Slip @@ -585,7 +585,7 @@ Generate packing slips for packages to be delivered. Used to notify package numb
  • -Packing Slip +Packing Slip
    • diff --git a/foundation/www/docs/current/models/stock/packing_slip_item.html b/foundation/www/docs/current/models/stock/packing_slip_item.html index c2204e22..5b657259 100644 --- a/foundation/www/docs/current/models/stock/packing_slip_item.html +++ b/foundation/www/docs/current/models/stock/packing_slip_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -99,7 +99,7 @@ -Batch +Batch @@ -192,7 +192,7 @@ -UOM +UOM @@ -213,7 +213,7 @@ -UOM +UOM @@ -256,7 +256,7 @@
  • -Packing Slip +Packing Slip
    • diff --git a/foundation/www/docs/current/models/stock/price_list.html b/foundation/www/docs/current/models/stock/price_list.html index 4197871d..80da4f5e 100644 --- a/foundation/www/docs/current/models/stock/price_list.html +++ b/foundation/www/docs/current/models/stock/price_list.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Currency +Currency @@ -147,7 +147,7 @@ Price List Master -Price List Country +Price List Country @@ -261,7 +261,7 @@ Price List Master
  • -BOM +BOM
    • @@ -270,7 +270,7 @@ Price List Master
  • -Buying Settings +Buying Settings
    • @@ -279,7 +279,7 @@ Price List Master
  • -Customer +Customer
    • @@ -288,7 +288,7 @@ Price List Master
  • -Customer Group +Customer Group
    • @@ -297,7 +297,7 @@ Price List Master
  • -Delivery Note +Delivery Note
    • @@ -306,7 +306,7 @@ Price List Master
  • -Item Price +Item Price
    • @@ -315,7 +315,7 @@ Price List Master
  • -POS Profile +POS Profile
    • @@ -324,7 +324,7 @@ Price List Master
  • -Pricing Rule +Pricing Rule
    • @@ -333,7 +333,7 @@ Price List Master
  • -Purchase Invoice +Purchase Invoice
    • @@ -342,7 +342,7 @@ Price List Master
  • -Purchase Order +Purchase Order
    • @@ -351,7 +351,7 @@ Price List Master
  • -Purchase Receipt +Purchase Receipt
    • @@ -360,7 +360,7 @@ Price List Master
  • -Quotation +Quotation
    • @@ -369,7 +369,7 @@ Price List Master
  • -Sales Invoice +Sales Invoice
    • @@ -378,7 +378,7 @@ Price List Master
  • -Sales Order +Sales Order
    • @@ -387,7 +387,7 @@ Price List Master
  • -Selling Settings +Selling Settings
    • @@ -396,7 +396,7 @@ Price List Master
  • -Shopping Cart Settings +Shopping Cart Settings
    • @@ -405,7 +405,7 @@ Price List Master
  • -Supplier +Supplier
    • @@ -414,7 +414,7 @@ Price List Master
  • -Supplier Quotation +Supplier Quotation
    • diff --git a/foundation/www/docs/current/models/stock/price_list_country.html b/foundation/www/docs/current/models/stock/price_list_country.html index 88ea0a84..63cfe132 100644 --- a/foundation/www/docs/current/models/stock/price_list_country.html +++ b/foundation/www/docs/current/models/stock/price_list_country.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Country +Country @@ -73,7 +73,7 @@
  • -Price List +Price List
    • diff --git a/foundation/www/docs/current/models/stock/purchase_receipt.html b/foundation/www/docs/current/models/stock/purchase_receipt.html index 54132af4..aa070b56 100644 --- a/foundation/www/docs/current/models/stock/purchase_receipt.html +++ b/foundation/www/docs/current/models/stock/purchase_receipt.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Supplier +Supplier @@ -189,7 +189,7 @@ PREC-RET- -Company +Company @@ -222,7 +222,7 @@ PREC-RET- -Purchase Receipt +Purchase Receipt @@ -255,7 +255,7 @@ PREC-RET- -Address +Address @@ -276,7 +276,7 @@ PREC-RET- -Contact +Contact @@ -357,7 +357,7 @@ PREC-RET- -Address +Address @@ -404,7 +404,7 @@ PREC-RET- -Currency +Currency @@ -450,7 +450,7 @@ PREC-RET- -Price List +Price List @@ -471,7 +471,7 @@ PREC-RET- -Currency +Currency @@ -530,7 +530,7 @@ PREC-RET- -Purchase Receipt Item +Purchase Receipt Item @@ -660,7 +660,7 @@ PREC-RET- -Purchase Taxes and Charges Template +Purchase Taxes and Charges Template @@ -681,7 +681,7 @@ PREC-RET- -Purchase Taxes and Charges +Purchase Taxes and Charges @@ -1020,7 +1020,7 @@ Net Total -Terms and Conditions +Terms and Conditions @@ -1082,7 +1082,7 @@ Yes -Warehouse +Warehouse @@ -1103,7 +1103,7 @@ Yes -Purchase Receipt Item Supplied +Purchase Receipt Item Supplied @@ -1182,7 +1182,7 @@ Closed -Warehouse +Warehouse @@ -1203,7 +1203,7 @@ Closed -Purchase Receipt +Purchase Receipt @@ -1272,7 +1272,7 @@ Closed -Letter Head +Letter Head @@ -1293,7 +1293,7 @@ Closed -Print Heading +Print Heading @@ -1729,7 +1729,7 @@ Closed
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -1738,7 +1738,7 @@ Closed
  • -Purchase Receipt +Purchase Receipt
    • @@ -1747,7 +1747,7 @@ Closed
  • -Stock Entry +Stock Entry
    • diff --git a/foundation/www/docs/current/models/stock/purchase_receipt_item.html b/foundation/www/docs/current/models/stock/purchase_receipt_item.html index b14ed071..4e6b44fe 100644 --- a/foundation/www/docs/current/models/stock/purchase_receipt_item.html +++ b/foundation/www/docs/current/models/stock/purchase_receipt_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -245,7 +245,7 @@ -UOM +UOM @@ -266,7 +266,7 @@ -UOM +UOM @@ -443,7 +443,7 @@ -Pricing Rule +Pricing Rule @@ -556,7 +556,7 @@ -Warehouse +Warehouse @@ -577,7 +577,7 @@ -Warehouse +Warehouse @@ -598,7 +598,7 @@ -Quality Inspection +Quality Inspection @@ -631,7 +631,7 @@ -Purchase Order +Purchase Order @@ -700,7 +700,7 @@ -Batch +Batch @@ -757,7 +757,7 @@ -Project +Project @@ -778,7 +778,7 @@ -Cost Center +Cost Center @@ -835,7 +835,7 @@ -BOM +BOM @@ -880,7 +880,7 @@ -Brand +Brand @@ -901,7 +901,7 @@ -Item Group +Item Group @@ -988,7 +988,7 @@ Used for Taxes and Charges

  • -Purchase Receipt +Purchase Receipt
    • diff --git a/foundation/www/docs/current/models/stock/quality_inspection.html b/foundation/www/docs/current/models/stock/quality_inspection.html index ceccbf32..16864048 100644 --- a/foundation/www/docs/current/models/stock/quality_inspection.html +++ b/foundation/www/docs/current/models/stock/quality_inspection.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Item +Item @@ -174,7 +174,7 @@ Sales Invoice -Serial No +Serial No @@ -195,7 +195,7 @@ Sales Invoice -Batch +Batch @@ -276,7 +276,7 @@ Sales Invoice -User +User @@ -333,7 +333,7 @@ Sales Invoice -Quality Inspection +Quality Inspection @@ -382,7 +382,7 @@ Sales Invoice -Quality Inspection Reading +Quality Inspection Reading @@ -484,7 +484,7 @@ Sales Invoice
  • -Delivery Note Item +Delivery Note Item
    • @@ -493,7 +493,7 @@ Sales Invoice
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -502,7 +502,7 @@ Sales Invoice
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -511,7 +511,7 @@ Sales Invoice
  • -Quality Inspection +Quality Inspection
    • @@ -520,7 +520,7 @@ Sales Invoice
  • -Sales Invoice Item +Sales Invoice Item
    • 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 a0d757e6..9e8df80a 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 8.6.3 + Version 8.6.5
  • -Quality Inspection +Quality Inspection
    • diff --git a/foundation/www/docs/current/models/stock/serial_no.html b/foundation/www/docs/current/models/stock/serial_no.html index d201cb6e..cf7492c6 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 8.6.3 + Version 8.6.5 Item +Item @@ -112,7 +112,7 @@ Distinct unit of an Item -Warehouse +Warehouse @@ -169,7 +169,7 @@ Distinct unit of an Item -Item Group +Item Group @@ -190,7 +190,7 @@ Distinct unit of an Item -Brand +Brand @@ -235,7 +235,7 @@ Distinct unit of an Item -DocType +DocType @@ -320,7 +320,7 @@ Distinct unit of an Item -Supplier +Supplier @@ -365,7 +365,7 @@ Distinct unit of an Item -DocType +DocType @@ -452,7 +452,7 @@ No -Customer +Customer @@ -497,7 +497,7 @@ No -Sales Invoice +Sales Invoice @@ -632,7 +632,7 @@ Out of AMC -Company +Company @@ -1156,7 +1156,7 @@ Out of AMC
  • -Quality Inspection +Quality Inspection
    • @@ -1165,7 +1165,7 @@ Out of AMC
  • -Warranty Claim +Warranty Claim
    • diff --git a/foundation/www/docs/current/models/stock/stock_entry.html b/foundation/www/docs/current/models/stock/stock_entry.html index 4c16a4f2..2d17fe85 100644 --- a/foundation/www/docs/current/models/stock/stock_entry.html +++ b/foundation/www/docs/current/models/stock/stock_entry.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Company +Company @@ -133,7 +133,7 @@ Subcontract -Production Order +Production Order @@ -154,7 +154,7 @@ Subcontract -Purchase Order +Purchase Order @@ -175,7 +175,7 @@ Subcontract -Delivery Note +Delivery Note @@ -196,7 +196,7 @@ Subcontract -Sales Invoice +Sales Invoice @@ -217,7 +217,7 @@ Subcontract -Purchase Receipt +Purchase Receipt @@ -310,7 +310,7 @@ Subcontract -BOM +BOM @@ -393,7 +393,7 @@ Subcontract -Warehouse +Warehouse @@ -426,7 +426,7 @@ Subcontract -Warehouse +Warehouse @@ -461,7 +461,7 @@ Subcontract -Stock Entry Detail +Stock Entry Detail @@ -574,7 +574,7 @@ Subcontract -Landed Cost Taxes and Charges +Landed Cost Taxes and Charges @@ -621,7 +621,7 @@ Subcontract -Supplier +Supplier @@ -654,7 +654,7 @@ Subcontract -Address +Address @@ -699,7 +699,7 @@ Subcontract -Customer +Customer @@ -756,7 +756,7 @@ Subcontract -Print Heading +Print Heading @@ -777,7 +777,7 @@ Subcontract -Letter Head +Letter Head @@ -810,7 +810,7 @@ Subcontract -Project +Project @@ -869,7 +869,7 @@ Subcontract -Stock Entry +Stock Entry @@ -890,7 +890,7 @@ Subcontract -Journal Entry +Journal Entry @@ -1634,7 +1634,7 @@ Subcontract
  • -Journal Entry +Journal Entry
    • @@ -1643,7 +1643,7 @@ Subcontract
  • -Stock Entry +Stock Entry
    • 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 230f8619..a8eb2360 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 8.6.3 + Version 8.6.5 Warehouse +Warehouse @@ -111,7 +111,7 @@ -Warehouse +Warehouse @@ -144,7 +144,7 @@ -Item +Item @@ -357,7 +357,7 @@ -UOM +UOM @@ -390,7 +390,7 @@ -UOM +UOM @@ -459,7 +459,7 @@ -Batch +Batch @@ -492,7 +492,7 @@ -Account +Account @@ -525,7 +525,7 @@ -Cost Center +Cost Center @@ -583,7 +583,7 @@ -BOM +BOM @@ -617,7 +617,7 @@ -Material Request +Material Request @@ -638,7 +638,7 @@ -Material Request Item +Material Request Item @@ -657,7 +657,7 @@
  • -Stock Entry +Stock Entry
    • 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 bdaf8620..5ac2c639 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 8.6.3 + Version 8.6.5 Item +Item @@ -99,7 +99,7 @@ -Warehouse +Warehouse @@ -144,7 +144,7 @@ -DocType +DocType @@ -231,7 +231,7 @@ -UOM +UOM @@ -318,7 +318,7 @@ -Project +Project @@ -339,7 +339,7 @@ -Company +Company diff --git a/foundation/www/docs/current/models/stock/stock_reconciliation.html b/foundation/www/docs/current/models/stock/stock_reconciliation.html index faca7acd..cf1de23a 100644 --- a/foundation/www/docs/current/models/stock/stock_reconciliation.html +++ b/foundation/www/docs/current/models/stock/stock_reconciliation.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -89,7 +89,7 @@ This tool helps you to update or fix the quantity and valuation of stock in the -Stock Reconciliation +Stock Reconciliation @@ -170,7 +170,7 @@ This tool helps you to update or fix the quantity and valuation of stock in the -Stock Reconciliation Item +Stock Reconciliation Item @@ -203,7 +203,7 @@ This tool helps you to update or fix the quantity and valuation of stock in the -Account +Account @@ -224,7 +224,7 @@ This tool helps you to update or fix the quantity and valuation of stock in the -Cost Center +Cost Center @@ -598,7 +598,7 @@ This tool helps you to update or fix the quantity and valuation of stock in the
  • -Stock Reconciliation +Stock Reconciliation
    • diff --git a/foundation/www/docs/current/models/stock/stock_reconciliation_item.html b/foundation/www/docs/current/models/stock/stock_reconciliation_item.html index 3f7612a8..5c9aa634 100644 --- a/foundation/www/docs/current/models/stock/stock_reconciliation_item.html +++ b/foundation/www/docs/current/models/stock/stock_reconciliation_item.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Item +Item @@ -99,7 +99,7 @@ -Warehouse +Warehouse @@ -274,7 +274,7 @@
  • -Stock Reconciliation +Stock Reconciliation
    • diff --git a/foundation/www/docs/current/models/stock/stock_settings.html b/foundation/www/docs/current/models/stock/stock_settings.html index 81637132..bd6616ef 100644 --- a/foundation/www/docs/current/models/stock/stock_settings.html +++ b/foundation/www/docs/current/models/stock/stock_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 -Item Group +Item Group @@ -88,7 +88,7 @@ Naming Series -UOM +UOM @@ -109,7 +109,7 @@ Naming Series -Warehouse +Warehouse @@ -314,7 +314,7 @@ Moving Average -Role +Role diff --git a/foundation/www/docs/current/models/stock/uom_conversion_detail.html b/foundation/www/docs/current/models/stock/uom_conversion_detail.html index 3b6d8dc6..4cf9fd44 100644 --- a/foundation/www/docs/current/models/stock/uom_conversion_detail.html +++ b/foundation/www/docs/current/models/stock/uom_conversion_detail.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 UOM +UOM @@ -85,7 +85,7 @@
  • -Item +Item
    • diff --git a/foundation/www/docs/current/models/stock/warehouse.html b/foundation/www/docs/current/models/stock/warehouse.html index 12146045..9bbfa71c 100644 --- a/foundation/www/docs/current/models/stock/warehouse.html +++ b/foundation/www/docs/current/models/stock/warehouse.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 Company +Company @@ -135,7 +135,7 @@ A logical Warehouse against which stock entries are made. -Account +Account @@ -292,7 +292,7 @@ A logical Warehouse against which stock entries are made. -Warehouse +Warehouse @@ -337,7 +337,7 @@ A logical Warehouse against which stock entries are made. -Warehouse +Warehouse @@ -645,7 +645,7 @@ A logical Warehouse against which stock entries are made.
  • -Asset +Asset
    • @@ -654,7 +654,7 @@ A logical Warehouse against which stock entries are made.
  • -Asset Movement +Asset Movement
    • @@ -663,7 +663,7 @@ A logical Warehouse against which stock entries are made.
  • -Bin +Bin
    • @@ -672,7 +672,7 @@ A logical Warehouse against which stock entries are made.
  • -BOM Explosion Item +BOM Explosion Item
    • @@ -681,7 +681,7 @@ A logical Warehouse against which stock entries are made.
  • -BOM Item +BOM Item
    • @@ -690,7 +690,7 @@ A logical Warehouse against which stock entries are made.
  • -Delivery Note +Delivery Note
    • @@ -699,7 +699,7 @@ A logical Warehouse against which stock entries are made.
  • -Delivery Note Item +Delivery Note Item
    • @@ -708,7 +708,7 @@ A logical Warehouse against which stock entries are made.
  • -Item +Item
    • @@ -717,7 +717,7 @@ A logical Warehouse against which stock entries are made.
  • -Item Reorder +Item Reorder
    • @@ -726,7 +726,7 @@ A logical Warehouse against which stock entries are made.
  • -Manufacturing Settings +Manufacturing Settings
    • @@ -735,7 +735,7 @@ A logical Warehouse against which stock entries are made.
  • -Material Request Item +Material Request Item
    • @@ -744,7 +744,7 @@ A logical Warehouse against which stock entries are made.
  • -Packed Item +Packed Item
    • @@ -753,7 +753,7 @@ A logical Warehouse against which stock entries are made.
  • -POS Profile +POS Profile
    • @@ -762,7 +762,7 @@ A logical Warehouse against which stock entries are made.
  • -Production Order +Production Order
    • @@ -771,7 +771,7 @@ A logical Warehouse against which stock entries are made.
  • -Production Order Item +Production Order Item
    • @@ -780,7 +780,7 @@ A logical Warehouse against which stock entries are made.
  • -Production Plan Item +Production Plan Item
    • @@ -789,7 +789,7 @@ A logical Warehouse against which stock entries are made.
  • -Production Planning Tool +Production Planning Tool
    • @@ -798,7 +798,7 @@ A logical Warehouse against which stock entries are made.
  • -Purchase Invoice +Purchase Invoice
    • @@ -807,7 +807,7 @@ A logical Warehouse against which stock entries are made.
  • -Purchase Invoice Item +Purchase Invoice Item
    • @@ -816,7 +816,7 @@ A logical Warehouse against which stock entries are made.
  • -Purchase Order Item +Purchase Order Item
    • @@ -825,7 +825,7 @@ A logical Warehouse against which stock entries are made.
  • -Purchase Receipt +Purchase Receipt
    • @@ -834,7 +834,7 @@ A logical Warehouse against which stock entries are made.
  • -Purchase Receipt Item +Purchase Receipt Item
    • @@ -843,7 +843,7 @@ A logical Warehouse against which stock entries are made.
  • -Quotation Item +Quotation Item
    • @@ -852,7 +852,7 @@ A logical Warehouse against which stock entries are made.
  • -Request for Quotation Item +Request for Quotation Item
    • @@ -861,7 +861,7 @@ A logical Warehouse against which stock entries are made.
  • -Sales Invoice Item +Sales Invoice Item
    • @@ -870,7 +870,7 @@ A logical Warehouse against which stock entries are made.
  • -Sales Order Item +Sales Order Item
    • @@ -879,7 +879,7 @@ A logical Warehouse against which stock entries are made.
  • -Serial No +Serial No
    • @@ -888,7 +888,7 @@ A logical Warehouse against which stock entries are made.
  • -Stock Entry +Stock Entry
    • @@ -897,7 +897,7 @@ A logical Warehouse against which stock entries are made.
  • -Stock Entry Detail +Stock Entry Detail
    • @@ -906,7 +906,7 @@ A logical Warehouse against which stock entries are made.
  • -Stock Ledger Entry +Stock Ledger Entry
    • @@ -915,7 +915,7 @@ A logical Warehouse against which stock entries are made.
  • -Stock Reconciliation Item +Stock Reconciliation Item
    • @@ -924,7 +924,7 @@ A logical Warehouse against which stock entries are made.
  • -Stock Settings +Stock Settings
    • @@ -933,7 +933,7 @@ A logical Warehouse against which stock entries are made.
  • -Supplier Quotation Item +Supplier Quotation Item
    • @@ -942,7 +942,7 @@ A logical Warehouse against which stock entries are made.
  • -Warehouse +Warehouse
    • diff --git a/foundation/www/docs/current/models/support/index.html b/foundation/www/docs/current/models/support/index.html index 2399b05c..0937e015 100644 --- a/foundation/www/docs/current/models/support/index.html +++ b/foundation/www/docs/current/models/support/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Customer +Customer @@ -244,7 +244,7 @@ Closed -Lead +Lead @@ -265,7 +265,7 @@ Closed -Contact +Contact @@ -310,7 +310,7 @@ Closed -Project +Project @@ -391,7 +391,7 @@ Closed -Company +Company diff --git a/foundation/www/docs/current/models/support/support_settings.html b/foundation/www/docs/current/models/support/support_settings.html index 11e5f431..b7a3fad4 100644 --- a/foundation/www/docs/current/models/support/support_settings.html +++ b/foundation/www/docs/current/models/support/support_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 -Serial No +Serial No @@ -131,7 +131,7 @@ Cancelled -Customer +Customer @@ -190,7 +190,7 @@ Cancelled -Item +Item @@ -315,7 +315,7 @@ Out of AMC -User +User @@ -374,7 +374,7 @@ Out of AMC -Contact +Contact @@ -431,7 +431,7 @@ Out of AMC -Territory +Territory @@ -452,7 +452,7 @@ Out of AMC -Customer Group +Customer Group @@ -485,7 +485,7 @@ Out of AMC -Address +Address @@ -545,7 +545,7 @@ Out of AMC -Company +Company @@ -602,7 +602,7 @@ Out of AMC -Warranty Claim +Warranty Claim @@ -720,7 +720,7 @@ Out of AMC
  • -Warranty Claim +Warranty Claim
    • diff --git a/foundation/www/docs/current/models/utilities/index.html b/foundation/www/docs/current/models/utilities/index.html index 69f3f5ac..27302311 100644 --- a/foundation/www/docs/current/models/utilities/index.html +++ b/foundation/www/docs/current/models/utilities/index.html @@ -7,7 +7,7 @@
    - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - Version 8.6.3 + Version 8.6.5 - - - - - -

    ERP Made Simple

    - - -

    ERPNext User Guides and API References

    - - - -

    ERPNext is a fully featured ERP system designed for Small and Medium Sized -business. ERPNext covers a wide range of features including Accounting, CRM, -Inventory management, Selling, Purchasing, Manufacturing, Projects, HR & -Payroll, Website, E-Commerce and much more.

    - -

    ERPNext is based on the Frappe Framework is highly customizable and extendable. -You can create Custom Form, Fields, Scripts and can also create your own Apps -to extend ERPNext functionality.

    - -

    ERPNext is Open Source under the GNU General Public Licence v3 and has been -listed as one of the Best Open Source Softwares in the world by many online -blogs.

    - -

    Getting Started

    - -

    To install ERPNext on a server, you will need to install Frappe Bench.

    - -

    You can also start a free 30 day trial at https://erpnext.com

    - - - - - \ No newline at end of file diff --git a/foundation/www/docs/index.md b/foundation/www/docs/index.md new file mode 100644 index 00000000..52df837c --- /dev/null +++ b/foundation/www/docs/index.md @@ -0,0 +1,30 @@ +# ERP Made Simple + +### ERPNext User Guides and API References + +ERPNext is a fully featured ERP system designed for Small and Medium Sized +business. ERPNext covers a wide range of features including Accounting, CRM, +Inventory management, Selling, Purchasing, Manufacturing, Projects, HR & +Payroll, Website, E-Commerce and much more. + +ERPNext is based on the Frappé Framework is highly customizable and extendable. +You can create Custom Form, Fields, Scripts and can also create your own Apps +to extend ERPNext functionality. + +ERPNext is Open Source under the GNU General Public Licence v3 and has been +listed as one of the Best Open Source Softwares in the world by many online +blogs. + +### Installing ERPNext + +To install ERPNext on a server, you will need to install [Frappé Bench](https://github.com/frappe/bench). + +You can also start a free 30 day trial at [https://erpnext.com](https://erpnext.com) + +### Getting Started + +The ERPNext User Manual will help you understand all the ERPNext modules. [Start learning how to use ERPNext by going through the manual](/docs/user/manual). + +### Feedback + +You're encouraged to help improve the quality of this documentation, by sending a pull request on the [GitHub Repository](https://github.com/frappe/erpnext). If you would like to have a discussion regarding the documentation, you can do so [at the forum](https://discuss.erpnext.com). diff --git a/foundation/www/docs/user/index.md b/foundation/www/docs/user/index.md index 0d34620c..687ed4bc 100644 --- a/foundation/www/docs/user/index.md +++ b/foundation/www/docs/user/index.md @@ -3,5 +3,5 @@ Learn ERPNext by watching the user manual or training videos. -1. [User Manual]({{docs_base_url}}/user/manual) -1. [Help Videos]({{docs_base_url}}/user/videos/learn) +1. [User Manual](/docs/user/manual) +1. [Help Videos](/docs/user/videos/learn) diff --git a/foundation/www/docs/user/manual/de/Beispiel/index.md b/foundation/www/docs/user/manual/de/Beispiel/index.md index f9a245f7..70f01956 100644 --- a/foundation/www/docs/user/manual/de/Beispiel/index.md +++ b/foundation/www/docs/user/manual/de/Beispiel/index.md @@ -1,3 +1,5 @@ +# Beispiel + Hier steht die Übersetzung Beigetragen von CWT Connector & Wire Technology GmbH diff --git a/foundation/www/docs/user/manual/de/CRM/contact.md b/foundation/www/docs/user/manual/de/CRM/contact.md index d966052a..acaa0939 100644 --- a/foundation/www/docs/user/manual/de/CRM/contact.md +++ b/foundation/www/docs/user/manual/de/CRM/contact.md @@ -8,11 +8,11 @@ Um einen neuen Kontakt zu erstellen, gehe Sie zu > 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 efa97729..a3c8c263 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. @@ -18,7 +18,7 @@ oder einen Upload über ein Datenimportwerkzeug durchführen. Kontakte und Adressen werden in ERPNext getrennt gespeichert, damit Sie mehrere verschiedene Kontakte oder Adressen mit Kunden und Lieferanten verknüpfen können. -Lesen Sie hierzu auch [Kontakt]({{docs_base_url}}/user/manual/de/CRM/contact.html). +Lesen Sie hierzu auch [Kontakt](/docs/user/manual/de/CRM/contact.html). ### Einbindung in Konten diff --git a/foundation/www/docs/user/manual/de/CRM/lead.md b/foundation/www/docs/user/manual/de/CRM/lead.md index 48e8c7e4..869f6647 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 752d0287..07e1828d 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 1a3526b4..5a9a4236 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 ae69f018..c3097530 100644 --- a/foundation/www/docs/user/manual/de/CRM/setup/campaign.md +++ b/foundation/www/docs/user/manual/de/CRM/setup/campaign.md @@ -4,19 +4,19 @@ Eine Kampagne ist eine groß angelegte Umsetzung einer Vertriebsstrategie um ein Produkt oder eine Dienstleistung zu bewerben. Dies erfolgt in einem Marktsegment in einer bestimmten geographischen Region um bestimmte Ziele zu erreichen. -Kampagne +Kampagne -Sie können in einer Kampagne [Leads]({{docs_base_url}}/user/manual/de/CRM/lead.html), [Opportunities]({{docs_base_url}}/user/manual/de/CRM/opportunity.html) und [Angebote]({{docs_base_url}}/user/manual/de/selling/quotation.html) nachverfolgen. +Sie können in einer Kampagne [Leads](/docs/user/manual/de/CRM/lead.html), [Opportunities](/docs/user/manual/de/CRM/opportunity.html) und [Angebote](/docs/user/manual/de/selling/quotation.html) nachverfolgen. ### Leads zu einer Kampagne nachverfolgen * Um einen Lead zu einer Kampagne nach zu verfolgen, wählen Sie "Leads anzeigen" aus. -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 6ddf49b0..865b471f 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 770747d0..921aa48d 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-entries.md b/foundation/www/docs/user/manual/de/accounts/accounting-entries.md index c26043ff..655fc639 100644 --- a/foundation/www/docs/user/manual/de/accounts/accounting-entries.md +++ b/foundation/www/docs/user/manual/de/accounts/accounting-entries.md @@ -6,19 +6,19 @@ Das Konzept der Buchführung erklärt sich über unten angeführtes Beispiel: Wi * Max Mustermann (Inhaber des Teeladens) investiert 25.000 Euro um die Geschäftstätigkeit zu beginnen. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-1.png) +![A&L](/docs/assets/old_images/erpnext/assets-1.png) **Analyse:** Max Mustermann investiert 25.000 Euro in das Unternehmen in der Hoffnung Gewinne zu erhalten. In anderen Worten schuldet die Firma 25.000 Euro an Max Mustermann, die in der Zukunft zurück gezahlt werden müssen. Deshalb ist das Konto Max Mustermann ein Verbindlichkeitenkonto und wird im Haben gebucht. Aufgrund der Investition steigen die Barmittel der Firma, "Kasse" ist ein Vermögenswert des Unternehmens und wird im Soll gebucht. * Die Firma benötigt sofort Geschäftsausstattung (Kocher, Teekannen, Tassen, etc.) und Rohmaterial (Tee, Zucker, Milch, etc.). Max Mustermann beschliesst im nächstgelegenen Gemischtwarenladen "Superbasar", mit dem er freundschaftlich verbunden ist, einzukaufen, und erhält dort Kredit. Die Geschäftsausstattung hat einen Wert von 2.800 Euro und das Rohmaterial von 2.200 Euro. Er zahlt 2.000 Euro von den insgesamt 5.000 Euro. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-2.png) +![A&L](/docs/assets/old_images/erpnext/assets-2.png) **Analyse:** Die Geschäftsausstattung ist Anlagevermögen der Firma (weil sie eine lange Lebensdauer hat) und das Rohmaterial ist Umlaufvermögen (weil es für das Tagesgeschäft verwendet wird). Aus diesem Grund wurden die Konten "Geschäftsausstattung" und "Warenbestand" im Soll gebucht und im Bestand erhöht. Max Mustermann zahlt 2.000 Euro, deshalb reduziert sich das Konto "Kasse" um diesen Betrag, weil der Geschäftsvorfall im Haben gebucht wird. Weil Max Mustermann Kredit erhält, und vereinbart wurde, dass 3.000 Euro später an "Superbasar" gezahlt werden, werden 3.000 Euro im Soll auf das Verbindlichkeitenkonto "Superbasar" gebucht. * Max Mustermann (, der sich um die Buchungen kümmert,) beschliesst zum Ende jeden Tages die Verkäufe zu buchen, so dass er täglich die Verkäufe analysieren kann. Am Ende des allerersten Tages hat der Teeladen 325 Tassen Tee verkauft, was einen Umsatz von 1.575 Euro ergibt. Der Inhaber verbucht hocherfreut die Umsätze seines ersten Tages. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-3.png) +![A&L](/docs/assets/old_images/erpnext/assets-3.png) **Analyse:** Der Ertrag wird auf dem Konto "Teeverkäufe" im Haben verbucht und der selbe Betrag wird auf dem Konto "Kasse" im Soll verbucht. Nehmen wir an, dass es 800 Euro kostet 325 Tassen Tea zuzubereiten. Deshalb reduziert sich das Konto "Waren" im Haben um 800 Euro und der Aufwand wird auf dem Konto "Warenaufwand" in selber Höhe im Soll gebucht. @@ -28,7 +28,7 @@ Das Konzept der Buchführung erklärt sich über unten angeführtes Beispiel: Wi Im Laufe des Monats kauft die Firma weiteres Rohmaterial für die Geschäftstätigkeit ein. Nach einem Monat bucht Max Mustermann den Gewinn um die Bilanz und die Gewinn- und Verlustrechnung auszugleichen. Den Gewinn erhält Max Mustermann und nicht die Firma, da es sich für die Firma um eine Verbindlichkeit handelt (sie muss ihn an Max Mustermann zahlen). Wenn die Bilanz nicht ausgeglichen ist, d. h. Aktive und Passive nicht gleich sind, dann wurde der Gewinn noch nicht verbucht. Um den Gewinn zu buchen, muss der folgende Buchungssatz erstellt werden: -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-4.png) +![A&L](/docs/assets/old_images/erpnext/assets-4.png) Erklärung: Die Nettoumsätze und Aufwände der Firme belaufen sich auf 40.000 bzw. 20.000 Euro. Die Firma hat also einen Gewinn von 20.000 Euro erwirtschaftet. Bei der Verbuchung des Gewinns wird dieser auf dem Konto GuV im Soll gebucht und die Gegenbuchung auf dem Konto "Eigenkapital" im Haben. Der Saldo des Kassenkontos der Firma beträgt 44.000 Euro und es ist Rohmaterial im Wert von 1.000 Euro übrig. diff --git a/foundation/www/docs/user/manual/de/accounts/accounting-reports.md b/foundation/www/docs/user/manual/de/accounts/accounting-reports.md index 36e983cf..1a61591e 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/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 a032611e..deb211a9 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 6e5beb47..68760357 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 f667630f..e2ef33d3 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 9d64ea02..0290e985 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/item-wise-tax.md b/foundation/www/docs/user/manual/de/accounts/item-wise-tax.md index d86690b0..638c6123 100644 --- a/foundation/www/docs/user/manual/de/accounts/item-wise-tax.md +++ b/foundation/www/docs/user/manual/de/accounts/item-wise-tax.md @@ -8,7 +8,7 @@ Wenn Sie über die Einstellung "Steuern und andere Abgaben" Steuern auswählen, Die Artikelstammdaten beinhalten eine Tabelle, in der Sie Steuern, die angewendet werden sollen, auflisten können. -![Artikelbezogene Steuer]({{docs_base_url}}/assets/old_images/erpnext/item-wise-tax.png) +![Artikelbezogene Steuer](/docs/assets/old_images/erpnext/item-wise-tax.png) Der im Artikelstamm angegebene Steuersatz hat gegenüber dem Steuersatz, der in Transaktionen angegeben wird, Vorrang. @@ -20,7 +20,7 @@ In den Stammdaten für Steuern und andere Abgaben sollten Sie alle auf Artikel a Beispiel: Wenn Sie Artikel mit 5% Umsatzsteuer haben, bei anderen eine Dienstleistungssteuer anfällt und bei wieder anderen eine Luxussteuer, dann sollten Ihre Steuerstammdaten auch alle drei Steuern enthalten. -![Vorlage für artikelbezogene Steuer]({{docs_base_url}}/assets/old_images/erpnext/item-wise-tax-master.png) +![Vorlage für artikelbezogene Steuer](/docs/assets/old_images/erpnext/item-wise-tax-master.png) #### Schritt 3: Steuersatz in den Stammdaten für Steuern und Abgaben auf 0 einstellen @@ -28,6 +28,6 @@ In den Stammdaten für Steuern und andere Abgaben wird der Steuersatz mit 0% ein Basierend auf den obigen Einstellungen werden Steuern also wie in den Artikelstammdaten angegeben angewendet. Probieren Sie beispielsweise Folgendes aus: -![Artikelbezogene Steuerkalkulation]({{docs_base_url}}/assets/old_images/erpnext/item-wise-tax-calc.png) +![Artikelbezogene Steuerkalkulation](/docs/assets/old_images/erpnext/item-wise-tax-calc.png) {next} 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 6ffb069f..fc62e4fb 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 70a0b95b..fa81a5c5 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 7263e2cc..b118bbf6 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 8cfd83f2..77b2c773 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/opening-entry.md b/foundation/www/docs/user/manual/de/accounts/opening-entry.md index e7c4d10d..1eba2eff 100644 --- a/foundation/www/docs/user/manual/de/accounts/opening-entry.md +++ b/foundation/www/docs/user/manual/de/accounts/opening-entry.md @@ -4,6 +4,6 @@ Wenn Sie eine neue Firma erstellen, dann können Sie das ERPNext-Modul Rechnungswesen starten, indem Sie in den Kontenplan gehen. -Wenn Sie aber von einem reinen Buchhaltungsprogramm wie Tally oder einer FoxPro-basieren Software migrieren, dann lesen Sie unter [Eröffnungsbilanz]({{docs_base_url}}/user/manual/de/accounts/opening-accounts.html) nach. +Wenn Sie aber von einem reinen Buchhaltungsprogramm wie Tally oder einer FoxPro-basieren Software migrieren, dann lesen Sie unter [Eröffnungsbilanz](/docs/user/manual/de/accounts/opening-accounts.html) nach. {next} diff --git a/foundation/www/docs/user/manual/de/accounts/point-of-sales-invoice.md b/foundation/www/docs/user/manual/de/accounts/point-of-sales-invoice.md index e1640897..69fdf6e9 100644 --- a/foundation/www/docs/user/manual/de/accounts/point-of-sales-invoice.md +++ b/foundation/www/docs/user/manual/de/accounts/point-of-sales-invoice.md @@ -13,7 +13,7 @@ Sie können eine Ausgangsrechnung des Typs POS erstellen, indem Sie "Ist POS" an In ERPNext können über den POS alle Verkaufs- und Einkaufstransaktionen, wie Ausgangsrechnung, Angebot, Kundenauftrag, Lieferantenauftrag, usw. bearbeitet werden. Über folgende zwei Schritte richten Sie den POS ein: 1. Aktivieren Sie die POS-Ansicht über Einstellungen > Anpassen > Funktionseinstellungen -2. Erstellen Sie einen Datensatz für die [POS-Einstellungen]({{docs_base_url}}/user/manual/de/setting-up/pos-setting.html) +2. Erstellen Sie einen Datensatz für die [POS-Einstellungen](/docs/user/manual/de/setting-up/pos-setting.html) #### Auf die POS-Ansicht umschalten @@ -34,7 +34,7 @@ An der Kasse muss der Verkäufer die Artikel, die der Kunde kauft, auswählen. I **Barcode/Seriennummer:** Ein Barcode/eine Seriennummer ist eine optionale maschinenlesbare Möglichkeit Daten zu einem Objekt einzulesen, mit dem er/sie verbunden ist. Geben Sie wie auf dem Bild unten angegeben den Barcode/die Seriennummer in das Feld ein und warten Sie einen kurzen Moment, dann wird der Artikel automatisch zum Einkaufswagen hinzugefügt. -![POS]({{docs_base_url}}/assets/old_images/erpnext/pos-add-item.png) +![POS](/docs/assets/old_images/erpnext/pos-add-item.png) > Tipp: Um die Menge eines Artikels zu ändern, geben Sie die gewünschte Menge im Feld "Menge" ein. Das wird hauptsächliche dann verwendet, wenn ein Artikel in größeren Mengen gekauft wird. @@ -51,7 +51,7 @@ Wenn Sie mehrere verschiedene Artikel auf einmal entfernen möchten, wählen Sie > Die Schaltfläche "Löschen" erscheint nur, wenn Artikel ausgewählt wurden. -![POS]({{docs_base_url}}/assets/old_images/erpnext/pos-remove-item.png) +![POS](/docs/assets/old_images/erpnext/pos-remove-item.png) ### Zahlung durchführen @@ -61,7 +61,7 @@ Wenn alle Artikel mit Mengenangabe im Einkaufswagen hinzugefügt wurden, können 2. Wählen Sie die Zahlungsart aus. 3. Klicken Sie auf die Schaltfläche "Zahlen" um das Dokument abzuspeichern. -![POS-Zahlung]({{docs_base_url}}/assets/old_images/erpnext/pos-make-payment.png) +![POS-Zahlung](/docs/assets/old_images/erpnext/pos-make-payment.png) Übertragen Sie das Dokument um den Datensatz abzuschliessen. Nachdem das Dokument übertragen wurde, können Sie es entweder ausdrucken oder per E-Mail versenden. diff --git a/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md b/foundation/www/docs/user/manual/de/accounts/purchase-invoice.md index 5d11bfad..fb8fc6fe 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 4a42b750..ed5d3cbe 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 @@ -54,6 +54,6 @@ Wenn Sie einem Kunden eine Rechnung ausstellen wollen, damit dieser eine Anzahlu "Proforma" bezieht sich auf eine Formsache. Warum sollte man das tun? Wenn Sie eine Ausgangsrechnung buchen, dann erscheint diese bei den Forderungen und den Erträgen. Das ist genau dann nicht optimal, wenn nicht sicher ist, ob Ihr Kunden die Anzahlung auch wirklich leistet. Wenn Ihr Kunden aber dennoch eine "Rechnung" will, dann geben Sie ihm ein Angebot (in ERPNext) das als "Proforma-Rechnung" bezeichnet wird. Auf diese Weise ist jeder glücklich. -Das ist ein weithin gebräuchliches Verfahren. Wir bei Frappe machen das genauso. +Das ist ein weithin gebräuchliches Verfahren. Wir bei Frappé machen das genauso. {next} diff --git a/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md b/foundation/www/docs/user/manual/de/accounts/setup/account-settings.md index 7024f431..3be8f647 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 3b953c54..3fc80102 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. @@ -37,7 +37,7 @@ Sie könne ein Budget in der Kostenstelle einrichten. Wenn Sie saisonale Verkäu > Rechnungswesen > Einstellungen > Budgetverteilung > Neu -![Budgetverteilung]({{docs_base_url}}/assets/old_images/erpnext/budgeting.png) +![Budgetverteilung](/docs/assets/old_images/erpnext/budgeting.png) ### Budgetaktionen 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 f1e0220f..c808d8ac 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 dbd103ff..d20779ad 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 @@ -2,9 +2,9 @@ # Steuerregeln Beigetragen von CWT Connector & Wire Technology GmbH -Sie können festlegen, welche [Steuervorlage]({{docs_base_url}}/user/manual/de/setting-up/setting-up-taxes.html) auf eine Verkaufs-/Einkaufstransaktion angewendet wird, wenn Sie die Funktion Steuerregel verwenden. +Sie können festlegen, welche [Steuervorlage](/docs/user/manual/de/setting-up/setting-up-taxes.html) auf eine Verkaufs-/Einkaufstransaktion angewendet wird, wenn Sie die Funktion Steuerregel verwenden. -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 8cb2a7ad..d4746110 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 @@ -12,7 +12,7 @@ Der Kontoauszug erscheint in ERPNext in der Form eines Berichtes. #### Abbilung 1: Kontoauszug -![]({{docs_base_url}}/assets/old_images/erpnext/bank-reconciliation-2.png) +![](/docs/assets/old_images/erpnext/bank-reconciliation-2.png) Wenn Sie den Bericht erhalten, überprüfen Sie bitte, ob das Feld "Abwicklungsdatum" wie bei der Bank angegeben mit dem Kontoauszug übereinstimmt. Wenn die Beträge übereinstimmen, dann werden die Abwicklungsdaten abgeglichen. Wenn die Beträge nicht übereinstimmen, dann überprüfen Sie bitte die Abwicklungsdaten und die Journalbuchungen/Buchungssätze. @@ -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 86b26fcf..f29b6eb0 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 76fa3283..eef05d4f 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 52b80262..933d0a71 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 b148da71..6ef1fc6b 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 9f90c655..cd692fcb 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_base_url}}/assets/img/buying/buying-settings.png) +![Einkaufseinstellungen](/docs/assets/img/buying/buying-settings.png) Lassen Sie uns die verschiedenen Optionen durckgehen. @@ -18,7 +18,7 @@ Sie können den Nummernkreis selbst definieren oder einstellen: > Einstellungen > Einstellungen > Nummernkreis -[Klicken Sie hier, wenn Sie mehr über Nummernkreise wissen möchten]({{docs_base_url}}/user/manual/de/setting-up/settings/naming-series.html) +[Klicken Sie hier, wenn Sie mehr über Nummernkreise wissen möchten](/docs/user/manual/de/setting-up/settings/naming-series.html) ### 2. Standard-Lieferantentyp diff --git a/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md b/foundation/www/docs/user/manual/de/buying/setup/supplier-type.md index 642bb9df..e1a6d516 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 9c3d4e80..df8d1438 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 4556c440..0923d8b0 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 9e51382a..6322028b 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 9b6f6b3a..791cf4a5 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 79d28eb3..00d4ea03 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 509d13c5..e8ba85db 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 52029090..cc6cdd0b 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_base_url}}/assets/img/setup/customize/doctype-basics.png) +![Grundlagen zum Doctype](/docs/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_base_url}}/assets/img/setup/customize/Doctype-all-fields.png) +![Felder im DocType](/docs/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_base_url}}/assets/img/setup/customize/doctype-field-naming.png) +![Bezeichnung von DocTypes](/docs/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_base_url}}/assets/img/setup/customize/Doctype-permissions.png) +![Berechtigungen bei DocTypes](/docs/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_base_url}}/assets/img/setup/customize/Doctype-save.png) +![DocTypes speichern](/docs/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_base_url}}/assets/img/setup/customize/Doctype-list-view.png) +![Übersicht der DocTypes](/docs/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_base_url}}/assets/img/setup/customize/Doctype-book-added.png) +![Übersicht der DocTypes](/docs/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 a6e23f38..f9bdf119 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 @@ -13,11 +13,11 @@ Um ein benutzerdefiniertes Feld hinzuzufügen, gehen Sie zu: > Einstellungen > Anpassen > Benutzerdefiniertes Feld > Neu -Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpassen von Feldern]({{docs_base_url}}/user/manual/de/customize-erpnext/customize-form) einfügen. +Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpassen von Feldern](/docs/user/manual/de/customize-erpnext/customize-form) einfügen. In einem benutzerdefinierten Formular finden Sie für jedes Feld die Plus(+)-Option. Wenn Sie auf dieses Symbol klicken, wird eine neue Zeile oberhalb dieses Feldes eingefügt. Sie können die Einstellungen für Ihr Feld in der neu eingefügten leeren Zeile eingeben. -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_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt. +Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier](/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt. -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/custom-script-examples/custom-script-fetch-values-from-master.md b/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md index 7b2bae1c..f0b17cdf 100644 --- a/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md +++ b/foundation/www/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md @@ -16,6 +16,6 @@ Fügen Sie also im Skript Ausgangsrechnung Kunde Folgendes hinzu: * * * -Sehen Sie hierzu auch: [Wie man ein benutzerdefiniertes Skript erstellt]({{docs_base_url}}/user/manual/de/customize-erpnext/custom-scripts/). +Sehen Sie hierzu auch: [Wie man ein benutzerdefiniertes Skript erstellt](/docs/user/manual/de/customize-erpnext/custom-scripts/). {next} diff --git a/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 c65f0cbd..e4491246 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/customize-form.md b/foundation/www/docs/user/manual/de/customize-erpnext/customize-form.md index ff045f53..3f15e6a4 100644 --- a/foundation/www/docs/user/manual/de/customize-erpnext/customize-form.md +++ b/foundation/www/docs/user/manual/de/customize-erpnext/customize-form.md @@ -14,13 +14,13 @@ Sie können zum benutzerdefinierten Formular folgendermaßen gelangen: Der Systemmanager findet die Option "Benutzerdefiniertes Formular" auch in der Liste Kundenauftrag (bzw. jedes andere Formular für diesen Sachverhalt). -![Formular anpassen - Listenansicht]({{docs_base_url}}/assets/old_images/erpnext/customize-form-list-view.png) +![Formular anpassen - Listenansicht](/docs/assets/old_images/erpnext/customize-form-list-view.png) ### Schritt 2: Wählen Sie den DocType/das Dokument Wählen Sie jetzt den DocType/das Dokument aus, welcher/s das anzupassende Feld enthält. -![Formular anpassen - Dokument]({{docs_base_url}}/assets/old_images/erpnext/customize-form-document.png) +![Formular anpassen - Dokument](/docs/assets/old_images/erpnext/customize-form-document.png) ### Schritt 3: Bearbeiten Sie die Eigenschaften @@ -28,7 +28,7 @@ Wenn Sie den DocType/das Dokument ausgewählt haben, werden alle Felder als Zeil Wenn Sie auf die Zeile "Projektname" klicken, werden Felder mit verschiedenen Eigenschaften für dieses Feld angezeigt. Um die Eigenschaft "Ist zwingend erforderlich" für ein Feld anzupassen gibt es ein Feld "Zwingend erfoderlich". Wenn Sie dieses Feld markieren, wird das Feld "Projektname" im Angebotsformular als zwingend erforderlich eingestellt. -![Formular anpassen - Zwingend erfoderliche Angaben]({{docs_base_url}}/assets/old_images/erpnext/customize-form-mandatory.png) +![Formular anpassen - Zwingend erfoderliche Angaben](/docs/assets/old_images/erpnext/customize-form-mandatory.png) Genauso können Sie folgende Eigenschaften eines Feldes anpassen. @@ -41,7 +41,7 @@ Genauso können Sie folgende Eigenschaften eines Feldes anpassen. ### Schritt 4: Aktualisieren -![Formular anpassen - Aktualisieren]({{docs_base_url}}/assets/old_images/erpnext/customize-form-update.png) +![Formular anpassen - Aktualisieren](/docs/assets/old_images/erpnext/customize-form-update.png) Bevor Sie das Formular "Kundenauftrag" testen, sollten Sie den Cache leeren und den Inhalt des Browserfensters aktualiseren, um die Änderungen wirksam werden zu lassen. @@ -72,7 +72,7 @@ Im Folgenden erhalten Sie eine Auflistung der Eigenschaften, die Sie für ein be Feldtyp - Klicken Sie hier um mehr über Feldtypen zu erfahren. + Klicken Sie hier um mehr über Feldtypen zu erfahren. Optionen 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 5871ef51..1ceadc90 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/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/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/hiding-modules-and-features.md b/foundation/www/docs/user/manual/de/customize-erpnext/hiding-modules-and-features.md index 01b27124..b20e89ae 100644 --- a/foundation/www/docs/user/manual/de/customize-erpnext/hiding-modules-and-features.md +++ b/foundation/www/docs/user/manual/de/customize-erpnext/hiding-modules-and-features.md @@ -8,7 +8,7 @@ Wie Sie aus dieser Anleitung ersehen können, beinhaltet ERPNext viele verschied > Einstellungen > Werkzeuge > Funktionen verbergen/einblenden -![Funktionen verbergen]({{docs_base_url}}/assets/old_images/erpnext/hide-features.png) +![Funktionen verbergen](/docs/assets/old_images/erpnext/hide-features.png) Aktivieren/Deaktivieren Sie die Funktionen, die Sie verwenden möchten bzw. nicht verwenden wollen und laden Sie Ihre Seite neu, damit die Änderungen übernommen werden. @@ -20,7 +20,7 @@ Um Module (Symbole) auf der Homepage zu verbergen, gehen Sie zu: > Einstellungen > Werkzeuge > Moduleinstellungen -![Module verbergen/anzeigen]({{docs_base_url}}/assets/old_images/erpnext/hide-module.png) +![Module verbergen/anzeigen](/docs/assets/old_images/erpnext/hide-module.png) > Anmerkung: Module werden automatisch für Benutzer verborgen, die keine Berechtigungen für Dokumente dieses Moduls haben. Beispiel: Wenn ein Benutzer keine Berechtigungen für Lieferantenauftrag, Materialanfrage und Lieferant hat, dann wird das Modul "Einkauf" automatisch verborgen. diff --git a/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md b/foundation/www/docs/user/manual/de/customize-erpnext/print-format.md index f67ddee2..17ecb3fd 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,13 +15,13 @@ Um Ihre eigenen Versionen zu erstellen, öffnen Sie eine bereits vorhandene Vorl > Einstellungen > Druck > Druckformate -![Druckformat]({{docs_base_url}}/assets/img/customize/print-settings.png) +![Druckformat](/docs/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. Ein Druckformat zu bearbeiten ist eine langwierige Angelegenheit und Sie müssen etwas Grundwissen über HTML, CSS und Python mitbringen, um dies verstehen zu können. Wenn Sie Hilfe benötigen, erstellen Sie bitte im Forum eine Anfrage. -Printformate werden auf der Serverseite über die [Programmiersprache Jinja Templating](http://jinja.pocoo.org/docs/templates/) erstellt. Alle Formulare haben Zugriff auf doc object, das Informationen über das Dokument enthält, welches formatiert wird. Sie können über das Frappe-Modul auch auf oft verwendete Hilfswerkzeuge zugreifen. +Printformate werden auf der Serverseite über die [Programmiersprache Jinja Templating](http://jinja.pocoo.org/docs/templates/) erstellt. Alle Formulare haben Zugriff auf doc object, das Informationen über das Dokument enthält, welches formatiert wird. Sie können über das Frappé-Modul auch auf oft verwendete Hilfswerkzeuge zugreifen. Zum Bearbeiten des Erscheinungsbildes bietet sich das [Bootstrap CSS Framework](http://getbootstrap.com/) an und Sie können die volle Bandbreite dieses Werkzeuges nutzen. @@ -38,7 +38,7 @@ Um Ihre Druck- und PDF-Einstellungen zu bearbeiten/zu aktualisieren, gehen Sie z > Einstellungen > Druck und Branding > Druckeinstellungen -![Druckformat]({{docs_base_url}}/assets/img/customize/print-settings.png) +![Druckformat](/docs/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 d24bce16..5972de6d 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 b53c81ef..5207cd5f 100644 --- a/foundation/www/docs/user/manual/de/human-resources/attendance.md +++ b/foundation/www/docs/user/manual/de/human-resources/attendance.md @@ -6,10 +6,10 @@ 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. -Sie können auch ganz einfach Anwesenheiten über das [Werkzeug zum Hochladen von Anwesenheiten]({{docs_base_url}}/user/manual/de/human-resources/tools/upload-attendance.html) hochladen. +Sie können auch ganz einfach Anwesenheiten über das [Werkzeug zum Hochladen von Anwesenheiten](/docs/user/manual/de/human-resources/tools/upload-attendance.html) hochladen. {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/employee.md b/foundation/www/docs/user/manual/de/human-resources/employee.md index a3f72a31..5cb408be 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 053bbea6..579bdf67 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 98e2d93e..4dae74f6 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/job-applicant.md b/foundation/www/docs/user/manual/de/human-resources/job-applicant.md index ce372e0e..63246438 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 @@ -2,13 +2,13 @@ # Bewerber Beigetragen von CWT Connector & Wire Technology GmbH -Sie können eine Liste von Bewerbern auf [offene Stellen]({{docs_base_url}}/user/manual/de/human-resources/job-opening.html) verwalten. +Sie können eine Liste von Bewerbern auf [offene Stellen](/docs/user/manual/de/human-resources/job-opening.html) verwalten. Um einen neuen Bewerber anzulegen, gehen Sie zu: > Personalwesen > Dokumente > Bewerber > Neu -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 5982319a..df422de4 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 852c324f..821bc77a 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,17 +6,17 @@ 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_base_url}}/user/manual/de/setting-up/users-and-permissions/user-permissions.html). +> Tipp: Wenn Sie möchten, dass alle Benutzer ihre Urlaubsanträge selbst erstellen, können Sie in den Einstellungen zur Urlaubsgenehmigung Ihre Mitarbeiter-IDs als so einstellen, dass sie für die Regel zutreffend sind. Für weiterführende Informationen kesen Sie hierzu die Diskussion zum Thema [Einstellungen zu Genehmigungen](/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.html). -Um einem Mitarbeiter Urlaub zuzuteilen, kreuzen Sie [Urlaubszuteilung]({{docs_base_url}}/user/manual/de/human-resources/setup/leave-allocation.html) an. +Um einem Mitarbeiter Urlaub zuzuteilen, kreuzen Sie [Urlaubszuteilung](/docs/user/manual/de/human-resources/setup/leave-allocation.html) an. {next} diff --git a/foundation/www/docs/user/manual/de/human-resources/offer-letter.md b/foundation/www/docs/user/manual/de/human-resources/offer-letter.md index 2c41116c..01d17ca4 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_base_url}}/user/manual/de/human-resources/job-applicant.html) erstellt werden. +> Anmerkung: Angebotsschreiben kann nur zu einem [Bewerber](/docs/user/manual/de/human-resources/job-applicant.html) erstellt werden. Es gibt ein vordefiniertes Druckformat zum Angebotsschreiben. -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 e50ac0ba..b9c7c844 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 f0762f45..413c33a8 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 4ad6614f..bbe64bd0 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 49d6d1e1..ac220645 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 66bb7cbb..f1371c2e 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 c18e88fa..9c940cfe 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 cae4e842..17a315bc 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 daa0dcd9..29f3ac12 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 d9169ca5..82cf2194 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 8efb6dc6..e9183c24 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,8 +4,8 @@ Hilft Ihnen Urlaub bestimmten Mitarbeitern zuzuteilen -Urlaubszuordnung +Urlaubszuordnung -Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug]({{docs_base_url}}/user/manual/de/human-resources/tools/leave-allocation-tool.html). +Um mehreren verschhiedenen Mitarbeitern Urlaub zuzuteilen, nutzen Sie das [Urlaubszuordnungs-Werkzeug](/docs/user/manual/de/human-resources/tools/leave-allocation-tool.html). {next} diff --git a/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 fb45c4a6..f667fb4d 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 866c84e7..ee5ee584 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 dd6231c8..ba7f1433 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/introduction/getting-started-with-erpnext.md b/foundation/www/docs/user/manual/de/introduction/getting-started-with-erpnext.md index 3899c22f..17156d1f 100644 --- a/foundation/www/docs/user/manual/de/introduction/getting-started-with-erpnext.md +++ b/foundation/www/docs/user/manual/de/introduction/getting-started-with-erpnext.md @@ -12,7 +12,7 @@ Wenn Sie die Benutzerschnittstelle ausprobieren wollen und wissen wollen, wie si ### 2\. Richten Sie sich ein kostenloses Konto bei ERPNext.com ein -ERPNext.com wird von der Organisation (Frappe), die ERPNext veröffentlicht, verwaltet. Sie können sich ein eigenes Konto anlegen, indem Sie sich auf der [Internetseite registrieren](https://erpnext.com). +ERPNext.com wird von der Organisation (Frappé), die ERPNext veröffentlicht, verwaltet. Sie können sich ein eigenes Konto anlegen, indem Sie sich auf der [Internetseite registrieren](https://erpnext.com). Sie können Sich außerdem auch dazu entscheiden, Ihre Software auf ERPNext.com zu speichern, wenn Sie einen Hostingvertrag abschliessen. Das ist eine Möglichkeit, wie Sie die Organisation, die ERPNext entwickelt und verbessert, unterstützen können. In diesem Fall bekommen Sie zusätzlich direkten Support bei Hostingfragen. @@ -24,6 +24,6 @@ Um Ärgernisse bei der Installation von Instanzen zu vermeiden, ist ERPNext als ### 4\. Installieren Sie ERPNext auf Ihrem Unix/Linux/Mac-Rechner -Wenn Sie sich mit der Installation von Anwendungen auf *nix-Plattformen auskennen, lesen Sie die Anweisungen zur Installation des [Frappe Bench](https://github.com/frappe/bench). +Wenn Sie sich mit der Installation von Anwendungen auf *nix-Plattformen auskennen, lesen Sie die Anweisungen zur Installation des [Frappé Bench](https://github.com/frappe/bench). {next} diff --git a/foundation/www/docs/user/manual/de/introduction/key-workflows.md b/foundation/www/docs/user/manual/de/introduction/key-workflows.md index 44f7d8d1..085520fa 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 28fd9a9d..e920ea49 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 64321bdd..fd47adc5 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 00486d32..a2899de1 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 49767eba..83500ca6 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 8cec04a6..37613841 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 c5edf4dc..61e36ef3 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 b5a553ca..652a3f2c 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 7d661a11..3a168d38 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 22c27236..5dc2232a 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/workstation.md +++ b/foundation/www/docs/user/manual/de/manufacturing/workstation.md @@ -10,10 +10,10 @@ 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. -> Anmerkung: Sie können Überstunden für einen Arbeitsplatz über die [Fertigungseinstellungen]({{docs_base_url}}/user/manual/de/manufacturing/setup/manufacturing-settings.html) aktivieren. +> Anmerkung: Sie können Überstunden für einen Arbeitsplatz über die [Fertigungseinstellungen](/docs/user/manual/de/manufacturing/setup/manufacturing-settings.html) aktivieren. {next} diff --git a/foundation/www/docs/user/manual/de/projects/activity-cost.md b/foundation/www/docs/user/manual/de/projects/activity-cost.md index a2878dad..54f95c88 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 58ab386b..6227cabc 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 04e03407..8c09f7f2 100644 --- a/foundation/www/docs/user/manual/de/projects/project.md +++ b/foundation/www/docs/user/manual/de/projects/project.md @@ -4,75 +4,75 @@ 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_base_url}}/user/manual/de/projects/tasks.html). +Eine Aufgabe kann über das Projektdokument selbst erstellt werden oder über die Schaltfläche [Aufgabe](/docs/user/manual/de/projects/tasks.html). -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 -ERPNext verwendet [Zeitprotokolle]({{docs_base_url}}/user/manual/de/projects/time-log.html) um den Fortschritt eines Projektes nachzuverfolgen. Sie können Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum wird dann zusammen mit der Kostenberechnung basierend auf dem Zeitprotokoll aktualisiert. +ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html) um den Fortschritt eines Projektes nachzuverfolgen. Sie können Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum wird dann zusammen mit der Kostenberechnung basierend auf dem Zeitprotokoll aktualisiert. * Um ein Zeitprotokoll zu einem Projekt anzusehen, klicken Sie auf "Zeitprotokolle" -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 -Sie können [Aufwandsabrechnungen]({{docs_base_url}}/user/manual/de/human-resources/expense-claim.html) mit Projektaufgaben verbuchen. Das System aktualisiert die Gesamtsumme der Aufwände im Abschnitt Kostenabrechnung. +Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense-claim.html) mit Projektaufgaben verbuchen. Das System aktualisiert die Gesamtsumme der Aufwände im Abschnitt Kostenabrechnung. * Um die Aufwandsabrechnungen zu einem Projekt anzusehen, klicken Sie auf "Aufwandsabrechnung". -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_base_url}}/user/manual/de/accounts/setup/cost-center.html) erstellen oder Sie können eine existierende Kostenstelle verwenden um alle Aufwände die zu einem Projekt entstehen mitzuverfolgen. +Sie können zu einem Projekt eine [Kostenstelle](/docs/user/manual/de/accounts/setup/cost-center.html) erstellen oder Sie können eine existierende Kostenstelle verwenden um alle Aufwände die zu einem Projekt entstehen mitzuverfolgen. -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. ### Abrechnung -Sie können einen [Kundenauftrag]({{docs_base_url}}/user/manual/de/selling/sales-order.html) zu einem Projekt erstellen bzw. ihn mit dem Projekt verknüpfen. Wenn er einmal verlinkt ist, können Sie das Vertriebsmodul dazu nutzen, dass Projekt mit Ihrem Kunden abzurechnen. +Sie können einen [Kundenauftrag](/docs/user/manual/de/selling/sales-order.html) zu einem Projekt erstellen bzw. ihn mit dem Projekt verknüpfen. Wenn er einmal verlinkt ist, können Sie das Vertriebsmodul dazu nutzen, dass Projekt mit Ihrem Kunden abzurechnen. -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 3d1af7f5..cbbc1646 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,40 +19,40 @@ Ein Aufgabe kann folgende Stati haben: "Offen", "In Arbeit", "Wartet auf Überpr Sie können eine Liste von abhängigen Aufgaben im Bereich "Hängt ab von" erstellen. -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. ### Zeitmanagement -ERPNext verwendet [Zeitprotokolle]({{docs_base_url}}/user/manual/de/projects/time-log.html) um den Fortschritt einer Aufgabe mitzuprotokollieren. Sie können mehrere unterschiedliche Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum kann dann zusammen mit der auf dem Zeitprotokoll basierenden Kostenberechnung aktualisiert werden. +ERPNext verwendet [Zeitprotokolle](/docs/user/manual/de/projects/time-log.html) um den Fortschritt einer Aufgabe mitzuprotokollieren. Sie können mehrere unterschiedliche Zeitprotokolle zu jeder Aufgabe erstellen. Das aktuelle Start- und Enddatum kann dann zusammen mit der auf dem Zeitprotokoll basierenden Kostenberechnung aktualisiert werden. * Um ein zu einer Aufgabe erstelltes Zeitprotokoll anzuschauen, klicken Sie auf "Zeitprotokolle". -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 -Sie können [Aufwandsabrechnungen]({{docs_base_url}}/user/manual/de/human-resources/expense-claim.html) mit einer Aufgabe verbuchen. Das System aktualisiert den Gesamtbetrag der Aufwandsabrechnungen im Abschnitt Kostenberechnung. +Sie können [Aufwandsabrechnungen](/docs/user/manual/de/human-resources/expense-claim.html) mit einer Aufgabe verbuchen. Das System aktualisiert den Gesamtbetrag der Aufwandsabrechnungen im Abschnitt Kostenberechnung. * Um eine Aufwandsabrechnung, die zu einer Aufgabe erstellt wurde, anzuschauen, klicken Sie auf "Aufwandsabrechnung". -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 56f524c1..983902e1 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 fb2c8948..03d8f03c 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". @@ -38,12 +38,12 @@ Um Zeitprotokolle über den Kalender zu erstellen, gehen Sie zu "Zeitprotokoll" ### Abrechnung über Zeitprotokolle * Wenn Sie ein Zeitprotokoll abrechnen wollen, müssem Sie die Option "Abrechenbar" anklicken. -* Im Abschnitt Kostenberechnung erstellt das System den Rechungsbetrag über die [Aktivitätskosten]({{docs_base_url}}/user/manual/de/projects/activity-cost.html) basierend auf dem angegebenen Mitarbeiter und der angegebenen Aktivitätsart. +* Im Abschnitt Kostenberechnung erstellt das System den Rechungsbetrag über die [Aktivitätskosten](/docs/user/manual/de/projects/activity-cost.html) basierend auf dem angegebenen Mitarbeiter und der angegebenen Aktivitätsart. * Das System kalkuliert dann den Rechnungsbetrag basierend auf den im Zeitprotokoll angegebenen Stunden. * Wenn "Abrechenbar" nicht markiert wurde, zeigt das System beim "Rechnungsbetrag" 0 an. -Zeitprotokoll - Abrechnung +Zeitprotokoll - Abrechnung -* Nach dem Übertragen des Zeitprotokolls müssen Sie einen [Zeitprotokollstapel]({{docs_base_url}}/user/manual/de/projects/time-log-batch.html) erstellen um mit der Abrechnung fortfahren zu können. +* Nach dem Übertragen des Zeitprotokolls müssen Sie einen [Zeitprotokollstapel](/docs/user/manual/de/projects/time-log-batch.html) erstellen um mit der Abrechnung fortfahren zu können. {next} diff --git a/foundation/www/docs/user/manual/de/selling/quotation.md b/foundation/www/docs/user/manual/de/selling/quotation.md index 84925e35..db6295c4 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: @@ -35,12 +35,12 @@ Ein Angebot enthält Informationen über: Die Preise, die sie abgeben, hängen von zwei Dingen ab: -* Die Preisliste: Wenn Sie mehrere verschiedene Preislisten haben, können Sie eine Preisliste auswählen oder sie mit dem Kunden markieren (so dass sie automatisch vorselektiert wird). Ihre Artikelpreise werden automatisch über die Preisliste aktualisert. Für weitere Informationen bitte bei [Preisliste]({{docs_base_url}}/user/manual/de/setting-up/price-lists.html) weiterlesen. +* Die Preisliste: Wenn Sie mehrere verschiedene Preislisten haben, können Sie eine Preisliste auswählen oder sie mit dem Kunden markieren (so dass sie automatisch vorselektiert wird). Ihre Artikelpreise werden automatisch über die Preisliste aktualisert. Für weitere Informationen bitte bei [Preisliste](/docs/user/manual/de/setting-up/price-lists.html) weiterlesen. * Die Währung: Wenn Sie einem Kunden in einer anderen Währung anbieten, müssen Sie die Umrechnungsfaktoren aktualisieren um ERPNext in die Lage zu versetzen die Information in Ihrer Standardwährung zu speichern. Das hilft Ihnen dabei den Wert Ihres Angebots in der Standardwährung zu analysieren. ### Steuern -Um Steuern zu Ihrem Angebot hinzu zu fügen, können Sie entweder eine Steuervorlage oder eine Verkaufssteuern- und Gebühren-Vorlage auswählen oder die Steuern selbst hinzufügen. Um Steuern im Einzelnen zu verstehen, lesen Sie bitte [Steuern]({{docs_base_url}}/user/manual/de/setting-up/setting-up-taxes.html). +Um Steuern zu Ihrem Angebot hinzu zu fügen, können Sie entweder eine Steuervorlage oder eine Verkaufssteuern- und Gebühren-Vorlage auswählen oder die Steuern selbst hinzufügen. Um Steuern im Einzelnen zu verstehen, lesen Sie bitte [Steuern](/docs/user/manual/de/setting-up/setting-up-taxes.html). Sie können Steuern auf die gleiche Art hinzufügen wie die Vorlage Verkaufssteuern und Gebühren. diff --git a/foundation/www/docs/user/manual/de/selling/sales-order.md b/foundation/www/docs/user/manual/de/selling/sales-order.md index 107760cd..426d7151 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 5e77cdb6..88ec038c 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 9dfeeae1..3ba581e9 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 1dbdb06a..cd04a7bb 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 4622eba0..74808daa 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 051f2be4..a9c654a2 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/bar-code.md b/foundation/www/docs/user/manual/de/setting-up/bar-code.md index 74d67380..3c0f5752 100644 --- a/foundation/www/docs/user/manual/de/setting-up/bar-code.md +++ b/foundation/www/docs/user/manual/de/setting-up/bar-code.md @@ -12,7 +12,7 @@ Ein Barcode-Lesegerät liest die Nummer des Aufklebers eines Artikels ein. Um mi ### Abbildung 1: Markieren Sie das Feld "Artikelbarcode" -Barcode +Barcode Wenn Sie einen Barcode einlesen wollen, gehen Sie zu: @@ -26,7 +26,7 @@ Gehen Sie dann zu "Rechnungswesen" und klicken Sie auf Ausgangsrechnung. Aktivie ### Abbildung 2: Aktivieren Sie das Feld "Ist POS" -Barcode +Barcode Gehen Sie zu "Artikel" und klicken Sie auf "Neue Zeile einfügen". 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 67a57964..51e3f9c7 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 ccaa611e..2207a1b7 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". @@ -25,17 +25,17 @@ Daten werden in ERPNext in Tabellen gespeichert, sehr ähnlich einer Tabellenkal Öffnen Sie die Vorlage nach dem Herunterladen in einer Tabellenkalkulationsanwendung und fügen Sie die Daten unterhalb der Spaltenköpfe ein. -![Tabellenblatt]({{docs_base_url}}/assets/old_images/erpnext/import-3.png) +![Tabellenblatt](/docs/assets/old_images/erpnext/import-3.png) Exportieren Sie dann Ihre Vorlage oder speichern Sie sie im CSV-Format (**Comma Separated Values**). -![Tabellenblatt]({{docs_base_url}}/assets/old_images/erpnext/import-4.png) +![Tabellenblatt](/docs/assets/old_images/erpnext/import-4.png) ### 3. Hochladen der CSV-Datei Fügen Sie abschliessend die CSV-Datei im Abschnitt Import hinzu. Klicken Sie auf die Schaltfläche "Hochladen und Importieren". -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 d099c1d3..a241529a 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 2968be1b..60a6a8f9 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 82b2a9a6..2758e46c 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 bad94a3d..0b044199 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,8 +4,8 @@ In ERPNext können sie jedes beliebige Dokument per E-Mail versenden (als PDF-Anhang) indem Sie in einem beliebigen geöffneten Dokument auf `Menü > E-Mail` gehen. -Emails versenden +Emails versenden -**Anmerkung:** Es müssen Konten zum [E-Mail-Versand]({{docs_base_url}}/user/manual/de/setting-up/email/email-account.html) eingerichtet sein. +**Anmerkung:** Es müssen Konten zum [E-Mail-Versand](/docs/user/manual/de/setting-up/email/email-account.html) eingerichtet sein. {next} diff --git a/foundation/www/docs/user/manual/de/setting-up/pos-setting.md b/foundation/www/docs/user/manual/de/setting-up/pos-setting.md index ce2730c3..bd4c441f 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 32ff4800..b2f618dd 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 8604340a..7dd88379 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 5eee079f..e1df9e83 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 618395e1..b493fa22 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 7177751f..42e03662 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 8ec6d4b6..77bf32ae 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 3c635681..8a4e1a9d 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 e6d4ff7e..c1d0eeff 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 d3d3b31c..50114c07 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 cb91d8c6..3096e9ad 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 016e4639..5c0f1c67 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 56a0c36d..ee447f05 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 17305c5b..0498ef57 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 63e00bf3..c23f1fd7 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/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 f4e63f6c..2fbaf6f9 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 e78fec80..fb00719e 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/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 14d70bc5..24ff12f1 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/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 f8ba3d62..b4aef54f 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/assets/img/setup-wizard/step-5.png"> --- @@ -16,7 +16,7 @@ Klicken Sie die Box "Briefkopf anhängen" an. Wählen Sie eine Bilddatei aus und Wenn Ihr Briefkopf noch nicht fertig ist, können Sie diesen Schritt auch überspringen. -Um später einen Briefkopf über das Modul "Einstellungen" auszuwählen, lesen Sie im Bereich [Briefkopf]({{docs_base_url}}/user/manual/de/setting-up/print/letter-head.html) weiter. +Um später einen Briefkopf über das Modul "Einstellungen" auszuwählen, lesen Sie im Bereich [Briefkopf](/docs/user/manual/de/setting-up/print/letter-head.html) weiter. ### Anhang als Internetverknüpfung 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 df9f73c5..91f74bf2 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/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 4fa577d1..60670aa3 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/assets/img/setup-wizard/step-7.png"> Geben Sie einfach den Namen der Steuerart und den Steuersatz ein. @@ -19,6 +19,6 @@ Eine Mehrwertsteuer (MwSt) ist eine Art Verbrauchssteuer. Aus der Sicht des Kund Das Anliegen der Mehrwertsteuer ist es, für den Staat ähnlich der Körperschaftssteuer und der Einkommensteuer Steuererträge zu generieren. Beispiel: Wenn Sie in einem Kaufhaus einkaufen schlägt Ihnen das Geschäft 19% als Mehrwertsteuer auf die Rechnung auf. -Um im Einstellungsassistenten die Mehrwertsteuer einzustellen, geben Sie einfach den Prozentsatz der vom Staat erhoben wird, ein. Um die Mehrwertsteuer zu einem späteren Zeitpunkt einzustellen, lesen Sie bitte den Abschnitt [Einstellen von Steuern]({{docs_base_url}}/user/manual/de/setting-up/setting-up-taxes.html). +Um im Einstellungsassistenten die Mehrwertsteuer einzustellen, geben Sie einfach den Prozentsatz der vom Staat erhoben wird, ein. Um die Mehrwertsteuer zu einem späteren Zeitpunkt einzustellen, lesen Sie bitte den Abschnitt [Einstellen von Steuern](/docs/user/manual/de/setting-up/setting-up-taxes.html). {next} 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 42a0e254..d74d9eb9 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/assets/img/setup-wizard/step-8.png"> --- @@ -19,6 +19,6 @@ Kundenname: American Power Mills Kontaktname: Shiv Agarwal -Um mehr über Kunden zu erfahren, lesen Sie im Abschnitt [Details zu Kunden]({{docs_base_url}}/user/manual/de/CRM/customer.html) nach. +Um mehr über Kunden zu erfahren, lesen Sie im Abschnitt [Details zu Kunden](/docs/user/manual/de/CRM/customer.html) nach. {next} 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 1c4a134d..125d6679 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,10 +5,10 @@ Geben Sie ein paar Namen Ihrer Lieferanten ein. Lieferanten +src="/docs/assets/img/setup-wizard/step-9.png"> --- -Um den Begriff "Lieferant" besser zu verstehen, lesen Sie unter [Lieferantenstammdaten]({{docs_base_url}}/user/manual/de/buying/supplier.html) nach. +Um den Begriff "Lieferant" besser zu verstehen, lesen Sie unter [Lieferantenstammdaten](/docs/user/manual/de/buying/supplier.html) nach. {next} 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 38d3ce78..86c69b9f 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 d5ad9d25..38d7605a 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 0e70de86..5fd88ca1 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 e4c21481..282aa497 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 6ca01b03..a8b3a5d2 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: @@ -32,7 +32,7 @@ Wenn dieser Punkt aktiviert ist, kann ein Benutzer mit dieser Rolle nur auf best Um Benutzerberechtigungen zu setzen, gehen Sie zu: -> Einstellungen > Berechtigungen > [Benutzerrechte-Manager]({{docs_base_url}}/user/manual/de/setting-up/users-and-permissions/user-permissions.html) +> Einstellungen > Berechtigungen > [Benutzerrechte-Manager](/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.html) @@ -44,30 +44,30 @@ 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. -Leserechte auf einen Satz von Feldern auf bestimmte Rollen beschränken. +Leserechte auf einen Satz von Feldern auf bestimmte Rollen beschränken. 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 95170340..67aa3a1c 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/users-and-permissions/user-permissions.md b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md index a628655f..3c8786b6 100644 --- a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md +++ b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/user-permissions.md @@ -1,46 +1,6 @@ # Benutzer-Berechtigungen -Beigetragen von CWT Connector & Wire Technology GmbH -Verwenden Sie den Benutzerberechtigungen-Manager um den Zugriff eines Benutzers auf eine Menge von Dokumenten einzuschränken. +This document has been changed but not yet translated. Please see the English Version -Rollenbasierte Berechtigungen definieren den Rahmen an Dokumententypen, innerhalb derer sich ein Benutzer mit einer Anzahl von Rollen bewegen darf. Sie können jedoch noch feinere Einstellungen treffen, wenn Sie für einen Benutzer Benutzerberechtigungen definieren. Wenn Sie bestimmte Dokumente in der Liste der Benutzerberechtigungen eintragen, dann können Sie den Zugriff dieses Benutzers auf bestimmte Dokumente eines bestimmten DocTypes begrenzen, unter der Bedingung, dass die Option "Benutzerberechtigungen anwenden" im Rollenberechtigungs-Manager aktiviert ist. - -Beginnen Sie wie folgt: - -> Einstellungen > Berechtigungen > Benutzerrechte-Manager - - -Abbildung: Übersicht aus dem Benutzerberechtigungs-Manager die aufzeigt, wie Benutzer nur auf bestimmte Firmen zugreifen können - -#### Beispiel - -Der Benutzer "aromn@example.com" hat die Rolle "Nutzer Vertrieb" und wir möchten die Zugriffsrechte des Benutzers so einschränken, dass er nur auf Datensätze einer bestimmten Firma, nämlich der Wind Power LLC, zugreifen kann. - -1\. Wir fügen eine Benutzerberechtigungs-Zeile für die Firma hinzu. - -Abbildung: Hinzufügen einer Zeile "Benutzer-Berechtigung" für die Kombination aus dem Benutzer "aromn@example.com" und der Firma Wind Power LLC - -2\. Die Rolle "Alle" hat nur Leseberechtigungen für die Firma, "Benutzer-Berechtigungen anwenden" ist aktiviert. - -Abbildung: Leseberechtigung mit aktivierter Option "Benutzer-Berechtigungen anwenden" für den DocType Firma - -3\. Die oben abgebildete Kombination der zwei Regeln führt dazu, dass der Benutzer "aromn@example.com" für die Firma Wind Power LLC nur Leserechte hat. - -Abbildung: Der Zugriff wird auf die Firma Wind Power LLC beschränkt - -4\. Wir möchten nun diese Benutzer-Berechtigung für "Firma" auf andere Dokumente wie "Angebot", "Kundenauftrag" etc. übertragen. Diese Formulare haben **Verknüpfungsfelder zu "Firma"**. Als Ergebnis werden Benutzer-Berechtigungen von "Firma" auch auf diese Dokumente übertragen, was dazu führt, dass der Benutzer "aromn@example.com" auf diese Dokumente zugreifen kann, wenn Sie mit Wind Power LLC verbunden sind. - -Abbildung: Benutzer mit der Rolle "Nutzer Vertrieb" können, basierend auf Ihren Benutzer-Berechtigungen, Angebote lesen, schreiben, erstellen, übertragen und stornieren, wenn "Benutzer-Berechtigungen anwenden" aktiviert ist. - -Abbildung: Die Auflistung der Angebote enthält nur Ergebnisse für die Firma Wind Power LLC für den Benutzer "aromn@example.com" - -5\. Benutzer-Berechtigungen werden automatisch auf Basis von verknüpften Feldern angewandt, genauso wie wir es bei den Angeboten gesehen haben. Aber: Das Lead-Formular hat vier Verknüpfungsfelder: "Region", "Firma", "Eigentümer des Leads" und "Nächster Kontakt durch". Nehmen wir an, Sie möchten dass die Leads den Zugriff des Benutzers basierend auf Ihrer Region einschränken, obwohl Sie für die DocTypes "Benutzer", "Region" und "Firma" Benutzer-Berechtigungen angelegt haben. Dann gehen Sie wir folgt vor: Aktivieren Sie die Option "Benutzer-Berechtigungen ignorieren" für die Verknüpfungsfelder "Firma", "Eigentümer des Leads" und "Nächster Kontakt durch". - -Abbildung: Der Vertriebsmitarbeiter kann Leads lesen, schreiben und erstellen, eingeschränkt durch Benutzer-Berechtigungen. - -Abbildung: Markieren Sie "Benutzer-Berechtigungen ignorieren" für die Felder "Firma", "Lead-Inhaber" und "Nächster Kontakt durch" über Setup > Anpassen > Formular anpassen > Lead. - -Abbildung: Aufgrund der obigen Kombination kann der Benutzer "aromn@example.com" nur auf Leads der Region "United States" zugreifen. - -{next} +User Permission diff --git a/foundation/www/docs/user/manual/de/setting-up/workflows.md b/foundation/www/docs/user/manual/de/setting-up/workflows.md index dab34f6e..2bdbaab5 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/index.md b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md index a479b223..08956942 100644 --- a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md +++ b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/index.md @@ -10,7 +10,7 @@ Bei diesem Prozess bucht das System jede Lagertransaktion um Lagerbestand und Bu Wenn Sie Artikel kaufen und erhalten, werden diese Artikel als Vermögen des Unternehmens gebucht (Warenbestand/Anlagevermögen). Wenn Sie diese Artikel wieder verkaufen und ausliefern, werden Kosten (Selbstkosten) in Höhe der Bezugskosten der Artikel verbucht. Nach jeder Lagertransaktion werden Buchungen im Hauptbuch erstellt. Dies hat zum Ergebnis, dass der Wert im Lagerbuch immer gleich dem Wert in der Bilanz bleibt. Das verbessert die Aussagekraft der Bilanz und der Gewinn- und Verlustrechnung. -Um Buchungen für bestimmte Lagertransaktionen zu überprüfen, bitte unter [Beispiele]({{docs_base_url}}/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.html) nachlesen. +Um Buchungen für bestimmte Lagertransaktionen zu überprüfen, bitte unter [Beispiele](/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.html) nachlesen. #### Vorteile @@ -34,6 +34,6 @@ Die Differenz aus dem Wert der Waren, die noch nicht verkauft wurden, und dem Wa Dieser Gesamtprozess wird als Stichtagsinventur bezeichnet. -Wenn Sie als bereits existierender Benutzer die Stichtagsinventur nutzen aber zur Ständigen Inventur wechseln möchten, müssen Sie der Migrationsanleitung folgen. Für weitere Details lesen Sie [Migration aus der Stichtagsinventur]({{docs_base_url}}/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html). +Wenn Sie als bereits existierender Benutzer die Stichtagsinventur nutzen aber zur Ständigen Inventur wechseln möchten, müssen Sie der Migrationsanleitung folgen. Für weitere Details lesen Sie [Migration aus der Stichtagsinventur](/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html). {next} diff --git a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md index 1d8fda56..1fa3a618 100644 --- a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md +++ b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md @@ -22,7 +22,7 @@ Schritte: > Einstellungen > Rechnungswesen > Konteneinstellungen > Eine Buchung für jede Lagerbewegung erstellen -![Aktivierung]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-1.png) +![Aktivierung](/docs/assets/old_images/erpnext/accounting-for-stock-1.png) * Erstellen Sie Lagerbuchungen (Materialübertrag) um verfügbare Lagerbestände von einem existierenden Lager auf ein neues Lager zu übertragen. Sobald im neuen Lager der Lagerbestand verfügbar wird, sollten Sie für zukünftige Transaktionen nur noch das neue Lager verwenden. diff --git a/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 d995319a..1a888fa3 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/articles/article-variants.md b/foundation/www/docs/user/manual/de/stock/articles/article-variants.md index 62722228..1284c51c 100644 --- a/foundation/www/docs/user/manual/de/stock/articles/article-variants.md +++ b/foundation/www/docs/user/manual/de/stock/articles/article-variants.md @@ -1,4 +1,6 @@ +# Article Variants + Beigetragen von CWT Connector & Wire Technology GmbH ## 4.6.2 Artikelvarianten diff --git a/foundation/www/docs/user/manual/de/stock/batch.md b/foundation/www/docs/user/manual/de/stock/batch.md index 39206748..a128befb 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 f9452722..221e2834 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". @@ -20,7 +20,7 @@ Sie werden bemerken, dass alle Informationen über nicht gelieferte Artikel und ### Pakete oder Artikel mit Produkt-Bundles versenden -Wenn Sie Artikel, die ein [Produkt-Bundle]({{docs_base_url}}/user/manual/de/selling/setup/product-bundle.html), ERPNext will automatically beinhalten, versenden, erstellt Ihnen ERPNext automatisch eine Tabelle "Packliste" basierend auf den Unterartikeln dieses Artikels. +Wenn Sie Artikel, die ein [Produkt-Bundle](/docs/user/manual/de/selling/setup/product-bundle.html), ERPNext will automatically beinhalten, versenden, erstellt Ihnen ERPNext automatisch eine Tabelle "Packliste" basierend auf den Unterartikeln dieses Artikels. Wenn Ihre Artikel serialisiert sind, dann müssen Sie für Artikel vom Typ Produkt-Bundle die Seriennummer in der Tabelle "Packliste" aktualisieren. diff --git a/foundation/www/docs/user/manual/de/stock/material-request.md b/foundation/www/docs/user/manual/de/stock/material-request.md index 2c9e9c00..75ba82e6 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,14 +12,14 @@ Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: ### Materialanfrage erstellen -Materialanfrage +Materialanfrage Eine Materialanfrage kann auf folgende Arten erstellt werden: * Automatisch aus einem Kundenauftrag heraus. * Automatisch, wenn die projizierte Menge eines Artikels in den Lagern einen bestimmten Bestand erreicht. * Automatisch aus einer Stückliste heraus, wenn Sie das Modul "Produktionsplanung" benutzen, um Ihre Fertigungsaktivitäten zu planen. -* Wenn Ihre Artikel Bestandsposten sind, müssen Sie überdies das Lager angeben, auf welches diese Artikel geliefert werden sollen. Das hilft dabei die [projizierte Menge]({{docs_base_url}}/user/manual/de/stock/projected-quantity.html) für diesen Artikel im Auge zu behalten. +* Wenn Ihre Artikel Bestandsposten sind, müssen Sie überdies das Lager angeben, auf welches diese Artikel geliefert werden sollen. Das hilft dabei die [projizierte Menge](/docs/user/manual/de/stock/projected-quantity.html) für diesen Artikel im Auge zu behalten. Es gibt folgende Typen von Materialanfragen: diff --git a/foundation/www/docs/user/manual/de/stock/projected-quantity.md b/foundation/www/docs/user/manual/de/stock/projected-quantity.md index 20e0d31a..0a17a69d 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 842d5781..7bfc82c6 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 76b9b51c..ad58e4b8 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 bfba6f02..b4d59010 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 3ad1c4d4..5fdf2507 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 95504014..1f93b44e 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 5626c2aa..6fadb9a1 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 5bd75c60..b9a0bd87 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 659ebb21..3b0314b5 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 d6c590b0..4fc7c1fa 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 41b65093..52f35046 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 c0f00986..f00fdfab 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 b4067951..94429f22 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 8a44a824..1d3b8faf 100644 --- a/foundation/www/docs/user/manual/de/support/issue.md +++ b/foundation/www/docs/user/manual/de/support/issue.md @@ -4,11 +4,11 @@ Bei einem Fall handelt es ich um eine eingehende Nachricht vom Kunden, normalerweise per Email oder aus der Kontaktschnittstelle Ihrer Webseite (Um das Supportticket vollständig in Ihre Emails einzubinden, lesen Sie bitte bei "Email-Einstellungen" nach). -> Tipp: Eine eigens eingerichtete Email-Adresse für Supportanfragen ist eine gute Möglichkeit um per Email eingehende Anfragen zu handhaben. Beispiel: Sie können Supportanfragen über support@erpnext.com an ERPNext senden und es werden automatisch im Frappe-System Einträge erstellt. +> Tipp: Eine eigens eingerichtete Email-Adresse für Supportanfragen ist eine gute Möglichkeit um per Email eingehende Anfragen zu handhaben. Beispiel: Sie können Supportanfragen über support@erpnext.com an ERPNext senden und es werden automatisch im Frappé-System Einträge erstellt. > Support > Dokumente > Anfrage > Neu -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 1ae71a03..48ffe93e 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 52b9328f..68cccecc 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 4dd64f48..bde40cdc 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_base_url}}/assets/img/support/warranty-claim.png) +![Warranty Claim](/docs/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/assignment.md b/foundation/www/docs/user/manual/de/using-erpnext/assignment.md index 64d33fd6..67cf6ba2 100644 --- a/foundation/www/docs/user/manual/de/using-erpnext/assignment.md +++ b/foundation/www/docs/user/manual/de/using-erpnext/assignment.md @@ -12,9 +12,9 @@ Einschränkende Berechtigungen können nicht über "Zuweisen zu" erstellt werden Die Option "Zuweisen zu" befindet sich in der Fußzeile des Dokuments. Wenn Sie auf das Zuteilungs-Symbol in der Werkzeugleiste klicken, werden Sie schnell zur Fußzeile des selben Dokuments weiter geleitet. -![Symbol für Zuweisung]({{docs_base_url}}/assets/old_images/erpnext/assigned-to-icon.png) +![Symbol für Zuweisung](/docs/assets/old_images/erpnext/assigned-to-icon.png) -![Zugewiesen zu]({{docs_base_url}}/assets/old_images/erpnext/assigned-to.png) +![Zugewiesen zu](/docs/assets/old_images/erpnext/assigned-to.png) ### Schritt 2: Zu einem Benutzer zuweisen @@ -22,19 +22,19 @@ Im Abschnitt "Zuweisen zu" können Sie einen Benutzer auswählen, dem das Dokume Bei der Zuordnung können Sie auch einen Kommentar für denjenigen hinterlassen, dem das Dokument zugeordnet wird. -![Benutzer zuweisen]({{docs_base_url}}/assets/old_images/erpnext/assign-user.png) +![Benutzer zuweisen](/docs/assets/old_images/erpnext/assign-user.png) ### Aufgabenliste des Empfängers Diese Transaktion erscheint in der Aufgabenliste des Empfängers. -![Todo zuweisen]({{docs_base_url}}/assets/old_images/erpnext/assign-todo.png) +![Todo zuweisen](/docs/assets/old_images/erpnext/assign-todo.png) Zuordnung entfernen Ein Benutzer kann eine Zuordnung entfernen, indem im Dokument die Schaltfläche "Zuordnung abgeschlossen" angeklickt wird. -![Zuordnung entfernen]({{docs_base_url}}/assets/old_images/erpnext/assign-remove.png) +![Zuordnung entfernen](/docs/assets/old_images/erpnext/assign-remove.png) Wenn die Zuordnung einmal als abgeschlossen markiert wurde, wird der Status des zugehörigen Eintrages in der Aufgabenliste auf "Abgeschlossen" gesetzt. 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 00c4541c..cfc454f2 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/using-erpnext/collaborating-around-forms.md b/foundation/www/docs/user/manual/de/using-erpnext/collaborating-around-forms.md index 196a6c0d..a9b15b2c 100644 --- a/foundation/www/docs/user/manual/de/using-erpnext/collaborating-around-forms.md +++ b/foundation/www/docs/user/manual/de/using-erpnext/collaborating-around-forms.md @@ -6,7 +6,7 @@ Sie können jedwede Transaktion aus dem System versenden, indem Sie auf die Schaltfläche "Zugeordnet zu" klicken. Im Menü "Kommunikation" wird ein Protokoll aller von Ihnen versendeter E-Mails gepflegt. -![Formulare]({{docs_base_url}}/assets/old_images/erpnext/forms.png) +![Formulare](/docs/assets/old_images/erpnext/forms.png) ### Kommentar @@ -14,6 +14,6 @@ Kommentare sind ein großartiger Weg Informationen über eine Transaktion, die a ### Schlagworte -Lesen Sie hier mehr über [Schlagworte]({{docs_base_url}}/user/manual/de/using-erpnext/tags.html) +Lesen Sie hier mehr über [Schlagworte](/docs/user/manual/de/using-erpnext/tags.html) {next} diff --git a/foundation/www/docs/user/manual/de/using-erpnext/messages.md b/foundation/www/docs/user/manual/de/using-erpnext/messages.md index 7c62b145..86c26f38 100644 --- a/foundation/www/docs/user/manual/de/using-erpnext/messages.md +++ b/foundation/www/docs/user/manual/de/using-erpnext/messages.md @@ -4,10 +4,10 @@ Sie können mithilfe des Nachrichtenwerkzeuges Mitteilungen über das System versenden und empfangen. Wenn Sie einem Benutzer eine Mitteilung senden, und der Benutzer angemeldet ist, öffnet sich ein Mitteilungsfenster und der Zähler für ungelesene Mitteilungen in der Kopfleiste wird angepasst. -![Liste der Mitteilungen]({{docs_base_url}}/assets/old_images/erpnext/message-list.png) +![Liste der Mitteilungen](/docs/assets/old_images/erpnext/message-list.png) Sie können Mitteilungen an alle Benutzer oder nur an bestimmte versenden. -![Mitteilung an]({{docs_base_url}}/assets/old_images/erpnext/message-to.png) +![Mitteilung an](/docs/assets/old_images/erpnext/message-to.png) {next} diff --git a/foundation/www/docs/user/manual/de/using-erpnext/notes.md b/foundation/www/docs/user/manual/de/using-erpnext/notes.md index 28a34afc..7557f475 100644 --- a/foundation/www/docs/user/manual/de/using-erpnext/notes.md +++ b/foundation/www/docs/user/manual/de/using-erpnext/notes.md @@ -12,13 +12,13 @@ In diesem Bereich können Sie lange Anmerkungen abspeichern. Diese können z. B. Geben Sie Titel und Inhalt ein. -![Anmerkung]({{docs_base_url}}/assets/old_images/erpnext/note.png) +![Anmerkung](/docs/assets/old_images/erpnext/note.png) ## Berechtigungen für ausgewählte Benutzer setzen Damit alle auf eine Anmerkung zugreifen können, aktivieren Sie "Öffentlich" unter dem Abschnitt Verknüpfungen. Damit ein Benutzer auf eine bestimmte Anmerkung zugreifen kann, können diese in der Tabelle "Teilen mit" ausgewählt werden. -![Berechtigungen für Anmerkungen]({{docs_base_url}}/assets/old_images/erpnext/note-permission.png) +![Berechtigungen für Anmerkungen](/docs/assets/old_images/erpnext/note-permission.png) Anmerkungen können intern auch als Wissensdatenbank genutzt werden. Sie können an die Anmerkungen auch Dateien anhängen und diese einer bestimmten Auswahl an Benutzern zugänglich machen. diff --git a/foundation/www/docs/user/manual/de/using-erpnext/tags.md b/foundation/www/docs/user/manual/de/using-erpnext/tags.md index 2d925ca4..73161bfa 100644 --- a/foundation/www/docs/user/manual/de/using-erpnext/tags.md +++ b/foundation/www/docs/user/manual/de/using-erpnext/tags.md @@ -4,6 +4,6 @@ Genauso wie Zuordnungen und Kommentare können Sie auch Ihre eigenen Schlagworte zu jeder Art von Transaktionen hinzufügen. Diese Schlagworte helfen Ihnen bei der Suche nach einem Dokument und klassifizieren dieses. ERPNext zeigt Ihnen die wichtigen Schlagworte in der Dokumentenliste an. -![Schlagworte]({{docs_base_url}}/assets/old_images/erpnext/tags-in-list.png) +![Schlagworte](/docs/assets/old_images/erpnext/tags-in-list.png) {next} diff --git a/foundation/www/docs/user/manual/de/using-erpnext/to-do.md b/foundation/www/docs/user/manual/de/using-erpnext/to-do.md index d0eb6d2f..395ccaf8 100644 --- a/foundation/www/docs/user/manual/de/using-erpnext/to-do.md +++ b/foundation/www/docs/user/manual/de/using-erpnext/to-do.md @@ -4,10 +4,10 @@ "Aufgaben" ist ein einfaches Werkzeug, welches alle Aktivitäten, die Ihnen [zugeordnet](https://erpnext.com/collaboration-tools/assignment) wurden, und die Sie zugeordnet haben, auflistet. Sie können zudem Ihre eigenen ToDos der Liste hinzufügen. -![Todo-Liste]({{docs_base_url}}/assets/old_images/erpnext/todo-list.png) +![Todo-Liste](/docs/assets/old_images/erpnext/todo-list.png) Wenn eine Aufgabe abgeschlossen wurde, können Sie einfach die Zuweisung vom Dokument entfernen. Dabei wird die Aufgabe von der ToDo-Liste entfernt. Bei Aufgaben, die nicht über ein Dokument zugeordnet wurden, können Sie den Status über den ToDo-Datensatz selbst auf "abgeschlossen" setzen. -![Todos abschliessen]({{docs_base_url}}/assets/old_images/erpnext/todo-close.png) +![Todos abschliessen](/docs/assets/old_images/erpnext/todo-close.png) {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 46ae46d4..27d073b2 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 ec3476f2..61ac7a43 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 af996aa2..16f48e94 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,11 +4,11 @@ Die meisten der Einstellungen, die Ihre Webseite betreffen, können hier eingestellt werden. -Webseiten-Einstellungen +Webseiten-Einstellungen ### Zielseite -* Homepage: Sie können angeben, welche [Webseite]({{docs_base_url}}/user/manual/de/website/web-page.html) die Startseite der Homepage ist. +* Homepage: Sie können angeben, welche [Webseite](/docs/user/manual/de/website/web-page.html) die Startseite der Homepage ist. * Startseite ist "Products": Wenn diese Option markiert ist, ist die Standard-Artikelgruppe die Startseite der Webseite. * Titel-Präfix: Stellt den Browser-Titel ein. @@ -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 639ac48b..0f9f7ee7 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 786398ac..b08b4363 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 ffd54682..aab2c1dd 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 bb21ca82..840f0be1 100644 --- a/foundation/www/docs/user/manual/en/CRM/crm_reports.md +++ b/foundation/www/docs/user/manual/en/CRM/crm_reports.md @@ -1,10 +1,12 @@ +# Crm Reports + CRM module's reports helps users to get the information about the prospects. Using Following reports, user can analyze the data about prospect's history with a company and will helps user to build strong relationships with them. ###Lead Details It has data about the leads and their contact and address details. Lead Details + src="/docs/assets/img/crm/report/lead.png"> ###Sales Funnel By using the sales funnel report, and by quantifying the number of prospects at each stage of the process, you can get an idea of your potential customers. @@ -14,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/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/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/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/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/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 18004917..39effa70 100644 --- a/foundation/www/docs/user/manual/en/CRM/customer.md +++ b/foundation/www/docs/user/manual/en/CRM/customer.md @@ -1,4 +1,6 @@ +# Customer + A customer, who is sometimes known as a client, buyer, or purchaser is the one who receives goods, services, products, or ideas, from a seller for a monetary consideration. A customer can also receive goods or services from a vendor or @@ -10,20 +12,20 @@ You can either directly create your Customers via > Selling > Customer -Create Customer +Create Customer -or upload it via the [Data Import Tool]({{docs_base_url}}/user/manual/en/setting-up/data/data-import-tool.html). +or upload it via the [Data Import Tool](/docs/user/manual/en/setting-up/data/data-import-tool.html). A Customer can avail the features (operations) in the selling process. The general flow can be summarised as: -Customer +Customer > Note: Customers are separate from Contacts and Addresses. A Customer can have multiple Contacts and Addresses. ### Contacts and Addresses -[Contacts and Addresses]({{docs_base_url}}/user/manual/en/CRM/contact.html) in ERPNext are stored separately so that you can +[Contacts and Addresses](/docs/user/manual/en/CRM/contact.html) in ERPNext are stored separately so that you can attach multiple Contacts or Addresses to Customers and Suppliers Thus we may have identical Customer Names that are uniquely identified by the ID. Since the email address is not part of the @@ -46,7 +48,7 @@ to create an Account in another Company, just change the Company value and By default, the system does not generate an account for every customer. All Customers can be booked in one account called Debtors. In order to manage a separate account for each customer, you have to first create the account under -Accounts Receivable in the [Chart of Accounts]({{docs_base_url}}/user/manual/en/accounts/chart-of-accounts.html) and then add it on the customer's +Accounts Receivable in the [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.html) and then add it on the customer's form accounts table. ### Customer Settings @@ -61,12 +63,12 @@ You can set how much credit you want to allow for a Customer by adding the “Credit Limit”. You can also set a global “Credit Limit” in the Company master. Classifying Customers -ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/manual/en/CRM/setup/customer-group.html) -and also divide them into [Territories]({{docs_base_url}}/user/manual/en/setting-up/territory.html) +ERPNext allows you to group your Customers using [Customer Group](/docs/user/manual/en/CRM/setup/customer-group.html) +and also divide them into [Territories](/docs/user/manual/en/setting-up/territory.html) Grouping will help you get better analysis of your data and identify which Customers are profitable and which are not. Territories will help you set sales targets for the respective territories. -You can also mention [Sales Person]({{docs_base_url}}/user/manual/en/CRM/setup/sales-person.html) against a customer. +You can also mention [Sales Person](/docs/user/manual/en/CRM/setup/sales-person.html) against a customer. ### Sales Partner diff --git a/foundation/www/docs/user/manual/en/CRM/lead.md b/foundation/www/docs/user/manual/en/CRM/lead.md index c5069e59..eb6965d7 100644 --- a/foundation/www/docs/user/manual/en/CRM/lead.md +++ b/foundation/www/docs/user/manual/en/CRM/lead.md @@ -1,4 +1,6 @@ +# Lead + To get the customer through the door, you may be doing all or any of the following: @@ -25,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 @@ -47,7 +49,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 85480b63..f953a7da 100644 --- a/foundation/www/docs/user/manual/en/CRM/newsletter.md +++ b/foundation/www/docs/user/manual/en/CRM/newsletter.md @@ -1,4 +1,6 @@ +# Newsletter + A newsletter is a short written report that tells about the recent activities of an organization. It is generally sent to members of the organization, potential clients customers or potential leads. @@ -13,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 d1c06b9a..72605b3c 100644 --- a/foundation/www/docs/user/manual/en/CRM/opportunity.md +++ b/foundation/www/docs/user/manual/en/CRM/opportunity.md @@ -1,4 +1,6 @@ +# Opportunity + When you know a Lead is looking for some products or services to buy, you can track that as an Opportunity. Also opportunity document helps user to collect the requirement of a customer/lead. @@ -8,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 @@ -28,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 5acc1afc..aec3b1a5 100644 --- a/foundation/www/docs/user/manual/en/CRM/setup/campaign.md +++ b/foundation/www/docs/user/manual/en/CRM/setup/campaign.md @@ -1,21 +1,23 @@ +# Campaign + A Campaign is a full-scale implementation of a sales strategy to promote a product or a service. This is done in a market segment of a particular geographical area, to achieve specified objectives. -Campaign +Campaign -You can track [Lead]({{docs_base_url}}/user/manual/en/CRM/lead.html), [Opportunity]({{docs_base_url}}/user/manual/en/CRM/opportunity.html), [Quotation]({{docs_base_url}}/user/manual/en/selling/quotation.html) against a campaign. +You can track [Lead](/docs/user/manual/en/CRM/lead.html), [Opportunity](/docs/user/manual/en/CRM/opportunity.html), [Quotation](/docs/user/manual/en/selling/quotation.html) against a campaign. ###Track Leads against Campaign * To track a 'Lead' against a campaign select 'View Leads'. -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 b87b7d93..13dfcde2 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 @@ -1,15 +1,17 @@ +# Customer Group + Customer groups allow you to organize your customers. You can also have discounts based on customer groups. You can also get trend analysis for each group. Typically Customers are grouped by market segment (that is usually based on your domain). -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/index.md b/foundation/www/docs/user/manual/en/CRM/setup/index.md index 98f85084..44ed3946 100644 --- a/foundation/www/docs/user/manual/en/CRM/setup/index.md +++ b/foundation/www/docs/user/manual/en/CRM/setup/index.md @@ -1,4 +1,6 @@ +# Setup + ### Topics 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 62066520..8f7c2663 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 @@ -1,15 +1,17 @@ +# Sales Person + Sales Persons behave exactly like Territories. You can create an organization chart of Sales Persons where each Sales Person’s target can be set individually. Again as in Territory, the target has to be set against Item Group. -Sales Person Tree +Sales Person Tree ####Sales Person in Transactions You can use this Sales Person in Customer and sales transactions like Sales Order, Delivery Note and Sales Invoice. -Click [here]({{docs_base_url}}/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions) to learn more +Click [here](/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions) to learn more about how Sales Persons are used in the transactions of Sales Cycle. {next} diff --git a/foundation/www/docs/user/manual/en/accounts/accounting-entries.md b/foundation/www/docs/user/manual/en/accounts/accounting-entries.md index ec509497..38327e3f 100644 --- a/foundation/www/docs/user/manual/en/accounts/accounting-entries.md +++ b/foundation/www/docs/user/manual/en/accounts/accounting-entries.md @@ -1,11 +1,13 @@ +# Accounting Entries + The concept of accounting is explained with an example given below: We will take a "Tea Stall" as a company and see how to book accounting entries for the business. * Mama (The Tea-stall owner) invests Rs 25000 to start the business. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-1.png) +![A&L](/docs/assets/old_images/erpnext/assets-1.png) __Analysis:__ Mama invested 25000 in company, hoping to get some profit. In other words, company is liable to pay 25000 to Mama in the future. So, account @@ -15,7 +17,7 @@ will debited. * The company needs equipments (Stove, teapot, cups etc) and raw materials (tea, sugar, milk etc) immediately. He decides to buy from the nearest general store "Super Bazaar" who is a friend so that he gets some credit. Equipments cost him 2800 and raw materials worth of 2200. He pays 2000 out of total cost 5000. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-2.png) +![A&L](/docs/assets/old_images/erpnext/assets-2.png) __Analysis:__ Equipments are "Fixed Assets" (because they have a long life) of the company and raw materials "Current Assets" (since they are used for day-to-day @@ -26,7 +28,7 @@ Bazaar" later, so Super Bazaar will be credited by 3000. * Mama (who takes care of all entries) decides to book sales at the end of the every day, so that he can analyze daily sales. At the end of the very first day, the tea stall sells 325 cups of tea, which gives net sales of Rs. 1575. The owner happily books his first day sales. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-3.png) +![A&L](/docs/assets/old_images/erpnext/assets-3.png) __Analysis:__ Income has been booked in "Sales of Tea" account which has been credited to increase the value and the same amount will be debited to "Cash" @@ -37,7 +39,7 @@ sold" account by same amount. At the end of the month, the company paid the rent amount of stall (5000) and salary of one employee (8000), who joined from the very first day. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-4.png) +![A&L](/docs/assets/old_images/erpnext/assets-4.png) ### Booking Profit @@ -48,7 +50,7 @@ its a liability for the company (it has to pay it to Mama). When the Balance Sheet is not balanced i.e. Debit is not equal to Credit, the profit has not yet been booked. To book profit, the following entry has to be made: -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-5.png) +![A&L](/docs/assets/old_images/erpnext/assets-5.png) Explanation: Company's net sales and expenses are 40000 and 20000 respectively. So, company made a profit of 20000. To make the profit booking diff --git a/foundation/www/docs/user/manual/en/accounts/accounting-reports.md b/foundation/www/docs/user/manual/en/accounts/accounting-reports.md index a045c243..c3b878d5 100644 --- a/foundation/www/docs/user/manual/en/accounts/accounting-reports.md +++ b/foundation/www/docs/user/manual/en/accounts/accounting-reports.md @@ -1,4 +1,6 @@ +# Accounting Reports + Some of the major accounting reports are: ### General Ledger @@ -8,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/assets/img/accounts/general-ledger.png"> ### Trial Balance @@ -21,7 +23,7 @@ the: * Credits * Closing -Trial Balance +Trial Balance The sum of all closing balances in a Trial Balance must be zero. @@ -31,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 @@ -39,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 f3563611..3a29107d 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 @@ -1,4 +1,6 @@ +# Advance Payment Entry + Payment done by the customer before accepting delivery of the product is an Advance Payment. For Orders of high value, the business houses expect to receive advance. @@ -23,7 +25,7 @@ the row "Is Advance" click 'Yes'. #### Figure 1 : Journal Entry -Advance Entry -Advace Payment +Advace Payment ### Double Entry Accounting @@ -40,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. @@ -54,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 e0966b49..310e2fa6 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 @@ -1,4 +1,6 @@ +# Adjust Withhold Amount Payment Entry + #Adjust Withhold Amount in the Payment Entry ###Question @@ -23,7 +25,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 +35,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/c-form.md b/foundation/www/docs/user/manual/en/accounts/articles/c-form.md index c776b67f..8d54e3ee 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/c-form.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/c-form.md @@ -1,4 +1,6 @@ +# C Form + #C-Form C-Form functionality is only applicable for Indian customers. @@ -15,7 +17,7 @@ Following are step to manage C-Form related sales in ERPNext. While creating Sales invoice for the customer, set C-Form applicability in Sales Invoice. In More Info section of Sales Invoice, set field called **Is C-Form Applicable** as **Yes**. Bydefault, this field will have No for a value. -![C-form]({{docs_base_url}}/assets/img/articles/Selection_0028c9f9a.png) +![C-form](/docs/assets/img/articles/Selection_0028c9f9a.png) Updating this field as Yes will allow you to pull this Sales Invoice in the C-Form Tool, and update C-Form No. as received from the Customer. @@ -27,22 +29,22 @@ Go to `Accounts > Setup > C-Form > New` Enter details like C-Form No, Received Date, State and Amount etc. Select Customer and pull related Sales Invoices under provided table. -![New C-Form]({{docs_base_url}}/assets/img/articles/Selection_020f01c1e.png) +![New C-Form](/docs/assets/img/articles/Selection_020f01c1e.png) ####Save & Submit C-Form After entering details, save and submit C-Form record. On save system will generate C-Form record and on submission update that C-Form No. in the Sales Invoice. -![C-Form]({{docs_base_url}}/assets/img/articles/Selection_02178f9d6.png) +![C-Form](/docs/assets/img/articles/Selection_02178f9d6.png) C-Form serial no will be updated in related invoice under the field 'C-Form No'. -![C-Form No]({{docs_base_url}}/assets/img/articles/Selection_022b7c6d5.png) +![C-Form No](/docs/assets/img/articles/Selection_022b7c6d5.png) ####Tracking Pending Invoice for C-Form To track invoices for which C-Form has not yet been received from Customer, you can create custom report on Sales Invoice. In this report, you can filter invoices which doesn't have C-Form updated in them yet, and followup with the customer accordingly. -![C-Form Report]({{docs_base_url}}/assets/img/articles/Selection_026.png) +![C-Form Report](/docs/assets/img/articles/Selection_026.png) 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 0e58f309..35770203 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 @@ -1,4 +1,6 @@ +# Changing Parent Account + #Changing Parent Account Chart of Account has hierarchical structure. Each account has a parent it is listed under. @@ -15,22 +17,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/difference-entry-button.md b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md index 1c89ab6f..a9009038 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 @@ -1,15 +1,17 @@ +# Difference Entry Button + #Difference Entry As per accounting standards, debit in a accounting entry must be equal to credit. If not, system does allow submission of accounting transaction, thereby stops ledger posting. In ERPNext, on saving accounting entry, system validates if debit and credit is tallying. -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 87be7df5..60702d25 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 @@ -13,19 +13,19 @@ Only User with System Manager's Role Assigned has permission to create new Fisca `Accounts > Setup > Fiscal Year` -Click [here]({{docs_base_url}}/user/manual/en/accounts/setup/fiscal-year.html) to learn more about Fiscal Year. +Click [here](/docs/user/manual/en/accounts/setup/fiscal-year.html) to learn more about Fiscal Year. #### Set Fiscal Year as Default After Fiscal Year is saved, you will find option to set that Fiscal year as Default. -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-accounting-entries.md b/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md index 36d70dd2..a869c814 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 @@ -1,4 +1,6 @@ +# Freeze Accounting Entries + #Freeze Accounting Entries To freeze accounting entries upto a certain date, follow below given steps. @@ -11,12 +13,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-freeze-accounting-ledger.md b/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md index 54bd29b9..f6f968ae 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 @@ -1,4 +1,6 @@ +# How To Freeze Accounting Ledger + #How To Freeze Accounting Ledger? If you want to discontinue using specific Account, you can freeze it. @@ -13,7 +15,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 +23,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/index.md b/foundation/www/docs/user/manual/en/accounts/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/index.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 bff85890..e43ef7a6 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 6c6c9443..795e7918 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 @@ -1,4 +1,6 @@ +# Managing Transactions In Multiple Currency + #Managing Transactions In Multiple Currency In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. If transaction is created in the parties currency, their currency symbol is updated in the print format as well. @@ -17,7 +19,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 +29,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 84cc3784..fdd66f1a 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 @@ -1,4 +1,6 @@ +# Post Dated Cheque Entry + #Post Dated Cheque Entry Post Dated Cheque is a cheque dated on future date. Party generally give post dated cheque, as advance payment. This cheque would be cleared only when cheque date arrives. @@ -15,7 +17,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. @@ -25,9 +27,9 @@ After entering required details, Save and Submit the Payment Entry. ####Adjusting Post Dated Cheque Entry -You can adjust Post Dated Payment Entry against an invoice via [Payment Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/payment-reconciliation.html). +You can adjust Post Dated Payment Entry against an invoice via [Payment Reconciliation Tool](/docs/user/manual/en/accounts/tools/payment-reconciliation.html). -When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool]({{docs_base_url}}/user/manual/en/accounts/tools/bank-reconciliation.html). +When cheque is cleared, i.e. on actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool](/docs/user/manual/en/accounts/tools/bank-reconciliation.html). In the Chart of Accounts, you might find value of this Payment Entry already reflecting against bank Account. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of bank balance as per system, and actual balance in the bank's statement. \ No newline at end of file diff --git a/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 7f165b3c..dbd71f7c 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 @@ -1,4 +1,6 @@ +# Tracking Project Profitability Using Cost Center + #Tracking Project Profibitability using Cost Center To track expenses and profibility for a project, you can use Cost Centers. You should create separate Cost Center for each Project. This will allow you to. @@ -16,7 +18,7 @@ To create new Project, go to: `Projects > Project > New` -Project Default Cost Center +Project Default Cost Center #### 1.2 Create Cost Center @@ -26,13 +28,13 @@ To create new Cost Center, go to: `Accounts > Setup > Cost Center` -[Click here to learn how to manage Cost Centers.]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center.html) +[Click here to learn how to manage Cost Centers.](/docs/user/manual/en/accounts/setup/cost-center.html) #### 1.3 Update Cost Center in the Project Update Cost Center in the Project master. -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 +46,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 +54,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 +64,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 @@ -76,6 +78,6 @@ To check Budget Variance report, go to: `Accounts > Budget and Cost Center > Budget Variance Report` -[Click here to learn how to do budgeting from Cost Center]({{docs_base_url}}/user/manual/en/accounts/budgeting.html). +[Click here to learn how to do budgeting from Cost Center](/docs/user/manual/en/accounts/budgeting.html). \ No newline at end of file diff --git a/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 9f7da0c3..67c11c55 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 @@ -1,9 +1,11 @@ +# Update Stock Option In Sales Invoice + #Delivery from Sales Invoice If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invoice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse. -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 f87d6bb3..80b4edfe 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 @@ -1,4 +1,6 @@ +# What Is The Differences Of Total And Valuation In Tax And Charges + #Purchase Tax or Charges Categories Consider Tax or Charge field in Purchase Taxes and Charges master has three values. @@ -7,7 +9,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. @@ -25,7 +27,7 @@ Tax or charge categorized as **Valuation** will be added in the value of purchas Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, this charge will be not be added to the total of purchase transaction, because it your expense, and should not be reflected to the supplier. -Check [here]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) to learn general posting done for expense categorized as Valuation. +Check [here](/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) to learn general posting done for expense categorized as Valuation. ####Total and Valuation: diff --git a/foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md b/foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md index 60bf536b..281a0eac 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md @@ -1,4 +1,6 @@ +# Withdrawing Salary From Owners Equity Account + #Withdrawing Salary from Owner's Equity Account ### Question 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 9cc7f449..6f51fbf4 100644 --- a/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md +++ b/foundation/www/docs/user/manual/en/accounts/bank-guarantee.md @@ -1,10 +1,12 @@ +# Bank Guarantee + A Bank Guarantee is a guarantee from a lending institution such as a bank ensuring the liabilities of a debtor will be met. In other words, if the debtor fails to settle a debt, the bank covers it. A Bank Guarantee enables the customer, or debtor, to acquire goods, buy equipment or draw down loans, and thereby expand business activity. A client may ask you to provide a Bank Guarantee from a third party such as a bank. This guarantee is for a specified amount, which is usually a percentage of the total value of the contract. The Bank Guarantee is valid for a specified duration after which it expires and must be returned to you by the client. This document allows you to track Bank Guarantees given to clients. You can set Email Alerts as the Bank Guarantee expiry date approaches to remind yourself to get the Bank Guarantee back from your client. -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 72d3b6d5..31029602 100644 --- a/foundation/www/docs/user/manual/en/accounts/budgeting.md +++ b/foundation/www/docs/user/manual/en/accounts/budgeting.md @@ -1,4 +1,6 @@ +# Budgeting + In ERPNext, you can set and manage Budgets against a specific Account. This is useful when, for example, you are doing online sales. You have a budget for search ads, and you want ERPNext to stop or warn you from over spending, based on that budget. Budgets are also great for planning purposes. When you are making plans for the next financial year, you would typically target a revenue based on which you would set your expenses. Setting a budget will ensure that your expenses do not get out of hand, at any point, as per your plans. @@ -11,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 @@ -29,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 @@ -52,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 bd96fa70..10448844 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 @@ -1,4 +1,6 @@ +# Chart Of Accounts + The Chart of Accounts forms the blueprint of your organization. The overall structure of your Chart of Accounts is based on a system of double entry accounting that has become a standard all over the world to quantify how a @@ -26,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: @@ -47,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 @@ -85,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 @@ -105,7 +107,7 @@ Supplier). > Note: An Account “Ledger” is also sometimes called as Account “Head”. -Chart of Accounts +Chart of Accounts ### Other Account Types @@ -120,7 +122,7 @@ To create new Accounts, explore your Chart of Accounts and click on an Account group under which you want to create the new Account. On the right side, you will see an option to “Open” or “Add Child” a new Account. -Chart of Accounts +Chart of Accounts Option to create will only appear if you click on a Group (folder) type Account. diff --git a/foundation/www/docs/user/manual/en/accounts/credit-limit.md b/foundation/www/docs/user/manual/en/accounts/credit-limit.md index c3b3f467..239b13bc 100644 --- a/foundation/www/docs/user/manual/en/accounts/credit-limit.md +++ b/foundation/www/docs/user/manual/en/accounts/credit-limit.md @@ -1,4 +1,6 @@ +# Credit Limit + A credit limit is the maximum amount of credit that a financial institution or @@ -13,7 +15,7 @@ To set credit limit go to Customer - Master #### Figure 1: Credit Limit -Credit Limit +Credit Limit Go to the 'More Info section' and enter the amount in the field Credit Limit. @@ -28,7 +30,7 @@ accept orders or raise credit limits of customers. #### Figure 2: Credit Controller -Credit Limit +Credit Limit Save the changes. diff --git a/foundation/www/docs/user/manual/en/accounts/index.md b/foundation/www/docs/user/manual/en/accounts/index.md index 2fab61e0..c58f53aa 100644 --- a/foundation/www/docs/user/manual/en/accounts/index.md +++ b/foundation/www/docs/user/manual/en/accounts/index.md @@ -1,4 +1,6 @@ +# Accounts + At the end of sales and purchase cycle comes billing and payments. You may have an accountant in your team, or you may be doing accounting yourself, or you may have outsourced your accounting. In all the cases financial accounting forms the core of any business management system like an ERP. diff --git a/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md b/foundation/www/docs/user/manual/en/accounts/item-wise-taxation.md index 328440b1..2adfe91a 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 @@ -1,4 +1,6 @@ +# Item Wise Taxation + In the sales and purchase transactions, you can apply taxes and other charges on the items. For the ease of applying taxes, you can fetch values from the [Sales Taxes and Charges master](/contents//setting-up/setting-up-taxes). Taxes and charges are applied equally on all the items. For example, if tax GST 16% is added in the tax table, then it will be applied on all the items. However, if you need to have different tax rate applied on some of the items, following is how you should setup Items and Sales Taxes and Other Charges master in your ERPNext account. Let's assume that we are creating a Sales Order. We have Sales Taxes and Charges master for GST 16%. Out of all the Sales Items, on one item, only 12% GST will be applied, while one more item is exempted from the tax. @@ -11,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.
    @@ -29,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 7065642b..19f588f6 100644 --- a/foundation/www/docs/user/manual/en/accounts/journal-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/journal-entry.md @@ -1,4 +1,6 @@ +# Journal Entry + All types of accounting entries other than **Sales Invoice** and **Purchase Invoice** are made using the **Journal Entry**. A **Journal Entry** is a standard accounting transaction that affects @@ -8,7 +10,7 @@ To create a Journal Entry go to: > Accounts > Documents > Journal Entry > New -Journal Entry +Journal Entry In a Journal Entry, you must select. diff --git a/foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md b/foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md index b140b902..6951c451 100644 --- a/foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md +++ b/foundation/www/docs/user/manual/en/accounts/managing-fixed-assets.md @@ -1,11 +1,13 @@ +# Managing Fixed Assets + In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Cars, etc. and manage depreciations, sale or disposal of those assets. ## Asset Category Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category. -Asset Category +Asset Category > **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master. @@ -13,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. @@ -41,24 +43,24 @@ Explanation of the fields: The system automatically creates a schedule for depreciation based on depreciation method and other related inputs in the Asset record. -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. 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. @@ -72,23 +74,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/accounts/multi-currency-accounting.md b/foundation/www/docs/user/manual/en/accounts/multi-currency-accounting.md index 048d1b92..38f960d2 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 @@ -1,19 +1,21 @@ +# Multi Currency Accounting + In ERPNext, you can make accounting entries in multiple currency. For example, if you have a bank account in foreign currency, you can make transactions in that currency and system will show bank balance in that specific currency only. ## Setup To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account. -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. @@ -32,7 +34,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 @@ -42,12 +44,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 #### Example 1: Payment Entry Against Customer With Alternate Currency @@ -55,7 +57,7 @@ Suppose, default currency of the company is INR and customer's accounting curren Exchange Rate in the payment entry should always be same as invoice (60), even if exchange rate on the payment date is 62. The bank account will be credited by the amount considering exchange rate as 62. Hence, Exchnage Gain / Loss will be booked based on exchange rate difference. -Payment Entry +Payment Entry #### Example 2: Inter-bank Transfer (USD -> INR) @@ -101,7 +103,7 @@ Lets say, Paypal account debited by following amounts over the week, which has n Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be look like below: -Inter Bank Transfer +Inter Bank Transfer ## Reports @@ -110,12 +112,12 @@ Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency. -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 7c0afca7..5ca58bc5 100644 --- a/foundation/www/docs/user/manual/en/accounts/opening-accounts.md +++ b/foundation/www/docs/user/manual/en/accounts/opening-accounts.md @@ -1,4 +1,6 @@ +# Opening Accounts + #Updating Opening Balance in Accounts If you are a new company you can start using ERPNext accounting module by going to chart of accounts. However, if you are migrating from a legacy accounting system like Tally or a Fox Pro based software @@ -9,7 +11,7 @@ We recommend that you start using accounting in a new financial year, but you co * List of outstanding sales and purchase invoices (Payables and Receivables). -If you were using another accounting software before, firstly you should close financial statements in that software. The closing balance of the accounts should be updated as an opening balance in the ERPNext. Before starting to update opening balance, ensure that your [Chart of Accounts]({{docs_base_url}}/user/manual/en/accounts/chart-of-accounts.html) has all the Accounts required. +If you were using another accounting software before, firstly you should close financial statements in that software. The closing balance of the accounts should be updated as an opening balance in the ERPNext. Before starting to update opening balance, ensure that your [Chart of Accounts](/docs/user/manual/en/accounts/chart-of-accounts.html) has all the Accounts required. > Opening entry is only for Balance Sheet accounts and not for the Accounts in the Profit and Loss statement. @@ -29,7 +31,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 +41,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 +59,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 +73,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,13 +81,13 @@ To track stock balance in the Chart of Account, an Account is created for each W `Chart of Accounts > Assets > Current Asset > StocK Assets > (Warehouse Account)` -Opening Account +Opening Account -To update stock opening balance, create [Stock Reconciliation entry]({{docs_base_url}}/user/manual/en/stock/opening-stock.html). Based on the valuation of items's update in the Warehouse, balance will be updated in the Warehouse account. +To update stock opening balance, create [Stock Reconciliation entry](/docs/user/manual/en/stock/opening-stock.html). Based on the valuation of items's update in the Warehouse, balance will be updated in the Warehouse account. ###Fixed Asset Opening -Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master]({{docs_base_url}}/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field. +Opening balance for the fixed asset account should be updated via Journal Entry. Assets which are not fully depreciated should be added in the [Asset master](/docs/user/manual/en/accounts/managing-fixed-assets.html). For adding Assets in your possession, ensure to check **Is Existing Asset** field. ### Outstanding Invoices diff --git a/foundation/www/docs/user/manual/en/accounts/payment-entry.md b/foundation/www/docs/user/manual/en/accounts/payment-entry.md index d09380ca..839ba6b0 100644 --- a/foundation/www/docs/user/manual/en/accounts/payment-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/payment-entry.md @@ -1,4 +1,6 @@ +# Payment Entry + Payment Entry can be made against following transactions. 1. Sales Invoice. @@ -10,25 +12,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. -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. @@ -38,13 +40,13 @@ You Entry can be created directly from `Account > Payment Entry > New`. In the n When making payment entry, there could be some difference in the actual payment amount and the invoice outstanding. This difference could be due to rounding error, or change in the currency exchange rate. You can set an Account here where this difference amount will be booked. -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. @@ -60,13 +62,13 @@ For outgoing payment: ###Multi Currency Payment Entry -ERPNext allows you maintain accounts and invoicing in the [multiple currency]({{docs_base_url}}/user/manual/en/accounts/multi-currency-accounting.html). If invoice is made in the party currency, Currency Exchange Rate between companies base currency and party currency is also entered in the invoice. When creating Payment Entry against that invoice, you will again have to mention the Currency Exchange Rate at the time of payment. +ERPNext allows you maintain accounts and invoicing in the [multiple currency](/docs/user/manual/en/accounts/multi-currency-accounting.html). If invoice is made in the party currency, Currency Exchange Rate between companies base currency and party currency is also entered in the invoice. When creating Payment Entry against that invoice, you will again have to mention the Currency Exchange Rate at the time of payment. -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. @@ -79,7 +81,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 ca8cda8a..b1b2931d 100644 --- a/foundation/www/docs/user/manual/en/accounts/payment-request.md +++ b/foundation/www/docs/user/manual/en/accounts/payment-request.md @@ -1,11 +1,13 @@ +# Payment Request + Payment Request is sent via Email and will contain a link to a Payment Gateway if setup. You can create payment request via Sales Order or Sales Invoice. - Create Payment Request via Sales Order -Payment Request +Payment Request - Create payment Request via Sales Invoice -Payment Request +Payment Request --- @@ -14,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 592875dd..dc0b2df4 100644 --- a/foundation/www/docs/user/manual/en/accounts/payments.md +++ b/foundation/www/docs/user/manual/en/accounts/payments.md @@ -1,4 +1,6 @@ +# Payments + Payment can be made against following transactions. 1. Sales Invoice. @@ -17,13 +19,13 @@ In ERPNext, there is two options through which user can capture the payment On submitting a document against which Payment Entry can be made, you will find Make Payment button. -Making Payment +Making Payment ####Step 2: Payment Entry -Making Payment +Making Payment -For more details about payment entry [check here.]({{docs_base_url}}/user/manual/en/accounts/payment-entry) +For more details about payment entry [check here.](/docs/user/manual/en/accounts/payment-entry) ## Journal Entry @@ -33,19 +35,19 @@ 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_base_url}}/user/manual/en/accounts/journal-entry) +For more details about journal entry [check here.](/docs/user/manual/en/accounts/journal-entry) {next} diff --git a/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 c8ec5d0d..25381173 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 @@ -16,7 +16,7 @@ POS Invoices created in the offline mode will be saved locally in the browser. I In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, Sales Order, Purchase Order etc. can be edited via the POS. There two steps to Setup POS: 1. Enable POS View via (Setup > Customize > Feature Setup) -2. Create a [POS Setting]({{docs_base_url}}/user/manual/en/setting-up/pos-setting.html) record +2. Create a [POS Profile](/docs/user/manual/en/setting-up/pos-setting.html) record #### Different sections of the POS @@ -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 3d754082..dd5c3662 100644 --- a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md +++ b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md @@ -1,4 +1,6 @@ +# Pricing Rule + #Pricing Rule Pricing Rule is a master where you can define rules based on which discount is applied to specific Customer or Supplier. @@ -26,7 +28,7 @@ In this section, conditions are set for the application of Pricing Rule. When tr ####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 +36,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. -Applicable +Applicable ####2.1 Price Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate. -Applicable Price +Applicable Price #### 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 +68,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,21 +92,21 @@ For example : User want to add 10% margin on the supplier price list at the tim Create price list for supllier and create item price against the price list. -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_base_url}}/user/manual/en/selling/articles/adding-margin.html) +For more details about pricing rule [Click Here](/docs/user/manual/en/selling/articles/adding-margin.html) \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md b/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md index 21d3d7a3..00198a5d 100644 --- a/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/purchase-invoice.md @@ -1,4 +1,6 @@ +# Purchase Invoice + Purchase Invoice is the exact opposite of your Sales Invoice. It is the bill that your Supplier sends you for products or services delivered. Here you accrue expenses to your Supplier. Making a Purchase Invoice is very similar to @@ -13,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 524aa419..3ae59a32 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 @@ -1,4 +1,6 @@ +# Recurring Orders And Invoices + #Recurring Orders and Invoices If you have a contract with a **Customer** where you bill the Customer on a monthly, quarterly, half-yearly or annual basis, you should use recurring feature in orders and invoices. @@ -11,7 +13,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 9a752377..08a3e310 100644 --- a/foundation/www/docs/user/manual/en/accounts/sales-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/sales-invoice.md @@ -1,4 +1,6 @@ +# Sales Invoice + A Sales Invoice is a bill that you send to your customers, against which the customer processes the payment. Sales Invoice is an accounting transaction. On submission of Sales Invoice, the system updates the receivable and books income against a Customer Account. You can create a Sales Invoice directly from @@ -7,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 @@ -63,7 +65,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 @@ -72,7 +74,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 * * * @@ -89,5 +91,5 @@ not ideal as your Customer may or may not decide to pay up. But since your Customer wants an “Invoice”, you could give the Customer a Quotation (in ERPNext) titled as “Pro Forma Invoice”. This way everyone is happy. -This is a fairly common practice. We follow this at Frappe too. +This is a fairly common practice. We follow this at Frappé too. {next} diff --git a/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md b/foundation/www/docs/user/manual/en/accounts/setup/accounts-settings.md index 0c94bee2..9d76d919 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 @@ -1,6 +1,8 @@ +# 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 ec85a1cd..5631048f 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 @@ -1,4 +1,6 @@ +# Cost Center + Your Chart of Accounts is mainly designed to provide reports to the government and tax authorities. Most businesses have multiple activities like different product lines, market segments, areas of business, etc that share some common @@ -33,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 abd5e778..548d90ac 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 @@ -1,4 +1,6 @@ +# Fiscal Year + A fiscal year is also known as a financial year or a budget year. It is used for calculating financial statements in businesses and other organisations. The fiscal year may or may not be the same as a calendar year. For tax @@ -24,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/index.md b/foundation/www/docs/user/manual/en/accounts/setup/index.md index e7554cfa..0ba43c3f 100644 --- a/foundation/www/docs/user/manual/en/accounts/setup/index.md +++ b/foundation/www/docs/user/manual/en/accounts/setup/index.md @@ -1,4 +1,6 @@ +# Setup + ### Topics {index} \ No newline at end of file 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 626bc829..09020adc 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 @@ -1,7 +1,9 @@ -You can define which [Tax Template]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule. +# Tax Rule -Tax Rule +You can define which [Tax Template](/docs/user/manual/en/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule. + +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. @@ -11,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/tools/bank-reconciliation.md b/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md index 3125e1a9..2215fade 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 @@ -1,4 +1,6 @@ +# Bank Reconciliation + ### Bank Reconciliation Statement If you are receiving payments or making payments via cheques, the bank statements will not accurately match the dates of your entry, this is because the bank usually takes time to “clear” these payments. Also you may have mailed a cheque to your Supplier and it may be a few days before it is received and deposited by the Supplier. In ERPNext you can synchronise your bank statements and your Journal Entries using the “Bank Reconciliation” tool. @@ -7,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. @@ -35,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/index.md b/foundation/www/docs/user/manual/en/accounts/tools/index.md index e7554cfa..fe14356d 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/index.md +++ b/foundation/www/docs/user/manual/en/accounts/tools/index.md @@ -1,4 +1,6 @@ +# Tools + ### Topics {index} \ No newline at end of file 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 9fb04694..c1b31a2b 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 @@ -1,4 +1,6 @@ +# Payment Reconciliation + In complex scenarios, especially in the capital goods industry, sometimes there is no direct link between payments and invoices. You send invoices to your Customers and your Customer sends you block payments or payments based on some schedule that is not linked to your invoices. In such cases, you can use the Payment to Invoice Matching Tool. @@ -9,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/payment-tool.md b/foundation/www/docs/user/manual/en/accounts/tools/payment-tool.md index cfd57fcf..e37cd42c 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/payment-tool.md +++ b/foundation/www/docs/user/manual/en/accounts/tools/payment-tool.md @@ -1,4 +1,6 @@ +# Payment Tool + ###Payment Tool The Payment Tool Feature allows non-accounting personnel to generate Journal Entries by populating relevant fields in the Journal Entry with account and payment details. @@ -12,14 +14,14 @@ To go to Payment Tool, click on Accounts > Tools > Payment Tool. 6. Click on Get Outstanding Vouchers to fetch all the valid Vouchers, Invoices and Orders against which a payment can be made/received. These will appear in the Against Voucher section. * __Note:__ In case User is paying a customer or receiving payment from a supplier, add the details regarding the relevant invoices and orders manually. - Payment Tool + Payment Tool 7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher - Payment Tool + Payment Tool 8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in. - Payment Tool + Payment Tool {next} diff --git a/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 eeb72ac2..93cef31e 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 @@ -1,4 +1,6 @@ +# Period Closing Voucher + At the end of every year or (quarterly or maybe even monthly), after completing auditing, you can close your books of accounts. This means that you make all your special entries like: * Depreciation @@ -20,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/buying/articles/index.md b/foundation/www/docs/user/manual/en/buying/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/index.md +++ b/foundation/www/docs/user/manual/en/buying/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 4d8fb1c0..c9edfe16 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 @@ -1,4 +1,6 @@ +# Maintaining Suppliers Part No In Item + #Maintaining Supplier's Item Code in the Item master For each item, code assigned might differ from the code your supplier has given to that same item. ERPNext allows you to track Supplier's Item Code in the item master. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code. @@ -7,15 +9,15 @@ For each item, code assigned might differ from the code your supplier has given In the Item master, under Supplier Details section, enter Item Code as given by the Supplier to this item. -Supplier Item Code +Supplier Item Code #### 2. Supplier's Item Code in Transactions -Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form.]({{docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html) +Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form.](/docs/user/manual/en/customize-erpnext/customize-form.html) Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master. -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 84311897..25ca5872 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 @@ -1,4 +1,6 @@ +# Pull Items In Purchase Order Based On Supplier + #Pull Items in Purchase Order based on Supplier **Question:** @@ -13,7 +15,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 +25,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 94c0f0f1..36792a97 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 @@ -1,4 +1,6 @@ +# Purchasing In Different Unit + #Purchasing in Different Unit (UoM) Each item has stock unit of measument (UoM) associated to it. For example UoM of pen could be numbers (Nos) and sand could be stocked kgs. However, when we place an order with Supplier, UoM for an item could change. Like we can order 1 set/box of Pen, or one truck of sand to our Supplier. When creating purchase transacton, you can change Purchase UoM for an item. @@ -16,28 +18,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 737c9309..236987f8 100644 --- a/foundation/www/docs/user/manual/en/buying/purchase-order.md +++ b/foundation/www/docs/user/manual/en/buying/purchase-order.md @@ -1,4 +1,6 @@ +# Purchase Order + A Purchase Order is analogous to a Sales Order. It is usually a binding contract with your Supplier that you promise to buy a set of Items under the given conditions. @@ -8,7 +10,7 @@ Supplier Quotation. #### Purchase Order Flow Chart -![Purchase Order]({{docs_base_url}}/assets/img/buying/buying_flow.png) +![Purchase Order](/docs/assets/img/buying/buying_flow.png) In ERPNext, you can also make a Purchase Order directly by going to: @@ -16,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: @@ -41,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 @@ -80,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 9d042a98..c3b4f032 100644 --- a/foundation/www/docs/user/manual/en/buying/purchase-taxes.md +++ b/foundation/www/docs/user/manual/en/buying/purchase-taxes.md @@ -1,4 +1,6 @@ +# Purchase Taxes + For Tax Accounts that you want to use in the tax templates, you must mention them as type “Tax” in your Chart of Accounts. @@ -9,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 3fab652f..05245df1 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 @@ -1,11 +1,13 @@ +# Request For Quotation + A Request for Quotation is a document that an organization submits to one or more suppliers eliciting quotation for items. In ERPNext, You can create request for quotation directly by going to: > Buying > Documents > Request for Quotation > New Request for Quotation -![Request For Quotation]({{docs_base_url}}/assets/img/buying/request-for-quotation.png) +![Request For Quotation](/docs/assets/img/buying/request-for-quotation.png) After creation of request for quotation, there are two ways to generate supplier quotation from request for quotation. @@ -13,41 +15,41 @@ After creation of request for quotation, there are two ways to generate supplier __Step 1:__ Open request for quotation and click on make supplier quotation. -![Request For Quotation]({{docs_base_url}}/assets/img/buying/make-supplier-quotation-from-rfq.png) +![Request For Quotation](/docs/assets/img/buying/make-supplier-quotation-from-rfq.png) __Step 2:__ Select supplier and click on make supplier quotation. -![Request For Quotation]({{docs_base_url}}/assets/img/buying/supplier-selection-from-rfq.png) +![Request For Quotation](/docs/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_base_url}}/assets/img/buying/supplier-quotation-from-rfq.png) +![Request For Quotation](/docs/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_base_url}}/assets/img/buying/set-email-id.png) +![Request For Quotation](/docs/assets/img/buying/set-email-id.png) __Step 2:__ User has to click on send supplier emails button. -![Request For Quotation]({{docs_base_url}}/assets/img/buying/send-supplier-emails.png) +![Request For Quotation](/docs/assets/img/buying/send-supplier-emails.png) * 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_base_url}}/assets/img/buying/supplier-password-update-link.png) +![Request For Quotation](/docs/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_base_url}}/assets/img/buying/send-rfq-link.png) +![Request For Quotation](/docs/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_base_url}}/assets/img/buying/supplier-portal-rfq.png) +![Request For Quotation](/docs/assets/img/buying/supplier-portal-rfq.png) __Step 4:__ On submission, system will create supplier quotation(draft mode) against the supplier. User has to review the supplier quotation and submit it. More details:- -![Request For Quotation]({{docs_base_url}}/assets/img/buying/request-for-quotation.gif) \ No newline at end of file +![Request For Quotation](/docs/assets/img/buying/request-for-quotation.gif) \ No newline at end of file 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 83d582e4..968fb28c 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 @@ -1,7 +1,9 @@ +# Buying Settings + Buying Settings is where you can define properties which will be applied in the Buying module's transactions. -![Buying Settings]({{docs_base_url}}/assets/img/buying/buying-settings.png) +![Buying Settings](/docs/assets/img/buying/buying-settings.png) Let us look at the various options that can be configured: @@ -15,7 +17,7 @@ You can define or select the Naming Series pattern from: `Setup > Data > Naming Series` -[Click here to know more about defining a Naming Series.]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html) +[Click here to know more about defining a Naming Series.](/docs/user/manual/en/setting-up/settings/naming-series.html) ### 2. Default Supplier Type diff --git a/foundation/www/docs/user/manual/en/buying/setup/index.md b/foundation/www/docs/user/manual/en/buying/setup/index.md index 98f85084..44ed3946 100644 --- a/foundation/www/docs/user/manual/en/buying/setup/index.md +++ b/foundation/www/docs/user/manual/en/buying/setup/index.md @@ -1,4 +1,6 @@ +# Setup + ### Topics 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 de0d4bad..01fb913b 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 @@ -1,4 +1,6 @@ +# Supplier Type + A supplier may be distinguished from a contractor or subcontractor, who commonly adds specialized input to deliverables. A supplier is also known as a vendor. There are different types of suppliers based on their goods and @@ -15,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 72302c23..98e7672c 100644 --- a/foundation/www/docs/user/manual/en/buying/supplier-quotation.md +++ b/foundation/www/docs/user/manual/en/buying/supplier-quotation.md @@ -1,4 +1,6 @@ +# Supplier Quotation + A Supplier Quotation is a formal statement of promise by potential supplier to supply the goods or services required by a buyer, at specified prices, and within a specified period. A quotation may also contain terms of sale and @@ -9,7 +11,7 @@ You can make a supplier quotation from a Material Request #### Supplier Quotation Flow-Chart -![Supplier Quotation]({{docs_base_url}}/assets/img/buying/buying_flow.png) +![Supplier Quotation](/docs/assets/img/buying/buying_flow.png) You can also make a Supplier Quotation directly from: @@ -17,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 @@ -36,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 32d98732..141d8f22 100644 --- a/foundation/www/docs/user/manual/en/buying/supplier-scorecard.md +++ b/foundation/www/docs/user/manual/en/buying/supplier-scorecard.md @@ -1,4 +1,6 @@ +# Supplier Scorecard + A Supplier Scorecard is an evaluation tool used to assess the performance of suppliers. Supplier scorecards can be used to keep track of item quality, delivery and responsiveness of suppliers across long periods of time. This data @@ -13,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 34856ebe..e9226c8f 100644 --- a/foundation/www/docs/user/manual/en/buying/supplier.md +++ b/foundation/www/docs/user/manual/en/buying/supplier.md @@ -1,17 +1,19 @@ +# Supplier + Suppliers are companies or individuals who provide you with products or services. 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. @@ -21,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 0f319acf..3475a4d8 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 @@ -1,18 +1,20 @@ +# Customer Orders Invoices And Shipping Status + ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web. -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/index.md b/foundation/www/docs/user/manual/en/customer-portal/index.md index 61bc83bb..7089056e 100644 --- a/foundation/www/docs/user/manual/en/customer-portal/index.md +++ b/foundation/www/docs/user/manual/en/customer-portal/index.md @@ -1,4 +1,6 @@ +# Customer Portal + Customer Portal is designed to give easy accesibility to customers of a company. 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 74b8748c..0a0ad056 100644 --- a/foundation/www/docs/user/manual/en/customer-portal/issues.md +++ b/foundation/www/docs/user/manual/en/customer-portal/issues.md @@ -1,4 +1,6 @@ +# Issues + The customer portal makes it very easy for a customer to raise concerns. A simple and intuitive interface facilitates your customer to report their concerns as Issues. They can view the complete thread of their @@ -6,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 d4a0f1c2..3af66f09 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 @@ -1,7 +1,9 @@ +# Portal Login + To login into the customer account, the customer has to use his Email Address and the password sent by ERPNext; generated through the sign-up process. -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 2f4b8ec2..879a399b 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 @@ -1,15 +1,17 @@ +# Sign Up + Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page. #### Step 1: Signup On the Login Page, you will find option to Signup. -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 cf15087f..6c11cd63 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 @@ -1,4 +1,6 @@ +# Allow Fields To Be Changed After Submit + #Editing Value in Submitted Document Once document is submitted, fields are frozen, and no editing is allowd. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted. @@ -13,17 +15,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/creating-custom-link-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md index 442220ca..f0e34b86 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 @@ -1,4 +1,6 @@ +# Creating Custom Link Field + #Creating Custom Link Fields Links field are the ones linked to another document type. For example, customer field is a link field in Sales Order. This field is linked to the Customer master. @@ -14,7 +16,7 @@ You can insert Custom Link Field by following steps below. In Customize Form, select Document Type (Quotation, Sales Order, Purchase Invoice Item etc.). Once field are updated in table, open field before which you wish to insert Custom Field. Then click on "Insert Above" to insert new Custom Field. -Select Docytpe +Select Docytpe ####Step 4: Custom Field Values @@ -25,6 +27,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 \ No newline at end of file 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 ecd1b775..77da4738 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 @@ -1,4 +1,6 @@ +# Customizing Sorting Order In The List View + #Customizing Sorting Order in the List View **Question:** I want records in my Item List sorted based on Desc Order of Item Code. @@ -13,13 +15,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 1c9c956b..adbbee33 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 @@ -1,7 +1,9 @@ +# Deleting Custom Reports + #Deleting Custom Reports -ERPNext has several [types of reports]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement. +ERPNext has several [types of reports](/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement. If there is a report custom report which needs to be deleted, it can be achieved by following steps. Please note that its applicable only for the Custom Reports, and not for the standard reports. @@ -9,16 +11,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 3a31a8c4..d60af5e8 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 @@ -1,9 +1,11 @@ +# Disable Rounded Total + #Disable Rounded Total All the sales transactions like Sales Order, Sales Invoice has Rounded Total in it. It calculated based on the value of Grand Total. Also Rounded Total is also visible in the Standard Print Formats. -Print Preview +Print Preview Follow steps given below to hide rounded total from Standard Print Formats, for all the sales transactions. @@ -15,7 +17,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/field-types.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md index b6c5b558..11a1ad36 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md @@ -1,4 +1,6 @@ +# Field Types + #Field Types Following are the types of fields you can define while creating new ones, or while amend standard ones. @@ -33,7 +35,7 @@ This field will give you date and time picker. Current date and time (as provide - Dynamic Link -Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.html) to learn how Dynamic Link Field function. +Click [here](/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.html) to learn how Dynamic Link Field function. - Float diff --git a/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 6e0fe7ca..ba91d35b 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 @@ -1,4 +1,6 @@ +# Increase Max Attachments + #Increase Max Attachments In ERPNext, you can limit how many files can be attached to specific Document. Using Custmize Form, you can set **Max(imum) Attachments** which can be added to a particular documents. @@ -11,13 +13,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/index.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/index.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 ed6ebf9d..d842ddbc 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 @@ -1,4 +1,6 @@ +# Make Field Visible In Print Format + #Make Fields Visible In Print Format Each transaction has Standard Print Format. In the Standard format, only certain fields are displayed by default. If user needs field in the Standard format to be visible, it can be customized by using Customize Form tool. @@ -15,13 +17,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/making-custom-reports-in-erpnext.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md index e309341c..375e0ee7 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md @@ -1,4 +1,6 @@ +# Making Custom Reports In Erpnext + #Reports in ERPNext There are three kind of reports in ERPNext. 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 e9e2a8c6..bf74cef4 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 @@ -1,4 +1,6 @@ +# Managing Dynamic Link Fields + #Managing Dynamic Link Fields Dynamic Link field is one which can search and hold value of any document/doctype. Let's consider an example to learn how Dynamic Link field works. @@ -13,7 +15,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 +30,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/maximum-numbers-of-fields-in-a-form.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md index b45aa4cf..74ab58f5 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/maximum-numbers-of-fields-in-a-form.md @@ -1,4 +1,6 @@ +# Maximum Numbers Of Fields In A Form + Sometimes while creating custom fields, you might experienced an error message like below: > Row size too large. The maximum row size for the used table type, not counting BLOBs, is 65535. This includes storage overhead, check the manual. You have to change some columns to TEXT or BLOBs @@ -13,7 +15,7 @@ Every table (regardless of storage engine) has a maximum row size of 65,535 byte The maximum row size constrains the number (and possibly size) of columns because the total length of all columns cannot exceed this size (65,535 bytes). For example, `utf8mb3` characters require up to 3 bytes per character, so for a `VARCHAR(140)` column, the server must allocate `140 × 3 = 420` bytes per value. Consequently, a table cannot contain more than `65,535 / 420 = 156` such columns. -In Frappe frapework, `VARCHAR(140)` type columns are created based on "Data", "Link", "Select", "Dynamic Link", "Password" and "Read Only" fieldtypes. Hence, you can create approximately 156 such columns in the system. +In Frappé frapework, `VARCHAR(140)` type columns are created based on "Data", "Link", "Select", "Dynamic Link", "Password" and "Read Only" fieldtypes. Hence, you can create approximately 156 such columns in the system. ### Solutions: 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 55e8b12d..b98c336b 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 @@ -1,4 +1,6 @@ +# Module Visibility + #Module Visibility If you have permission on specific module, but it is still not visible, following are the possibilities of issues you should look at. Let's consider a scenario that user is permission of Website module, but not able to access it. @@ -7,7 +9,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/perm-level-error-in-permission-manager.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md index 4783c530..11e95b8a 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md @@ -1,7 +1,9 @@ +# Perm Level Error In Permission Manager + #Perm Level Error in Permission Manager -While customizing rules in the [Permission Manager]({{docs_base_url}}/user/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions), you might receive an error message saying: +While customizing rules in the [Permission Manager](/docs/user/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions), you might receive an error message saying: `For System Manager _(or other role)_ at level 2 _(or other level)_ in Customer _(or other document)_ in row 8: Permission at level 0 must be set before higher levels are set.` diff --git a/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 db442b5d..15543d9d 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 @@ -1,4 +1,6 @@ +# Search Record By Specific Field + #Search Record by Specific Field While creating any document (say Sales Invoice), you have to select other document id in it (say Serial No). For ease in selection, you can also make value of other field of that visible in the search result. Search By functionality enables to define field whos value will be visible in the search result. @@ -17,12 +19,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 44eceb0b..b16aa20e 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 @@ -1,4 +1,6 @@ +# Set Language + #Change the Language ERPNext is an multi-lingual application. It allows each user to select preferred lannguage. Following is how User can customize language in one's account. @@ -9,13 +11,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 +33,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 69279a92..607f6e1f 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 @@ -1,4 +1,6 @@ +# Set Precision + #Set Precision In ERPNext, default precision for `Float`, `Currency` and `Percent` field is three. It allows you to enter value having value upto three decimal places. @@ -9,11 +11,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 f9018853..41cd92df 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 0fd98555..47e17b3d 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 @@ -1,4 +1,6 @@ +# Custom Doctype + DocType or a Document Type is a tool to insert form in ERPNext. The forms like Sales Order, Sales Invoices, Production Order are added as Doctype in the backend. Let's assume we are creating a Custom Doctype for a Book. @@ -20,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 @@ -35,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. @@ -45,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 @@ -66,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 de227a6b..1c14abdf 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 @@ -1,4 +1,6 @@ +# Custom Field + Every form in the ERPNext has standard set of fields. If you need to capture some information, but there is no standard field available for it, you can insert Custom Field in a form as per your requirement. Following are the steps to insert Custom Field in the existing form. @@ -13,37 +15,37 @@ To add a Custom Field, go to: In the Customize Form, select Document Type in which you want to insert Custom Field. Let's assume we are inserting Custom Field in the Employee master. -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_base_url}}/user/manual/en/customize-erpnext/articles/field-types.html) to learn more about types of field you can set for your Custom Field. +Click [here](/docs/user/manual/en/customize-erpnext/articles/field-types.html) to learn more about types of field you can set for your Custom Field. ####Set Option Based on the Field Type, value will be entered in the Options field. -If you are creating a Link field, then in the Options, enter Doctype name with which this field will be linked. Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html) to learn more about creating custom link field. +If you are creating a Link field, then in the Options, enter Doctype name with which this field will be linked. Click [here](/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html) to learn more about creating custom link field. If field type is set as Select (drop down field), then all he possible result for this field should be listed in the Options field. Each possible result should be separate by row. -Select Document Type +Select Document Type For Data field, Option can be set to "Email" or "Phone" and the field will be validated accordingly. @@ -64,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/custom-script-examples/custom-script-fetch-values-from-master.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md index 7914e40b..6e54d903 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md @@ -1,4 +1,6 @@ +# Custom Script Fetch Values From Master + To pull a value of a link on selection, use the `add_fetch` method. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md index 19e73103..26ac9275 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md @@ -1,4 +1,6 @@ +# Generate Item Code Based On Custom Logic + Add this in the Custom Script of **Item**, so that the new Item Code is generated just before the a new Item is saved. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md index dbb9d4b1..3a4da9bd 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md @@ -1,4 +1,6 @@ +# Custom Script Examples + ### How to Create a Custom Script Create a Custom Script (you must have System Manager role for this): diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md index 13a44e00..16c58ea8 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md @@ -1,4 +1,6 @@ +# Make Read Only After Saving + Use the method `cur_frm.set_df_property` to update the field's display. In this script we also use the `__islocal` property of the doc to check if the diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md index 7c038b84..fc87d844 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md @@ -1,4 +1,6 @@ +# Restrict Cancel Rights + Add a handler to `custom_before_cancel` event: diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md index 9dc413c1..d64fd1ca 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md @@ -1,4 +1,6 @@ +# Restrict Purpose Of Stock Entry + frappe.ui.form.on("Material Request", "validate", function(frm) { if(frappe.user=="user1@example.com" && frm.doc.purpose!="Material Receipt") { diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md index 76394a0f..05287ed9 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md @@ -1,4 +1,6 @@ +# Restrict User Based On Child Record + // restrict certain warehouse to Material Manager cur_frm.cscript.custom_validate = function(doc) { diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md index 505475c5..a9e52586 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md @@ -1,4 +1,6 @@ +# Sales Invoice Id Based On Sales Order Id + Below script allows you to get naming series in Sales Invoice, same as of corresponding Sales Order. Invoice uses a prefix M- but the number duplicates the SO doc name (number). diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md index 167e314c..502ca670 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md @@ -1,4 +1,6 @@ +# Update Date Field Based On Value In Other Date Field + Below script would auto-set value for the date field, based on the value in another date field. Example: Production Due Date must be set as two days before Delivery Date. If you have Production Due Date field already, with field type as Date, as per the below given script, date will be auto-updated in it, two days prior Deliver Date. diff --git a/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 ff9ef598..22d3a477 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 @@ -1,11 +1,13 @@ +# Custom Scripts + If you wish to change any ERPNext form formats, you can do so by using Custom Scripts. For example, if you wish to add a submit button after saving, to a Lead form, you can do so by creating your own script. `Setup > Customization > Custom Script` -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 153c5bf0..555aa400 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 @@ -1,8 +1,10 @@ +# Customize Form + Before we venture to learn form customization tool, click [here](https://frappe.io/docs/user/en/tutorial/doctypes.html) to understand the architecture of forms in ERPNext. It shall help you in using Customize Form tool more efficiently. -Customize Form is the tool which allows user to customize property of the standard fields, and insert [custom fields]({{docs_base_url}}/user/manual/en/customize-erpnext/custom-field.html) as per the requirement. Let's assume we need to set Project Name field as a mandatory field in the Sales Order form. Following are the steps which shall be followed to achieve this. +Customize Form is the tool which allows user to customize property of the standard fields, and insert [custom fields](/docs/user/manual/en/customize-erpnext/custom-field.html) as per the requirement. Let's assume we need to set Project Name field as a mandatory field in the Sales Order form. Following are the steps which shall be followed to achieve this. ####Step 1: Go to Customize Form @@ -12,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 @@ -20,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 @@ -28,11 +30,11 @@ On selecting Document Type, all the fields of the Document Type will updated as To customized Project field, click on the respective row, and check "Mandatory". With this, Project field will become mandatory in the Sales Order. -Customize Form select doctype +Customize Form select doctype Like setting setting field Mandatory, following are the other customization options in the Customize Form tool. -* Change [Field Type]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/field-types.html). +* Change [Field Type](/docs/user/manual/en/customize-erpnext/articles/field-types.html). * Edit Field Labels to suit your industry/language. * Set field precision for the Currency field. * To hide field, check Hidden. @@ -48,9 +50,9 @@ To have customizations take effect, reload your ERPNext account once. From Customize Form, you can also do following customizations: -* Max Attachment Limit: Define [maximum no. of files]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) which can attached on a document. +* Max Attachment Limit: Define [maximum no. of files](/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) which can attached on a document. * Default Print Format: For one document type, you can have multiple print formats. In the Customize Form, you can also set default Print Format for a document. -* Set [Title Field]({{docs_base_url}}/user/manual/en/customize-erpnext/document-title.html) +* Set [Title Field](/docs/user/manual/en/customize-erpnext/document-title.html) * Sort Field and Sort Order: Define field based on which documents in the list view will be sorted. >Note: Though we want you to do everything you can to customize your ERP based on your business needs, we recommend that you do not make “wild” changes to the forms. This is because, these changes may affect certain operations and may mess up your forms. Make small changes and see its effect before doing some more. @@ -93,7 +95,7 @@ table, th, td { Field Type - Click here to learn about of fields types. + Click here to learn about of fields types. Options 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 31d47d54..bdc366c3 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 @@ -1,4 +1,6 @@ +# Document Title + You can customize the title of documents based on properties so that you have meaningful information for the list views. For example the default title on **Quotation** is the customer name, but if you are dealing a few customers and sending lots of quotes to the same customer, you may want to customize. @@ -22,14 +24,14 @@ You can define the title by setting document properties in braces `{}`. For exam {customer_name} for {project} Customize Title + src="/docs/assets/img/customize/customize-title.gif"> #### Fixed or Editable Titles If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document. Editable Title + src="/docs/assets/img/customize/editable-title.gif"> If you want a fixed title, you can set the rule in the **Options** property. In this way, the title will be automatically updated everytime the document is updated. diff --git a/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 7b0b6316..f5e6516b 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,9 +5,9 @@ To hide modules (icons) from the home page, go to: `Setup > Permissions > Show / Hide Modules` -Hide Features +Hide Features -Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/module-visibility.html) to learn about other features from where icons from the desktop can be hidden. +Click [here](/docs/user/manual/en/customize-erpnext/articles/module-visibility.html) to learn about other features from where icons from the desktop can be hidden. > Note: Modules are automatically hidden for users that have no permissions on the documents within that module. For example, if a User has no permissions on Purchase Order, Purchase Request, Supplier, the “Buying” module will automatically hidden for that User. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md index 3554a2b5..d2db7151 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 @@ -1,4 +1,6 @@ +# Kanban Board + #Kanban Board Kanban is a Japanese manufacturing system in which the supply of components is regulated through the use of an instruction card sent along the production line. @@ -9,35 +11,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 745553ab..849287a7 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 @@ -1,4 +1,6 @@ +# Print Format + Print Formats are the layouts that are generated when you want to Print or Email a transaction like a Sales Invoice. There are two types of Print Formats, @@ -17,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” @@ -44,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/fleet_management/index.md b/foundation/www/docs/user/manual/en/fleet_management/index.md index 9947f5ae..941cb28d 100644 --- a/foundation/www/docs/user/manual/en/fleet_management/index.md +++ b/foundation/www/docs/user/manual/en/fleet_management/index.md @@ -1,4 +1,6 @@ +# Fleet Management + Fleet Management module helps your Organization manage their fleet of vehicles and track their expenses. To use Fleet Management in ERPNext, @@ -18,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 @@ -38,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', @@ -56,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/appraisal.md b/foundation/www/docs/user/manual/en/human-resources/appraisal.md index 133d47c2..7ae085c2 100644 --- a/foundation/www/docs/user/manual/en/human-resources/appraisal.md +++ b/foundation/www/docs/user/manual/en/human-resources/appraisal.md @@ -1,4 +1,6 @@ +# Appraisal + In ERPNext, you can manage Employee Appraisals by creating an Appraisal Template for each role with the parameters that define the performance by giving appropriate weightage to each parameter. @@ -7,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 a517f04b..03f94516 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 @@ -11,15 +11,15 @@ Create following Groups and Ledgers in Chart of Accounts if not there. #### 1.1 Employee Loan Account -Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters) +Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters) -![CoA]({{docs_base_url}}/assets/img/articles/Selection_433.png) +![CoA](/docs/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_base_url}}/assets/img/articles/Selection_434.png) +![CoA](/docs/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_base_url}}/assets/img/articles/Selection_435.png) +![Loan Entry](/docs/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_base_url}}/assets/img/articles/Selection_436.png) +![Loan Reco](/docs/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_base_url}}/assets/img/articles/Selection_437.png) +![Loan Reco](/docs/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_base_url}}/assets/img/articles/Selection_439.png) +![Loan Reco](/docs/assets/img/articles/Selection_439.png) diff --git a/foundation/www/docs/user/manual/en/human-resources/articles/index.md b/foundation/www/docs/user/manual/en/human-resources/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/human-resources/articles/index.md +++ b/foundation/www/docs/user/manual/en/human-resources/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 78b0dacd..a01125c8 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/attendance.md b/foundation/www/docs/user/manual/en/human-resources/attendance.md index d9e0155a..fd541570 100644 --- a/foundation/www/docs/user/manual/en/human-resources/attendance.md +++ b/foundation/www/docs/user/manual/en/human-resources/attendance.md @@ -1,16 +1,18 @@ +# Attendance + An Attendance record stating that an Employee has been present on a particular day can be created manually by: > Human Resources > Documents > Attendance > New Attendance -Attendence +Attendence You can get a monthly report of your Attendance data by going to the “Monthly Attendance Details” report. -You can easily set attendance for Employees using the [Employee Attendance Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/employee-attendance-tool.html) +You can easily set attendance for Employees using the [Employee Attendance Tool](/docs/user/manual/en/human-resources/tools/employee-attendance-tool.html) -You can also bulk upload attendence using the [Upload Attendence Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/upload-attendance.html) +You can also bulk upload attendence using the [Upload Attendence Tool](/docs/user/manual/en/human-resources/tools/upload-attendance.html) {next} diff --git a/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 65239983..7b8f0ea0 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 @@ -13,4 +13,4 @@ Go to "Daily Work Summary Settings" via HR module or search bar and set the comp You can also choose to Customize the Message you send to your employees: -Department +Department 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 acad6252..85a0e17e 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 f93edeab..5d29dfde 100644 --- a/foundation/www/docs/user/manual/en/human-resources/employee.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee.md @@ -1,10 +1,12 @@ +# Employee + There are many fields you can add in your Employee records. 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 e1b702f6..e9abf0b7 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 @@ -1,24 +1,26 @@ +# Expense Claim + Expense Claim is made when Employee’s make expenses out of their pocket on behalf of the company. For example, if they take a customer out for lunch, they can make a request for reimbursement via the Expense Claim form. To make a new Expense Claim, go to: > HR > Expense Claim > New Expense Claim -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 Approver for the Expense Claim is selected by an Employee himself. Users to whom `Expense Approver` role is assigned will shown in the Expense Claim Approver field. -After saving Expense Claim, Employee should [Assign document to Approver]({{docs_base_url}}/user/manual/en/using-eprnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert]({{docs_base_url}}/user/manual/en/setting-up/email/email-alerts.html). +After saving Expense Claim, Employee should [Assign document to Approver](/docs/user/manual/en/using-eprnext/assignment.html). On assignment, approving user will also receive email notification. To automate email notification, you can also setup [Email Alert](/docs/user/manual/en/setting-up/email/email-alerts.html). Expense Claim Approver can update the “Sanctioned Amounts” against Claimed Amount of an Employee. If submitting, Approval Status should be submitted to Approved or Rejected. If Approved, then Expense Claim gets submitted. If rejected, then Expen Comments can be added in the Comments section explaining why the claim was approved or rejected. @@ -26,19 +28,19 @@ 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 +Expense Claim Note: This amount should not be clubbed with Salary because the amount will then be taxable to the Employee. @@ -47,6 +49,6 @@ Note: This amount should not be clubbed with Salary because the amount will then * 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 7e55df83..65f9955c 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 @@ -1,4 +1,6 @@ +# Fleet Management + Fleet Management section of Human Resources helps your Organization manage their fleet of vehicles and track their expenses. To use Fleet Management in ERPNext, @@ -18,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 @@ -38,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', @@ -56,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 c119cca9..8fec005e 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 @@ -1,4 +1,6 @@ +# Holiday List + #Holiday List Holiday List is a list which contains the dates of holidays. @@ -15,22 +17,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-resource-setup.md b/foundation/www/docs/user/manual/en/human-resources/human-resource-setup.md index 2063932e..2cc69b3a 100644 --- a/foundation/www/docs/user/manual/en/human-resources/human-resource-setup.md +++ b/foundation/www/docs/user/manual/en/human-resources/human-resource-setup.md @@ -1,4 +1,6 @@ +# Human Resource Setup + The HR module has a setup process where you create the masters for all the major activities. 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 33a4ae99..1f360ca3 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 a5358943..fe32d069 100644 --- a/foundation/www/docs/user/manual/en/human-resources/index.md +++ b/foundation/www/docs/user/manual/en/human-resources/index.md @@ -1,4 +1,6 @@ +# Human Resources + The Human Resources (HR) Module covers the processes linked to managing a team of co-workers. Most important feature here is processing the payroll by using Process Payroll to generate Salary Slips. Most countries have complex tax diff --git a/foundation/www/docs/user/manual/en/human-resources/job-applicant.md b/foundation/www/docs/user/manual/en/human-resources/job-applicant.md index d4ee9609..075b57dd 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 @@ -1,11 +1,13 @@ -You can mantain a list of People who have applied for a [Job Opening]({{docs_base_url}}/user/manual/en/human-resources/job-opening.html). +# Job Applicant + +You can mantain a list of People who have applied for a [Job Opening](/docs/user/manual/en/human-resources/job-opening.html). To create a new Job Applicant go to > Human Resource > Job Applicant > New -Job Applicant +Job Applicant ### Linking with an Email Account @@ -21,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-opening.md b/foundation/www/docs/user/manual/en/human-resources/job-opening.md index 3d4aca68..9527ee37 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 @@ -1,11 +1,13 @@ +# Job Opening + You can make a record of the open vacancies in your company using Job Opening. To create a new Job Opening go to > Human Resource > Job Opening > New -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 4ea0f00f..5c272e07 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 @@ -1,4 +1,6 @@ +# Leave Application + If your company has a formal system where Employees have to apply for leaves to be able to qualify as paid leaveas, you can create Leave Application to track approval and usage of leaves. You have to mention the Employee, Leave @@ -6,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 @@ -14,12 +16,12 @@ Type and the period for which the leave is taken. * You need to mention a list of Leave Approvers against an Employee in the Employee Master. -Leave Approver +Leave Approver > Tip : If you want all users to create their own Leave Applications, you can set their “Employee ID” as a match rule in the Leave Application Permission -settings. See the earlier discussion on [Setting Up Permissions]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/user-permissions.html) +settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.html) for more info. -You assign Leaves aginast an Employee check [Leave Allocation]({{docs_base_url}}/user/manual/en/human-resources/leave.html) +You assign Leaves aginast an Employee check [Leave Allocation](/docs/user/manual/en/human-resources/leave.html) {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/leave.md b/foundation/www/docs/user/manual/en/human-resources/leave.md index 3bc7a638..439cbeb6 100644 --- a/foundation/www/docs/user/manual/en/human-resources/leave.md +++ b/foundation/www/docs/user/manual/en/human-resources/leave.md @@ -1,4 +1,6 @@ +# Leave + #Overview This section enables you to manage leave schedule of your organization. It also explains the way employees can apply for leaves. Employees create leave request and manager (leave approver) approves or rejects the request. You can select from a number of leave types such as sick leave, casual leave, privilege leave and so on. You can also allocate leaves to your employees and generate reports to track leaves record. @@ -13,7 +15,7 @@ Leave Type refers to types of leave allotted to an employee by a company. An emp requirement. New Leave Type + src="/docs/assets/img/human-resources/new-leave-type.png"> **Max Days Leave Allowed:** It refers to maximum number of days this particular Leave Type can be availed at a stretch. If an employee exceeds the maximum number of days under a particular Leave Type, his/her extended leave may be considered as ‘Leave Without Pay’ and this may affect his/her salary calculation. @@ -46,7 +48,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/assets/img/human-resources/manual-leave-allocation.png"> ###Via Leave Allocation Tool > Human Resources > Tools > Leave Allocation Tool @@ -54,7 +56,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/assets/img/human-resources/leave-allocation-tool.png"> --- @@ -72,7 +74,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/assets/img/human-resources/new-leave-application.png"> **Notes:** @@ -90,4 +92,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/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 index 47b2bde1..85143b66 100644 --- a/foundation/www/docs/user/manual/en/human-resources/offer-letter.md +++ b/foundation/www/docs/user/manual/en/human-resources/offer-letter.md @@ -1,4 +1,6 @@ +# 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. @@ -6,12 +8,12 @@ In ERPNext you can make a record of the Offer Letters that you can given to cand > Human Resource > Offer Letter > New -Offer Letter +Offer Letter -> Note: An offer letter can be made only against a [Job Applicant]({{docs_base_url}}/user/manual/en/human-resources/job-applicant.html) +> Note: An offer letter can be made only against a [Job Applicant](/docs/user/manual/en/human-resources/job-applicant.html) There is a pre-designed print format to print you offer letter. -Offer Letter +Offer Letter {next} \ No newline at end of file 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 3e2cbbe2..62cfcc25 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 @@ -1,4 +1,6 @@ +# Salary And Payroll + Salary is a fixed amount of money or compensation paid to an employee by an employer in return for the work performed . Payroll is the administration of financial records of employees' salaries, wages, bonuses, net pay, and deductions. @@ -45,7 +47,7 @@ To create a new Salary Structure go to: #### Figure 1.1:Salary Structure -Salary Structure +Salary Structure ### In the Salary Structure, @@ -54,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 @@ -71,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 @@ -122,7 +124,7 @@ 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: @@ -130,7 +132,7 @@ You can also create salary slip for multiple employees using Process Payroll: #### Figure 3: Process Payroll -Process Payroll +Process Payroll In Process Payroll, @@ -165,7 +167,7 @@ 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 d2e1278b..4fc31b71 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 @@ -1,6 +1,8 @@ +# Branch + 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 d915e634..4d212004 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 @@ -1,11 +1,13 @@ +# Deduction Type + You can make a record of the tax and other salary deductions and describe it as Deduction Type To create a new Deduction Type > Human Resource > Setup > Deduction Type > New -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 7bb97364..3d38f826 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 @@ -1,6 +1,8 @@ +# Department + 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 0d6f7b4e..c2f6da17 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 @@ -1,6 +1,8 @@ +# Designation + 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 fd986323..cae7d726 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 @@ -1,11 +1,13 @@ +# Earning Type + You can make a record of the Salary Components and describe it as Earning Type To create a new Earning Type > Human Resource > Setup > Earning Type > New -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 0b0501b7..e364ebe4 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 @@ -1,6 +1,8 @@ +# Employment Type + 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 a3ed99b1..9c385592 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/setup/index.md b/foundation/www/docs/user/manual/en/human-resources/setup/index.md index be943bcc..a7193b07 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/index.md +++ b/foundation/www/docs/user/manual/en/human-resources/setup/index.md @@ -1,2 +1,4 @@ +# Setup + {index} \ 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 cbdc3ded..c6be28c2 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 @@ -1,10 +1,12 @@ +# Employee Attendance Tool + To go the attendance tool, go to: > Human Resources > Tools > Employee Attendance Tool This tool allows you to add attendance records for multiple employees quickly. -Attendence upload +Attendence upload {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/index.md b/foundation/www/docs/user/manual/en/human-resources/tools/index.md index be943bcc..cf6a36ae 100644 --- a/foundation/www/docs/user/manual/en/human-resources/tools/index.md +++ b/foundation/www/docs/user/manual/en/human-resources/tools/index.md @@ -1,2 +1,4 @@ +# Tools + {index} \ 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 7cd0e789..b091ca0e 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 @@ -1,10 +1,12 @@ +# Upload Attendance + This tool helps you to upload bulk attendence from a csv file. 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 341cac98..b9016966 100644 --- a/foundation/www/docs/user/manual/en/human-resources/training.md +++ b/foundation/www/docs/user/manual/en/human-resources/training.md @@ -1,9 +1,11 @@ +# Training + ### Training Event Schedule seminars, workshops, conferences etc using Training Event. You can also invite your employees to attend the event using this feature. -Employee +Employee ### Inviting Employees for Event @@ -13,17 +15,17 @@ The system shall notify the employee with status 'Open' by sending a email to th The status is changed to 'Invited' when an invitation email is sent to the employee by the system. When an Employee confirms his/her presence for the event you can change the status to 'Confirmed'. -Employee +Employee ### Training Result After compleation of the training Employee Wise training results can be stored based on the Feedback received from the Trainer. -Employee +Employee ### Trainig Feedback Collect feedback regarding the event from your Employees using 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 d05114f6..dfa72e38 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 @@ -1,4 +1,6 @@ +# Concepts And Terms + Before you start implementation, lets get familiar with the terminology that is used and some basic concepts in ERPNext. diff --git a/foundation/www/docs/user/manual/en/introduction/do-i-need-an-erp.md b/foundation/www/docs/user/manual/en/introduction/do-i-need-an-erp.md index 141f467e..ab733386 100644 --- a/foundation/www/docs/user/manual/en/introduction/do-i-need-an-erp.md +++ b/foundation/www/docs/user/manual/en/introduction/do-i-need-an-erp.md @@ -1,4 +1,6 @@ +# Do I Need An Erp + ERPNext is a modern tool that covers not only accounting but also all other business functions, on an integrated platform. It has many benefits over both traditional accounting as well as ERP applications. diff --git a/foundation/www/docs/user/manual/en/introduction/getting-started-with-erpnext.md b/foundation/www/docs/user/manual/en/introduction/getting-started-with-erpnext.md index 32620c57..e43183e0 100644 --- a/foundation/www/docs/user/manual/en/introduction/getting-started-with-erpnext.md +++ b/foundation/www/docs/user/manual/en/introduction/getting-started-with-erpnext.md @@ -1,4 +1,6 @@ +# Getting Started With Erpnext + # Getting Started with ERPNext @@ -15,7 +17,7 @@ see the demo at: ### 2\. Start a Free Account at ERPNext.com -ERPNext.com is managed by the organization (Frappe) that publishes ERPNext. +ERPNext.com is managed by the organization (Frappé) that publishes ERPNext. You can start with your own account by [signing up on the website](https://erpnext.com). @@ -35,6 +37,6 @@ Image](https://erpnext.com/download) ### 4\. Install ERPNext on your Unix/Linux/Mac machine -If you are familiar with installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/bench). +If you are familiar with installing applications on *nix platforms, read the instructions on how to install using [Frappé Bench](https://github.com/frappe/bench). {next} diff --git a/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md b/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md index 771e5329..ee978188 100644 --- a/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md +++ b/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md @@ -1,4 +1,6 @@ +# Implementation Strategy + Before you start managing your Operations in EPRNext, you must first become familiar with the system and the terms used. For this we recommend implementation should happen in two phases. diff --git a/foundation/www/docs/user/manual/en/introduction/index.md b/foundation/www/docs/user/manual/en/introduction/index.md index 46b1edb3..3322230b 100644 --- a/foundation/www/docs/user/manual/en/introduction/index.md +++ b/foundation/www/docs/user/manual/en/introduction/index.md @@ -1,4 +1,6 @@ +# Introduction + ## What is an ERP and why should I care? (If you are already convinced you need an all-in-one system for your diff --git a/foundation/www/docs/user/manual/en/introduction/key-workflows.md b/foundation/www/docs/user/manual/en/introduction/key-workflows.md index db15e40b..c9076ad8 100644 --- a/foundation/www/docs/user/manual/en/introduction/key-workflows.md +++ b/foundation/www/docs/user/manual/en/introduction/key-workflows.md @@ -4,10 +4,10 @@ This diagram covers how ERPNext tracks your company information across key functions. This diagram does not cover all the features of ERPNext. -![]({{docs_base_url}}/assets/old_images/erpnext/overview.png) +![](/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/open-source.md b/foundation/www/docs/user/manual/en/introduction/open-source.md index c63b8a0b..5cf6fe52 100644 --- a/foundation/www/docs/user/manual/en/introduction/open-source.md +++ b/foundation/www/docs/user/manual/en/introduction/open-source.md @@ -1,4 +1,6 @@ +# Open Source + The source code is an Open Source software. It is open for anyone to understand, extend or improve. And it is free! diff --git a/foundation/www/docs/user/manual/en/introduction/the-champion.md b/foundation/www/docs/user/manual/en/introduction/the-champion.md index eade82eb..0dd7838b 100644 --- a/foundation/www/docs/user/manual/en/introduction/the-champion.md +++ b/foundation/www/docs/user/manual/en/introduction/the-champion.md @@ -1,9 +1,11 @@ +# The Champion +

    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/index.md b/foundation/www/docs/user/manual/en/manufacturing/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/index.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 a48dffa0..d6f36490 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 @@ -1,4 +1,6 @@ +# Nested Bom Structure + #Nested BOM Structure **Question:** Our manufacturing process involves producing sub-assembly items before final product. How should we manage BOM master in this scenario? @@ -9,7 +11,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/production-planning-subassembly.md b/foundation/www/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md index 314cf5b2..355d1849 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md @@ -1,4 +1,6 @@ +# Production Planning Subassembly + #Production Planning & Subassembly if you need Production Planning Tool to consider raw-materials required for the manufacturing of sub-assembly items selected in the BOM, please check following instructions to achieve the same. diff --git a/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 7dd17ee9..a7364691 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 @@ -1,17 +1,19 @@ +# Valuation Based On Field In Bom + #Valuation Based On in BOM **Question:** What are for various options in `Valuation Based On` in the Bill Of Materials (BOM)? **Answer:** There are 3 available options in the Valuation Based On field: -Nested BOM +Nested BOM **Valuation Rate:** Item valuation rate is defined based on it's purchase or manufacture value. For Purchase Item, it is defined based on charges entered in the Purchase Receipt. If you don't have any Purchase Receipt made for an item or a Stock Reconciliation, then there won't be any Valuation Rate for that item. -**Price List Rate:** This option allows to pull item rates from [Price List.]({{docs_base_url}}/user/manual/en/stock/item/item-price.html) +**Price List Rate:** This option allows to pull item rates from [Price List.](/docs/user/manual/en/stock/item/item-price.html) **Last Purchase Rate:** It will be the last Purchase (Order) Rate of an item. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md b/foundation/www/docs/user/manual/en/manufacturing/bill-of-materials.md index e152f352..ad285178 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 @@ -1,4 +1,6 @@ +# Bill Of Materials + At the heart of the Manufacturing system is the **Bill of Materials** (BOM). The **BOM** is a list of all materials (either bought or made) and operations that go into a finished product or sub-Item. In ERPNext, the component could @@ -9,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. @@ -26,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 a7636f17..54efd223 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/introduction.md +++ b/foundation/www/docs/user/manual/en/manufacturing/introduction.md @@ -1,5 +1,7 @@ -Task +# Introduction + +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 9b008ced..52cd0126 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/operation.md +++ b/foundation/www/docs/user/manual/en/manufacturing/operation.md @@ -1,4 +1,6 @@ +# Operation + ### Operation Stores a list of all Manufacturing Operations, its description and the Default Workstation for the Operation. @@ -7,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 6088f5ad..fb823d12 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/production-order.md +++ b/foundation/www/docs/user/manual/en/manufacturing/production-order.md @@ -1,5 +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 @@ -12,7 +14,7 @@ by: > Manufacturing > Documents > Production Order > New -Production Order +Production Order ### Creating Production Orders @@ -34,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 @@ -55,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: @@ -78,12 +80,12 @@ If this is the case, you can select the Skip Material Transfer check box, which ### Making Time Logs -* Progress in the Production Order can be tracked using [Timesheet]({{docs_base_url}}/user/manual/en/projects/timesheet/timesheet-against-production-order.html) +* Progress in the Production Order can be tracked using [Timesheet](/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.html) * Timesheet's time slots are created against Production Order Operations. * Drafts of Timesheet are created based on the scheduled operations when an Production Order is Submitted. * To create more Timesheets against an operation click 'Make Timesheet' button. -Make timesheet against PO +Make timesheet against PO ###Updating Finished Goods @@ -91,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. @@ -110,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/setup/index.md b/foundation/www/docs/user/manual/en/manufacturing/setup/index.md index e14f0725..5430d779 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/setup/index.md +++ b/foundation/www/docs/user/manual/en/manufacturing/setup/index.md @@ -1,4 +1,6 @@ +# Setup + Global settings for manufacturing Processes ### Topics 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 28911606..eb1cb380 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 @@ -1,11 +1,13 @@ +# Manufacturing Settings + #Manufacturing Settings Manufacturing Settings can be found at: `Manufacturing > Setup > Manufacturing Settings` -Manufacturing Settings +Manufacturing Settings ####Disable Capacity Planning and Time Tracking @@ -17,15 +19,15 @@ If you don't track actual operations time, and want to disable creation of Time In the Workstation master, actual working hours are defined (say 101m to 6pm). As per the Capacity Planning, Time Logs are created against Workstation, for tracking actual operations hour. It also considers working hours of a Workstation when scheduling job (via Time Log). -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. ####Allow Production on Holidays -Holiday of a company can be recorded in the [Holiday List]({{docs_base_url}}/user/manual/en/human-resources/) master. While scheduling production job on workstation, system doesn't consider a day listed in the Holiday list. If you want production job to be scheduled on holidays as well, `Allow Production on Holidays` field should be checked. +Holiday of a company can be recorded in the [Holiday List](/docs/user/manual/en/human-resources/) master. While scheduling production job on workstation, system doesn't consider a day listed in the Holiday list. If you want production job to be scheduled on holidays as well, `Allow Production on Holidays` field should be checked. -Manufacturing Settings +Manufacturing Settings ####Over Production Allowance Percentage @@ -35,7 +37,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 0f021f96..a40c97a3 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md +++ b/foundation/www/docs/user/manual/en/manufacturing/subcontracting.md @@ -1,4 +1,6 @@ +# Subcontracting + Subcontracting is a type of job contract that seeks to outsource certain types of work to other companies. It allows work on more than one phase of the project to be done at once, often leading to a quicker completion. @@ -16,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 @@ -24,20 +26,20 @@ Items as sub-items. For example, If you are manufacturing a pen, the processed pen will be named under Bill of Materials(BOM), whereas, the refill, knob, and other items which go into the making of pen, will be categorized as sub-items. -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. -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/bom-replace-tool.md b/foundation/www/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md index bf273acb..19010634 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md +++ b/foundation/www/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md @@ -34,7 +34,7 @@ If we have more items to be added , or existing items to be edited in the BOM of To update new BOM updated in the BOM of finished item, where CPU is selected as raw-material, you can use BOM Replace tool. -BOM replace Tool +BOM replace Tool In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer). diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/index.md b/foundation/www/docs/user/manual/en/manufacturing/tools/index.md index 98f85084..9919d806 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/tools/index.md +++ b/foundation/www/docs/user/manual/en/manufacturing/tools/index.md @@ -1,4 +1,6 @@ +# Tools + ### Topics 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 503e4172..5358c611 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 @@ -1,4 +1,6 @@ +# Production Planning Tool + Production Planning Tool helps you plan production and purchase of Items for a period (usually a week or a month). @@ -12,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 @@ -26,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 @@ -35,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 @@ -47,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 57468cff..0806dacf 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/workstation.md +++ b/foundation/www/docs/user/manual/en/manufacturing/workstation.md @@ -1,4 +1,6 @@ +# Workstation + ### Workstation Workstation stores information regarding the place where the workstation operations is carried out. @@ -9,12 +11,12 @@ You can also create a Workstation by: > Manufacturing > Documents > Workstation > New -Workstation +Workstation In workstation specify the workstation working hours under the 'working hour' section. You can also specify the working hours based on shifts. While scheduling Production Order, system will check for the availability of the workstation based on the working hours specified. -> Note : You can enable overtime for your workstation in [Manufacturing Settings]({{docs_base_url}}/user/manual/en/manufacturing/setup/manufacturing-settings.html) +> Note : You can enable overtime for your workstation in [Manufacturing Settings](/docs/user/manual/en/manufacturing/setup/manufacturing-settings.html) {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/activity-cost.md b/foundation/www/docs/user/manual/en/projects/activity-cost.md index f7b041d3..37a84841 100644 --- a/foundation/www/docs/user/manual/en/projects/activity-cost.md +++ b/foundation/www/docs/user/manual/en/projects/activity-cost.md @@ -1,5 +1,7 @@ +# Activity Cost + Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type. This rate is pulled by the system while making Time Logs. It is used for Project Costing. -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 cd7d8319..fb1f81c2 100644 --- a/foundation/www/docs/user/manual/en/projects/activity-type.md +++ b/foundation/www/docs/user/manual/en/projects/activity-type.md @@ -1,7 +1,9 @@ +# Activity Type + 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/index.md b/foundation/www/docs/user/manual/en/projects/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/projects/articles/index.md +++ b/foundation/www/docs/user/manual/en/projects/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 15226730..454fc714 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]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png) +![Activity Cost](/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png) #### Time Log Based on Actual Time spent on the Project-Task, Employee will create a time log. -![Time Log]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png) +![Time Log](/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png) 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]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png) +![Time Log Costing](/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png) 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]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png) +![Costing in Task](/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png) 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]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png) +![Costing in Project](/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png) \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/index.md b/foundation/www/docs/user/manual/en/projects/index.md index 097ed3a9..8713a172 100644 --- a/foundation/www/docs/user/manual/en/projects/index.md +++ b/foundation/www/docs/user/manual/en/projects/index.md @@ -1,4 +1,6 @@ +# Projects + ERPNext helps you manage your Projects by breaking them into Tasks and allocating them to different people. diff --git a/foundation/www/docs/user/manual/en/projects/project.md b/foundation/www/docs/user/manual/en/projects/project.md index 077f58fe..bd82fe7e 100644 --- a/foundation/www/docs/user/manual/en/projects/project.md +++ b/foundation/www/docs/user/manual/en/projects/project.md @@ -1,7 +1,9 @@ +# Project + 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. @@ -9,80 +11,80 @@ 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_base_url}}/user/manual/en/projects/tasks.html) +Task can be created via Project document itself or can be created via [Task](/docs/user/manual/en/projects/tasks.html) -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 -ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Project. +ERPNext uses [Time Log](/docs/user/manual/en/projects/time-log.html) to track the progress of a Project. You can create Time Logs against each task. The Actual Start and End Time along with the costing shall then be updated based on the Time Log. * To view Time Log made against a Project click on 'Time Logs' -Project - View Time Log +Project - View Time Log -Project - Time Log List +Project - Time Log List * You can also create a Time Log directlly and link it to the Project. -Project - Link Time Log +Project - Link Time Log ### Managing expenses -You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resources/expense-claim.html) against a project task. +You can book [Expense Claim](/docs/user/manual/en/human-resources/expense-claim.html) against a project task. The system shall update the total amount from expense claims in the project costing section. * To view Expense Claims made against a Project click on 'Expense Claims' -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_base_url}}/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project. +You can make a [Cost Center](/docs/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project. -Project - Cost Center +Project - Cost Center ###Project Costing The Project Costing section helps you track the time and expenses incurred against the project. -Project - Costing +Project - Costing * The Costing Section is updated based on Time Logs made. @@ -90,9 +92,9 @@ The Project Costing section helps you track the time and expenses incurred again ###Billing -You can make/link a [Sales Order]({{docs_base_url}}/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project. +You can make/link a [Sales Order](/docs/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project. -Project - Sales Order +Project - Sales Order ###Gantt Chart @@ -101,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 0b65085a..2fb27723 100644 --- a/foundation/www/docs/user/manual/en/projects/tasks.md +++ b/foundation/www/docs/user/manual/en/projects/tasks.md @@ -1,14 +1,16 @@ +# Tasks + 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'. @@ -18,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. @@ -26,35 +28,35 @@ You can specify a list of dependent tasks under the 'Depends On' section. ### Managing Time -ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Task. +ERPNext uses [Time Log](/docs/user/manual/en/projects/time-log.html) to track the progress of a Task. You can create multiple Time Logs against each task. The Actual Start and End Time along with the costing is updated based on the Time Log. * To view Time Log made against a Task click on 'Time Logs' -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 -You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resources/expense-claim.html) against a task. +You can book [Expense Claim](/docs/user/manual/en/human-resources/expense-claim.html) against a task. The system shall update the total amount from expense claims in the costing section. * To view Expense Claims made against a Task click on 'Expense Claims' -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 f6f1cecb..896a6def 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 @@ -1,4 +1,6 @@ +# Time Log Batch + You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Sheet, go to > Projects > Time Sheet > New Time Sheet @@ -7,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/index.md b/foundation/www/docs/user/manual/en/projects/timesheet/index.md index 8f944f72..f087e6aa 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/index.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/index.md @@ -1,4 +1,6 @@ +# Timesheet + Timesheet can be used for track actual hours worked. It can be used for multiple purposes like: * Billable work to Customers diff --git a/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 ce9c16c7..0e0bca34 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 @@ -1,4 +1,6 @@ +# Salary Slip From Timesheet + #Salary Slip from Timesheet If salary / wages for your employees are calculated based on number of hours worked, you can use Timesheet to track actual hours worked, and for creating Salary Slip. @@ -7,7 +9,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 +19,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 +37,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 728ec3e3..5cec36bb 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 @@ -1,4 +1,6 @@ +# Sales Invoice From Timesheet + #Sales Invoice from Timesheet Customer can be invoiced based on total no. of hours your Employees has worked for that Customer. Timesheet can be used to track actual no. of hours Employee has worked. For example, in the IT services domain, clients are billed based on man-hour bases, where per hour billing cost is pre-determined.s @@ -15,15 +17,15 @@ 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 Employee will have to select an Activity Type (like planning, site visit, repairing etc. ). Costing and Billing Rate for each Activity can be different for each Employee. These cost can be tracked in the Activity Cost. On selection of Activity Type, Activity Cost is fetched from that Employee. Based on total Activity Cost and total no. of hours, Total Billing Amount (to the Customer) is calculated. -To learn more on how to setup Activity Type and Activity Cost, click [here]({{docs_base_url}}/user/manual/en/projects/articles/project-costing). +To learn more on how to setup Activity Type and Activity Cost, click [here](/docs/user/manual/en/projects/articles/project-costing). -Sales Invoice +Sales Invoice #### Step 4: Enter Actual Time @@ -31,7 +33,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. @@ -39,7 +41,7 @@ Based on the actual hours worked and Activity Cost of an Employee, Total Billing After submitting Timesheet, you will find buttons to create Sales Invoice and Salary Slip against this Timesheet. -Sales Invoice +Sales Invoice ###Create Sales Invoice from Timesheet @@ -47,13 +49,13 @@ After submitting Timesheet, you will find buttons to create Sales Invoice and Sa In the Timesheet, if "Is Billable" is checked, you will find option to create Sales Invoice against it. -Sales Invoice +Sales Invoice ####Sales Invoice Sales Invoice has dedicated table for the Timesheet table where Timesheet details will be updated. You can select more Timesheets in this table. -Sales Invoice +Sales Invoice ####Select Customer and Item @@ -66,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 6ba2edf1..f84a6a2a 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 @@ -1,11 +1,13 @@ +# Timesheet Against Production Order + #Timesheet based on Production Order Creating Timesheet for Production Order helps in capacity planning for the Workstations. Also it helps in tracking actual time consumed the Workstation for completing specific operation. When a Production Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet. -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 +15,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 d1ddcaee..a79e216d 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 @@ -1,13 +1,15 @@ +# Timesheet Against Project + #Timesheet against Project and Task Timesheets can be tracked against Project and Tasks so that you can get reports on how much time was spent on each Task or Project. -Sales Invoice +Sales Invoice ####Billable Timesheet -To bill Customer based on Timesheet, check "Is Billable" in the Timesheet created against Project and Task. To learn more about billing Customer from Timesheet, click [here]({{docs_base_url}}/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.html). +To bill Customer based on Timesheet, check "Is Billable" in the Timesheet created against Project and Task. To learn more about billing Customer from Timesheet, click [here](/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.html). User can also make invoice against timesheet by selecting the project on the invoice. System will fetch the records from the timesheet based on selected project, for mode detail check below video @@ -18,4 +20,4 @@ When creating Timesheet, Employee will have to select an Activity Type. For each In the Timesheet, costing will be done based on Activity Cost multiplied with number of hours. Based the Timesheet Cost, total costing will be doen for the Task and Project as well. -To learn about setup of Activity Type and Activity Cost, click [here]({{docs_base_url}}/user/manual/en/projects/articles/project-costing). \ No newline at end of file +To learn about setup of Activity Type and Activity Cost, click [here](/docs/user/manual/en/projects/articles/project-costing). \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/regional/index.md b/foundation/www/docs/user/manual/en/regional/index.md index 2af22f80..68464f2e 100644 --- a/foundation/www/docs/user/manual/en/regional/index.md +++ b/foundation/www/docs/user/manual/en/regional/index.md @@ -1,4 +1,6 @@ +# Regional + ERPNext aims to support local regulation for all the regions in the world. In most cases ERPNext is very flexible so you can easily add Custom Fields and make Custom Reports to support the regluation of your region. As of mid-2017, ERPNext aims to pre-set additional fields and forms required for companies to easily submit reports to the relevant authorities. diff --git a/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md b/foundation/www/docs/user/manual/en/regional/india/gst-remimders.md index 6c106a5c..bffadd49 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 f46f5336..d3d2bcf1 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/schools/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md index f899ebef..8c70a7e4 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md @@ -1,14 +1,16 @@ +# Assessment Criteria + #Assessment Criteria 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 {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md index 0247a068..b94cf081 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md @@ -1,14 +1,16 @@ +# Assessment Group + #Assessment Group Assessment Group tree is a master where you can define the hierarchy for examination conducted in your education institute. For example, if you conduct two assessment in a academic year, then setup Assessment Group as following. -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 {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md index d074842d..6b557ded 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md @@ -1,4 +1,6 @@ +# Assessment Plan + #Assessment Plan To schedule an assessment/examination for a Student Group, for specific Course, create Assessment Plan. In the Assessment Plan, you can also capture details like: @@ -11,10 +13,10 @@ 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 {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md index 1312874a..f3c0b6d2 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md @@ -1,8 +1,10 @@ +# Assessment Result + #Assessment Result -Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool]({{docs_base_url}}/user/manual/en/schools/assessment/assessment_result_tool.html). +Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/schools/assessment/assessment_result_tool.html). -Assessment Result +Assessment Result {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md index a127fc6f..ce1a36b4 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md @@ -1,9 +1,11 @@ +# Assessment Result Tool + #Assessment Result Tool Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student. -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. diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md b/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md index 788dad02..3385a2ef 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md @@ -1,8 +1,10 @@ +# Grading Scale + #Grading Scale In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned. -Grading Scale +Grading Scale {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/index.md b/foundation/www/docs/user/manual/en/schools/Assessment/index.md index 317b468f..58d97326 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/index.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/index.md @@ -1,4 +1,6 @@ +# Assessment + #Assessment Every education institute organizes assessment / examination to evaluates progress of their Students. In ERPNext, you can manage complete assessment processing for your ERPNext account. diff --git a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md b/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md index 71fd4c2d..78ea65cf 100644 --- a/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md +++ b/foundation/www/docs/user/manual/en/schools/admission/program-enrollment.md @@ -1,6 +1,8 @@ +# Program Enrollment + This form allows you to enroll a student to a program. A student can be enrolled to multiple programs. -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md b/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md index a1d51338..8b941f88 100644 --- a/foundation/www/docs/user/manual/en/schools/admission/student-applicant.md +++ b/foundation/www/docs/user/manual/en/schools/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 @@ -22,8 +22,8 @@ You can Approve or Reject a student applicant. By accepting a student applicant Once you approve a Student Applicant you can enroll them to a program. When you click the 'Enroll' buttom, -the system shall create a student against that applicant and redirect you to the [Program Enrollment form]({{docs_base_url}}/user/manual/en/schools/student/program-enrollment.html). +the system shall create a student against that applicant and redirect you to the [Program Enrollment form](/docs/user/manual/en/schools/student/program-enrollment.html). -Student Applicant Enrollment +Student Applicant Enrollment {next} diff --git a/foundation/www/docs/user/manual/en/schools/fees/fee-category.md b/foundation/www/docs/user/manual/en/schools/fees/fee-category.md index c44cfad9..7994a317 100644 --- a/foundation/www/docs/user/manual/en/schools/fees/fee-category.md +++ b/foundation/www/docs/user/manual/en/schools/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/schools/fees/fee-structure.md b/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md index e36bf579..2b0d6789 100644 --- a/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md +++ b/foundation/www/docs/user/manual/en/schools/fees/fee-structure.md @@ -3,6 +3,6 @@ A Fee Structure is a template that can be used while making fee records. -Fees Structure +Fees Structure {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/fees/fees.md b/foundation/www/docs/user/manual/en/schools/fees/fees.md index 4a291f87..53b39edc 100644 --- a/foundation/www/docs/user/manual/en/schools/fees/fees.md +++ b/foundation/www/docs/user/manual/en/schools/fees/fees.md @@ -2,8 +2,8 @@ # Fees Maintain a record of fees collected from students. -The [Fee Structure]({{docs_base_url}}/user/manual/en/schools/fees/fee-structure.html) is fetched based on the selected Program and Academic Term. +The [Fee Structure](/docs/user/manual/en/schools/fees/fee-structure.html) is fetched based on the selected Program and Academic Term. -Fees +Fees {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/fees/index.md b/foundation/www/docs/user/manual/en/schools/fees/index.md index a6147c45..ec90139c 100644 --- a/foundation/www/docs/user/manual/en/schools/fees/index.md +++ b/foundation/www/docs/user/manual/en/schools/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/schools/index.md b/foundation/www/docs/user/manual/en/schools/index.md index 5c7ae3a2..43672a26 100644 --- a/foundation/www/docs/user/manual/en/schools/index.md +++ b/foundation/www/docs/user/manual/en/schools/index.md @@ -1,7 +1,9 @@ +# Schools + The School Modules is designed to meet requirements of Schools, Colleges & Educational Institutes. -Fees Section +Fees Section {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md b/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md index cb18e5d8..a3af2a51 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md +++ b/foundation/www/docs/user/manual/en/schools/schedule/course-schedule.md @@ -4,13 +4,13 @@ Course Schedule is the schedule of a session conducted by an Instructor for a particular Course. You can see the overall course schedule in the Calendar view. -Course Schedule +Course Schedule ### 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 +21,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/schools/schedule/examination.md b/foundation/www/docs/user/manual/en/schools/schedule/examination.md index 62245692..bd604501 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/examination.md +++ b/foundation/www/docs/user/manual/en/schools/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/schools/schedule/index.md b/foundation/www/docs/user/manual/en/schools/schedule/index.md index ff10ade3..e8176587 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/index.md +++ b/foundation/www/docs/user/manual/en/schools/schedule/index.md @@ -1,7 +1,7 @@ # Schedule -Schedule Section +Schedule Section ### Topics diff --git a/foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md b/foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md index 15c5b579..82ba0075 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md +++ b/foundation/www/docs/user/manual/en/schools/schedule/scheduling-tool.md @@ -3,7 +3,7 @@ This tool can be used to create 'Course Schedules'. -Scheduling Tool +Scheduling Tool ### Creating Course Schedules diff --git a/foundation/www/docs/user/manual/en/schools/schedule/student-attendance.md b/foundation/www/docs/user/manual/en/schools/schedule/student-attendance.md index 9e3670b8..57aeb6e2 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/student-attendance.md +++ b/foundation/www/docs/user/manual/en/schools/schedule/student-attendance.md @@ -3,6 +3,6 @@ Maintains attendance record of the student. Attendance Records can be created against Course Schedules. -Student Attendance +Student Attendance {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/academic-term.md b/foundation/www/docs/user/manual/en/schools/setup/academic-term.md index 4dbcc1bc..12d4a860 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/academic-term.md +++ b/foundation/www/docs/user/manual/en/schools/setup/academic-term.md @@ -1,7 +1,7 @@ # Academic Term -Academic Term +Academic Term {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/academic-year.md b/foundation/www/docs/user/manual/en/schools/setup/academic-year.md index 6f480475..217afe96 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/academic-year.md +++ b/foundation/www/docs/user/manual/en/schools/setup/academic-year.md @@ -1,6 +1,6 @@ # Academic Year -Academic Year +Academic Year {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/course.md b/foundation/www/docs/user/manual/en/schools/setup/course.md index 6676f3d8..c2ed9799 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/course.md +++ b/foundation/www/docs/user/manual/en/schools/setup/course.md @@ -1,6 +1,6 @@ # Course -Course +Course {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/index.md b/foundation/www/docs/user/manual/en/schools/setup/index.md index 8627fd25..7eba1e0f 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/index.md +++ b/foundation/www/docs/user/manual/en/schools/setup/index.md @@ -1,7 +1,7 @@ # Setup -Setup Section +Setup Section ### Topics diff --git a/foundation/www/docs/user/manual/en/schools/setup/instructor.md b/foundation/www/docs/user/manual/en/schools/setup/instructor.md index c734192d..b05be687 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/instructor.md +++ b/foundation/www/docs/user/manual/en/schools/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/en/schools/setup/program.md b/foundation/www/docs/user/manual/en/schools/setup/program.md index 5ef9db9d..40d99b4e 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/program.md +++ b/foundation/www/docs/user/manual/en/schools/setup/program.md @@ -1,6 +1,6 @@ # Program -Program +Program {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/room.md b/foundation/www/docs/user/manual/en/schools/setup/room.md index e580fda3..44df465c 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/room.md +++ b/foundation/www/docs/user/manual/en/schools/setup/room.md @@ -2,6 +2,6 @@ # Room -Room +Room {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/student/student-batch.md b/foundation/www/docs/user/manual/en/schools/student/student-batch.md index 9de0b893..2c0e20b8 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student-batch.md +++ b/foundation/www/docs/user/manual/en/schools/student/student-batch.md @@ -3,6 +3,6 @@ Student batch is a collection of students from Student Groups. -Student +Student {next} diff --git a/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md b/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md index c156e9e5..ef23ce58 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md +++ b/foundation/www/docs/user/manual/en/schools/student/student-group-creation-tool.md @@ -1,7 +1,9 @@ +# Student Group Creation Tool + This tool allows you to create student groups in bulk. You can specify multiple parameters to create them. -Student Group Creation Tool +Student Group Creation Tool {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/student/student-group.md b/foundation/www/docs/user/manual/en/schools/student/student-group.md index c0abc51f..f32ee105 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student-group.md +++ b/foundation/www/docs/user/manual/en/schools/student/student-group.md @@ -4,6 +4,6 @@ A student group is a collection of students taking a same course. You can create Course Schedules and Examinations against a Student Group. A student group needs to be created for every course in a particular academic term and academic year. -Student Group +Student Group {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/student/student-log.md b/foundation/www/docs/user/manual/en/schools/student/student-log.md index f688bae9..a8f4668b 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student-log.md +++ b/foundation/www/docs/user/manual/en/schools/student/student-log.md @@ -4,6 +4,6 @@ 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/schools/student/student.md b/foundation/www/docs/user/manual/en/schools/student/student.md index 217ccacb..86aa055c 100644 --- a/foundation/www/docs/user/manual/en/schools/student/student.md +++ b/foundation/www/docs/user/manual/en/schools/student/student.md @@ -6,6 +6,6 @@ The student doctype maintains personal details of the student. You can view everything related to a particular student on this page. Eg : Fees, Student Group, etc -Student +Student {next} 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 087f32a5..18edacf2 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 @@ -1,4 +1,6 @@ +# Selling In Different Uom + #Selling in Different Unit (UoM) A sell price unit of measure (UOM) is the UOM with which you price items. You can have multiple sell price UOMs for any inventory item. However, when Customer places, UoM for an item could change. @@ -8,7 +10,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 +20,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 +29,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 e864e567..a0a25ecc 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 @@ -1,4 +1,6 @@ +# Adding Margin + #Adding Margin User Can apply the margin on Quotation Item and Sales Order Item using following two options. @@ -10,7 +12,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 +25,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 +37,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 a86f49b2..914ca294 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 @@ -1,4 +1,6 @@ +# Applying Discount + #Applying Discount There are several ways Discount can be applied on an item in the sales transactions. @@ -7,28 +9,28 @@ There are several ways Discount can be applied on an item in the sales transacti You can find the Discount (%) field in the Item table. Discount (%) is applied on the Price List Rate to get the selling Rate of the Item. -Discount Percentage +Discount Percentage The feature of Discount (%) is available in all sales and purchase transactions. -You can use Pricing Rule for auto-application of Discount (%). [Click here to learn how Pricing Rule functions.]({{docs_base_url}}/user/manual/en/accounts/pricing-rule.html) +You can use Pricing Rule for auto-application of Discount (%). [Click here to learn how Pricing Rule functions.](/docs/user/manual/en/accounts/pricing-rule.html) #### 2. Discount on Net Total and Grand Total In the "Additional Discount" section, you can apply discount as amount or as percentage. -Discount 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 5d86e5fa..65e42c46 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 @@ -1,9 +1,11 @@ +# Close Sales Order + #Close Sales Order In the submitted Sales Orders, you will find **Stop** option. Stopping Sales Order will restrict user from creating Delivery Note and Sales Invoice against it. -Close SO +Close SO ####Scenario @@ -11,7 +13,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 f379e991..be7705f8 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 @@ -1,4 +1,6 @@ +# Drop Shipping + #Drop Ship **Drop shipping** is a supply chain management technique in which the retailer does not keep goods in stock. Instead they transfer customer orders and shipment details to either the manufacturer, another retailer, or a wholesaler, who then ships the goods directly to the customer @@ -11,19 +13,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 +33,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 71ccd3fc..27d76756 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 @@ -1,4 +1,6 @@ +# Erpnext For Services Organization + #ERPNext for Service Organization **Question:** ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by companies offering servies? @@ -15,7 +17,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. @@ -33,11 +35,11 @@ Modules unchecked here will be hidden from all the User. Within the form, there are many fields only needed for companies into trading and manufacturing businesses. These fields can be hidden for the service company. Feature Setup is a tool where you can enable/disable specific feature. If a feature is disabled, then fields relevant to that feature is hidden from all the forms. For example, if Serial No. feature is disabled, then Serial. No. field from Item as well as from all the sales and purchase transaction will be hidden. -[To learn more about Feature Setup, click here.]({{docs_base_url}}/user/manual/en/customize-erpnext/hiding-modules-and-features.html). +[To learn more about Feature Setup, click here.](/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.html). ####Permissions -ERPNext is the permission controlled system. Users access system based on permissions assigned to them. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from that User. [Click here to learn more about permission management.]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions.html). +ERPNext is the permission controlled system. Users access system based on permissions assigned to them. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from that User. [Click here to learn more about permission management.](/docs/user/manual/en/setting-up/users-and-permissions.html). You can also refer to help video on User and Permissions setting in ERPNext. diff --git a/foundation/www/docs/user/manual/en/selling/articles/index.md b/foundation/www/docs/user/manual/en/selling/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/index.md +++ b/foundation/www/docs/user/manual/en/selling/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 0bc1fe3e..fec0c8ff 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 @@ -1,17 +1,19 @@ +# Sales Persons In The Sales Transactions + #Sales Persons in the Sales Transactions -In ERPNext, Sales Person master is maintained in [tree structure]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters.html). Sales Person is selectable in all the sales transactions. +In ERPNext, Sales Person master is maintained in [tree structure](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.html). Sales Person is selectable in all the sales transactions. Sales Persons can be updated in the Customer master as well. On selection of Customer in the transactions, Sales Persons as updated in the Customer will fetch into sales transaction. -Sales Person 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 +27,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 c7ea46fe..8fdde614 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 @@ -1,4 +1,6 @@ +# Shipping Rule + #Shipping Rule Shipping Rule master helps in defining a rule based on which shipping charge is applied on a sales transactions. @@ -11,7 +13,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 +21,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 b0cb32e8..4ca10d57 100644 --- a/foundation/www/docs/user/manual/en/selling/quotation.md +++ b/foundation/www/docs/user/manual/en/selling/quotation.md @@ -1,4 +1,6 @@ +# Quotation + During a sale, the customer may request for a written note about the products or services you are planning to offer, along with the prices and other terms of engagement. This is called a “Proposal” or an “Estimate” or a “Pro Forma @@ -6,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: @@ -16,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: @@ -35,7 +37,7 @@ A Quotation contains details about: The rates you quote may depend on two things. - * The Price List: If you have multiple Price Lists, you can select a Price List or tag it to the Customer (so that it is auto-selected). Your Item prices will automatically be updated from the Price List. For details refer [Price List]({{docs_base_url}}/user/manual/en/setting-up/price-lists.html) + * The Price List: If you have multiple Price Lists, you can select a Price List or tag it to the Customer (so that it is auto-selected). Your Item prices will automatically be updated from the Price List. For details refer [Price List](/docs/user/manual/en/setting-up/price-lists.html) * The Currency: If you are quoting to a Customer in a different currency, you will have to update the conversion rates to enable ERPNext to save the information in your standard Currency. This will help you to analyze the value of your Quotations in standard Currency. @@ -45,9 +47,9 @@ 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_base_url}}/user/manual/en/setting-up/setting-up-taxes.html). +To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html). ### Terms and Conditions 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 d8368b39..1fc023c2 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,9 +57,9 @@ 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_base_url}}/user/manual/en/setting-up/setting-up-taxes.html). +To understand taxes in detail visit [Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html). ### Sales Team @@ -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/index.md b/foundation/www/docs/user/manual/en/selling/setup/index.md index f1d9ef44..648f2bc4 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/index.md +++ b/foundation/www/docs/user/manual/en/selling/setup/index.md @@ -1,4 +1,6 @@ +# Setup + This section includes information on how to setup customer groups, sales partners, sales persons and terms and conditions. It has instructions on how to configure selling settings, in order to enable default fields. diff --git a/foundation/www/docs/user/manual/en/selling/setup/item-price.md b/foundation/www/docs/user/manual/en/selling/setup/item-price.md index f515ef57..86696f2e 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 @@ -1,4 +1,6 @@ +# Item Price + Item Price is the record in which you can log sellig and buying rate of an item. There are two ways to reach to new Item Price form. @@ -15,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. @@ -25,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 035aadfe..fefb9b4c 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 @@ -1,4 +1,6 @@ +# Product Bundle + #Product Bundle Product Bundle can be seen as something like a "Bill-of-Material" on the Sales side. It's a master where you can list existing items which are bundled together and sold as a set (or bundle). For instance, when you sell a laptop, you need to ensure that charger, mouse and laptop bag are delivered with it and stock levels of these items get affected. @@ -12,7 +14,7 @@ To create new Product Bundle, Go to: Selling > Setup > Product Bundle > New -Product Bundle +Product Bundle ###Select Parent Item @@ -34,7 +36,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 c3187a38..f1f1b2d4 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 @@ -1,4 +1,6 @@ +# Sales Partner + People who assist you in getting business are termed as Sales Partners. Sales Partners can be represented by different names in ERPNext. You can call them Channel Partner, Distributor, Dealer, Agent, Retailer, Implementation Partner, Reseller etc. For each Sales Partner, you can define commission offer to them. When Sales Partner is selected in transactions, their commission is calculated over Net Total of Sales Order/Invoice or Delivery Note. @@ -11,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. @@ -20,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 624a2f2a..58f87349 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 @@ -1,4 +1,6 @@ +# Sales Person Target Allocation + With management of Sales Person, ERPNext also allow you to assign target to Sales Persons based on Item Group and Territory. Based on target allocated and actual sales booked by Sales Person, you will get target variance report for the Sales Person. ###1. Sales Person - Item Groupwise Target Allocation @@ -13,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. @@ -24,7 +26,7 @@ In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. If you wish to spread allocated target across months, then you should setup Monthly Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation). -Target Distribution +Target Distribution ####Report - Sales Person Target Variance Item Groupwise @@ -35,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. @@ -51,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 @@ -65,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 --- @@ -77,13 +79,13 @@ 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. ###See Also -1. [Sales Person Target Allocation]({{docs_base_url}}/user/manual/en/selling/setup/sales-person-target-allocation) -2. [Using Sales Person in transactions]({{docs_base_url}}/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions) +1. [Sales Person Target Allocation](/docs/user/manual/en/selling/setup/sales-person-target-allocation) +2. [Using Sales Person in transactions](/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions) {next} diff --git a/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md b/foundation/www/docs/user/manual/en/selling/setup/selling-settings.md index 91cee348..365069d7 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 @@ -1,8 +1,10 @@ +# Selling Settings + Selling Setting is where you can define propertiese which will be applied in your selling transactions. Let's check into each property one by one. -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 01375093..1ad6e1e2 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 @@ -1,7 +1,9 @@ +# Shipping Rule + Using Shipping Rule you can define the cost for delivering the product to the customer. You can define different shipping rules for the same item across different territories. -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 77d59e2a..0a6fbe89 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 @@ -1,4 +1,6 @@ +# Change Password + #Change User Password Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password. @@ -6,11 +8,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 39f53297..4648a409 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 @@ -1,4 +1,6 @@ +# Delete A Company And All Related Transactions + #Delete All Related Transactions for a Company Often, users setup all the master data and then create a few dummy records. Then they want to delete the dummy records and the company and start over again, keeping the other master data like Customers, Items, BOMs intact. @@ -13,7 +15,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/edit-submitted-document.md b/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md index aa90d36d..37111046 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 @@ -1,4 +1,6 @@ +# Edit Submitted Document + #Edit Submitted Document To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document. @@ -7,19 +9,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/index.md b/foundation/www/docs/user/manual/en/setting-up/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/index.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md b/foundation/www/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md index 68f7f681..290267cb 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md @@ -1,8 +1,10 @@ +# Integrating Erpnext With Other Application + #Integrating ERPNext with other Applications -For now, ERPNext has out-of-the-box integration available for some applications like Shopify, your SMS gateway and payment gateway. To integrate ERPNext with other application, you can use REST API of Frappe. Check following links to learn more about REST API of Frappe. +For now, ERPNext has out-of-the-box integration available for some applications like Shopify, your SMS gateway and payment gateway. To integrate ERPNext with other application, you can use REST API of Frappé. Check following links to learn more about REST API of Frappé. -[Frappe Rest API](https://frappe.io/docs/user/en/guides/integration/rest_api.html) +[Frappé Rest API](https://frappe.io/docs/user/en/guides/integration/rest_api.html) \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md b/foundation/www/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md index fdb8bb35..c13e333d 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md @@ -1,10 +1,12 @@ +# Manage Header And Footer + #Manage Header And Footer Check following to learn how to setup Letter Head in ERPNext. -[Managing Letter head]({{docs_base_url}}/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.html) +[Managing Letter head](/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.html) ERPNext doesn't have option to define standard Footer. As a work around, you can use Terms and Condition master for footer. Content of Terms and Condition is already the last to appear in the standard print formats on transactions. Check following link to learn how to manage Terms and Conditions in ERPNext. -[Terms and Condition]({{docs_base_url}}/user/manual/en/setting-up/print/terms-and-conditions.html) +[Terms and Condition](/docs/user/manual/en/setting-up/print/terms-and-conditions.html) 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 c5d3d839..3761de38 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 @@ -1,11 +1,13 @@ +# Managing Multiple Companies + #Managing Multiple Companies ERPNext allows you to create multiple companies in a single ERPNext instance. In one account has multiple companies, you will find option to select Company in each transactions. While most of the records (mostly transactions) will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which are common among all the companies. -If you have separate teams working on each company, you can restrict access of the User to the data of specific Company. Click [here]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/) to know how to set permission rules for giving restricted access to the User. +If you have separate teams working on each company, you can restrict access of the User to the data of specific Company. Click [here](/docs/user/manual/en/setting-up/users-and-permissions/) to know how to set permission rules for giving restricted access to the User. Following are the steps to add new Company. @@ -17,7 +19,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,13 +31,13 @@ Also, you can define other properties for new company like: Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement. -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 f5cfab2f..da01a612 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 @@ -1,11 +1,13 @@ +# Managing Perm Level + #Managing Perm Level in Permission Manager In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0. -Perm Level for a field can be defined in the [Customize Form]({{docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html). +Perm Level for a field can be defined in the [Customize Form](/docs/user/manual/en/customize-erpnext/customize-form.html). -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 +17,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 83611e14..a798d33a 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 @@ -1,4 +1,6 @@ +# Managing Tree Structure Masters + #Managing Tree Structure Masters Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent master, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy. @@ -25,7 +27,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 +45,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 259ca6a6..092ad94d 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 @@ -1,7 +1,9 @@ +# Naming Series Current Value + #Setting the Current Value for Naming Series -Naming Series feature allows you to define prefix for naming of a documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO-00001, SO-00002... and so on. Click [here]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html) to learn how you can customize Number Series for a transaction/master in ERPNext. +Naming Series feature allows you to define prefix for naming of a documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO-00001, SO-00002... and so on. Click [here](/docs/user/manual/en/setting-up/settings/naming-series.html) to learn how you can customize Number Series for a transaction/master in ERPNext. ### 1. Setting the Current Value @@ -15,19 +17,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/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 25c00186..da779d9e 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 @@ -1,4 +1,6 @@ +# Overwriting Data From Data Import Tool + #Overwriting Data from Data Import Tool Data Import Tool allows importing documents (like customers, Suppliers, Orders, Invoices etc.) from spreadsheet file into ERPNext. The very same tool can also be used for overwrite values in the existing documents. @@ -15,7 +17,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 +25,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 +39,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/rename-user.md b/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md index 74e02d00..80bb4860 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 @@ -1,4 +1,6 @@ +# Rename User + #Rename User Renaming functionality allows you to edit id of specific record. User is saved with person's Email Address. Only User with System Manager's role will be able to rename User IDs. @@ -15,13 +17,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/using-custom-domain-on-erpnext.md b/foundation/www/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md index 0bebdea2..5c66f5ba 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md @@ -1,4 +1,6 @@ +# Using Custom Domain On Erpnext + If you have subscribed to any of the plans at [ERPNext](https://erpnext.com), you can have us serve your site on your custom domain (for example at http://example.com). This enables your website to be served on a custom domain. diff --git a/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md b/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md index 7797c487..8d50856e 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 @@ -1,4 +1,6 @@ +# Authorization Rule + Authorization Rule is a tool to define rule for conditional authorization. If you sales and purchase transactions of higher value or discount requires an authorization from senior manager, you can set authorization rule for it. @@ -35,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/bar-code.md b/foundation/www/docs/user/manual/en/setting-up/bar-code.md index 7636bd75..006201c5 100644 --- a/foundation/www/docs/user/manual/en/setting-up/bar-code.md +++ b/foundation/www/docs/user/manual/en/setting-up/bar-code.md @@ -1,4 +1,6 @@ +# Bar Code + A Barcode is a machine-readable code in the form of numbers and a pattern of parallel lines of varying widths, printed on a commodity and used especially for stock control. @@ -19,7 +21,7 @@ setup, check the box that says Item Barcode. #### Figure 1: Check the box 'Item Barcode' -Barcode +Barcode To start scanning with a bar-code, go to @@ -40,7 +42,7 @@ Then go to Accounts and click on Sales Invoice. Check the box 'Is POS' #### Figure 2: Check the box 'Is POS' -Barcode +Barcode Go to Item and click on Add new row. diff --git a/foundation/www/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md b/foundation/www/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md index 35fe40d0..d5bd7000 100644 --- a/foundation/www/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md +++ b/foundation/www/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md @@ -1,4 +1,6 @@ +# Calculate Incentive For Sales Team + Can be used in any Sales Transaction with **Sales Team** Table: diff --git a/foundation/www/docs/user/manual/en/setting-up/company-setup.md b/foundation/www/docs/user/manual/en/setting-up/company-setup.md index 68bbc7ba..79aeadfc 100644 --- a/foundation/www/docs/user/manual/en/setting-up/company-setup.md +++ b/foundation/www/docs/user/manual/en/setting-up/company-setup.md @@ -1,4 +1,6 @@ +# Company Setup + Enter your company details to complete Company Setup. Mention the type of business, under Domain. You can enter manufacturing, retail, or services depending on the nature of your business activity. If you have more than one diff --git a/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 bbf2ae6c..b2a3aee1 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 54094479..44e22611 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 @@ -1,9 +1,11 @@ +# Data Import Tool + The Data Import Tool is a great way to upload (or edit) bulk data, specially master data, into the system. To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button: -Start Import +Start Import The tool has two sections, one to download a template and the second to upload the data. @@ -24,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/email/.md b/foundation/www/docs/user/manual/en/setting-up/email/.md index 0348bf8b..13d063dd 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/.md +++ b/foundation/www/docs/user/manual/en/setting-up/email/.md @@ -1,4 +1,6 @@ +# + Emails are the nervous system of business communication and ERPNext has been designed to make good use of this. 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 257270c5..5ed19a79 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 e1968f04..5f0ccf9e 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 0820d8e4..887a730a 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 8efd6368..974229e2 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,44 +44,44 @@ Create an Email Account based on the Email ID of the User. For each User who's e If you are creating an Email Account for your colleague who's Email Password is unknown to you, then check field "Awaiting Password". As per this setting, a User (for whom Email Account is created) will get a prompt to enter email password when accessing his/her ERPNext Account. -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. -For more details on how to setup Email Account, [click here]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html"). +For more details on how to setup Email Account, [click here](/docs/user/manual/en/setting-up/email/email-account.html"). #### Step 4: Linking Email Account in User master Once an Email Account is created for an User, select that Email Account in the User. This will ensure that emails pulled from the said Email ID will accessible only to this User in your ERPNext account. -Email 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 268ff65f..b9e63043 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 2b1712df..8a6a83d1 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,8 +3,8 @@ In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document. -Send Email +Send Email -**Note:** You must have outgoing [email accounts]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html) setup for this. +**Note:** You must have outgoing [email accounts](/docs/user/manual/en/setting-up/email/email-account.html) setup for this. {next} diff --git a/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 d3035c38..d3f76b88 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 dfc3f7db..e4fdc5ea 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 75e9fd23..3060b95b 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 083fa0ca..3794aea7 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/dropbox-backup.md b/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md index 8ea3ab5a..a123b4cc 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 @@ -1,4 +1,6 @@ +# Dropbox Backup + #Setting Up Dropbox Backups We always recommend customers to maintain backup of their data in ERPNext. The database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well. @@ -12,7 +14,7 @@ To setup Dropbox Backup, Set Frequency to download backup in your Dropbox account. -set frequency +set frequency ####Step 2: Allow Dropbox Access @@ -22,13 +24,13 @@ 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. @@ -40,18 +42,18 @@ With this, a folder called "ERPNext" will be created in your Dropbox account, an ####Step 2:Create a new app -Create new +Create new ####Step 3: Fill in details for the 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 -Set Redirect URL +Set Redirect URL ####Step 5: Settings in Site Config diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/index.md b/foundation/www/docs/user/manual/en/setting-up/integrations/index.md index 2fb30362..cbd38ffa 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/index.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/index.md @@ -1,4 +1,6 @@ +# Integrations + Integration Services is platform to configure 3rd Party Services. 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 fdd9cb33..b41f39a7 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 @@ -1,4 +1,6 @@ +# Ldap Integration + #Setting up LDAP Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations. @@ -12,9 +14,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 6c672fa1..bed87384 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 @@ -1,4 +1,6 @@ +# Paypal Integration + #Setting up PayPal A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar. @@ -12,17 +14,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 +36,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 e9250f39..de14c56c 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 @@ -1,4 +1,6 @@ +# Razorpay Integration + #Setting up Razorpay A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar. @@ -11,15 +13,15 @@ To setup Razorpay, #### 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 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 4665b84c..edec5052 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 @@ -1,4 +1,6 @@ +# Stripe Integration + #Setting up Stripe To setup Stripe, @@ -7,15 +9,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 e889c94c..74f3450b 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 @@ -1,5 +1,5 @@ -# Point of Sale Setting +# Point of Sale Profile POS includes advanced features to cater to different functionality, such as inventory management, CRM, financials, warehousing, etc., all built into the @@ -11,14 +11,20 @@ If you are in retail operations, you want your Point of Sale to be as quick and efficient as possible. To do this, you can create a POS Setting for a user from: -> Accounts > Setup > Point-of-Sale Setting +> Accounts > Setup > Point-of-Sale Profile Set default values as defined. -POS Setting +POS Setting + +To set the default mode of payment, enabled the option default in the mode of payments table +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 > Important : If you specify a particular User, the POS setting will be applied only to that User. If the User option is left blank, the setting will -be set for all users. To understand POS in detail visit [Point of Sale]({{docs_base_url}}/user/manual/en/accounts/point-of-sale-pos-invoice.html) +be set for all users. To understand POS in detail visit [Point of Sale](/docs/user/manual/en/accounts/point-of-sale-pos-invoice.html) {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/price-lists.md b/foundation/www/docs/user/manual/en/setting-up/price-lists.md index 7529120c..66f06b46 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 @@ -1,4 +1,6 @@ +# Price Lists + ERPNext lets you maintain multiple selling and buying prices for an Item using Price Lists. A PriceList is a name you can give to a set of Item prices. Why would you want Price Lists? You have different prices for different zones (based on the shipping costs), for different currencies etc. @@ -9,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 68c9955f..2c584db9 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 5dc013b4..e2e58d8f 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 @@ -1,9 +1,11 @@ +# Cheque Print Template + #Cheque Print Template Business involves making payment to various parties like suppliers and employees. Payment can be made in various modes like cash, NEFT or cheque. If you are making a payment via cheque, you can also create a Print Format for printing Cheque from ERPNext based on the Payment Entry. -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 +17,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 +31,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 2a6890cc..77dd092c 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 @@ -1,4 +1,6 @@ +# Custom Translations + #Custom Translations User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature. @@ -7,11 +9,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 +21,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 +39,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 92aa65f9..2384678e 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 @@ -1,4 +1,6 @@ +# Letter Head + #Letter Head Each company has default Letter Head for their company. This Letter Head values are generally set as Header and Footer in the documents. In ERPNext, you can capture the these details in the Letter Head master. @@ -20,7 +22,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 +34,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 901b59d0..845ba0b2 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 a8d3e4c8..0cd53d65 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 @@ -1,4 +1,6 @@ +# Print Headings + Print Headings are the names which you can give to your sales invoices, supplier quotations etc. You can create a list of names for different business communications. @@ -9,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 fe79abc5..6512c221 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/terms-and-conditions.md b/foundation/www/docs/user/manual/en/setting-up/print/terms-and-conditions.md index f69e9e37..6ae9f2b3 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 @@ -1,4 +1,6 @@ +# Terms And Conditions + Terms and conditions are the general and special arrangements, provisions, requirements, rules, specifications, and standards that a company follows. These specifications are an integral part of an agreement or contract that the company gets into with its customers, suppliers or partners. ### 1. Make a new Terms and Conditions @@ -7,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. @@ -21,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 1c647e63..62736e42 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 41db4611..c163a507 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 @@ -1,4 +1,6 @@ +# Setting Up Taxes + One of the primary motivator for compulsory use of accounting tools is calculation of Taxes. You may or may not make money but your government will (to help your country be safe and prosperous). And if you don’t calculate your @@ -23,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. @@ -50,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 56354011..104f0044 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 2fc26415..3590eb97 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 d692a5fa..28ac48cd 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 ab931fe0..eae0f26c 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,6 +9,6 @@ To open System Settings, go to: > Setup > Settings > System Settings -System Settings +System Settings {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md index 04950aed..e1dd3e29 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-1-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-10-item.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md index 3700b197..6613abd0 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md @@ -4,7 +4,7 @@ In this final step, please enter the names of the Items you buy or sell. Add Items +src="/docs/assets/img/setup-wizard/step-10.png"> Please set the group of the item (Product / Service) and unit of measure. Don't worry you will be able to edit all of this later. diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md index 5a30e9c7..40906e38 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md @@ -3,7 +3,7 @@ Set your country name, currency and timezone. -Currency +Currency --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md index b36b8405..43d449c1 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md @@ -4,7 +4,7 @@ Enter Users Profile Details like Name, User ID and preferred password. User +src="/docs/assets/img/setup-wizard/step-3.png"> --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md index c0e847a7..31d124d3 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md @@ -4,7 +4,7 @@ Enter Company Details like Name, Abbreviation and Financial Year Details. Company Details +src="/docs/assets/img/setup-wizard/step-4.png"> --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md index d89c9c17..c82784d5 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md @@ -4,7 +4,7 @@ Attach Company Letterhead and Company Logo. Company Logo and Letterhead +src="/docs/assets/img/setup-wizard/step-5.png"> --- @@ -16,7 +16,7 @@ Click on the box ‘Attach Letterhead’ . Select the image file from the place You may choose to skip this step if your letterhead is not ready. -To select letterhead later through the setup module, read [Letter-head]({{docs_base_url}}/user/manual/en/setting-up/print/letter-head.html) +To select letterhead later through the setup module, read [Letter-head](/docs/user/manual/en/setting-up/print/letter-head.html) #### To "attach as web-link" diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md index a269d4a8..907edafb 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md @@ -4,6 +4,6 @@ Add other users and assign them roles based on their job responsibilities. Users +src="/docs/assets/img/setup-wizard/step-6.png"> {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md index 5c4b0eab..4092bb70 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md @@ -4,7 +4,7 @@ Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type. Tax Details +src="/docs/assets/img/setup-wizard/step-7.png"> Just set the tax name and the standard percentage levied. @@ -18,6 +18,6 @@ A value added tax (VAT) is a form of consumption tax. From the perspective of th The purpose of VAT is to generate tax revenues to the government similar to the corporate income tax or the personal income tax. For Example: When you shop at a departmental store and avail discount on the products, the store charges you 5% extra on the total bill as the VAT. -To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) +To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html) {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md index a6fac963..50446ed8 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md @@ -5,7 +5,7 @@ Enter your Customer names and the contact person from that organisation. Customers +src="/docs/assets/img/setup-wizard/step-8.png"> --- @@ -19,6 +19,6 @@ Customer Name: American Power Mills Contact Name: Shiv Agarwal -To understand Customer in detail visit [Customer Details]({{docs_base_url}}/user/manual/en/CRM/customer.html) +To understand Customer in detail visit [Customer Details](/docs/user/manual/en/CRM/customer.html) {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md index d7e8c846..72abf31c 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md @@ -4,10 +4,10 @@ Enter a few of your Suppliers' names. Suppliers +src="/docs/assets/img/setup-wizard/step-9.png"> --- -To understand Suppliers in detail visit [Supplier Master]({{docs_base_url}}/user/manual/en/buying/supplier.html) +To understand Suppliers in detail visit [Supplier Master](/docs/user/manual/en/buying/supplier.html) {next} 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 444f6c96..5940346e 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 53931a24..10bc5a9f 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 @@ -1,4 +1,6 @@ +# Stock Reconciliation For Non Serialized Item + Stock Reconciliation is the process of counting and evaluating stock-in-trade, usually at an organisations year end in order to value the total stock for preparation of the accounts. In this process actual physical stocks are @@ -28,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** @@ -60,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 faa2da06..35c19aaa 100644 --- a/foundation/www/docs/user/manual/en/setting-up/territory.md +++ b/foundation/www/docs/user/manual/en/setting-up/territory.md @@ -1,4 +1,6 @@ +# Territory + If your business operates in multiple Territories (could be countries, states or cities) it is usually a great idea to build your structure in the system. Once you group your Customers by Territories, you can set annual targets for @@ -6,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 9bcae8e2..a34f094b 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/index.md b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/index.md index bac0a78b..23c2e6f8 100644 --- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/index.md +++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/index.md @@ -1,4 +1,6 @@ +# Users And Permissions + In ERPNext, you can create multiple users and assign them different roles. There are some users which can only access the public facing part of ERPNext (i.e. the website). Such users are called "Website Users". diff --git a/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 fb71b4a9..e3191bfe 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: @@ -29,7 +29,7 @@ Permissions are applied on a combination of: If enabled, a user with that role will be able to access only specific Documents for that Document Type. Such specific Document access is defined in the list of User Permissions. Additionally, User Permissions defined for other Document Types also get applied if they are related to the current Document Type through Link Fields. To set, User Permissions go to: - > Setup > Permissions > [User Permissions Manager]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/user-permissions.html) + > Setup > Permissions > [User Permissions Manager](/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.html) --- @@ -39,37 +39,37 @@ Permissions are applied on a combination of: Leave Application is a good **example** that encompasses all areas of Permission System. -Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User +Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User 1. **It should be created by an Employee.** For this, Employee Role should be given Read, Write, Create permissions. -Giving Read, Write and Create Permissions to Employee for Leave Application +Giving Read, Write and Create Permissions to Employee for Leave Application 1. **An Employee should only be able to access his/her Leave Application.** Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.) -Limiting access to Leave Applications for a user with Employee Role via User Permissions Manager +Limiting access to Leave Applications for a user with Employee Role via User Permissions Manager 1. **HR Manager should be able to see all Leave Applications.** Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled. -Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access. +Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access. 2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.** Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.) -Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee. +Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee. 3. **It should be Approved / Rejected only by HR User or Leave Approver.** The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1. -Limiting read access for a set of fields to certain Roles +Limiting read access for a set of fields to certain Roles 4. **HR User should be able to delegate Leave Applications to his/her subordinates** HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users. -Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application' +Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application' {next} diff --git a/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 7aedd3ce..33cedcb5 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 298060d9..602bd244 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 9cbf8942..2376db2a 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 @@ -1,61 +1,53 @@ # User Permissions -Role Base Permissions define the periphery of document types within which a user with a set of Roles can move around in. However, you can have an even finer control by defining User Permissions for a User. By setting specific documents in User Permissions list, you can limit access for that User to specific documents of a particular DocType, on the condition that "Apply User Permissions" is checked in Role Permissions Manager. +Along with Role based permissions, you can also set user level permissions that are based on rules that are evaluated against the data containted in the document being accessed. This is particularly useful when you want to restrict based on: -To start with, go to: +1. Allow user to access data belonging to one Company +1. Allow user to access data related to a specific Customer or Territory -> Setup > Permissions > User Permissions Manager +### Creating User Permissions -User Permissions Manager displaying how users can access only a specific Company. +To create a User Permission, go to Setup > Permission > User Permissions -#### Example +When you create a new record you will have to specify -User 'tom.hagen@riosolutions.com' has Sales User role and we want to limit the user to access records for only a specific Company 'Rio Solutions'. +1. The user for which the rule has to be applied +1. The type of document which will be allowed (for example "Company") +1. The specific item that you want to allow (the name of the "Company) - 1. We add a User Permissions row for Company. - - User Permissions For Company +Creating a new user permission - Add User Permissions row for a combination of User 'tom.hagen@riosolutions.com' and Company 'Rio Solutions'. +If you want to apply the permissions to all Roles for that user, keep the "Apply Permissions for all Roles of this User" checked. If you check this, it will automatically setup the rules for Roles to check for User Permissions. - 1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked. - - Role Permissions for All on Company +### Choosing Which Roles to Apply - Read Permission with Apply User Permissions checked for DocType Company. +You can also manually edit the the roles for which you want the user permissions to apply. To do that go the the **Role Permission Manager** and select the role for which you want to Edit the User Permissions. - 1. The combined effect of the above two rules lead to User 'tom.hagen@riosolutions.com' having only Read access to Company 'Rio Solutions'. - - Effect of Role and User Permissions on Company - - Access is limited to Company 'Rio Solutions'. +Note that the "Apply User Permissions" is already checked for this role. Then click on "Select Document Types" - 1. We want this User Permission on Company to get applied on other documents like Quotation, Sales Order, etc. - - These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'tom.hagen@riosolutions' to acces these documents having Company 'Rio Solutions'. +Select Document Types to Edit the Setting - Sales User Role Permissions for Quotation - - Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked. +Here you will see that Company has already been checked. If you want user permissions not be applied for that particular rule, you can un check it. - Quotation List limited to results for Company 'Rio Solutions' +Select Document Types to Edit the Setting - Quotation List is limited to results for Company 'Rio Solutions' for User 'tom.hagen@riosolutions.com'. +### Ignoring User Permissions on Certain Fields - 1. User Permissions get applied automatically based on Link Fields, just like how it worked for Quotation. But, Lead Form has 4 Link fields: Territory, Company, Lead Owner and Next Contact By. Say, you want Leads to limit access to Users based only on Territory, even though you have defined User Permissions for DocTypes User, Territory and Company. You can do this by setting 'Ignore User Permissions' for Link fields: Company, Lead Owner and Next Contact By. - -Role Permissions on Lead for Sales User Role +Another way of allowing documents to be seen that have been restricited by User Permissions is to check "Ignore User Permissions" on a particular field by going to **Customize Form** -Sales User can Read, Write and Create Leads limited by User Permissions. +For example you don't want Assets to be restricited for any user, then select **Asset** in **Customize Form** and in the Company field, check on "Ignore User Permissions" -Set Ingore User Permissions from Setup > Customize > Customize Form +Ignore User Permissions on specific properties -Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead. +### Strict Permisssions -Lead List is limited to records with Territory 'United States' +Since User Permissions are applied via Roles, there may be many users belonging to a particular Role. Suppose you have three users belonging to Role "Accounts User" and you have applied **User Permissions** to only one user, then the permissions will only be restricted to that user. -Due to the effect of the above combination, User 'tom.hagen@riosolutions.com' can only access Leads with Territory 'United States'. +You can change this setting incase you want the user permissions to be assigned to all users, even if they are not assigned any user permissions by going to **System Settings** and checking "Apply Strict User Permissions" -{next} +### Checking How User Permissions are Applied +Finally once you have created your air-tight permission model, and you want to check how it applies to various users, you can see it via the **Permitted Documents for User** report. Using this report, you can select the **User** and document type and check how user permissions get applied. + +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 64ada8db..d887b08f 100644 --- a/foundation/www/docs/user/manual/en/setting-up/workflows.md +++ b/foundation/www/docs/user/manual/en/setting-up/workflows.md @@ -1,4 +1,6 @@ +# Workflows + In order to allow multiple people to submit multiple requests, for approvals, by multiple users, ERPNext requires you to fill the workflow conditions. ERPNext tracks the multiple permissions before submission. @@ -12,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 : @@ -20,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: @@ -47,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/index.md b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md index a0c9eded..8d5059d4 100644 --- a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md +++ b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md @@ -1,4 +1,6 @@ +# Accounting Of Inventory Stock + The value of available inventory is treated as an Asset in company's Chart of Accounts. Depending on the type of items, it can be treated as Fixed Asset or Current Asset. To prepare Balance Sheet, you should make the accounting @@ -20,7 +22,7 @@ balance. This improves accuracy of Balance Sheet and Profit and Loss statement. To check accounting entries for a particular stock transaction, please check -[examples]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) +[examples](/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html) #### **Advantages** @@ -65,6 +67,6 @@ This complete process is called Periodic Inventory. If you are an existing user using Periodic Inventory and want to use Perpetual Inventory, you have to follow some steps to migrate. For details, check -[Migration From Periodic Inventory]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html). +[Migration From Periodic Inventory](/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html). {next} diff --git a/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 cd291c43..25cb7175 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 @@ -1,4 +1,6 @@ +# Migrate To Perpetual Inventory + Perpetual Inventory Valuation is activated by default in the system. For the users who are currently following periodic inventory valuation system, and wish to migrate to perpetual inventory valuation system, please follow the steps explained below. @@ -21,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 6a557dd8..769b5850 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 @@ -1,4 +1,6 @@ +# Perpetual Inventory + As per the perpetual inventory system, accounts posting is done for every stock transaction. On creating new Warehouse, the system will automatically create an Account in the Chart of Account, with the same name as Warehouse Name. @@ -11,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. @@ -132,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. @@ -148,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. @@ -206,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 @@ -239,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. @@ -277,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 * * * @@ -312,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 * * * @@ -349,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 22500fc3..e9c8a877 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 @@ -1,9 +1,11 @@ +# Allow Over Delivery Billing Against Sales Order Upto Certain Limit + #Allow Over Delivery/Billing While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master. -Item 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 +19,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 998b43c9..72bbe22e 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 @@ -1,21 +1,23 @@ +# Auto Creation Of Material Request + #Auto Creation of Material Request To prevent stockouts, you can track item's reorder level. When stock level goes below reorder level, purchase manager is notified and instructed to initiate purchase process for the item. In ERPNext, you can update item's Reorder Level and Reorder Qty in the Item master. If same item has different reorder level, you can also update warehouse-wise reorder level and reorder qty. -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. @@ -24,5 +26,5 @@ If auto creation of Material Request is failed, User with Purchase Manager role **An error occurred for certain Items while creating Material Requests based on Re-order level.** **Date 01-04-2016 not in any Fiscal Year.** -One of the reason of error could be Fiscal Year as well. Click [here]({{docs_base_url}}/user/manual/en/accounts/articles/fiscal-year-error.html) to learn more about it. +One of the reason of error could be Fiscal Year as well. Click [here](/docs/user/manual/en/accounts/articles/fiscal-year-error.html) to learn more about it. \ No newline at end of file diff --git a/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 2d5f7532..2b5a5d3f 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 @@ -1,9 +1,11 @@ +# Creating Depreciation For Item + #Depreciation Entry **Question:** A Fixed Asset Item has been purchased and stored in a warehouse. How to create a depreciation for a Fixed Asset Item? -**Answer:**You can post asset depreciation entry for the fixed asset item via [Stock Reconciliation]({{docs_base_url}}/user/manual/en/stock/opening-stock.html) Entry. +**Answer:**You can post asset depreciation entry for the fixed asset item via [Stock Reconciliation](/docs/user/manual/en/stock/opening-stock.html) Entry. ####Step 1: @@ -14,7 +16,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 +24,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/index.md b/foundation/www/docs/user/manual/en/stock/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/index.md +++ b/foundation/www/docs/user/manual/en/stock/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 84615a66..1b771803 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 @@ -1,4 +1,6 @@ +# Maintain Stock Field Frozen In Item Master + #Maintain Stock field Frozen in the Item master In the item master, you might witness values in the following fields to be frozen. @@ -7,7 +9,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/manage-rejected-finished-goods-items.md b/foundation/www/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md index 8cd24969..41fe8324 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md +++ b/foundation/www/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md @@ -1,4 +1,6 @@ +# Manage Rejected Finished Goods Items + #Manage Rejected Finished Goods Items There could be manufactured Items which would not pass quality test, hence rejected. diff --git a/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 6bdecf65..96a505c3 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 @@ -1,17 +1,19 @@ +# Managing Batch Wise Inventory + #Managing Batch wise Inventory Set of items which has same properties and attributes can be group in a single Batch. For example, pharmaceuticals items are batch, so that it's manufacturing and expiry date can be tracked together. To maintain batches against an Item you need to mention 'Has Batch No' as yes in the Item Master. -Batch Item +Batch Item You can create a new Batch from: `Stock > Documents > Batch > New` -To learn more about batch, click [here.]({{docs_base_url}}/user/manual/en/stock/batch.html) +To learn more about batch, click [here.](/docs/user/manual/en/stock/batch.html) For the Batch item, updating Batch No. in the stock transactions (Purchase Receipt & Delivery Note) is mandatory. @@ -19,13 +21,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 +35,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 8e4e3aae..6ac6d94c 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 @@ -1,4 +1,6 @@ +# Managing Fractions In Uom + #Managing Fractions in UoM UoM stands for Unit of Measurement. Few examples of UoM are Numbers (Nos), Kgs, Litre, Meter, Box, Carton etc. @@ -19,7 +21,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 +29,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 ede23fdb..d6d68672 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 @@ -1,7 +1,9 @@ +# Opening Stock Balance Entry For The Serialized And Batch Item + #Opening Stock Balance Entry for the Serialized and Batch Item -Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them is update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext]({{docs_base_url}}/user/manual/en/stock/serial-no.html). +Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them is update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](/docs/user/manual/en/stock/serial-no.html). **Question:** Why Opening Balance entry for the Serialized and Batch Item cannot be updated via Stock Reconciliation? @@ -35,13 +37,13 @@ Select Items for which opening balance is to be updated. For the serialized item, update quantity as many Serial Nos are their. -For the serialized item, mention Serial Nos. equivalent to it's Qty. Or if Serial Nos. are configured to be created based on Prefix, then no need to mention Serial Nos. manually. Click [here]({{docs_base_url}}/user/manual/en/stock/articles/serial-no-naming.html) to learn more about Serial No. naming. +For the serialized item, mention Serial Nos. equivalent to it's Qty. Or if Serial Nos. are configured to be created based on Prefix, then no need to mention Serial Nos. manually. Click [here](/docs/user/manual/en/stock/articles/serial-no-naming.html) to learn more about Serial No. naming. For a batch item, provide Batch ID in which opening balance will be updated. Keep batch master ready, and updated it for the Batch Item. To create new Batch, go to: `Stock > Setup > Batch > New` -[Click here to learn how Batchwise inventory is managed in ERPNext.]({{docs_base_url}}/user/manual/en/stock/articles/managing-batch-wise-inventory.html) +[Click here to learn how Batchwise inventory is managed in ERPNext.](/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html) #### Step 7: Update Valuation Rate an Item @@ -51,7 +53,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 702cffa6..f6e20c0b 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 @@ -1,4 +1,6 @@ +# Repack Entry + #Repack Entry Repack Entry is created for item bought in bulk, which is being packed into smaller packages. For example, item bought in tons can be repacked into Kgs. @@ -23,7 +25,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 +33,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/serial-no-naming.md b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md index ba25579a..886e7f29 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 @@ -1,4 +1,6 @@ +# Serial No Naming + #Serial No. Naming Serial Nos. is unique value assigned on each unit of an item. Serial no. helps in tracking item's warranty and expiry details. Generally high value items like machines, computers, costly equipments are serialized. @@ -15,11 +17,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 +31,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 cd8ea581..a85dcc2f 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 @@ -1,4 +1,6 @@ +# Stock Entry Purpose + #Stock Entry Purpose Stock Entry is a stock transaction, which can be used for multiple purposes. Let's learn about each Stock Entry Purpose below. @@ -9,7 +11,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,34 +19,34 @@ Material Receipt entry is created to inward stock of item(s) in a warehouse. Thi For the stock valuation purpose, provided Item Valuation becomes a mandatory field in the Material Receipt entry. -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 -Repack Entry is created when items purchases in bulk is repacked under smaller packs. ![Check this page to know more about Repack entry.]({{docs_base_url}}/user/manual/en/stock/articles/repack-entry.html) +Repack Entry is created when items purchases in bulk is repacked under smaller packs. ![Check this page to know more about Repack entry.](/docs/user/manual/en/stock/articles/repack-entry.html) #### 6.Purpose: Subcontract -Subcontracting transaction involves company transfer raw-material items to the sub-contractors warehouse. This requires adding a warehouse for the sub-contractor as well. Sub-contract entry transfers stock from the companies warehouse to the sub-contractors warehouse.![Check this page to know more about Subcontracting]({{docs_base_url}}/user/manual/en/manufacturing/subcontracting.html). +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/stock-level-report.md b/foundation/www/docs/user/manual/en/stock/articles/stock-level-report.md index 583b5b90..6c65395f 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/stock-level-report.md +++ b/foundation/www/docs/user/manual/en/stock/articles/stock-level-report.md @@ -1,4 +1,6 @@ +# Stock Level Report + #Stock Level Report Stock Level report list stock item's quantity available in a particular warehouse. 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 a88a6a41..82e383f1 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 @@ -1,4 +1,6 @@ +# Track Items Using Barcode + #Track Items Using Barcode A barcode is a value decoded into vertical spaced lines. Barcode scanners are the input medium, like Keyboard. When it scans a barcode, the data appears in the computer screens at the point of a cursor. @@ -7,10 +9,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 3802a26a..b390e7f1 100644 --- a/foundation/www/docs/user/manual/en/stock/batch.md +++ b/foundation/www/docs/user/manual/en/stock/batch.md @@ -1,4 +1,6 @@ +# Batch + Batch feature in ERPNext allows you to group multiple units of an item, and assign them a unique value/number/tag called Batch No. @@ -10,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 @@ -24,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 7cf45bed..394672ae 100644 --- a/foundation/www/docs/user/manual/en/stock/delivery-note.md +++ b/foundation/www/docs/user/manual/en/stock/delivery-note.md @@ -1,4 +1,6 @@ +# Delivery Note + A Delivery Note is made when a shipment is shipped from the company’s Warehouse. @@ -14,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. @@ -23,7 +25,7 @@ details are carried over from your Sales Order. ### Shipping Packets or Items with Product Bundle -If you are shipping Items that have a [Product Bundle]({{docs_base_url}}/user/manual/en/selling/setup/product-bundle.html), ERPNext will automatically +If you are shipping Items that have a [Product Bundle](/docs/user/manual/en/selling/setup/product-bundle.html), ERPNext will automatically create a “Packing List” table for you based on the sub-Items in that Item. If your Items are serialized, then for Product Bundle type of Items, you will have diff --git a/foundation/www/docs/user/manual/en/stock/index.md b/foundation/www/docs/user/manual/en/stock/index.md index 7de6380e..1e2e65b3 100644 --- a/foundation/www/docs/user/manual/en/stock/index.md +++ b/foundation/www/docs/user/manual/en/stock/index.md @@ -1,4 +1,6 @@ +# Stock + For most small business that deal in physical goods, a large part of their net worth is invested in the stock in hand. diff --git a/foundation/www/docs/user/manual/en/stock/installation-note.md b/foundation/www/docs/user/manual/en/stock/installation-note.md index 96f1b2b6..815849e2 100644 --- a/foundation/www/docs/user/manual/en/stock/installation-note.md +++ b/foundation/www/docs/user/manual/en/stock/installation-note.md @@ -1,6 +1,8 @@ +# Installation Note + 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 f8927331..ca768485 100644 --- a/foundation/www/docs/user/manual/en/stock/item/index.md +++ b/foundation/www/docs/user/manual/en/stock/item/index.md @@ -1,4 +1,6 @@ +# Item + An Item is your companys' product or a service. The term Item is applicable to things (products or services) you sell as well as raw materials or components of products yet to be produced (before they can be sold to customers). An Item can be a physical product or a service that you buy/sell from your customers/suppliers. ERPNext allows you to manage all sorts of items like raw-materials, sub-assemblies, finished goods, item variants and service items. ERPNext is optimised for itemised management of your sales and purchase. If you are in services, you can create an Item for each services that your offer. Completing the Item Master is very essential for successful implementation of ERPNext. @@ -6,11 +8,11 @@ ERPNext is optimised for itemised management of your sales and purchase. If you ## Item Properties * **Item Name:** Item name is the actual name of your product or service. - * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification]({{docs_base_url}}/user/manual/en/stock/item/item-codification.html) - * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group]({{docs_base_url}}/user/manual/en/stock/setup/item-group.html) + * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification](/docs/user/manual/en/stock/item/item-codification.html) + * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group](/docs/user/manual/en/stock/setup/item-group.html) * **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list. * **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item. - * **Variant:** A Item Variant is a different version of a Item.To learn more about managing variants see [Item Variants]({{docs_base_url}}/user/manual/en/stock/item/item-variants.html) + * **Variant:** A Item Variant is a different version of a Item.To learn more about managing variants see [Item Variants](/docs/user/manual/en/stock/item/item-variants.html) ### Upload an Image @@ -30,11 +32,11 @@ In ERPNext, you can select different type of Warehouses to stock your different These numbers help to track individual units or batches of Items which you sell. It also tracks warranty and returns. In case any individual Item is recalled by the supplier the number system helps to track individual Item. The numbering system also manages expiry dates. Please note that if you sell your items in thousands, and if the items are very small like pens or erasers, you need not serialize them. In ERPNext, you will have to mention the serial number in some accounting entries. To create serial numbers you will have to manually create all the numbers in your entries. If your product is not a big consumer durable Item, if it has no warranty and has no chances of being recalled, avoid giving serial numbers. > Tip: While entering an item code in an items table, if the table requires inventory details, then depending on whether the entered item is batched or serialized, you can enter serial or batch numbers right away in a pop-up dialog. -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. - * [Discussion on Serialized Inventory]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html) + * [Discussion on Serialized Inventory](/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html) ### Re Ordering @@ -46,7 +48,7 @@ These numbers help to track individual units or batches of Items which you sell. These settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account. For example, If you have a tax Account, “VAT 10%” and this particular Item is exempted from tax, then you select “VAT 10%” in the first column, and set “0” as the tax rate in the second column. -Go to [Setting Up Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) to understand this topic in detail. +Go to [Setting Up Taxes](/docs/user/manual/en/setting-up/setting-up-taxes.html) to understand this topic in detail. ### Inspection @@ -56,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. @@ -68,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. @@ -78,25 +80,25 @@ 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_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail. +Visit [Manufacturing](/docs/user/manual/en/manufacturing.html) and [Website ](/docs/user/manual/en/website.html)to understand these topics in detail. ### Learn more about Item diff --git a/foundation/www/docs/user/manual/en/stock/item/item-codification.md b/foundation/www/docs/user/manual/en/stock/item/item-codification.md index b71903c0..018b4bbf 100644 --- a/foundation/www/docs/user/manual/en/stock/item/item-codification.md +++ b/foundation/www/docs/user/manual/en/stock/item/item-codification.md @@ -1,4 +1,6 @@ +# Item Codification + If you already have a full-fledged business with a number of physical items, you would have probably coded your items. If you have not, you have a choice. We recommend that you should codify if you have lot of products with long or diff --git a/foundation/www/docs/user/manual/en/stock/item/item-price.md b/foundation/www/docs/user/manual/en/stock/item/item-price.md index e7718435..f7e861ed 100644 --- a/foundation/www/docs/user/manual/en/stock/item/item-price.md +++ b/foundation/www/docs/user/manual/en/stock/item/item-price.md @@ -1,4 +1,6 @@ +# Item Price + Item Price is the record in which you can log selling and buying rate of an item. There are two ways to reach to new Item Price form. @@ -15,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]({{docs_base_url}}/assets/old_images/erpnext/item-price-list.png) +![Item Price list](/docs/assets/old_images/erpnext/item-price-list.png) On selection of Price List, its currency and for selling or buying property will be fetched as well. @@ -25,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 Item]({{docs_base_url}}/assets/old_images/erpnext/item-price-item.png) +![Item Price Item](/docs/assets/old_images/erpnext/item-price-item.png) Step 3: Enter Rate Enter selling/buying rate of an item in Price List currency. -![Item Price Rate]({{docs_base_url}}/assets/old_images/erpnext/item-price-rate.png) +![Item Price Rate](/docs/assets/old_images/erpnext/item-price-rate.png) Step 4: Save Item Price 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 e217fad9..30974ada 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 @@ -1,4 +1,6 @@ +# Item Valuation Fifo And Moving Average + ### How are Items Valued? One of the major features of any inventory system is that you can find out the @@ -20,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 17bafa12..6e3e5fb3 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,33 +20,33 @@ To use Item Variants in ERPNext, create an Item and check 'Has Variants'. * The Item shall then be referred to as a so called 'Template'. Such a Template is not identical to a regular 'Item' any longer. For example it (the Template) can not be used directly in any Transactions (Sales Order, Delivery Note, Purchase Invoice) itself. Only the Variants of an Item (_blue_ t-shirt in size _small)_ can be practically used in such. Therefore it would be ideal to decide whether an item 'Has Variants' or not directly when creating it. -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_base_url}}/user/manual/en/stock/setup/item-attribute.html) +To learn more about setting Attributes Master check [Item Attributes](/docs/user/manual/en/stock/setup/item-attribute.html) ### Variants Based on Manufacturers To setup variants based on Manufactueres, in your Item template, set "Variants Based On" as "Manufacturers" Setup Item Variant by Manufacturer + src='/docs/assets/img/stock/select-mfg-for-variant.png'> When you make a new Variant, the system will prompt you to select a Manufacturer. You can also optionally put in a Manufacturer Part Number Setup Item Variant by Manufacturer + src='/docs/assets/img/stock/set-variant-by-mfg.png'> The naming of the variant will be the name (ID) of the template Item with a number suffix. e.g. "ITEM000" will have variant "ITEM000-1" \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/item/purchase-details.md b/foundation/www/docs/user/manual/en/stock/item/purchase-details.md index 5d2d8fa3..a1479faf 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 3f393f46..f50add88 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 ee312df9..65e991a3 100644 --- a/foundation/www/docs/user/manual/en/stock/material-request.md +++ b/foundation/www/docs/user/manual/en/stock/material-request.md @@ -1,8 +1,10 @@ +# Material Request + 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: @@ -10,14 +12,14 @@ To generate a Material Request manually go to: #### Creating Material Request -Material Request +Material Request A Material Request can be generated: * Automatically from a Sales Order. * Automatically when the Projected Quantity of an Item in stores reaches a particular level. * Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing activities. - * If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the [Projected Quantity]({{docs_base_url}}/user/manual/en/stock/projected-quantity.html) for this Item. + * If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the [Projected Quantity](/docs/user/manual/en/stock/projected-quantity.html) for this Item. A Material Request can be of type: @@ -26,7 +28,7 @@ A Material Request can be of type: * Material Issue - If the requested material is to be Issued. * Manufacture - If the requested material is to be Produced. -The User can also raise a [Request For Quotation]({{docs_base_url}}/user/manual/en/buying/request-for-quotation.html) against a Material Request. To create a Request For Quotation the user can click on 'Make'. +The User can also raise a [Request For Quotation](/docs/user/manual/en/buying/request-for-quotation.html) against a Material Request. To create a Request For Quotation the user can click on 'Make'. > Info: Material Request is not mandatory. It is ideal if you have centralized buying so that you can collect this information from various departments. diff --git a/foundation/www/docs/user/manual/en/stock/opening-stock.md b/foundation/www/docs/user/manual/en/stock/opening-stock.md index fbeffca6..0ada9bab 100644 --- a/foundation/www/docs/user/manual/en/stock/opening-stock.md +++ b/foundation/www/docs/user/manual/en/stock/opening-stock.md @@ -11,6 +11,6 @@ In both cases, you should enter "Difference/Expense Account" as **Temporary Open If you are not making opening Stock Entry, you can select "Stock Adjustment" account in Difference/Expense Account field which is an expense account. -To understand Opening Stock for serialized Items visit [Stock Reconciliation]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html) +To understand Opening Stock for serialized Items visit [Stock Reconciliation](/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html) {next} diff --git a/foundation/www/docs/user/manual/en/stock/projected-quantity.md b/foundation/www/docs/user/manual/en/stock/projected-quantity.md index 80a3dca8..a8b2e3e9 100644 --- a/foundation/www/docs/user/manual/en/stock/projected-quantity.md +++ b/foundation/www/docs/user/manual/en/stock/projected-quantity.md @@ -1,4 +1,6 @@ +# Projected Quantity + Projected Quantity is the level of stock that is predicted for a particular Item, based on the current stock levels and other requirements. It is the quantity of gross inventory that includes supply and demand in the past which @@ -12,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 f0da28da..aa527e55 100644 --- a/foundation/www/docs/user/manual/en/stock/purchase-receipt.md +++ b/foundation/www/docs/user/manual/en/stock/purchase-receipt.md @@ -1,4 +1,6 @@ +# Purchase Receipt + Purchase Receipts are made when you accept material from your Supplier usually against a Purchase Order. @@ -11,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 821b8360..8074b1f9 100644 --- a/foundation/www/docs/user/manual/en/stock/purchase-return.md +++ b/foundation/www/docs/user/manual/en/stock/purchase-return.md @@ -1,4 +1,6 @@ +# Purchase Return + ERPNext has an option for products that are need to be returned to the supplier. This may be on account of a number of reasons like defects in goods, quality not matching, the buyer not needing the stock, etc. @@ -7,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/sales-return.md b/foundation/www/docs/user/manual/en/stock/sales-return.md index aabfc451..a8aff584 100644 --- a/foundation/www/docs/user/manual/en/stock/sales-return.md +++ b/foundation/www/docs/user/manual/en/stock/sales-return.md @@ -1,4 +1,6 @@ +# Sales Return + Goods sold being returned is quite a common practice in business. They could be returned by the customer on quality issues, non-delivery on agreed date, or any other reason. @@ -7,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 ca074f25..7907eb1f 100644 --- a/foundation/www/docs/user/manual/en/stock/serial-no.md +++ b/foundation/www/docs/user/manual/en/stock/serial-no.md @@ -1,4 +1,6 @@ +# Serial No + As we discussed in the **Item** section, if an **Item** is _serialized_, a **Serial Number** (Serial No) record is maintained for each quantity of that **Item**. This information is helpful in tracking the location of the Serial @@ -21,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/index.md b/foundation/www/docs/user/manual/en/stock/setup/index.md index 43874704..e8da5342 100644 --- a/foundation/www/docs/user/manual/en/stock/setup/index.md +++ b/foundation/www/docs/user/manual/en/stock/setup/index.md @@ -1,4 +1,6 @@ +# Setup + ### Topics {index} 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 16c3da43..850e10f7 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 @@ -1,17 +1,19 @@ +# Item Attribute + 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 403bc8e5..ca4eedeb 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 @@ -1,4 +1,6 @@ +# Item Group + Item Group is the classification category. Depending on the type of product, categorise it under its respective field. If the product is service oriented, name it under the group head - service. If the @@ -6,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 @@ -14,7 +16,7 @@ under Trading. * Select 'Add Child' -Add Item Group +Add Item Group ### Delete an Item Group @@ -22,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 aca488e4..0c60cebe 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 @@ -1,6 +1,8 @@ +# Stock Settings + You can set default settings for your stock related transactions here. -Stock Settings +Stock Settings {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/stock-entry.md b/foundation/www/docs/user/manual/en/stock/stock-entry.md index 99e8dc6e..79a178a8 100644 --- a/foundation/www/docs/user/manual/en/stock/stock-entry.md +++ b/foundation/www/docs/user/manual/en/stock/stock-entry.md @@ -1,4 +1,6 @@ +# Stock Entry + A Stock Entry is a simple document that lets you record Item movement from a Warehouse, to a Warehouse and between Warehouses. @@ -6,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: @@ -28,15 +30,15 @@ If the stock entry is an incoming entry i.e any item is receiving at a target wa To add additional costs, enter the description and amount of the cost in the Additional Costs table. -Stock Entry Additional Costs +Stock Entry Additional Costs The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate. -Stock Entry Item Valuation Rate +Stock Entry Item Valuation Rate If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account. -Additional Costs General Ledger +Additional Costs General Ledger > **Note:** To update Stock from a spreadsheet, see [Stock Reconciliation]({{doc_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html). diff --git a/foundation/www/docs/user/manual/en/stock/stock-how-to.md b/foundation/www/docs/user/manual/en/stock/stock-how-to.md index 669d6ad9..f51c3bbc 100644 --- a/foundation/www/docs/user/manual/en/stock/stock-how-to.md +++ b/foundation/www/docs/user/manual/en/stock/stock-how-to.md @@ -1,3 +1,5 @@ +# Stock How To + This page contains most frequently asked questions on Stocks. diff --git a/foundation/www/docs/user/manual/en/stock/tools/index.md b/foundation/www/docs/user/manual/en/stock/tools/index.md index 43874704..799d2dd4 100644 --- a/foundation/www/docs/user/manual/en/stock/tools/index.md +++ b/foundation/www/docs/user/manual/en/stock/tools/index.md @@ -1,4 +1,6 @@ +# Tools + ### Topics {index} 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 cfc643b9..b0e84d29 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 @@ -1,4 +1,6 @@ +# Landed Cost Voucher + Landed Cost is the total cost of a product to reach the product at the buyer’s door. Landed costs include the original cost of the item, complete shipping costs, customs duties, taxes, insurance and currency conversion fees etc. All of these components might not be applicable in every shipment, but relevant components must be considered as a part of the landed cost. > To understand landed cost better, let’s take an example based on our daily lives. You need to purchase a new washing machine for your home. Before making actual purchase, you probably do some investigation to know the best price. In this process, you often found a better deal from a store which is long away from your home. But you should also consider shipping cost while buying from that store. Total cost including transportation might be more than the price you get in your nearby store. In that case you will choose to buy from your nearest store, as landed cost of the item is cheaper in the nearest store. @@ -21,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 03f5150e..d2c2dfed 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 @@ -1,8 +1,10 @@ +# Packing Slip + A packing slip is a document listing the items in a shipment. Usually attached to the goods delivered. While Shipping a product 'Draft' for Delivery Notes are created. You can make a Packing Slip from these Delivery Notes (Draft) -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 9a1c3efd..7df171c7 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 @@ -1,9 +1,11 @@ +# Quality Inspection + In ERPNext, you can mark your incoming or outgoing products for Quality Inspection. To enable ERPNext to perform this function, go to : > Stock > Quality Inspection > New -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 e02674fe..b1500ac8 100644 --- a/foundation/www/docs/user/manual/en/stock/warehouse.md +++ b/foundation/www/docs/user/manual/en/stock/warehouse.md @@ -1,4 +1,6 @@ +# Warehouse + A warehouse is a commercial building for storage of goods. Warehouses are used by manufacturers, importers, exporters, wholesalers, transport businesses, customs, etc. They are usually large plain buildings in industrial areas of @@ -13,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/support/index.md b/foundation/www/docs/user/manual/en/support/index.md index 6ceab230..bc5c0d1e 100644 --- a/foundation/www/docs/user/manual/en/support/index.md +++ b/foundation/www/docs/user/manual/en/support/index.md @@ -1,4 +1,6 @@ +# Support + Great customer support and maintenance is at the heart of any successful small business. ERPNext gives you the tools to track all incoming requests and issues from your customers so that you can respond quickly. Your database of incoming diff --git a/foundation/www/docs/user/manual/en/support/issue.md b/foundation/www/docs/user/manual/en/support/issue.md index 24515e99..d41c2a92 100644 --- a/foundation/www/docs/user/manual/en/support/issue.md +++ b/foundation/www/docs/user/manual/en/support/issue.md @@ -1,4 +1,6 @@ +# Issue + Issue is an incoming query from your Customer, usually via email or from the “Contact” section of your website. (To fully integrate the Support Ticket to email, see the Email Settings section). @@ -6,13 +8,13 @@ Ticket to email, see the Email Settings section). > Tip: A dedicated support Email Address is a good way to integrate incoming queries via email. For example, you can send support queries to ERPNext at support@erpnext.com and it will automatically create a Issue in the -Frappe system. +Frappé system. > Support > Issue > New Issue -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 d7190384..747d9908 100644 --- a/foundation/www/docs/user/manual/en/support/maintenance-schedule.md +++ b/foundation/www/docs/user/manual/en/support/maintenance-schedule.md @@ -1,4 +1,6 @@ +# Maintenance Schedule + All machines require regular maintenance, specially those that contain a lot of moving parts, so if you are in the business of maintaining those or have some of them in your own premises, this is a useful tool to plan a calendar of @@ -11,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 bb3e510c..78e358e3 100644 --- a/foundation/www/docs/user/manual/en/support/maintenance-visit.md +++ b/foundation/www/docs/user/manual/en/support/maintenance-visit.md @@ -1,11 +1,13 @@ +# Maintenance Visit + A Maintenance Visit is a record of a visit made by an engineer to a Customer’s premise usually against a Customer Issue. You can create a new Maintenance Visit from: > Support > Maintenance Visit > New Maintenance Visit -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 a2bee34d..1035d78e 100644 --- a/foundation/www/docs/user/manual/en/support/support_reports.md +++ b/foundation/www/docs/user/manual/en/support/support_reports.md @@ -1,4 +1,6 @@ +# Support Reports + ### Support Hours @@ -6,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 676a95eb..e2f1d4a7 100644 --- a/foundation/www/docs/user/manual/en/support/warranty-claim.md +++ b/foundation/www/docs/user/manual/en/support/warranty-claim.md @@ -1,4 +1,6 @@ +# Warranty Claim + If you are selling **Items** under warranty or if you have sold and extended service contract like the Annual Maintenance Contract (AMC), your **Customer** may call you about an issue or a break-down and give you the Serial No of this @@ -16,7 +18,7 @@ To create a new **Warranty Claim**: > Support > Warranty Claim > New Warranty Claim -![Warranty Claim]({{docs_base_url}}/assets/img/support/warranty-claim.png) +![Warranty Claim](/docs/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 fb7f7d16..ef3d8d9c 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 @@ -1,4 +1,6 @@ +# Global Search + Global-search.md @@ -9,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 17cfa330..6ea3922b 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 @@ -1,10 +1,12 @@ +# Adding Attachments To Outgoing Messages + #Adding Attachments to Outgoing Messages -ERPNext has in-built file manager. Click [here]({{docs_base_url}}/user/videos/learn/file-manager.html) to learn more on how attachments are managed in ERPNext. +ERPNext has in-built file manager. Click [here](/docs/user/videos/learn/file-manager.html) to learn more on how attachments are managed in ERPNext. If you have file attached to the document (say Purchase Order), and same file needs to be emailed as attachment, following is how you can achieve it. -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 3b3922d7..aec4e838 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 @@ -1,4 +1,6 @@ +# Adding File As A Attachment + #Adding File as a Attachment ERPNext allows to attach files with documents. User with a read permission on particular document will also be able to access files attached with it. @@ -9,11 +11,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,11 +23,11 @@ Click on Attach to browse and select the file. If you use separate server for files, or use online service like Dropbox, you can attach file by providing link of a particular file. -Sales Order Select File +Sales Order Select File `For hosted users, limit of 5 MB is applied on file size.` -To ensure there are not many files attached to a document, which can affect your accounts performance, you can set limit as how many files can be attached to a particular document. Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) to learn more about it. +To ensure there are not many files attached to a document, which can affect your accounts performance, you can set limit as how many files can be attached to a particular document. Click [here](/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) to learn more about it. ####File Manager diff --git a/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 609da8b8..79f4ff07 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 @@ -1,4 +1,6 @@ +# Bulk Rename + #Bulk Rename Using renaming tool, you can to rectify/change multiple document ids at once. This tool is only accessible to the User who has System Manager role assigned. @@ -11,7 +13,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 +23,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_base_url}}/assets/img/articles/Selection_0173436a8.png) +![Upload Data](/docs/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 b242a363..ea380959 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 @@ -1,9 +1,11 @@ +# Check Link Between Documents + #Checking Link Between Documents Links option shows one document is linked to which other documents. Check Menu for the Links options. -Cancel Doc +Cancel Doc ####Scenario @@ -19,6 +21,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 ae52b886..f6cd67d2 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 @@ -1,4 +1,6 @@ +# Delete Submitted Document + #Delete Submitted Document To be able to delete Submitted document, you should first Cancel. Once canceled, you can delete that document from Menu or from the List View of that Document Type. @@ -13,18 +15,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 5bc89ea3..683da3f4 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 @@ -1,4 +1,6 @@ +# Duplicate Record + #Duplicate a Record Duplicate feature helps you to copy values of existing document into new document. @@ -11,6 +13,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/index.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/index.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 807954c5..f08e5567 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 @@ -1,4 +1,6 @@ +# Merging Documents + #Merging Documents For a document, if you have two records which are identical, and meant for common purpose, you can merge them into one record. @@ -13,7 +15,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 +23,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 162bf2d6..5861364d 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 @@ -1,11 +1,13 @@ +# Pos View + #POS View POS (point of sale) view renders form in a different layout, optimized for the quick selection of items. This view has primarily been designed for the retail business. Using POS View, you can only create Sales Invoice, without switching to standard form view. For other transactions, like Sales Order, Delivery Note, Purchase Order, Purchase Receipt etc., POS View is only used for Item selection. For entering other values in the transaction, you should switch to form view. -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 3bd867c3..d69f7b93 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 @@ -1,4 +1,6 @@ +# Renaming Documents + #Renaming a Document Using Renaming feature, you can change ID of a master documents like Item, Warehouse, Accounts etc. Following are the steps to rename Item Code. Following same steps, you can rename other masters as well. @@ -9,7 +11,7 @@ Using Renaming feature, you can change ID of a master documents like Item, Wareh #### 2. Rename -Renamed Item +Renamed Item ###Effect of Renaming @@ -17,8 +19,8 @@ Renaming document affects existing transaction where this record is selected. Co ###See Also -1. [Bulk Renaming]({{docs_base_url}}/user/manual/en/using-erpnext/articles/bulk-rename.html) -2. [Document Merging]({{docs_base_url}}/user/manual/en/using-erpnext/articles/merging-documents.html) +1. [Bulk Renaming](/docs/user/manual/en/using-erpnext/articles/bulk-rename.html) +2. [Document Merging](/docs/user/manual/en/using-erpnext/articles/merging-documents.html) **List of Renamable Documents** diff --git a/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 20bd6bd2..f9e0f9b9 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 @@ -1,4 +1,6 @@ +# Search Filter + #Search Filter Search Filter option allow user to filter records based on value in the specific field of that document. Search Filters are available on the List View of Document Type and in the Report Builder. @@ -9,20 +11,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 +33,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 874849c7..def0cad5 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 @@ -1,7 +1,9 @@ +# Tree Master Renaming + #Tree Master Renaming -There are various master which are maintained in tree structure. Click [here]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters.html) to learn more about tree structured masters in ERPNext. +There are various master which are maintained in tree structure. Click [here](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.html) to learn more about tree structured masters in ERPNext. Following are the steps to be followed for renaming ID of a master which is maintained in tree structure. Let's rename an Account for the instance. @@ -13,12 +15,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 a871142b..77479f31 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/assignment.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/assignment.md @@ -1,4 +1,6 @@ +# Assignment + Assign To feature in ERPNext allows you to allocate particular document to specific user, whom needs to further work on that document. For example, if Sales Order needs to be approved/submitted by Sales Manager, first draft user can allocate that Sales Order to Sales Manager. On allocating document to Sales Manager, it will be added to that user's ToDo list. Same way, allocation can also be done to Material User and Account user who needs to create Delivery Note and Sales Invoice respectively against this Sales Note. @@ -11,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. @@ -25,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 575a6449..908fc110 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/calendar.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/calendar.md @@ -1,9 +1,11 @@ +# Calendar + The Calendar is a tool where you can create and share Events and also see auto-generated events from the system. You can switch calendar view based on Month, Week and Day. -Calendar +Calendar ### Creating Events in Calendar @@ -13,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. @@ -21,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 @@ -32,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 @@ -42,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 @@ -52,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 8ce1de88..7cbc7d42 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/chat.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/chat.md @@ -1,4 +1,6 @@ +# Chat + You can send and receive messages from the system by using the Messages tool. `Explore > Tools > Chat` @@ -6,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 5a1ba499..febf372c 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 @@ -1,25 +1,27 @@ +# Collaborating Around Forms + Following are the tools in each document using which you can collaborate with other Users in your ERPNext account. ### Assigned to -If some document requires an action from User, you can Assign that document to that User. On assignment, User to whom document is assigned is intimated via email. To learn about Assign To feature, [click here.]({{docs_base_url}}/user/manual/en/using-erpnext/assignment.html) +If some document requires an action from User, you can Assign that document to that User. On assignment, User to whom document is assigned is intimated via email. To learn about Assign To feature, [click here.](/docs/user/manual/en/using-erpnext/assignment.html) ### Comments Comments are a great way to add information about a transaction that is not a part of the transactions. Like some background information etc. -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 -[Read more about Tags]({{docs_base_url}}/user/manual/en/using-erpnext/tags.html) +[Read more about Tags](/docs/user/manual/en/using-erpnext/tags.html) {next} diff --git a/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md b/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md index 927d1aa0..a1508f4f 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 @@ -1,4 +1,6 @@ +# Document Versioning + #Document Versioning The document versioning feature allows you to track all the changes made in the form over the period. It will be very helpful in audit trial to check which user edited what value, and when exactly. @@ -7,16 +9,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/index.md b/foundation/www/docs/user/manual/en/using-erpnext/index.md index 41c0afd5..933aecc7 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/index.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/index.md @@ -1,4 +1,6 @@ +# Using Erpnext + We live in an era when people are very comfortable communicating, discussing, asking, assigning work and getting feedback electronically. The Internet acts as a great medium to collaborate on work too. Taking this concept into ERP diff --git a/foundation/www/docs/user/manual/en/using-erpnext/notes.md b/foundation/www/docs/user/manual/en/using-erpnext/notes.md index 683c947a..9c52ef1e 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/notes.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/notes.md @@ -1,4 +1,6 @@ +# Notes + You can store your long notes under this section. It can contain your partner lists, frequently used passwords, terms and conditions, or any other document which needs to be shared. Following are the steps to create new Note. `Explore > Note > New` @@ -7,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 062f73e4..ae03ce4e 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 @@ -1,9 +1,11 @@ +# Restore Deleted Docs + #Restore Deleted Documents In ERPNext, you can delete a records if not needed. They can be masters like Items, Customer or transactions like Sales Order, Payment Entries etc. -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 +17,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 61570f6c..c8b14e9b 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/tags.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/tags.md @@ -1,10 +1,12 @@ +# Tags + Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. -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 e77ab5c4..8eadc472 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 @@ -1,10 +1,12 @@ -To Do is a simple tool where all the activities [assigned]({{docs_base_url}}/user/manual/en/using-erpnext/assignments.html) to you and assigned by you are listed. You can also add your own to-do items in the list. +# To Do -Assign +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 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 06aabd2c..59ad41b3 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 @@ -1,4 +1,6 @@ +# Add Products To Website + ### Add Products to the Website ERPNext will populate your website with products out of your Item Master. The html code will be @@ -12,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_base_url}}/assets/img/articles/new-item-for-website-01.png) +![New Website Item 01](/docs/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_base_url}}/assets/img/articles/new-item-for-website-02.png) +![New Website Item 02](/docs/assets/img/articles/new-item-for-website-02.png) #### Step 3: Check the 'Show in Website' box @@ -27,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_base_url}}/assets/img/articles/new-item-for-website-03.png) +![New Website Item 03](/docs/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_base_url}}/assets/img/articles/new-item-for-website-04.png) +![New Website Item 04](/docs/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_base_url}}/assets/img/articles/new-item-for-website-05.png) +![New Website Item 05](/docs/assets/img/articles/new-item-for-website-05.png) ### Item Groups @@ -48,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_base_url}}/assets/img/articles/new-item-for-website-06.png) +![New Website Item 06](/docs/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_base_url}}/assets/img/articles/new-item-for-website-07.png) +![New Website Item 07](/docs/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_base_url}}/assets/img/articles/new-item-for-website-08.png) +![New Website Item 08](/docs/assets/img/articles/new-item-for-website-08.png) {next} diff --git a/foundation/www/docs/user/manual/en/website/articles/index.md b/foundation/www/docs/user/manual/en/website/articles/index.md index be943bcc..dfda826d 100644 --- a/foundation/www/docs/user/manual/en/website/articles/index.md +++ b/foundation/www/docs/user/manual/en/website/articles/index.md @@ -1,2 +1,4 @@ +# Articles + {index} \ No newline at end of file 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 dda24ae6..3cfdec49 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 @@ -1,9 +1,11 @@ +# Managing User Sign Up Via Website + #Customer / Supplier Signup Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page. -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-home-page.md b/foundation/www/docs/user/manual/en/website/articles/website-home-page.md index c11c626b..a39f8bcf 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_base_url}}/assets/img/articles/Selection_021.png) +![Website Setting Home](/docs/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 4be1c595..c280a84c 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 @@ -1,12 +1,14 @@ +# Website Security + #Website Security One can easily generate a website using ERPNext. We can list our Products on the website and also create blogs. Products are directly fetched from the Item Master records of your ERPNext account. Some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to the public. Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to `Selling > Items and Pricing > Item` and in the Item form check the `show in website` checkbox. - + Once the check box has been checked, then more details will appear that you can fill in for the details of the product as to be shown on the website. - \ No newline at end of file + \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/website/blog-post.md b/foundation/www/docs/user/manual/en/website/blog-post.md index fe40428a..05de52d2 100644 --- a/foundation/www/docs/user/manual/en/website/blog-post.md +++ b/foundation/www/docs/user/manual/en/website/blog-post.md @@ -1,4 +1,6 @@ +# Blog Post + Blogs are a great way to share your thoughts about your business and keep your customers and readers updated of what you are up to. @@ -9,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 c8030ea5..f43c2f3d 100644 --- a/foundation/www/docs/user/manual/en/website/blogger.md +++ b/foundation/www/docs/user/manual/en/website/blogger.md @@ -1,7 +1,9 @@ +# Blogger + 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/index.md b/foundation/www/docs/user/manual/en/website/index.md index 487644b9..a51e6eb7 100644 --- a/foundation/www/docs/user/manual/en/website/index.md +++ b/foundation/www/docs/user/manual/en/website/index.md @@ -1,4 +1,6 @@ +# Website + Websites are a core component of any business and having a good website usually means: diff --git a/foundation/www/docs/user/manual/en/website/setup/index.md b/foundation/www/docs/user/manual/en/website/setup/index.md index 70b367e4..465c8158 100644 --- a/foundation/www/docs/user/manual/en/website/setup/index.md +++ b/foundation/www/docs/user/manual/en/website/setup/index.md @@ -1,4 +1,6 @@ +# Setup + Settings for your website can be mentioned under setup. ### Topics diff --git a/foundation/www/docs/user/manual/en/website/setup/social-login-keys.md b/foundation/www/docs/user/manual/en/website/setup/social-login-keys.md index 16500228..a793bc33 100644 --- a/foundation/www/docs/user/manual/en/website/setup/social-login-keys.md +++ b/foundation/www/docs/user/manual/en/website/setup/social-login-keys.md @@ -1,4 +1,6 @@ +# Social Login Keys + Social Login enables users to login to ERPNext via their Google, Facebook or GitHub account. ### Enabling Social Logins. 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 ce63238c..be47a376 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 @@ -1,11 +1,13 @@ +# Website Settings + Most of the website related settings can be defined here. -Website Settings +Website Settings ####Landing Page -* Home Page: You can specify which [Web Page]({{docs_base_url}}/user/manual/en/website/web-page.html) must be the homepage of the website +* Home Page: You can specify which [Web Page](/docs/user/manual/en/website/web-page.html) must be the homepage of the website * Home Page is Products: if Checked, the Home page will be the default Item Group for the website. @@ -15,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. @@ -24,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. @@ -38,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 ce136c8a..bed7ef63 100644 --- a/foundation/www/docs/user/manual/en/website/shopping-cart.md +++ b/foundation/www/docs/user/manual/en/website/shopping-cart.md @@ -1,4 +1,6 @@ +# Shopping Cart + On the Webpage, a shopping cart is an icon that allows you to store all the things that you have earmarked for purchasing. It is a graphical representation of a shopping basket or a shopping cart that allows you to save @@ -15,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. @@ -23,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 @@ -36,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 176a9e7f..fe26f9be 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 e7dfdc8d..ad25cea8 100644 --- a/foundation/www/docs/user/manual/en/website/web-page.md +++ b/foundation/www/docs/user/manual/en/website/web-page.md @@ -1,11 +1,13 @@ +# Web Page +

    Static Content like your Home Page, About Us, Contact Us, Terms pages can be created using the Web Page.

    To create a new Web Page, go to: > Website > Web Page > New -Web Page +Web Page #### Title diff --git a/foundation/www/docs/user/manual/es/accounts/accounting-entries.md b/foundation/www/docs/user/manual/es/accounts/accounting-entries.md index 6dd41e73..d2379948 100644 --- a/foundation/www/docs/user/manual/es/accounts/accounting-entries.md +++ b/foundation/www/docs/user/manual/es/accounts/accounting-entries.md @@ -1,4 +1,6 @@ +# Accounting Entries + @@ -9,7 +11,7 @@ para el negocio. * Mama (El propietario de Tea-stall) invierte $25000 para iniciar el negocio. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-1.png) +![A&L](/docs/assets/old_images/erpnext/assets-1.png) __Análisis:__ Mama invierte 25000 en la compañía, con la esperanza de obtener alguna ganancia. En otras palabras, la compañía es responsable del pago de $25000 a mama en @@ -22,7 +24,7 @@ la compañía y debe ser debitado. que pertenece a un amigo y le concede cierto crédito. Los equipos cuestan 2800 y las materias primas valen 2200. La compañía paga 2000 de un total de 5000. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-2.png) +![A&L](/docs/assets/old_images/erpnext/assets-2.png) __Análisis:__ Los equipos son "Activos Fijos" (porque tienen una larga vida útil) de la compañía y las materias primas son "Activos corrientes" (porque son usados en la @@ -38,7 +40,7 @@ un crédito de 3000. día, Tea Stall vende 325 tazas de té, lo cual da una venta neta de RS. 1575. El propietario registra feliz su primer día de ventas. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-3.png) +![A&L](/docs/assets/old_images/erpnext/assets-3.png) __Análisis:__ Los ingresos han sido anotados en la cuenta "Ventas de Té", la cual se debita para incrementar el valor y la misma cantidad se acredita de la cuenta @@ -49,7 +51,7 @@ debe ser registado en la cuenta "Costos de bienes vendidos" en la misma cantidad Al finalizar el mes, la compañía paga el arriendo del local (5000) y el salario de un empleado (8000), el cual trabajó desde el primer día. -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-4.png) +![A&L](/docs/assets/old_images/erpnext/assets-4.png) ### Registro de ganancias @@ -61,7 +63,7 @@ que pagárselas a Mama). Cuando el Libro de Balance no está balanceado, p.e. el débito no es igual al crédito, la ganacia aún no ha sido anotada. Se debe realziar la siguiente entrada: -![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-5.png) +![A&L](/docs/assets/old_images/erpnext/assets-5.png) Explicación: Las ventas y gastos netos son 40000 y 20000 respectivamente. Entonces, la compañía tuvo una ganancia de 20000. Para registrar esa entrada, diff --git a/foundation/www/docs/user/manual/es/accounts/accounting-reports.md b/foundation/www/docs/user/manual/es/accounts/accounting-reports.md index 7c859357..c58d6782 100644 --- a/foundation/www/docs/user/manual/es/accounts/accounting-reports.md +++ b/foundation/www/docs/user/manual/es/accounts/accounting-reports.md @@ -1,4 +1,6 @@ +# Accounting Reports + @@ -13,7 +15,7 @@ actualizado de todas las entradas que existan para una cuetna dada en un periodo determinado. Libro Mayor + src="/docs/assets/img/accounts/general-ledger.png"> ### Balance Contable @@ -25,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. @@ -34,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 @@ -42,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 143f36b6..5f4d00ec 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 @@ -1,36 +1,35 @@ - +# Advance Payment Entry + Los pagos realizados por el cliente antes de recibir el envío del producto se denominan Anticipos. Para ordenes de alto costo, los negocios esperan recibir dcho tipos de pago. - + __Por Ejemplo:__ Consider a customer- Jane D'souza placing an order for a double bed costing $10000 She is asked to give some advance before the furniture house begins work on her order. She gives them $5000 in cash. - + Go to Accounts and open a new Journal Entry to make the advance entry. -> Accounts > Documents > Journal Entry > New Journal Entry +> Accounts > Documents > Journal Entry > New Journal Entry Mention the voucher type as cash voucher. This differs for different customers. If somebody pays by cheque the voucher type will be Bank Voucher. Then select the customer account and make the respective debit and credit -entries. +entries. Since the customer has given $5000 as cash advance,it will be recorded as a credit entry against the customer. To balance it with the debit entry [Double accounting Entry] enter $5000 as debit against the company's cash account. In the row "Is Advance" click 'Yes'. -#### Figure 1 : Journal Entry -Advance Entry +#### Figure 1 : Journal Entry -Advance Entry -Advace Payment +Advace Payment -### Double Entry Accounting +### Double Entry Accounting Double entry bookkeeping is a system of accounting in which every transaction has a corresponding positive and negative entry : debits and credits. Every @@ -42,10 +41,10 @@ account. This means that every transaction must be recorded in two accounts; one account will be debited because it receives value and the other account will be credited because it has given value. - + #### Figure 2: Transaction and Difference Entry -Advace Payment +Advace Payment Save and submit the JV. If this document is not saved it will not be pulled in other accounting documents. @@ -57,9 +56,9 @@ To link the Sales Invoice to the Journal Entry which mentions the advance payment entry, click on ‘Get Advances Received’. Allocate the amount of advance in the advances table. The accounting will be adjusted accordingly. -#### Figure 3: Receive Advance +#### Figure 3: Receive Advance -Advace Payment +Advace Payment Save and submit the Sales Invoice. diff --git a/foundation/www/docs/user/manual/es/accounts/index.md b/foundation/www/docs/user/manual/es/accounts/index.md index 5084afcb..5bccdc77 100644 --- a/foundation/www/docs/user/manual/es/accounts/index.md +++ b/foundation/www/docs/user/manual/es/accounts/index.md @@ -1,4 +1,6 @@ +# Accounts + diff --git a/foundation/www/docs/user/manual/es/index.md b/foundation/www/docs/user/manual/es/index.md index 700890f7..d4fb9a91 100644 --- a/foundation/www/docs/user/manual/es/index.md +++ b/foundation/www/docs/user/manual/es/index.md @@ -1,7 +1,4 @@ - # Manual de Usuario (Español) ### Contenido: @@ -10,4 +7,4 @@ WORK IN PROGRESS **Trabajo en progreso.** -[La traducción al Español del manual de ERPNext está en progreso. Click aquí para ver el manual en ingles]({{ docs_base_url }}/user/manual/en) +[La traducción al Español del manual de ERPNext está en progreso. Click aquí para ver el manual en ingles](/docs/user/manual/en) diff --git a/foundation/www/docs/user/manual/es/introduction/do-i-need-an-erp.md b/foundation/www/docs/user/manual/es/introduction/do-i-need-an-erp.md index a6df9c96..5f34602b 100644 --- a/foundation/www/docs/user/manual/es/introduction/do-i-need-an-erp.md +++ b/foundation/www/docs/user/manual/es/introduction/do-i-need-an-erp.md @@ -1,4 +1,6 @@ +# Do I Need An Erp + ERPNext es una herramienta moderna que no solo abarca el módulo de contabilidad, sino que también, cubre todas las otras funciones de su negocio en una plataforma integrada. Tiene muchos beneficios sobre los sistemas tradicionales de contabilidad y otros ERP en el mercado. diff --git a/foundation/www/docs/user/manual/es/introduction/getting-started-with-erpnext.md b/foundation/www/docs/user/manual/es/introduction/getting-started-with-erpnext.md index 5db7b45c..b98c0062 100644 --- a/foundation/www/docs/user/manual/es/introduction/getting-started-with-erpnext.md +++ b/foundation/www/docs/user/manual/es/introduction/getting-started-with-erpnext.md @@ -1,4 +1,6 @@ +# Getting Started With Erpnext + Hay muchas manera de comenzar a utilizar ERPNext. ### 1\. Ver el Demo @@ -11,7 +13,7 @@ see the demo at: ### 2\. Comienza con una cuenta gratis en ERPNext.com -ERPNext.com es manejado por la organización (Frappe) que publicó ERPNext. +ERPNext.com es manejado por la organización (Frappé) que publicó ERPNext. Puedes iniciar con su propia cuenta en [registrandote en la página](https://erpnext.com). También, puedes hostear tu aplicación en erpnext.com comprando un plan de alojamiento. @@ -27,6 +29,6 @@ Puedes usarla en **cualquier** plataforma incluyendo Microsoft Windows. ### 4\. Instalar ERPNext en su ordenador Unix/Linux/Mac -En caso de estar relacionado con la instalación de aplicaciones en plataformas *nix, leer las instrucciones de como instalarlo usando [Frappe Bench](https://github.com/frappe/bench). +En caso de estar relacionado con la instalación de aplicaciones en plataformas *nix, leer las instrucciones de como instalarlo usando [Frappé Bench](https://github.com/frappe/bench). {next} diff --git a/foundation/www/docs/user/manual/es/introduction/implementation-strategy.md b/foundation/www/docs/user/manual/es/introduction/implementation-strategy.md index b8ca4cb4..4200e333 100644 --- a/foundation/www/docs/user/manual/es/introduction/implementation-strategy.md +++ b/foundation/www/docs/user/manual/es/introduction/implementation-strategy.md @@ -1,4 +1,6 @@ +# Implementation Strategy + Antes de que empieces a manejar todas tus operaciones en ERPNext, primero deberías estar familiarizado con el sistema y los términos que utiliza. Por esa razón recomendamos que la implementación pase en dos fases. diff --git a/foundation/www/docs/user/manual/es/introduction/index.md b/foundation/www/docs/user/manual/es/introduction/index.md index 46268c5d..86d75b72 100644 --- a/foundation/www/docs/user/manual/es/introduction/index.md +++ b/foundation/www/docs/user/manual/es/introduction/index.md @@ -1,4 +1,6 @@ +# Introduction + ## ¿Qué es un ERP y Por qué debería interesarme? (Si ya sabes que necesitas un sistema todo-en-uno para su compañia, puedes pasar a la siguiente página) diff --git a/foundation/www/docs/user/manual/es/introduction/key-workflows.md b/foundation/www/docs/user/manual/es/introduction/key-workflows.md index 3d1df21c..cff815ea 100644 --- a/foundation/www/docs/user/manual/es/introduction/key-workflows.md +++ b/foundation/www/docs/user/manual/es/introduction/key-workflows.md @@ -4,10 +4,10 @@ Este diagrama cubre como ERPNext hace el seguimiento de la información de su compañia a través de funciones claves. Este diagrama no cubre toda la funcionalidad o características de ERPNext. -![]({{docs_base_url}}/assets/old_images/erpnext/overview.png) +![](/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/open-source.md b/foundation/www/docs/user/manual/es/introduction/open-source.md index a1b59730..ecdaaa6c 100644 --- a/foundation/www/docs/user/manual/es/introduction/open-source.md +++ b/foundation/www/docs/user/manual/es/introduction/open-source.md @@ -1,4 +1,6 @@ +# Open Source + El código fuente de ERPNext es de código abierto. Está abierto para que todos podamos entenderlo, extenderlo o mejorarlo. Y es gratis! diff --git a/foundation/www/docs/user/manual/es/introduction/the-champion.md b/foundation/www/docs/user/manual/es/introduction/the-champion.md index fa2f1e45..2c75e807 100644 --- a/foundation/www/docs/user/manual/es/introduction/the-champion.md +++ b/foundation/www/docs/user/manual/es/introduction/the-champion.md @@ -1,9 +1,11 @@ +# The Champion +

    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/index.md b/foundation/www/docs/user/manual/index.md index a7a36176..52cc926c 100644 --- a/foundation/www/docs/user/manual/index.md +++ b/foundation/www/docs/user/manual/index.md @@ -1,11 +1,8 @@ - # ERPNext User Manual Select your language -1. [English]({{docs_base_url}}/user/manual/en) -1. [Deutsch]({{docs_base_url}}/user/manual/de) -1. [Español]({{docs_base_url}}/user/manual/es) \ No newline at end of file +1. [English](/docs/user/manual/en) +1. [Deutsch](/docs/user/manual/de) +1. [Español](/docs/user/manual/es) \ No newline at end of file diff --git a/foundation/www/docs/user/videos/index.md b/foundation/www/docs/user/videos/index.md index 97aa9ad2..ee1bf7b3 100644 --- a/foundation/www/docs/user/videos/index.md +++ b/foundation/www/docs/user/videos/index.md @@ -2,13 +2,13 @@ # ERPNext Videos

    - Learn ERPNext + Learn ERPNext

    - - + +
    @@ -25,7 +25,7 @@
    - +
    diff --git a/foundation/www/docs/user/videos/learn/index.md b/foundation/www/docs/user/videos/learn/index.md index 1d04035b..2ba9b608 100644 --- a/foundation/www/docs/user/videos/learn/index.md +++ b/foundation/www/docs/user/videos/learn/index.md @@ -12,23 +12,23 @@

    ERPNext Demonstrations

      -
    • +
    • ERPNext for Services Business 52:50
      • -
    • +
    • ERPNext for Distributors 51:47
      • -
    • +
    • ERPNext for Manufacturers 14:26
      • -
    • +
    • ERPNext for Retailers 39:21
      • -
    • +
    • ERPNext for Schools 39:21
      • @@ -36,7 +36,7 @@

      Using ERPNext

        -
      • +
      • User Interface and Navigation 2:17
        • @@ -44,47 +44,47 @@

        Setting Up

          -
        • +
        • The Setup Wizard 2:28
          • -
        • +
        • User and Permissions 6:16
          • -
        • +
        • Data Import Tool 6:31
          • -
        • +
        • Printing and Branding 4:00
          • -
        • +
        • Customer and Supplier 4:35
          • -
        • +
        • Item and Pricing 3:55
          • -
        • +
        • Opening Stock 4:27
          • -
        • +
        • Chart of Accounts 3:10
          • -
        • +
        • Opening Account Balances 4:40
          • -
        • +
        • Email Account 2:27
          • -
        • +
        • File Manager 2:24
          • @@ -92,31 +92,31 @@

          CRM and Sales

            -
          • +
          • Customer Relationship Management 3:29
            • -
          • +
          • Customer 4:35
            • -
          • +
          • Sales Order to Payment 4:28
            • -
          • +
          • Product Bundle 2:31
            • -
          • +
          • Newsletter 2:04
            • -
          • +
          • Taxes 3:00
            • -
          • +
          • Drop Ship 2:26
            • @@ -124,23 +124,23 @@

            Buying

              -
            • +
            • Supplier 4:35
              • -
            • +
            • Material Request to Purchase Order 2:25
              • -
            • +
            • Request for Quotation 3:17
              • -
            • +
            • Purchase Order to Payment 3:16
              • -
            • +
            • Taxes 5:13
              • @@ -148,39 +148,39 @@

              Stock

                -
              • +
              • Item and Pricing 3:17
                • -
              • +
              • Item Variant 2:38
                • -
              • +
              • Stock Opening Balance 4:27
                • -
              • +
              • Stock Entries 3:46
                • -
              • +
              • Serialized Inventory 4:12
                • -
              • +
              • Batched Inventory 3:46
                • -
              • +
              • Managing Subcontracting 4:37
                • -
              • +
              • Quality Inspection 2:36
                • -
              • +
              • Fixed Assets Management 6:35
                • @@ -188,23 +188,23 @@

                Accounts

                  -
                • +
                • Chart of Accounts 3:10
                  • -
                • +
                • Accounts Opening Balances 4:40
                  • -
                • +
                • Taxes 5:13
                  • -
                • +
                • Advance Payments 2:52
                  • -
                • +
                • Budgeting 3:26
                  • @@ -212,25 +212,25 @@

                  Manufacturing

                    -
                  • +
                  • Bill of Materials 3:27
                    • -
                  • +
                  • Production Planning Tool 1:41
                    • -
                  • +
                  • Production Order 2:24
                  • - + ERPNext for Manufacturers (Make to Order) 14:26
                  • - + ERPNext for Manufacturers (Engineer to Order) 44:40
                    • @@ -238,19 +238,19 @@

                    Human Resource

                      -
                    • +
                    • Employees 1:59
                      • -
                    • +
                    • Processing Payroll 4:00
                      • -
                    • +
                    • Leave Management 2:50
                      • -
                    • +
                    • Expense Claims 2:52
                      • @@ -258,11 +258,11 @@

                      Retail

                        -
                      • +
                      • Point of Sale 2:34
                        • -
                      • +
                      • ERPNext for Retailers (Demo) 39:21
                        • @@ -270,7 +270,7 @@

                        Project

                          -
                        • +
                        • Project and Task 3:52
                          • @@ -278,10 +278,10 @@

                          Website

                            -
                          • +
                          • Publish Items on Website 5:14 -
                          • +
                          • Shopping Cart 6:32
                            • @@ -289,19 +289,19 @@

                            Customization

                              -
                            • +
                            • Field Customization 3:10
                              • -
                            • +
                            • Bulk Update Data 1:38
                              • -
                            • +
                            • Workflow 3:38
                              • -
                            • +
                            • Report Builder 4:27
                              • diff --git a/foundation/www/faq.md b/foundation/www/faq.md index 65009b9b..7e89a4a3 100644 --- a/foundation/www/faq.md +++ b/foundation/www/faq.md @@ -34,7 +34,7 @@ To implement ERPNext, you must have a general understanding of financial account If you also want to offer customization services on ERPNext, you should have some expertise on: -1. [Frappe Framework](https://frappe.io) +1. [Frappé Framework](https://frappe.io) 1. Python 1. Java Script @@ -87,7 +87,7 @@ Listing on our community portal is free. You can list yourself as a Service Prov #### 9. I want to sell services but pass on development support to you. Does that work? -No, we (Frappe Technologies) do not do any paid development. All our energy is used in supporting and enhancing the ERPNext product. If you want to develop a feature or customization, you can engage a freelancer or drop in a request on the [discussion forum](https://discuss.erpnext.com). If you are planning do this on any scale, it is best to [get one of your developers trained on ERPNext](https://www.youtube.com/watch?v=eCAMPcl7NKc&list=PL3lFfCEoMxvzHtsZHFJ4T3n5yMM3nGJ1W). +No, we (Frappé Technologies) do not do any paid development. All our energy is used in supporting and enhancing the ERPNext product. If you want to develop a feature or customization, you can engage a freelancer or drop in a request on the [discussion forum](https://discuss.erpnext.com). If you are planning do this on any scale, it is best to [get one of your developers trained on ERPNext](https://www.youtube.com/watch?v=eCAMPcl7NKc&list=PL3lFfCEoMxvzHtsZHFJ4T3n5yMM3nGJ1W). [It is very easy to build new apps / extensions to ERPNext.](http://frappe.io/docs/user/tutorial/) @@ -101,7 +101,7 @@ Yes, we are in the process of generalising our tools that we use to power erpnex #### 11. I want to sell ERPNext in my brand name, will you do that? -ERPNext is our brand and identity. All work we do will be under the brand name of ERPNext and Frappe. If you want to disguise this as your work, you are free to do it, but don't expect any help from us. If you are using our help documentation, you must attribute us publicly because the documentation is licensed as [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/3.0/us/) +ERPNext is our brand and identity. All work we do will be under the brand name of ERPNext and Frappé. If you want to disguise this as your work, you are free to do it, but don't expect any help from us. If you are using our help documentation, you must attribute us publicly because the documentation is licensed as [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/3.0/us/) [Check why you should not rebrand ERPNext.](https://frappe.io/blog/general/why-you-should-not-rebrand-erpnext) diff --git a/foundation/www/legal.md b/foundation/www/legal.md index 3330ee7f..98257dad 100644 --- a/foundation/www/legal.md +++ b/foundation/www/legal.md @@ -24,9 +24,9 @@ II. The registered office of the Company will be situated in the State of Mahara III. (A) THE OBJECTS FOR WHICH THE COMPANY IS ESTABLISHED ARE: -1. Educating, inspiring, improving, and furthering the development of the open-source enterprise resource planning (ERP) software “ERPNext” as well as the underlying software framework “Frappe Framework” and promoting its value to both users and developers. -1. Soliciting and managing contributions to the Frappe Framework and ERPNext code base. -1. Publicising, promoting the adoption of, and facilitating the ongoing development of related technology to Frappe Framework and ERPNext as well as educational resources. This includes, but is not limited to, maintaining a public web site, planning conferences and offering grants to Frappe Framework or ERPNext-related open source projects. +1. Educating, inspiring, improving, and furthering the development of the open-source enterprise resource planning (ERP) software “ERPNext” as well as the underlying software framework “Frappé Framework” and promoting its value to both users and developers. +1. Soliciting and managing contributions to the Frappé Framework and ERPNext code base. +1. Publicising, promoting the adoption of, and facilitating the ongoing development of related technology to Frappé Framework and ERPNext as well as educational resources. This includes, but is not limited to, maintaining a public web site, planning conferences and offering grants to Frappé Framework or ERPNext-related open source projects. 1. Building an ecosystem and enhancing communication within the ecosystem. 1. Creating products and marketplaces with which the community can interact and share information and services. 1. Continuously improving the project by sponsoring features, documentation, and fixing bugs.