diff --git a/foundation/www/docs/_sidebar.json b/foundation/www/docs/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/_sidebar.json +++ b/foundation/www/docs/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/_sidebar.json b/foundation/www/docs/assets/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/_sidebar.json +++ b/foundation/www/docs/assets/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/css/_sidebar.json b/foundation/www/docs/assets/css/_sidebar.json new file mode 100644 index 00000000..906a7228 --- /dev/null +++ b/foundation/www/docs/assets/css/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/css/docs-erp.css b/foundation/www/docs/assets/css/docs-erp.css new file mode 100644 index 00000000..5ac75160 --- /dev/null +++ b/foundation/www/docs/assets/css/docs-erp.css @@ -0,0 +1,14 @@ +.embed-container { + position: relative; + padding-bottom: 56.25%; + height: 0; + overflow: hidden; + max-width: 100%; } + +.embed-container iframe, .embed-container object, .embed-container embed { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/foundation/www/docs/assets/img/_sidebar.json b/foundation/www/docs/assets/img/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/_sidebar.json +++ b/foundation/www/docs/assets/img/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/accounts/_sidebar.json b/foundation/www/docs/assets/img/accounts/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/accounts/_sidebar.json +++ b/foundation/www/docs/assets/img/accounts/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/accounts/bulk-payment.gif b/foundation/www/docs/assets/img/accounts/bulk-payment.gif new file mode 100644 index 00000000..e91a2d0f Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/bulk-payment.gif differ diff --git a/foundation/www/docs/assets/img/accounts/company-round-off-account.png b/foundation/www/docs/assets/img/accounts/company-round-off-account.png new file mode 100644 index 00000000..a02a2224 Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/company-round-off-account.png differ diff --git a/foundation/www/docs/assets/img/accounts/exchange-rate-frozen.png b/foundation/www/docs/assets/img/accounts/exchange-rate-frozen.png new file mode 100644 index 00000000..912f9665 Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/exchange-rate-frozen.png differ diff --git a/foundation/www/docs/assets/img/accounts/invoice.jpg b/foundation/www/docs/assets/img/accounts/invoice.jpg new file mode 100644 index 00000000..07688304 Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/invoice.jpg differ diff --git a/foundation/www/docs/assets/img/accounts/multi-currency/_sidebar.json b/foundation/www/docs/assets/img/accounts/multi-currency/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/accounts/multi-currency/_sidebar.json +++ b/foundation/www/docs/assets/img/accounts/multi-currency/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/accounts/retail-hero.jpg b/foundation/www/docs/assets/img/accounts/retail-hero.jpg new file mode 100644 index 00000000..3eeb9c88 Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/retail-hero.jpg differ diff --git a/foundation/www/docs/assets/img/accounts/round-off-account.png b/foundation/www/docs/assets/img/accounts/round-off-account.png new file mode 100644 index 00000000..2810026f Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/round-off-account.png differ diff --git a/foundation/www/docs/assets/img/accounts/shareholder/_sidebar.json b/foundation/www/docs/assets/img/accounts/shareholder/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/accounts/shareholder/_sidebar.json +++ b/foundation/www/docs/assets/img/accounts/shareholder/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/agriculture/__init__.py b/foundation/www/docs/assets/img/agriculture/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/agriculture/_sidebar.json b/foundation/www/docs/assets/img/agriculture/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/agriculture/_sidebar.json +++ b/foundation/www/docs/assets/img/agriculture/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/agriculture/crops_and_land/__init__.py b/foundation/www/docs/assets/img/agriculture/crops_and_land/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/agriculture/crops_and_land/_sidebar.json b/foundation/www/docs/assets/img/agriculture/crops_and_land/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/agriculture/crops_and_land/_sidebar.json +++ b/foundation/www/docs/assets/img/agriculture/crops_and_land/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/__init__.py b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/_sidebar.json b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/_sidebar.json +++ b/foundation/www/docs/assets/img/agriculture/diseases_and_fertilizer/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/agriculture/land-unit.png b/foundation/www/docs/assets/img/agriculture/land-unit.png new file mode 100644 index 00000000..215e71f9 Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/land-unit.png differ diff --git a/foundation/www/docs/assets/img/agriculture/soil-texture.png b/foundation/www/docs/assets/img/agriculture/soil-texture.png new file mode 100644 index 00000000..9b2233c5 Binary files /dev/null and b/foundation/www/docs/assets/img/agriculture/soil-texture.png differ diff --git a/foundation/www/docs/assets/img/articles/_sidebar.json b/foundation/www/docs/assets/img/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/articles/_sidebar.json +++ b/foundation/www/docs/assets/img/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/articles/subscriber.png b/foundation/www/docs/assets/img/articles/subscriber.png new file mode 100644 index 00000000..e4ce64d4 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/subscriber.png differ diff --git a/foundation/www/docs/assets/img/articles/subscription-1.png b/foundation/www/docs/assets/img/articles/subscription-1.png new file mode 100644 index 00000000..cbff30f9 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/subscription-1.png differ diff --git a/foundation/www/docs/assets/img/articles/subscription-plan.png b/foundation/www/docs/assets/img/articles/subscription-plan.png new file mode 100644 index 00000000..b60f796c Binary files /dev/null and b/foundation/www/docs/assets/img/articles/subscription-plan.png differ diff --git a/foundation/www/docs/assets/img/articles/subscription-settings.png b/foundation/www/docs/assets/img/articles/subscription-settings.png new file mode 100644 index 00000000..405f0bf1 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/subscription-settings.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/__init__.py b/foundation/www/docs/assets/img/articles/twofactor/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/articles/twofactor/_sidebar.json b/foundation/www/docs/assets/img/articles/twofactor/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/articles/twofactor/_sidebar.json +++ b/foundation/www/docs/assets/img/articles/twofactor/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/asset/__init__.py b/foundation/www/docs/assets/img/asset/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/asset/_sidebar.json b/foundation/www/docs/assets/img/asset/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/asset/_sidebar.json +++ b/foundation/www/docs/assets/img/asset/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/asset/book-asset-depreciation-accounting-automatically.png b/foundation/www/docs/assets/img/asset/book-asset-depreciation-accounting-automatically.png new file mode 100644 index 00000000..db0187db Binary files /dev/null and b/foundation/www/docs/assets/img/asset/book-asset-depreciation-accounting-automatically.png differ diff --git a/foundation/www/docs/assets/img/buying/_sidebar.json b/foundation/www/docs/assets/img/buying/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/buying/_sidebar.json +++ b/foundation/www/docs/assets/img/buying/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/buying/supplier-new-address-contact.png b/foundation/www/docs/assets/img/buying/supplier-new-address-contact.png new file mode 100644 index 00000000..2a674e30 Binary files /dev/null and b/foundation/www/docs/assets/img/buying/supplier-new-address-contact.png differ diff --git a/foundation/www/docs/assets/img/buying/supplier-payable-account.png b/foundation/www/docs/assets/img/buying/supplier-payable-account.png new file mode 100644 index 00000000..ce35ef81 Binary files /dev/null and b/foundation/www/docs/assets/img/buying/supplier-payable-account.png differ diff --git a/foundation/www/docs/assets/img/collaboration-tools/_sidebar.json b/foundation/www/docs/assets/img/collaboration-tools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/collaboration-tools/_sidebar.json +++ b/foundation/www/docs/assets/img/collaboration-tools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/crm/_sidebar.json b/foundation/www/docs/assets/img/crm/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/crm/_sidebar.json +++ b/foundation/www/docs/assets/img/crm/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/crm/report/_sidebar.json b/foundation/www/docs/assets/img/crm/report/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/crm/report/_sidebar.json +++ b/foundation/www/docs/assets/img/crm/report/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/customize/_sidebar.json b/foundation/www/docs/assets/img/customize/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/customize/_sidebar.json +++ b/foundation/www/docs/assets/img/customize/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/customize/print-format.png b/foundation/www/docs/assets/img/customize/print-format.png index a1e0edef..17ec965e 100644 Binary files a/foundation/www/docs/assets/img/customize/print-format.png and b/foundation/www/docs/assets/img/customize/print-format.png differ diff --git a/foundation/www/docs/assets/img/customize/print-settings.png b/foundation/www/docs/assets/img/customize/print-settings.png index 635afc3c..ef859a9f 100644 Binary files a/foundation/www/docs/assets/img/customize/print-settings.png and b/foundation/www/docs/assets/img/customize/print-settings.png differ diff --git a/foundation/www/docs/assets/img/education/_sidebar.json b/foundation/www/docs/assets/img/education/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/education/_sidebar.json +++ b/foundation/www/docs/assets/img/education/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/education/admission/_sidebar.json b/foundation/www/docs/assets/img/education/admission/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/education/admission/_sidebar.json +++ b/foundation/www/docs/assets/img/education/admission/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/education/assessment.png b/foundation/www/docs/assets/img/education/assessment.png new file mode 100644 index 00000000..b5581a8b Binary files /dev/null and b/foundation/www/docs/assets/img/education/assessment.png differ diff --git a/foundation/www/docs/assets/img/education/assessment/_sidebar.json b/foundation/www/docs/assets/img/education/assessment/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/education/assessment/_sidebar.json +++ b/foundation/www/docs/assets/img/education/assessment/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/education/fees/_sidebar.json b/foundation/www/docs/assets/img/education/fees/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/education/fees/_sidebar.json +++ b/foundation/www/docs/assets/img/education/fees/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/education/schedule/_sidebar.json b/foundation/www/docs/assets/img/education/schedule/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/education/schedule/_sidebar.json +++ b/foundation/www/docs/assets/img/education/schedule/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/education/school-hero.png b/foundation/www/docs/assets/img/education/school-hero.png new file mode 100644 index 00000000..4f53a1f8 Binary files /dev/null and b/foundation/www/docs/assets/img/education/school-hero.png differ diff --git a/foundation/www/docs/assets/img/education/setup/_sidebar.json b/foundation/www/docs/assets/img/education/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/education/setup/_sidebar.json +++ b/foundation/www/docs/assets/img/education/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/education/student/_sidebar.json b/foundation/www/docs/assets/img/education/student/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/education/student/_sidebar.json +++ b/foundation/www/docs/assets/img/education/student/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/erpnext_integrations/_sidebar.json b/foundation/www/docs/assets/img/erpnext_integrations/_sidebar.json new file mode 100644 index 00000000..906a7228 --- /dev/null +++ b/foundation/www/docs/assets/img/erpnext_integrations/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/erpnext_integrations/woocommerce_demo.gif b/foundation/www/docs/assets/img/erpnext_integrations/woocommerce_demo.gif new file mode 100644 index 00000000..6bd8050c Binary files /dev/null and b/foundation/www/docs/assets/img/erpnext_integrations/woocommerce_demo.gif differ diff --git a/foundation/www/docs/assets/img/erpnext_integrations/woocommerce_setting_config.gif b/foundation/www/docs/assets/img/erpnext_integrations/woocommerce_setting_config.gif new file mode 100644 index 00000000..949b5ea8 Binary files /dev/null and b/foundation/www/docs/assets/img/erpnext_integrations/woocommerce_setting_config.gif differ diff --git a/foundation/www/docs/assets/img/healthcare/_sidebar.json b/foundation/www/docs/assets/img/healthcare/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/healthcare/_sidebar.json +++ b/foundation/www/docs/assets/img/healthcare/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/healthcare/appointment-analytics.png b/foundation/www/docs/assets/img/healthcare/appointment-analytics.png new file mode 100644 index 00000000..b431db16 Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/appointment-analytics.png differ diff --git a/foundation/www/docs/assets/img/healthcare/patient-appointment.png b/foundation/www/docs/assets/img/healthcare/patient-appointment.png new file mode 100644 index 00000000..9c0970cc Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/patient-appointment.png differ diff --git a/foundation/www/docs/assets/img/hotels/__init__.py b/foundation/www/docs/assets/img/hotels/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/hotels/_sidebar.json b/foundation/www/docs/assets/img/hotels/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/hotels/_sidebar.json +++ b/foundation/www/docs/assets/img/hotels/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/human-resources/_sidebar.json b/foundation/www/docs/assets/img/human-resources/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/human-resources/_sidebar.json +++ b/foundation/www/docs/assets/img/human-resources/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/human-resources/employee-loan-application.png b/foundation/www/docs/assets/img/human-resources/employee-loan-application.png deleted file mode 100644 index 317de4f0..00000000 Binary files a/foundation/www/docs/assets/img/human-resources/employee-loan-application.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/human-resources/employee-loan.png b/foundation/www/docs/assets/img/human-resources/employee-loan.png deleted file mode 100644 index 19f3181e..00000000 Binary files a/foundation/www/docs/assets/img/human-resources/employee-loan.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/human-resources/health-insurance.png b/foundation/www/docs/assets/img/human-resources/health-insurance.png new file mode 100644 index 00000000..0a2174b4 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/health-insurance.png differ diff --git a/foundation/www/docs/assets/img/human-resources/insurance-no.gif b/foundation/www/docs/assets/img/human-resources/insurance-no.gif new file mode 100644 index 00000000..37cfcdee Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/insurance-no.gif differ diff --git a/foundation/www/docs/assets/img/human-resources/loan-application.png b/foundation/www/docs/assets/img/human-resources/loan-application.png new file mode 100644 index 00000000..3c6cfd28 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/loan-application.png differ diff --git a/foundation/www/docs/assets/img/human-resources/loan-repayment.gif b/foundation/www/docs/assets/img/human-resources/loan-repayment.gif new file mode 100644 index 00000000..41449842 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/loan-repayment.gif differ diff --git a/foundation/www/docs/assets/img/human-resources/loan.png b/foundation/www/docs/assets/img/human-resources/loan.png new file mode 100644 index 00000000..f2f71d48 Binary files /dev/null and b/foundation/www/docs/assets/img/human-resources/loan.png differ diff --git a/foundation/www/docs/assets/img/human-resources/repayment-schedule.png b/foundation/www/docs/assets/img/human-resources/repayment-schedule.png index f2ddf02f..31085c1a 100644 Binary files a/foundation/www/docs/assets/img/human-resources/repayment-schedule.png and b/foundation/www/docs/assets/img/human-resources/repayment-schedule.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/BOM-hero.png b/foundation/www/docs/assets/img/manufacturing/BOM-hero.png new file mode 100644 index 00000000..6f64dd8e Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/BOM-hero.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/_sidebar.json b/foundation/www/docs/assets/img/manufacturing/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/manufacturing/_sidebar.json +++ b/foundation/www/docs/assets/img/manufacturing/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/manufacturing/allow-alternative-item-bom.png b/foundation/www/docs/assets/img/manufacturing/allow-alternative-item-bom.png new file mode 100644 index 00000000..41208817 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/allow-alternative-item-bom.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/allow-alternative-item-wo.png b/foundation/www/docs/assets/img/manufacturing/allow-alternative-item-wo.png new file mode 100644 index 00000000..baa732fb Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/allow-alternative-item-wo.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/allow-alternative-item.png b/foundation/www/docs/assets/img/manufacturing/allow-alternative-item.png new file mode 100644 index 00000000..17719803 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/allow-alternative-item.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/allow-material-consumption.png b/foundation/www/docs/assets/img/manufacturing/allow-material-consumption.png new file mode 100644 index 00000000..3a3f78e6 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/allow-material-consumption.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/cancel-material-consumption-stock-entry.gif b/foundation/www/docs/assets/img/manufacturing/cancel-material-consumption-stock-entry.gif new file mode 100644 index 00000000..dab2b43a Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/cancel-material-consumption-stock-entry.gif differ diff --git a/foundation/www/docs/assets/img/manufacturing/consumed-qty.png b/foundation/www/docs/assets/img/manufacturing/consumed-qty.png new file mode 100644 index 00000000..6a4baa11 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/consumed-qty.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/item-alternative.png b/foundation/www/docs/assets/img/manufacturing/item-alternative.png new file mode 100644 index 00000000..ff7c66c3 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/item-alternative.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/manufacturing-hero.png b/foundation/www/docs/assets/img/manufacturing/manufacturing-hero.png new file mode 100644 index 00000000..a74a63d3 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/manufacturing-hero.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/material-consumption-button.png b/foundation/www/docs/assets/img/manufacturing/material-consumption-button.png new file mode 100644 index 00000000..2f7ef554 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/material-consumption-button.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/material-consumption-for-manufacture.png b/foundation/www/docs/assets/img/manufacturing/material-consumption-for-manufacture.png new file mode 100644 index 00000000..46f69bd1 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/material-consumption-for-manufacture.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/material-consumption-stock-entry.gif b/foundation/www/docs/assets/img/manufacturing/material-consumption-stock-entry.gif new file mode 100644 index 00000000..f036767b Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/material-consumption-stock-entry.gif differ diff --git a/foundation/www/docs/assets/img/manufacturing/production-order.png b/foundation/www/docs/assets/img/manufacturing/production-order.png deleted file mode 100644 index fc71943d..00000000 Binary files a/foundation/www/docs/assets/img/manufacturing/production-order.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/manufacturing/purchase-order.png b/foundation/www/docs/assets/img/manufacturing/purchase-order.png new file mode 100644 index 00000000..c1f1a274 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/purchase-order.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/purchase_order_item_alternative.gif b/foundation/www/docs/assets/img/manufacturing/purchase_order_item_alternative.gif new file mode 100644 index 00000000..4907e3ec Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/purchase_order_item_alternative.gif differ diff --git a/foundation/www/docs/assets/img/manufacturing/work-order.png b/foundation/www/docs/assets/img/manufacturing/work-order.png new file mode 100644 index 00000000..f88d8591 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/work-order.png differ diff --git a/foundation/www/docs/assets/img/manufacturing/work_order_item_alternative.gif b/foundation/www/docs/assets/img/manufacturing/work_order_item_alternative.gif new file mode 100644 index 00000000..076f0b19 Binary files /dev/null and b/foundation/www/docs/assets/img/manufacturing/work_order_item_alternative.gif differ diff --git a/foundation/www/docs/assets/img/multilingual_print_format/_sidebar.json b/foundation/www/docs/assets/img/multilingual_print_format/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/multilingual_print_format/_sidebar.json +++ b/foundation/www/docs/assets/img/multilingual_print_format/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/_sidebar.json b/foundation/www/docs/assets/img/non_profit/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/non_profit/_sidebar.json +++ b/foundation/www/docs/assets/img/non_profit/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/chapter.png b/foundation/www/docs/assets/img/non_profit/chapter.png new file mode 100644 index 00000000..d7dfc6bf Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/chapter.png differ diff --git a/foundation/www/docs/assets/img/non_profit/chapter/__init__.py b/foundation/www/docs/assets/img/non_profit/chapter/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/chapter/_sidebar.json b/foundation/www/docs/assets/img/non_profit/chapter/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/non_profit/chapter/_sidebar.json +++ b/foundation/www/docs/assets/img/non_profit/chapter/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/donor/__init__.py b/foundation/www/docs/assets/img/non_profit/donor/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/donor/_sidebar.json b/foundation/www/docs/assets/img/non_profit/donor/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/non_profit/donor/_sidebar.json +++ b/foundation/www/docs/assets/img/non_profit/donor/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/grant_application/__init__.py b/foundation/www/docs/assets/img/non_profit/grant_application/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/grant_application/_sidebar.json b/foundation/www/docs/assets/img/non_profit/grant_application/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/non_profit/grant_application/_sidebar.json +++ b/foundation/www/docs/assets/img/non_profit/grant_application/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/membership/__init__.py b/foundation/www/docs/assets/img/non_profit/membership/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/membership/_sidebar.json b/foundation/www/docs/assets/img/non_profit/membership/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/non_profit/membership/_sidebar.json +++ b/foundation/www/docs/assets/img/non_profit/membership/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/non_profit/non-profit-hero-linus.png b/foundation/www/docs/assets/img/non_profit/non-profit-hero-linus.png new file mode 100644 index 00000000..176389f6 Binary files /dev/null and b/foundation/www/docs/assets/img/non_profit/non-profit-hero-linus.png differ diff --git a/foundation/www/docs/assets/img/non_profit/volunteer/__init__.py b/foundation/www/docs/assets/img/non_profit/volunteer/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/non_profit/volunteer/_sidebar.json b/foundation/www/docs/assets/img/non_profit/volunteer/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/non_profit/volunteer/_sidebar.json +++ b/foundation/www/docs/assets/img/non_profit/volunteer/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/pos-setting/_sidebar.json b/foundation/www/docs/assets/img/pos-setting/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/pos-setting/_sidebar.json +++ b/foundation/www/docs/assets/img/pos-setting/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/price-list/_sidebar.json b/foundation/www/docs/assets/img/price-list/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/price-list/_sidebar.json +++ b/foundation/www/docs/assets/img/price-list/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/project/_sidebar.json b/foundation/www/docs/assets/img/project/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/project/_sidebar.json +++ b/foundation/www/docs/assets/img/project/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/project/projects.png b/foundation/www/docs/assets/img/project/projects.png new file mode 100644 index 00000000..8768b294 Binary files /dev/null and b/foundation/www/docs/assets/img/project/projects.png differ diff --git a/foundation/www/docs/assets/img/project/services-hero.png b/foundation/www/docs/assets/img/project/services-hero.png new file mode 100644 index 00000000..70e0c4e3 Binary files /dev/null and b/foundation/www/docs/assets/img/project/services-hero.png differ diff --git a/foundation/www/docs/assets/img/project/support.png b/foundation/www/docs/assets/img/project/support.png new file mode 100644 index 00000000..4026e7ce Binary files /dev/null and b/foundation/www/docs/assets/img/project/support.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/_sidebar.json b/foundation/www/docs/assets/img/project/timesheet/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/project/timesheet/_sidebar.json +++ b/foundation/www/docs/assets/img/project/timesheet/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-after-complete.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-after-complete.png new file mode 100644 index 00000000..6138176e Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-after-complete.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-1.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-1.png deleted file mode 100644 index db871b8b..00000000 Binary files a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-1.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-2.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-2.png deleted file mode 100644 index bcae5e3a..00000000 Binary files a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-2.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-3.gif b/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-3.gif deleted file mode 100644 index 07092c44..00000000 Binary files a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-3.gif and /dev/null differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-4.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-4.png deleted file mode 100644 index 5d214efc..00000000 Binary files a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-4.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-5.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-5.png deleted file mode 100644 index ac97a317..00000000 Binary files a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-5.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-6.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-6.png deleted file mode 100644 index 05b09585..00000000 Binary files a/foundation/www/docs/assets/img/project/timesheet/timesheet-production-order-6.png and /dev/null differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-timer-alert.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-timer-alert.png new file mode 100644 index 00000000..46da2eee Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-timer-alert.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-timer-in-progress.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-timer-in-progress.png new file mode 100644 index 00000000..a060344f Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-timer-in-progress.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-timer.gif b/foundation/www/docs/assets/img/project/timesheet/timesheet-timer.gif new file mode 100644 index 00000000..a838614d Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-timer.gif differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-1.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-1.png new file mode 100644 index 00000000..81e2ccea Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-1.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-2.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-2.png new file mode 100644 index 00000000..8f442f1d Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-2.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-3.gif b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-3.gif new file mode 100644 index 00000000..bb988c7c Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-3.gif differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-4.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-4.png new file mode 100644 index 00000000..0b4fc5c7 Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-4.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-5.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-5.png new file mode 100644 index 00000000..7f077313 Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-5.png differ diff --git a/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-6.png b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-6.png new file mode 100644 index 00000000..c2814a0d Binary files /dev/null and b/foundation/www/docs/assets/img/project/timesheet/timesheet-work-order-6.png differ diff --git a/foundation/www/docs/assets/img/regional/_sidebar.json b/foundation/www/docs/assets/img/regional/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/regional/_sidebar.json +++ b/foundation/www/docs/assets/img/regional/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/regional/india/_sidebar.json b/foundation/www/docs/assets/img/regional/india/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/regional/india/_sidebar.json +++ b/foundation/www/docs/assets/img/regional/india/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/regional/uae/_sidebar.json b/foundation/www/docs/assets/img/regional/uae/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/regional/uae/_sidebar.json +++ b/foundation/www/docs/assets/img/regional/uae/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/restaurant/__init__.py b/foundation/www/docs/assets/img/restaurant/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/restaurant/_sidebar.json b/foundation/www/docs/assets/img/restaurant/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/restaurant/_sidebar.json +++ b/foundation/www/docs/assets/img/restaurant/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/sales_goal/_sidebar.json b/foundation/www/docs/assets/img/sales_goal/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/sales_goal/_sidebar.json +++ b/foundation/www/docs/assets/img/sales_goal/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/__init__.py b/foundation/www/docs/assets/img/schools/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/_sidebar.json b/foundation/www/docs/assets/img/schools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/schools/_sidebar.json +++ b/foundation/www/docs/assets/img/schools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/admission/__init__.py b/foundation/www/docs/assets/img/schools/admission/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/admission/_sidebar.json b/foundation/www/docs/assets/img/schools/admission/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/schools/admission/_sidebar.json +++ b/foundation/www/docs/assets/img/schools/admission/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/assessment/__init__.py b/foundation/www/docs/assets/img/schools/assessment/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/assessment/_sidebar.json b/foundation/www/docs/assets/img/schools/assessment/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/schools/assessment/_sidebar.json +++ b/foundation/www/docs/assets/img/schools/assessment/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/fees/__init__.py b/foundation/www/docs/assets/img/schools/fees/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/fees/_sidebar.json b/foundation/www/docs/assets/img/schools/fees/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/schools/fees/_sidebar.json +++ b/foundation/www/docs/assets/img/schools/fees/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/schedule/__init__.py b/foundation/www/docs/assets/img/schools/schedule/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/schedule/_sidebar.json b/foundation/www/docs/assets/img/schools/schedule/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/schools/schedule/_sidebar.json +++ b/foundation/www/docs/assets/img/schools/schedule/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/setup/__init__.py b/foundation/www/docs/assets/img/schools/setup/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/setup/_sidebar.json b/foundation/www/docs/assets/img/schools/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/schools/setup/_sidebar.json +++ b/foundation/www/docs/assets/img/schools/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/schools/student/__init__.py b/foundation/www/docs/assets/img/schools/student/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/schools/student/_sidebar.json b/foundation/www/docs/assets/img/schools/student/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/schools/student/_sidebar.json +++ b/foundation/www/docs/assets/img/schools/student/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/selling/_sidebar.json b/foundation/www/docs/assets/img/selling/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/selling/_sidebar.json +++ b/foundation/www/docs/assets/img/selling/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup-wizard/_sidebar.json b/foundation/www/docs/assets/img/setup-wizard/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup-wizard/_sidebar.json +++ b/foundation/www/docs/assets/img/setup-wizard/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/_sidebar.json b/foundation/www/docs/assets/img/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/customize/_sidebar.json b/foundation/www/docs/assets/img/setup/customize/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/customize/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/customize/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/data-export/_sidebar.json b/foundation/www/docs/assets/img/setup/data-export/_sidebar.json new file mode 100644 index 00000000..906a7228 --- /dev/null +++ b/foundation/www/docs/assets/img/setup/data-export/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/data-export/data-export-tool.gif b/foundation/www/docs/assets/img/setup/data-export/data-export-tool.gif new file mode 100644 index 00000000..892363e8 Binary files /dev/null and b/foundation/www/docs/assets/img/setup/data-export/data-export-tool.gif differ diff --git a/foundation/www/docs/assets/img/setup/data-import/_sidebar.json b/foundation/www/docs/assets/img/setup/data-import/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/data-import/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/data-import/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/data/_sidebar.json b/foundation/www/docs/assets/img/setup/data/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/data/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/data/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/email/_sidebar.json b/foundation/www/docs/assets/img/setup/email/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/email/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/email/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/feedback/_sidebar.json b/foundation/www/docs/assets/img/setup/feedback/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/feedback/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/feedback/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/integrations/_sidebar.json b/foundation/www/docs/assets/img/setup/integrations/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/integrations/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/integrations/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/integrations/gocardless_account.png b/foundation/www/docs/assets/img/setup/integrations/gocardless_account.png new file mode 100644 index 00000000..db6bcc94 Binary files /dev/null and b/foundation/www/docs/assets/img/setup/integrations/gocardless_account.png differ diff --git a/foundation/www/docs/assets/img/setup/integrations/gocardless_coa.png b/foundation/www/docs/assets/img/setup/integrations/gocardless_coa.png new file mode 100644 index 00000000..17b5f599 Binary files /dev/null and b/foundation/www/docs/assets/img/setup/integrations/gocardless_coa.png differ diff --git a/foundation/www/docs/assets/img/setup/integrations/payment_gateway_account_gocardless.png b/foundation/www/docs/assets/img/setup/integrations/payment_gateway_account_gocardless.png new file mode 100644 index 00000000..2c08e9f0 Binary files /dev/null and b/foundation/www/docs/assets/img/setup/integrations/payment_gateway_account_gocardless.png differ diff --git a/foundation/www/docs/assets/img/setup/print/_sidebar.json b/foundation/www/docs/assets/img/setup/print/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/print/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/print/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/settings/_sidebar.json b/foundation/www/docs/assets/img/setup/settings/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/settings/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/settings/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/users/_sidebar.json b/foundation/www/docs/assets/img/setup/users/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/setup/users/_sidebar.json +++ b/foundation/www/docs/assets/img/setup/users/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/setup/users/add-user-details.png b/foundation/www/docs/assets/img/setup/users/add-user-details.png new file mode 100644 index 00000000..e9cbede1 Binary files /dev/null and b/foundation/www/docs/assets/img/setup/users/add-user-details.png differ diff --git a/foundation/www/docs/assets/img/stock/_sidebar.json b/foundation/www/docs/assets/img/stock/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/stock/_sidebar.json +++ b/foundation/www/docs/assets/img/stock/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/stock/purchase-order-hero.png b/foundation/www/docs/assets/img/stock/purchase-order-hero.png new file mode 100644 index 00000000..c1f1a274 Binary files /dev/null and b/foundation/www/docs/assets/img/stock/purchase-order-hero.png differ diff --git a/foundation/www/docs/assets/img/stock/stock-hero.jpg b/foundation/www/docs/assets/img/stock/stock-hero.jpg new file mode 100644 index 00000000..fa222cda Binary files /dev/null and b/foundation/www/docs/assets/img/stock/stock-hero.jpg differ diff --git a/foundation/www/docs/assets/img/support/_sidebar.json b/foundation/www/docs/assets/img/support/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/support/_sidebar.json +++ b/foundation/www/docs/assets/img/support/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/taxes/_sidebar.json b/foundation/www/docs/assets/img/taxes/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/taxes/_sidebar.json +++ b/foundation/www/docs/assets/img/taxes/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/users-and-permissions/_sidebar.json b/foundation/www/docs/assets/img/users-and-permissions/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/users-and-permissions/_sidebar.json +++ b/foundation/www/docs/assets/img/users-and-permissions/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/__init__.py b/foundation/www/docs/assets/img/users-and-permissions/user-perms/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/_sidebar.json b/foundation/www/docs/assets/img/users-and-permissions/user-perms/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/users-and-permissions/user-perms/_sidebar.json +++ b/foundation/www/docs/assets/img/users-and-permissions/user-perms/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png b/foundation/www/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png index d2762dd7..d9e1a6a2 100644 Binary files a/foundation/www/docs/assets/img/users-and-permissions/user-perms/new-user-permission.png 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/videos/_sidebar.json b/foundation/www/docs/assets/img/videos/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/videos/_sidebar.json +++ b/foundation/www/docs/assets/img/videos/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/assets/img/website/_sidebar.json b/foundation/www/docs/assets/img/website/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/assets/img/website/_sidebar.json +++ b/foundation/www/docs/assets/img/website/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/__init__.py b/foundation/www/docs/current/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/_sidebar.json b/foundation/www/docs/current/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/_sidebar.json +++ b/foundation/www/docs/current/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/api/__init__.py b/foundation/www/docs/current/api/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/_sidebar.json b/foundation/www/docs/current/api/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/api/_sidebar.json +++ b/foundation/www/docs/current/api/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/__init__.py b/foundation/www/docs/current/api/accounts/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/accounts/_sidebar.json b/foundation/www/docs/current/api/accounts/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/api/accounts/_sidebar.json +++ b/foundation/www/docs/current/api/accounts/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/email_alert/_sidebar.json b/foundation/www/docs/current/api/accounts/email_alert/_sidebar.json new file mode 100644 index 00000000..906a7228 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/email_alert/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/email_alert/erpnext.accounts.email_alert.html b/foundation/www/docs/current/api/accounts/email_alert/erpnext.accounts.email_alert.html new file mode 100644 index 00000000..9fb5998f --- /dev/null +++ b/foundation/www/docs/current/api/accounts/email_alert/erpnext.accounts.email_alert.html @@ -0,0 +1,20 @@ + +

erpnext.accounts.email_alert

+
+ + + Version 10.1.31 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/email_alert/index.html b/foundation/www/docs/current/api/accounts/email_alert/index.html new file mode 100644 index 00000000..867fab91 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/email_alert/index.html @@ -0,0 +1,22 @@ + + + + + +

email_alert

+
+ + + Version 10.1.31 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/email_alert/index.txt b/foundation/www/docs/current/api/accounts/email_alert/index.txt new file mode 100644 index 00000000..14d3d103 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/email_alert/index.txt @@ -0,0 +1 @@ +erpnext.accounts.email_alert \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/_sidebar.json b/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/_sidebar.json new file mode 100644 index 00000000..906a7228 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/erpnext.accounts.email_alert.notification_for_new_fiscal_year.html b/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/erpnext.accounts.email_alert.notification_for_new_fiscal_year.html new file mode 100644 index 00000000..aaeff1b4 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/erpnext.accounts.email_alert.notification_for_new_fiscal_year.html @@ -0,0 +1,20 @@ + +

erpnext.accounts.email_alert.notification_for_new_fiscal_year

+
+ + + Version 10.1.31 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/erpnext.accounts.email_alert.notification_for_new_fiscal_year.notification_for_new_fiscal_year.html b/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/erpnext.accounts.email_alert.notification_for_new_fiscal_year.notification_for_new_fiscal_year.html new file mode 100644 index 00000000..c8075102 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/erpnext.accounts.email_alert.notification_for_new_fiscal_year.notification_for_new_fiscal_year.html @@ -0,0 +1,36 @@ + +

erpnext.accounts.email_alert.notification_for_new_fiscal_year.notification_for_new_fiscal_year

+
+ + + Version 10.1.31 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.accounts.email_alert.notification_for_new_fiscal_year.notification_for_new_fiscal_year.get_context + (context) +

+

No docs

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

notification_for_new_fiscal_year

+
+ + + Version 10.1.31 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/index.txt b/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/index.txt new file mode 100644 index 00000000..b5a7fbc0 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/email_alert/notification_for_new_fiscal_year/index.txt @@ -0,0 +1,2 @@ +erpnext.accounts.email_alert.notification_for_new_fiscal_year +erpnext.accounts.email_alert.notification_for_new_fiscal_year.notification_for_new_fiscal_year \ No newline at end of file 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 591912ad..586bdfc1 100644 --- a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html +++ b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 +

erpnext.accounts.print_format.gst_purchase_invoice

+
+ + + Version 10.1.31 + + + Source + +
+ + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/print_format/gst_purchase_invoice/index.html b/foundation/www/docs/current/api/accounts/print_format/gst_purchase_invoice/index.html new file mode 100644 index 00000000..516b6585 --- /dev/null +++ b/foundation/www/docs/current/api/accounts/print_format/gst_purchase_invoice/index.html @@ -0,0 +1,22 @@ + + + + + +

gst_purchase_invoice

+
+ + + Version 10.1.31 + + + Source + +
+ +

Package Contents

+ +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/print_format/gst_purchase_invoice/index.txt b/foundation/www/docs/current/api/accounts/print_format/gst_purchase_invoice/index.txt new file mode 100644 index 00000000..c26902fd --- /dev/null +++ b/foundation/www/docs/current/api/accounts/print_format/gst_purchase_invoice/index.txt @@ -0,0 +1 @@ +erpnext.accounts.print_format.gst_purchase_invoice \ No newline at end of file diff --git a/foundation/www/docs/current/api/accounts/print_format/index.html b/foundation/www/docs/current/api/accounts/print_format/index.html index 91912d95..1048e2f2 100644 --- a/foundation/www/docs/current/api/accounts/print_format/index.html +++ b/foundation/www/docs/current/api/accounts/print_format/index.html @@ -7,7 +7,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - - - -

- - - test_get_party_shipping_address - (self) -

-

No docs

-
-
- - - - - -

- - - test_get_party_shipping_address2 - (self) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/accounts/test/index.html b/foundation/www/docs/current/api/accounts/test/index.html index 51090b8f..49825d7b 100644 --- a/foundation/www/docs/current/api/accounts/test/index.html +++ b/foundation/www/docs/current/api/accounts/test/index.html @@ -7,7 +7,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 +

erpnext.config.erpnext_integrations

+
+ + + Version 10.1.31 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.config.erpnext_integrations.get_data + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/config/erpnext.config.healthcare.html b/foundation/www/docs/current/api/config/erpnext.config.healthcare.html index ce3c4daa..cd07f4eb 100644 --- a/foundation/www/docs/current/api/config/erpnext.config.healthcare.html +++ b/foundation/www/docs/current/api/config/erpnext.config.healthcare.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
- - - -

- - - __init__ - (self) -

-

No docs

-
-
- - - - - -

- - - append_taxes_from_master - (self, tax_master_doctype=None) -

-

No docs

-
-
- - - - - -

- - - apply_shipping_rule - (self) -

-

No docs

-
-
- - - - - -

- - - before_print - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_taxes_and_totals - (self) -

-

No docs

-
-
- - - - - -

- - - clear_unallocated_advances - (self, childtype, parentfield) -

-

No docs

-
-
- - - - - -

- - - delink_advance_entries - (self, linked_doc_name) -

-

No docs

-
-
- - - - - -

- - - get_advance_entries - (self, include_unallocated=True) -

-

No docs

-
-
- - - - - -

- - - get_company_default - (self, fieldname) -

-

No docs

-
-
- - - - - -

- - - get_gl_dict - (self, args, account_currency=None) -

-

this method populates the common properties of a gl entry record

-
-
- - - - - -

- - - get_party - (self) -

-

No docs

-
-
- - - - - -

- - - get_shipping_address - (self) -

-

Returns Address object from shipping address fields if present

-
-
- - - - - -

- - - get_stock_items - (self) -

-

No docs

-
-
- - - - - -

- - - group_similar_items - (self) -

-

No docs

-
-
- - - - - -

- - - is_inclusive_tax - (self) -

-

No docs

-
-
- - - - - -

- - - is_rounded_total_disabled - (self) -

-

No docs

-
-
- - - - - -

- - - onload - (self) -

-

No docs

-
-
- - - - - -

- - - set_advances - (self) -

-

Returns list of advances against Account, Party, Reference

-
-
- - - - - -

- - - set_due_date - (self) -

-

No docs

-
-
- - - - - -

- - - set_missing_item_details - (self, for_validate=False) -

-

set missing item values

-
-
- - - - - -

- - - set_missing_values - (self, for_validate=False) -

-

No docs

-
-
- - - - - -

- - - set_other_charges - (self) -

-

No docs

-
-
- - - - - -

- - - set_payment_schedule - (self) -

-

No docs

-
-
- - - - - -

- - - set_price_list_currency - (self, buying_or_selling) -

-

No docs

-
-
- - - - - -

- - - set_taxes - (self) -

-

No docs

-
-
- - - - - -

- - - set_total_advance_paid - (self) -

-

No docs

-
-
- - - - - -

- - - update_against_document_in_jv - (self) -

- 
        Links invoice and advance voucher:
-            1. cancel advance voucher
-            2. split into multiple rows if partially adjusted, assign against voucher
-            3. submit advance voucher
-
-
-
- - - - - -

- - - validate - (self) -

-

No docs

-
-
- - - - - -

- - - validate_account_currency - (self, account, account_currency=None) -

-

No docs

-
-
- - - - - -

- - - validate_advance_entries - (self) -

-

No docs

-
-
- - - - - -

- - - validate_all_documents_schedule - (self) -

-

No docs

-
-
- - - - - -

- - - validate_currency - (self) -

-

No docs

-
-
- - - - - -

- - - validate_date_with_fiscal_year - (self) -

-

No docs

-
-
- - - - - -

- - - validate_due_date - (self) -

-

No docs

-
-
- - - - - -

- - - validate_enabled_taxes_and_charges - (self) -

-

No docs

-
-
- - - - - -

- - - validate_fixed_asset - (self) -

-

No docs

-
-
- - - - - -

- - - validate_invoice_documents_schedule - (self) -

-

No docs

-
-
- - - - - -

- - - validate_multiple_billing - (self, ref_dt, item_ref_dn, based_on, parentfield) -

-

No docs

-
-
- - - - - -

- - - validate_non_invoice_documents_schedule - (self) -

-

No docs

-
-
- - - - - -

- - - validate_paid_amount - (self) -

-

No docs

-
-
- - - - - -

- - - validate_party - (self) -

-

No docs

-
-
- - - - - -

- - - validate_payment_schedule_amount - (self) -

-

No docs

-
-
- - - - - -

- - - validate_payment_schedule_dates - (self) -

-

No docs

-
-
- - - - - -

- - - validate_tax_account_company - (self) -

-

No docs

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

- - - __setup__ - (self) -

-

No docs

-
-
- - - - - -

- - - cleanup_raw_materials_supplied - (self, parent_items, raw_material_table) -

-

Remove all those child items which are no longer present in main item table

-
-
- - - - - -

- - - create_raw_materials_supplied - (self, raw_material_table) -

-

No docs

-
-
- - - - - -

- - - get_feed - (self) -

-

No docs

-
-
- - - - - -

- - - get_items_from_bom - (self, item_code, bom) -

-

No docs

-
-
- - - - - -

- - - make_sl_entries_for_supplier_warehouse - (self, sl_entries) -

-

No docs

-
-
- - - - - -

- - - on_cancel - (self) -

-

No docs

-
-
- - - - - -

- - - on_submit - (self) -

-

No docs

-
-
- - - - - -

- - - set_landed_cost_voucher_amount - (self) -

-

No docs

-
-
- - - - - -

- - - set_missing_values - (self, for_validate=False) -

-

No docs

-
-
- - - - - -

- - - set_qty_as_per_stock_uom - (self) -

-

No docs

-
-
- - - - - -

- - - set_supplier_from_item_default - (self) -

-

No docs

-
-
- - - - - -

- - - set_total_in_words - (self) -

-

No docs

-
-
- - - - - -

- - - update_ordered_and_reserved_qty - (self) -

-

No docs

-
-
- - - - - -

- - - update_raw_materials_supplied - (self, item, raw_material_table) -

-

No docs

-
-
- - - - - -

- - - update_stock_ledger - (self, allow_negative_stock=False, via_landed_cost_voucher=False) -

-

No docs

-
-
- - - - - -

- - - update_valuation_rate - (self, parentfield) -

- 
        item_tax_amount is the total tax amount applied on that item
-        stored for valuation
-
-        TODO: rename item_tax_amount to valuation_tax_amount
-
-
-
- - - - - -

- - - validate - (self) -

-

No docs

-
-
- - - - - -

- - - validate_accepted_rejected_qty - (self) -

-

No docs

-
-
- - - - - -

- - - validate_for_subcontracting - (self) -

-

No docs

-
-
- - - - - -

- - - validate_negative_quantity - (self, item_row, field_list) -

-

No docs

-
-
- - - - - -

- - - validate_purchase_return - (self) -

-

No docs

-
-
- - - - - -

- - - validate_rejected_warehouse - (self) -

-

No docs

-
-
- - - - - -

- - - validate_schedule_date - (self) -

-

No docs

-
-
- - - - - -

- - - validate_stock_or_nonstock_items - (self) -

-

No docs

-
-
- -
+ + + + +

+ + + erpnext.controllers.buying_controller.get_items_from_bom + (item_code, bom, exploded_item=1) +

+

No docs

+
+
+ + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.html index 0944cad0..4586c7b3 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
- - - -

- - - __setup__ - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_commission - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_contribution - (self) -

-

No docs

-
-
- - - - - -

- - - check_close_sales_order - (self, ref_fieldname) -

-

No docs

-
-
- - - - - -

- - - get_already_delivered_qty - (self, current_docname, so, so_detail) -

-

No docs

-
-
- - - - - -

- - - get_feed - (self) -

-

No docs

-
-
- - - - - -

- - - get_item_list - (self) -

-

No docs

-
-
- - - - - -

- - - get_so_qty_and_warehouse - (self, so_detail) -

-

No docs

-
-
- - - - - -

- - - has_product_bundle - (self, item_code) -

-

No docs

-
-
- - - - - -

- - - onload - (self) -

-

No docs

-
-
- - - - - -

- - - remove_shipping_charge - (self) -

-

No docs

-
-
- - - - - -

- - - set_missing_lead_customer_details - (self) -

-

No docs

-
-
- - - - - -

- - - set_missing_values - (self, for_validate=False) -

-

No docs

-
-
- - - - - -

- - - set_price_list_and_item_details - (self, for_validate=False) -

-

No docs

-
-
- - - - - -

- - - set_qty_as_per_stock_uom - (self) -

-

No docs

-
-
- - - - - -

- - - set_total_in_words - (self) -

-

No docs

-
-
- - - - - -

- - - update_reserved_qty - (self) -

-

No docs

-
-
- - - - - -

- - - update_stock_ledger - (self) -

-

No docs

-
-
- - - - - -

- - - validate - (self) -

-

No docs

-
-
- - - - - -

- - - validate_max_discount - (self) -

-

No docs

-
-
- - - - - -

- - - validate_order_type - (self) -

-

No docs

-
-
- - - - - -

- - - validate_selling_price - (self) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.status_updater.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.status_updater.html index bea96a83..cfaf1887 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.status_updater.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.status_updater.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31
- - - -

- - - _update_children - (self, args, update_modified) -

-

Update quantities or amount in child table

-
-
- - - - - -

- - - _update_modified - (self, args, update_modified) -

-

No docs

-
-
- - - - - -

- - - _update_percent_field - (self, args, update_modified=True) -

-

Update percent field in parent transaction

-
-
- - - - - -

- - - _update_percent_field_in_targets - (self, args, update_modified=True) -

-

Update percent field in parent transaction

-
-
- - - - - -

- - - check_overflow_with_tolerance - (self, item, args) -

- 
        Checks if there is overflow condering a relaxation tolerance
-
-
-
- - - - - -

- - - limits_crossed_error - (self, args, item) -

-

Raise exception for limits crossed

-
-
- - - - - -

- - - set_status - (self, update=False, status=None, update_modified=True) -

-

No docs

-
-
- - - - - -

- - - update_billing_status - (self, zero_amount_refdoc, ref_dt, ref_fieldname) -

-

No docs

-
-
- - - - - -

- - - update_billing_status_for_zero_amount_refdoc - (self, ref_dt) -

-

No docs

-
-
- - - - - -

- - - update_prevdoc_status - (self) -

-

No docs

-
-
- - - - - -

- - - update_qty - (self, update_modified=True) -

-

Updates qty or amount at row level

- -

Parameters:

- -
    -
  • update_modified - If true, updates modified and modified_by for target parent doc
    • -
-
-
- - - - - -

- - - validate_qty - (self) -

-

Validates qty at row level

-
-
- -
diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.stock_controller.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.stock_controller.html index acc32cbc..a1b30f86 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.stock_controller.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.stock_controller.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31
- - - -

- - - check_expense_account - (self, item) -

-

No docs

-
-
- - - - - -

- - - get_gl_entries - (self, warehouse_account=None, default_expense_account=None, default_cost_center=None) -

-

No docs

-
-
- - - - - -

- - - get_incoming_rate_for_sales_return - (self, item_code, against_document) -

-

No docs

-
-
- - - - - -

- - - get_items_and_warehouses - (self) -

-

No docs

-
-
- - - - - -

- - - get_serialized_items - (self) -

-

No docs

-
-
- - - - - -

- - - get_sl_entries - (self, d, args) -

-

No docs

-
-
- - - - - -

- - - get_stock_ledger_details - (self) -

-

No docs

-
-
- - - - - -

- - - get_voucher_details - (self, default_expense_account, default_cost_center, sle_map) -

-

No docs

-
-
- - - - - -

- - - make_adjustment_entry - (self, expected_gle, voucher_obj) -

-

No docs

-
-
- - - - - -

- - - make_batches - (self, warehouse_field) -

-

Create batches if required. Called before submit

-
-
- - - - - -

- - - make_gl_entries - (self, gl_entries=None, repost_future_gle=True, from_repost=False) -

-

No docs

-
-
- - - - - -

- - - make_gl_entries_on_cancel - (self, repost_future_gle=True) -

-

No docs

-
-
- - - - - -

- - - make_sl_entries - (self, sl_entries, is_amended=None, allow_negative_stock=False, via_landed_cost_voucher=False) -

-

No docs

-
-
- - - - - -

- - - update_billing_percentage - (self, update_modified=True) -

-

No docs

-
-
- - - - - -

- - - update_stock_ledger_entries - (self, sle) -

-

No docs

-
-
- - - - - -

- - - validate - (self) -

-

No docs

-
-
- - - - - -

- - - validate_inspection - (self) -

-

Checks if quality inspection is set for Items that require inspection. - On submit, throw an exception

-
-
- - - - - -

- - - validate_warehouse - (self) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html index 6d9c730e..a93326bb 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 Class calculate_taxes_and_totals -

Inherits from __builtin__.object +

Inherits from builtins.object

- - - -

- - - __init__ - (self, doc) -

-

No docs

-
-
- - - - - -

- - - _calculate - (self) -

-

No docs

-
-
- - - - - -

- - - _cleanup - (self) -

-

No docs

-
-
- - - - - -

- - - _get_tax_rate - (self, tax, item_tax_map) -

-

No docs

-
-
- - - - - -

- - - _load_item_tax_rate - (self, item_tax_rate) -

-

No docs

-
-
- - - - - -

- - - _set_in_company_currency - (self, doc, fields) -

-

set values in base currency

-
-
- - - - - -

- - - apply_discount_amount - (self) -

-

No docs

-
-
- - - - - -

- - - calculate - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_change_amount - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_item_values - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_margin - (self, item) -

-

No docs

-
-
- - - - - -

- - - calculate_net_total - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_outstanding_amount - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_paid_amount - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_taxes - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_total_advance - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_totals - (self) -

-

No docs

-
-
- - - - - -

- - - calculate_write_off_amount - (self) -

-

No docs

-
-
- - - - - -

- - - determine_exclusive_rate - (self) -

-

No docs

-
-
- - - - - -

- - - get_current_tax_amount - (self, item, tax, item_tax_map) -

-

No docs

-
-
- - - - - -

- - - get_current_tax_fraction - (self, tax, item_tax_map) -

- 
        Get tax fraction for calculating tax exclusive amount
-        from tax inclusive amount
-
-
-
- - - - - -

- - - get_tax_amount_if_for_valuation_or_deduction - (self, tax_amount, tax) -

-

No docs

-
-
- - - - - -

- - - get_total_for_discount_amount - (self) -

-

No docs

-
-
- - - - - -

- - - initialize_taxes - (self) -

-

No docs

-
-
- - - - - -

- - - manipulate_grand_total_for_inclusive_tax - (self) -

-

No docs

-
-
- - - - - -

- - - round_off_totals - (self, tax) -

-

No docs

-
-
- - - - - -

- - - set_cumulative_total - (self, row_idx, tax) -

-

No docs

-
-
- - - - - -

- - - set_discount_amount - (self) -

-

No docs

-
-
- - - - - -

- - - set_item_wise_tax - (self, item, tax, tax_rate, current_tax_amount) -

-

No docs

-
-
- - - - - -

- - - set_item_wise_tax_breakup - (self) -

-

No docs

-
-
- - - - - -

- - - set_rounded_total - (self) -

-

No docs

-
-
- - - - - -

- - - validate_conversion_rate - (self) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/controllers/erpnext.controllers.trends.html b/foundation/www/docs/current/api/controllers/erpnext.controllers.trends.html index 759ee1fb..511ac36f 100644 --- a/foundation/www/docs/current/api/controllers/erpnext.controllers.trends.html +++ b/foundation/www/docs/current/api/controllers/erpnext.controllers.trends.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
- - - -

- - - __init__ - (self, connector) -

-

No docs

-
-
- - - - - -

- - - delete - (self, doctype, migration_id) -

-

No docs

-
-
- - - - - -

- - - get - (self, remote_objectname, fields=None, filters=None, start=0, page_length=10) -

-

No docs

-
-
- - - - - -

- - - get_issues - (self, repo, start=0, page_length=10) -

-

No docs

-
-
- - - - - -

- - - get_milestones - (self, repo, start=0, page_length=10) -

-

No docs

-
-
- - - - - -

- - - insert - (self, doctype, doc) -

-

No docs

-
-
- - - - - -

- - - update - (self, doctype, doc, migration_id) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/erpnext_integrations/connectors/erpnext.erpnext_integrations.connectors.html b/foundation/www/docs/current/api/erpnext_integrations/connectors/erpnext.erpnext_integrations.connectors.html index a9cecf8d..78800efe 100644 --- a/foundation/www/docs/current/api/erpnext_integrations/connectors/erpnext.erpnext_integrations.connectors.html +++ b/foundation/www/docs/current/api/erpnext_integrations/connectors/erpnext.erpnext_integrations.connectors.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 +

erpnext.erpnext_integrations.connectors.woocommerce_connection

+
+ + + Version 10.1.31 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.erpnext_integrations.connectors.woocommerce_connection.add_tax_details + (sales_order, price, desc, status) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.erpnext_integrations.connectors.woocommerce_connection.link_customer_and_address + (raw_billing_data, customer_status) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.erpnext_integrations.connectors.woocommerce_connection.link_item + (item_data, item_status) +

+

No docs

+
+
+ + + + + + +

Public API +
/api/method/erpnext.erpnext_integrations.connectors.woocommerce_connection.order +

+

+ + + erpnext.erpnext_integrations.connectors.woocommerce_connection.order + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.erpnext_integrations.connectors.woocommerce_connection.verify_request + () +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/erpnext_integrations/connectors/index.html b/foundation/www/docs/current/api/erpnext_integrations/connectors/index.html index 566c2ed8..c67d7107 100644 --- a/foundation/www/docs/current/api/erpnext_integrations/connectors/index.html +++ b/foundation/www/docs/current/api/erpnext_integrations/connectors/index.html @@ -7,7 +7,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Public API +
/api/method/erpnext.hub_node.get_item_favourites +

+

+ + + erpnext.hub_node.get_item_favourites + (start=0, limit=20, fields=['*'], order_by=None) +

+

No docs

+
+
+ + + + + +

Public API
/api/method/erpnext.hub_node.get_list

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

No docs

@@ -254,6 +272,24 @@ +

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

+

+ + + erpnext.hub_node.send_review + (hub_item_code, review) +

+

No docs

+
+
+ + + + + +

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

@@ -261,7 +297,25 @@ erpnext.hub_node.update_category - (item_name, category) + (hub_item_code, category) +

+

No docs

+
+
+ + + + + + +

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

+

+ + + erpnext.hub_node.update_wishlist_item + (item_name, remove=0)

No docs

diff --git a/foundation/www/docs/current/api/hub_node/index.html b/foundation/www/docs/current/api/hub_node/index.html index 3a7ecb72..a89f4f95 100644 --- a/foundation/www/docs/current/api/hub_node/index.html +++ b/foundation/www/docs/current/api/hub_node/index.html @@ -7,7 +7,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + + erpnext.regional.check_deletion_permission + (doc, method) +

+

No docs

+
+
+ + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/france/__init__.py b/foundation/www/docs/current/api/regional/france/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/api/regional/france/_sidebar.json b/foundation/www/docs/current/api/regional/france/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/api/regional/france/_sidebar.json +++ b/foundation/www/docs/current/api/regional/france/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/api/regional/france/erpnext.regional.france.html b/foundation/www/docs/current/api/regional/france/erpnext.regional.france.html index be8fc616..9a76a773 100644 --- a/foundation/www/docs/current/api/regional/france/erpnext.regional.france.html +++ b/foundation/www/docs/current/api/regional/france/erpnext.regional.france.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - - - erpnext.regional.france.utils.check_deletion_permission - (doc, method) -

-

No docs

-
-
- - - - - - -

diff --git a/foundation/www/docs/current/api/regional/france/index.html b/foundation/www/docs/current/api/regional/france/index.html index 216cb17b..faace7ec 100644 --- a/foundation/www/docs/current/api/regional/france/index.html +++ b/foundation/www/docs/current/api/regional/france/index.html @@ -7,7 +7,7 @@

- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 +

erpnext.setup.default_success_action

+
+ + + Version 10.1.31 + + + Source + +
+ + + + + + + + + +

+ + + erpnext.setup.default_success_action.get_default_success_action + () +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.default_success_action.get_first_success_message + (doctype) +

+

No docs

+
+
+ + + + + + + +

+ + + erpnext.setup.default_success_action.get_message + (doctype) +

+

No docs

+
+
+ + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/setup/erpnext.setup.html b/foundation/www/docs/current/api/setup/erpnext.setup.html index 92404183..af439329 100644 --- a/foundation/www/docs/current/api/setup/erpnext.setup.html +++ b/foundation/www/docs/current/api/setup/erpnext.setup.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + + erpnext.setup.install.create_default_success_action + () +

+

No docs

+
+
+ + + + + + +

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

- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Class website_maker -

Inherits from __builtin__.object +

Inherits from builtins.object

- - - -

- - - __init__ - (self, args) -

-

No docs

-
-
- - - - - -

- - - make_blog - (self) -

-

No docs

-
-
- - - - - -

- - - make_web_page - (self) -

-

No docs

-
-
- - - - - -

- - - make_website_settings - (self) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.defaults_setup.html b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.defaults_setup.html index b5601a7c..174759ad 100644 --- a/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.defaults_setup.html +++ b/foundation/www/docs/current/api/setup/setup_wizard/operations/erpnext.setup.setup_wizard.operations.defaults_setup.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + + erpnext.shopping_cart.product_info.set_product_info_for_website + (item) +

+

set product price uom for website

+
+
+ + + \ No newline at end of file diff --git a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html index 71d3dd85..befe8822 100644 --- a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html +++ b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31
- - - -

- - - create_quotation - (self) -

-

No docs

-
-
- - - - - -

- - - create_user_if_not_exists - (self, email, first_name=None) -

-

No docs

-
-
- - - - - -

- - - disable_shopping_cart - (self) -

-

No docs

-
-
- - - - - -

- - - enable_shopping_cart - (self) -

-

No docs

-
-
- - - - - -

- - - login_as_customer - (self) -

-

No docs

-
-
- - - - - -

- - - login_as_new_user - (self) -

-

No docs

-
-
- - - - - -

- - - remove_all_items_from_cart - (self) -

-

No docs

-
-
- - - - - -

- - - remove_test_quotation - (self, quotation) -

-

No docs

-
-
- - - - - -

- - - setUp - (self) -

-

No docs

-
-
- - - - - -

- - - tearDown - (self) -

-

No docs

-
-
- - - - - -

- - - test_add_to_cart - (self) -

-

No docs

-
-
- - - - - -

- - - test_get_cart_customer - (self) -

-

No docs

-
-
- - - - - -

- - - test_get_cart_new_user - (self) -

-

No docs

-
-
- - - - - -

- - - test_remove_from_cart - (self) -

-

No docs

-
-
- - - - - -

- - - test_tax_rule - (self) -

-

No docs

-
-
- - - - - -

- - - test_update_cart - (self) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.utils.html b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.utils.html index 7024cb9c..0f2300a3 100644 --- a/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.utils.html +++ b/foundation/www/docs/current/api/shopping_cart/erpnext.shopping_cart.utils.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Public API +
/api/method/erpnext.stock.get_item_details.get_batch_qty_and_serial_no +

+

+ + + erpnext.stock.get_item_details.get_batch_qty_and_serial_no + (batch_no, stock_qty, warehouse, item_code, has_serial_no) +

+

No docs

+
+
+ + + + + +

Public API
/api/method/erpnext.stock.get_item_details.get_bin_details

@@ -184,7 +202,7 @@ erpnext.stock.get_item_details.get_bin_details_and_serial_nos - (item_code, warehouse, stock_qty=None, serial_no=None) + (item_code, warehouse, has_batch_no, stock_qty=None, serial_no=None)

No docs

@@ -388,7 +406,7 @@ erpnext.stock.get_item_details.get_pos_profile_item_details - (company, args, pos_profile=None) + (company, args, pos_profile=None, update_data=False)

No docs

@@ -515,6 +533,22 @@ + +

+ + + erpnext.stock.get_item_details.get_serial_no_batchwise + (args) +

+

No docs

+
+
+ + + + + +

Public API
/api/method/erpnext.stock.get_item_details.get_serial_no_details

diff --git a/foundation/www/docs/current/api/stock/erpnext.stock.html b/foundation/www/docs/current/api/stock/erpnext.stock.html index c0068918..4d446073 100644 --- a/foundation/www/docs/current/api/stock/erpnext.stock.html +++ b/foundation/www/docs/current/api/stock/erpnext.stock.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 erpnext.stock.get_warehouse_account - (warehouse, company) + (warehouse, warehouse_account=None)

No docs

diff --git a/foundation/www/docs/current/api/stock/erpnext.stock.reorder_item.html b/foundation/www/docs/current/api/stock/erpnext.stock.reorder_item.html index 7e2aee16..25d942a5 100644 --- a/foundation/www/docs/current/api/stock/erpnext.stock.reorder_item.html +++ b/foundation/www/docs/current/api/stock/erpnext.stock.reorder_item.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Class update_entries_after -

Inherits from __builtin__.object +

Inherits from builtins.object 

    update valution rate and qty after transaction
     from the current time-bucket onwards
@@ -179,176 +179,6 @@
- - - -

- - - __init__ - (self, args, allow_zero_rate=False, allow_negative_stock=None, via_landed_cost_voucher=False, verbose=1) -

-

No docs

-
-
- - - - - -

- - - build - (self) -

-

No docs

-
-
- - - - - -

- - - check_if_allow_zero_valuation_rate - (self, voucher_type, voucher_detail_no) -

-

No docs

-
-
- - - - - -

- - - get_fifo_values - (self, sle) -

-

No docs

-
-
- - - - - -

- - - get_moving_average_values - (self, sle) -

-

No docs

-
-
- - - - - -

- - - get_serialized_values - (self, sle) -

-

No docs

-
-
- - - - - -

- - - get_sle_after_datetime - (self) -

-

get Stock Ledger Entries after a particular datetime, for reposting

-
-
- - - - - -

- - - get_sle_before_datetime - (self) -

-

get previous stock ledger entry before current time-bucket

-
-
- - - - - -

- - - process_sle - (self, sle) -

-

No docs

-
-
- - - - - -

- - - raise_exceptions - (self) -

-

No docs

-
-
- - - - - -

- - - update_bin - (self) -

-

No docs

-
-
- - - - - -

- - - validate_negative_stock - (self, sle) -

- 
        validate negative stock for entries current datetime onwards
-        will not consider cancelled entries
-
-
-
- -
diff --git a/foundation/www/docs/current/api/stock/erpnext.stock.utils.html b/foundation/www/docs/current/api/stock/erpnext.stock.utils.html index 1b4b8aad..f6441182 100644 --- a/foundation/www/docs/current/api/stock/erpnext.stock.utils.html +++ b/foundation/www/docs/current/api/stock/erpnext.stock.utils.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
- - - -

- - - get_reply - (self) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/utilities/erpnext.utilities.html b/foundation/www/docs/current/api/utilities/erpnext.utilities.html index a7c398e2..90da139b 100644 --- a/foundation/www/docs/current/api/utilities/erpnext.utilities.html +++ b/foundation/www/docs/current/api/utilities/erpnext.utilities.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
- - - -

- - - _add_calendar_event - (self, opts) -

-

No docs

-
-
- - - - - -

- - - add_calendar_event - (self, opts, force=False) -

-

No docs

-
-
- - - - - -

- - - compare_values - (self, ref_doc, fields, doc=None) -

-

No docs

-
-
- - - - - -

- - - delete_events - (self) -

-

No docs

-
-
- - - - - -

- - - get_link_filters - (self, for_doctype) -

-

No docs

-
-
- - - - - -

- - - load_notification_message - (self) -

-

No docs

-
-
- - - - - -

- - - validate_posting_time - (self) -

-

No docs

-
-
- - - - - -

- - - validate_rate_with_reference_doc - (self, ref_details) -

-

No docs

-
-
- - - - - -

- - - validate_uom_is_integer - (self, uom_field, qty_fields) -

-

No docs

-
-
- - - - - -

- - - validate_with_previous_doc - (self, ref) -

-

No docs

-
-
- -
diff --git a/foundation/www/docs/current/api/utilities/erpnext.utilities.user_progress.html b/foundation/www/docs/current/api/utilities/erpnext.utilities.user_progress.html index 8566d435..503e44ab 100644 --- a/foundation/www/docs/current/api/utilities/erpnext.utilities.user_progress.html +++ b/foundation/www/docs/current/api/utilities/erpnext.utilities.user_progress.html @@ -3,7 +3,7 @@
- Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - 10.1.2 + 10.1.31 diff --git a/foundation/www/docs/current/models/__init__.py b/foundation/www/docs/current/models/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/_sidebar.json b/foundation/www/docs/current/models/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/_sidebar.json +++ b/foundation/www/docs/current/models/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/__init__.py b/foundation/www/docs/current/models/accounts/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/accounts/_sidebar.json b/foundation/www/docs/current/models/accounts/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/accounts/_sidebar.json +++ b/foundation/www/docs/current/models/accounts/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/account.html b/foundation/www/docs/current/models/accounts/account.html index f865665d..a4c9c9d7 100644 --- a/foundation/www/docs/current/models/accounts/account.html +++ b/foundation/www/docs/current/models/accounts/account.html @@ -9,7 +9,7 @@
- Version 10.1.2 + Version 10.1.31
- - - -

- - - after_rename - (self, old, new, merge=False) -

-

No docs

-
-
- - - - - -

- - - autoname - (self) -

-

No docs

-
-
- - - - - -

- - - before_rename - (self, old, new, merge=False) -

-

No docs

-
-
- - - - - -

- - - check_gle_exists - (self) -

-

No docs

-
-
- - - - - -

- - - check_if_child_exists - (self) -

-

No docs

-
-
- - - - - -

- - - convert_group_to_ledger - (self) -

-

No docs

-
-
- - - - - -

- - - convert_ledger_to_group - (self) -

-

No docs

-
-
- - - - - -

- - - on_trash - (self) -

-

No docs

-
-
- - - - - -

- - - onload - (self) -

-

No docs

-
-
- - - - - -

- - - set_root_and_report_type - (self) -

-

No docs

-
-
- - - - - -

- - - validate - (self) -

-

No docs

-
-
- - - - - -

- - - validate_account_currency - (self) -

-

No docs

-
-
- - - - - -

- - - validate_balance_must_be_debit_or_credit - (self) -

-

No docs

-
-
- - - - - -

- - - validate_frozen_accounts_modifier - (self) -

-

No docs

-
-
- - - - - -

- - - validate_group_or_ledger - (self) -

-

No docs

-
-
- - - - - -

- - - validate_mandatory - (self) -

-

No docs

-
-
- - - - - -

- - - validate_parent - (self) -

-

Fetch Parent Details and validate parent account

-
-
- - - - - -

- - - validate_root_details - (self) -

-

No docs

-
-
- -
@@ -701,6 +449,22 @@ Credit + +

+ + + erpnext.accounts.doctype.account.account.on_doctype_update + () +

+

No docs

+
+
+ + + + + +

Public API
/api/method/erpnext.accounts.doctype.account.account.update_account_number

@@ -820,15 +584,6 @@ Credit -
  • - - -Employee Loan - -
    • - - -
  • @@ -946,6 +701,15 @@ Credit +
  • + + +Loan + +
    • + + +
  • @@ -1161,6 +925,15 @@ Credit
    • + +
  • + + +Woocommerce Settings + +
    • + + diff --git a/foundation/www/docs/current/models/accounts/accounts_settings.html b/foundation/www/docs/current/models/accounts/accounts_settings.html index b10ffd20..5628c6ec 100644 --- a/foundation/www/docs/current/models/accounts/accounts_settings.html +++ b/foundation/www/docs/current/models/accounts/accounts_settings.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - enable_payment_schedule_in_print - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_stale_days - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/bank_guarantee.html b/foundation/www/docs/current/models/accounts/bank_guarantee.html index ae361372..8d9ef1bd 100644 --- a/foundation/www/docs/current/models/accounts/bank_guarantee.html +++ b/foundation/www/docs/current/models/accounts/bank_guarantee.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 1 - customer + bg_type + + Select + + Bank Guarantee Type + + + + 
    +Receiving
+Providing
    + + + + + 2 + reference_doctype + + Link + + Reference Document Type + + + + + + + +    DocType + + + + + + + + 3 + reference_docname + + Dynamic Link + + Reference Document Name + + + + 
    reference_doctype
    + + + + + 4 + customer Link @@ -62,7 +113,28 @@ - 2 + 5 + supplier + + Link + + Supplier + + + + + + + +Supplier + + + + + + + + 6 project Link @@ -83,8 +155,20 @@ - 3 - account + 7 + column_break_6 + + Column Break + + + + + + + + + 8 + account Link @@ -104,7 +188,7 @@ - 4 + 9 amount Currency @@ -116,19 +200,7 @@ - 5 - column_break_6 - - Column Break - - - - - - - - - 6 + 10 start_date Date @@ -140,8 +212,8 @@ - 7 - validity + 11 + validity Int @@ -152,8 +224,8 @@ - 8 - end_date + 12 + end_date Date @@ -163,9 +235,45 @@ + + 13 + section_break_14 + + Section Break + + + + + + + - 9 - bank_guarantee_number + 14 + more_information + + Text Editor + + Clauses and Conditions + + + + + + + 15 + margin_details + + Section Break + + Other Details + + + + + + + 16 + bank_guarantee_number Data @@ -175,32 +283,80 @@ - - 10 - section_break_10 + + 17 + name_of_beneficiary - Section Break + Data - More Information + Name of Beneficiary - 11 - more_information + 18 + name_of_bank - Text Editor + Data - Notes + Name of Bank - 12 + 19 + column_break_19 + + Column Break + + + + + + + + + 20 + margin_money + + Currency + + Margin Money + + + + + + + 21 + charges + + Currency + + Charges Incurred + + + + + + + 22 + fixed_deposit_number + + Data + + Fixed Deposit Number + + + + + + + 23 amended_from Link @@ -247,6 +403,24 @@ + + + +

    Public API +
    /api/method/erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_vouchar_detials +

    +

    + + + erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_vouchar_detials + (column_list, doctype, docname) +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/accounts/bank_reconciliation.html b/foundation/www/docs/current/models/accounts/bank_reconciliation.html index 486aa56e..b71ba2fe 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 10.1.2 + Version 10.1.31 6 + include_pos_transactions + + Check + + Include POS Transactions + + + + + + + 7 get_payment_entries Button @@ -130,7 +142,7 @@ - 7 + 8 payment_entries Table @@ -151,7 +163,7 @@ - 8 + 9 update_clearance_date Button @@ -163,7 +175,7 @@ - 9 + 10 total_amount Currency @@ -198,34 +210,6 @@
    - - - -

    - - - get_payment_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_clearance_date - (self) -

    -

    No docs

    -
    -
    - -
    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 a2144271..b519944f 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_null_value - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_accounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplicate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/budget_account.html b/foundation/www/docs/current/models/accounts/budget_account.html index 99b2bb18..1a2cce40 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - before_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_invoice_details - (self, invoice_no) -

    - 
    Pull details from invoices for referrence
-
    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    - 
    Update C-Form No on invoices
-
    -
    -
    - - - - - -

    - - - set_cform_in_sales_invoices - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_invoiced_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    Validate invoice that c-form is applicable - and no other c-form is received for that

    -
    -
    - -
    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 4fcbad08..3d8943d8 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_checked_options - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/cash_flow_mapping_accounts.html b/foundation/www/docs/current/models/accounts/cash_flow_mapping_accounts.html index 3c082478..e6a3d59b 100644 --- a/foundation/www/docs/current/models/accounts/cash_flow_mapping_accounts.html +++ b/foundation/www/docs/current/models/accounts/cash_flow_mapping_accounts.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - after_rename - (self, olddn, newdn, merge=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

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

    -

    No docs

    -
    -
    - - - - - -

    - - - check_gle_exists - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_if_child_exists - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - convert_group_to_ledger - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - convert_ledger_to_group - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_mandatory - (self) -

    -

    No docs

    -
    -
    - -
    + + + + +

    + + + erpnext.accounts.doctype.cost_center.cost_center.on_doctype_update + () +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/accounts/fiscal_year.html b/foundation/www/docs/current/models/accounts/fiscal_year.html index b9812f0a..01cf45c5 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 10.1.2 + Version 10.1.31 + + 6 + auto_created + + Check + + Auto Created + + + + + @@ -132,90 +144,6 @@
    - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_as_default - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_overlap - (self) -

    -

    No docs

    -
    -
    - -
    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 63513ad0..0a38d676 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_mandatory - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_pl_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update_with_args - (self, adv_adj, update_outstanding=Yes, from_repost=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - pl_must_have_cost_center - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_account_details - (self, adv_adj) -

    -

    Account must be ledger, active and not freezed

    -
    -
    - - - - - -

    - - - validate_and_set_fiscal_year - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_cost_center - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_currency - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_party - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/gst_account.html b/foundation/www/docs/current/models/accounts/gst_account.html index 88693757..8a786402 100644 --- a/foundation/www/docs/current/models/accounts/gst_account.html +++ b/foundation/www/docs/current/models/accounts/gst_account.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - 
    JV-
    + 
    JV-
+JV-RET-
    @@ -397,6 +398,18 @@ Depreciation Entry 26 + paid_loan + + Data + + Paid Loan + + + + + + + 27 column_break98 Column Break @@ -408,7 +421,7 @@ Depreciation Entry - 27 + 28 bill_no Data @@ -420,7 +433,7 @@ Depreciation Entry - 28 + 29 bill_date Date @@ -432,7 +445,7 @@ Depreciation Entry - 29 + 30 due_date Date @@ -444,7 +457,7 @@ Depreciation Entry - 30 + 31 write_off Section Break @@ -456,7 +469,7 @@ Depreciation Entry - 31 + 32 write_off_based_on Select @@ -471,7 +484,7 @@ Accounts Payable - 32 + 33 get_outstanding_invoices Button @@ -485,7 +498,7 @@ Accounts Payable - 33 + 34 column_break_30 Column Break @@ -497,7 +510,7 @@ Accounts Payable - 34 + 35 write_off_amount Currency @@ -511,7 +524,7 @@ Accounts Payable - 35 + 36 printing_settings Section Break @@ -523,7 +536,7 @@ Accounts Payable - 36 + 37 pay_to_recd_from Data @@ -535,7 +548,7 @@ Accounts Payable - 37 + 38 column_break_35 Column Break @@ -547,7 +560,7 @@ Accounts Payable - 38 + 39 letter_head Link @@ -568,7 +581,7 @@ Accounts Payable - 39 + 40 select_print_heading Link @@ -589,7 +602,7 @@ Accounts Payable - 40 + 41 addtional_info Section Break @@ -603,7 +616,7 @@ Accounts Payable - 41 + 42 column_break3 Column Break @@ -615,7 +628,7 @@ Accounts Payable - 42 + 43 is_opening Select @@ -630,7 +643,7 @@ Yes - 43 + 44 stock_entry Link @@ -651,7 +664,7 @@ Yes - 44 + 45 subscription_section Section Break @@ -663,12 +676,12 @@ Yes - 45 - subscription + 46 + auto_repeat Link - Subscription + Auto Repeat @@ -676,7 +689,7 @@ Yes -    Subscription +Auto Repeat @@ -684,7 +697,7 @@ Yes - 46 + 47 amended_from Link @@ -726,510 +739,6 @@ Yes
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_credit_limit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_remarks - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_balance - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_outstanding_invoices - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_title - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_values - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gl_entries - (self, cancel=0, adv_adj=0) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_account_and_party_balance - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_against_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_amounts_in_company_currency - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_exchange_rate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_print_format_fields - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_amount - (self, amt, currency) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_debit_credit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - unlink_advance_entry_reference - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - unlink_asset_reference - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_advance_paid - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_employee_loan - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_expense_claim - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_against_jv - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_cheque_info - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_credit_debit_note - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_empty_accounts_table - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_entries_for_advance - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_expense_claim - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_invoices - (self) -

    -

    Validate totals and docstatus for invoices

    -
    -
    - - - - - -

    - - - validate_multi_currency - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_orders - (self) -

    -

    Validate totals, closed and docstatus for orders

    -
    -
    - - - - - -

    - - - validate_party - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_reference_doc - (self) -

    -

    Validates reference document

    -
    -
    - - - - - -

    - - - validate_total_debit_and_credit - (self) -

    -

    No docs

    -
    -
    - -
    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 fd76f229..6f32196e 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 10.1.2 + Version 10.1.31 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 bb3b3a83..0bc8f8cd 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 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_accounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_repeating_companies - (self) -

    -

    Error when Same Company is entered multiple times in accounts

    -
    -
    - -
    @@ -174,15 +132,6 @@ General -
  • - - -Employee Loan - -
    • - - -
  • @@ -192,6 +141,15 @@ General +
  • + + +Loan + +
    • + + +
  • @@ -201,6 +159,33 @@ General +
  • + + +Payment Schedule + +
    • + + + +
  • + + +Payment Term + +
    • + + + +
  • + + +Payment Terms Template Detail + +
    • + + +
  • 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 5ce64070..773771b6 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_months - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 37a9e37d..191eaf52 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - add_party - (self, party_type, party) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_invoice_dict - (self, row=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_opening_invoice_summary - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_invoices - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    Load the Opening Invoice summary

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html b/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html index cbfed340..b28a2a4e 100644 --- a/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html +++ b/foundation/www/docs/current/models/accounts/opening_invoice_creation_tool_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 55 - subscription + auto_repeat Link - Subscription + Auto Repeat @@ -834,7 +834,7 @@ Internal Transfer -Subscription +Auto Repeat @@ -911,496 +911,6 @@ Internal Transfer
    - - - -

    - - - add_bank_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - add_deductions_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - add_party_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - clear_unallocated_reference_document_rows - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - delink_advance_entry_references - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gl_entries - (self, cancel=0, adv_adj=0) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_recurring - (self, reference_doc, subscription_doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_amounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_amounts_in_company_currency - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_difference_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_exchange_rate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_missing_ref_details - (self, force=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_missing_values - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_remarks - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_title - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_allocated_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_unallocated_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - setup_party_account_field - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_advance_paid - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_expense_claim - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_outstanding_amounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_account_type - (self, account, account_types) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_allocated_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_bank_accounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplicate_entry - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_journal_entry - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_mandatory - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_party_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_payment_against_negative_invoice - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_payment_type - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_reference_documents - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_transaction_reference - (self) -

    -

    No docs

    -
    -
    - -
    @@ -1477,6 +987,22 @@ Internal Transfer + +

    + + + erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_on_journal_entry + (name) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_reference_documents

    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 7419f2a5..12d303e4 100644 --- a/foundation/www/docs/current/models/accounts/payment_entry_deduction.html +++ b/foundation/www/docs/current/models/accounts/payment_entry_deduction.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_as_default_if_not_set - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_default_payment_gateway - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/payment_reconciliation.html b/foundation/www/docs/current/models/accounts/payment_reconciliation.html index 34d100d3..34b68bef 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 10.1.2 + Version 10.1.31
    - - - -

    - - - add_invoice_entries - (self, non_reconciled_invoices) -

    -

    No docs

    -
    -
    - - - - - -

    - - - add_payment_entries - (self, entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_condition - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_mandatory_to_fetch - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_invoice_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_jv_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_nonreconciled_payment_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_payment_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_unreconciled_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - reconcile - (self, args) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_invoice - (self) -

    -

    No docs

    -
    -
    - -
    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 ec542bf9..f5d29089 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_if_payment_entry_exists - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_payment_entry - (self, submit=True) -

    -

    create entry

    -
    -
    - - - - - -

    - - - get_message - (self) -

    -

    return message with payment gateway link

    -
    -
    - - - - - -

    - - - get_payment_success_url - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_payment_url - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_communication_entry - (self) -

    -

    Make communication entry

    -
    -
    - - - - - -

    - - - make_invoice - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_payment_authorized - (self, status=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - send_email - (self) -

    -

    send email with payment link

    -
    -
    - - - - - -

    - - - set_as_cancelled - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_as_paid - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_failed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_payment_request_url - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_currency - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_payment_request - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_reference_document - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/payment_schedule.html b/foundation/www/docs/current/models/accounts/payment_schedule.html index 3b4d87fd..94fec378 100644 --- a/foundation/www/docs/current/models/accounts/payment_schedule.html +++ b/foundation/www/docs/current/models/accounts/payment_schedule.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 + + 6 + mode_of_payment + + Link + + Mode of Payment + + + + + + + +Mode of Payment + + + + + + diff --git a/foundation/www/docs/current/models/accounts/payment_term.html b/foundation/www/docs/current/models/accounts/payment_term.html index adfd0a4f..a0a076d1 100644 --- a/foundation/www/docs/current/models/accounts/payment_term.html +++ b/foundation/www/docs/current/models/accounts/payment_term.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 3 + mode_of_payment + + Link + + Mode of Payment + + + + + + + +Mode of Payment + + + + + + + + 4 column_break_3 Column Break @@ -77,7 +98,7 @@ - 4 + 5 due_date_based_on Select @@ -93,7 +114,7 @@ Month(s) after the end of the invoice month - 5 + 6 credit_days Int @@ -105,7 +126,7 @@ Month(s) after the end of the invoice month - 6 + 7 credit_months Int @@ -117,7 +138,7 @@ Month(s) after the end of the invoice month - 7 + 8 section_break_6 Section Break @@ -129,7 +150,7 @@ Month(s) after the end of the invoice month - 8 + 9 description Small Text diff --git a/foundation/www/docs/current/models/accounts/payment_terms_template.html b/foundation/www/docs/current/models/accounts/payment_terms_template.html index ca0875ef..80a34486 100644 --- a/foundation/www/docs/current/models/accounts/payment_terms_template.html +++ b/foundation/www/docs/current/models/accounts/payment_terms_template.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_duplicate_terms - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_credit_days - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_invoice_portion - (self) -

    -

    No docs

    -
    -
    - -
    @@ -190,15 +134,6 @@ -
  • - - -Delivery Note - -
    • - - -
  • diff --git a/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html b/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html index cabaf5c1..d75bec42 100644 --- a/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html +++ b/foundation/www/docs/current/models/accounts/payment_terms_template_detail.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 + + 7 + mode_of_payment + + Link + + Mode of Payment + + + + + + + +Mode of Payment + + + + + + 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 dae44791..1c84e9d2 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 10.1.2 + Version 10.1.31
    - - - -

    - - - get_pl_balances - (self) -

    -

    Get balance for pl accounts

    -
    -
    - - - - - -

    - - - make_gl_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_account_head - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_posting_date - (self) -

    -

    No docs

    -
    -
    - -
    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 b93332c0..5fa8f11c 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - before_save - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_default_payment - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_defaults - (self, include_current_pos=True) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_all_link_fields - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_customer_territory_group - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_default_profile - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplicate_groups - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/pos_profile_user.html b/foundation/www/docs/current/models/accounts/pos_profile_user.html index a18bb462..8a815afd 100644 --- a/foundation/www/docs/current/models/accounts/pos_profile_user.html +++ b/foundation/www/docs/current/models/accounts/pos_profile_user.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - set_link_for_pos - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/pricing_rule.html b/foundation/www/docs/current/models/accounts/pricing_rule.html index 251d6dfe..b85f2eea 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 10.1.2 + Version 10.1.31
    - - - -

    - - - cleanup_fields_value - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_applicable_for_selling_or_buying - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_mandatory - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_max_discount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_min_max_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_rate_or_discount - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/purchase_invoice.html b/foundation/www/docs/current/models/accounts/purchase_invoice.html index e5e0e237..70fac6e9 100644 --- a/foundation/www/docs/current/models/accounts/purchase_invoice.html +++ b/foundation/www/docs/current/models/accounts/purchase_invoice.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 126 - subscription + auto_repeat Link - Subscription + Auto Repeat @@ -1907,7 +1907,7 @@ Cancelled -Subscription +Auto Repeat @@ -1936,496 +1936,6 @@ Cancelled
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_conversion_rate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_for_closed_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_prev_docstatus - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_remarks - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_gl_entries - (self, warehouse_account=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gl_entries - (self, gl_entries=None, repost_future_gle=True, from_repost=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gle_for_rounding_adjustment - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_item_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_payment_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_supplier_gl_entry - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_tax_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_write_off_gl_entry - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_recurring - (self, reference_doc, subscription_doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - po_required - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - pr_required - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_against_expense_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_expense_account - (self, for_validate=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_missing_values - (self, for_validate=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_billing_status_in_pr - (self, update_modified=True) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_fixed_asset - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status_updater_args - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_cash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_credit_to_acc - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_fixed_asset_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item_code - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_purchase_receipt_if_update_stock - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_supplier_invoice - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_warehouse - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_with_previous_doc - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_write_off_account - (self) -

    -

    No docs

    -
    -
    - -
    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 842cf735..856557ac 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 61 + include_exploded_items + + Check + + Include Exploded Items + + + + + + + 62 col_break6 Column Break @@ -934,7 +946,7 @@ Used for Taxes and Charges

    - 62 + 63 is_fixed_asset Check @@ -946,7 +958,7 @@ Used for Taxes and Charges

    - 63 + 64 asset Link @@ -967,7 +979,7 @@ Used for Taxes and Charges

    - 64 + 65 po_detail Data @@ -979,7 +991,7 @@ Used for Taxes and Charges

    - 65 + 66 purchase_receipt Link @@ -1000,7 +1012,7 @@ Used for Taxes and Charges

    - 66 + 67 page_break Check @@ -1012,7 +1024,7 @@ Used for Taxes and Charges

    - 67 + 68 pr_detail Data @@ -1024,7 +1036,7 @@ Used for Taxes and Charges

    - 68 + 69 valuation_rate Currency @@ -1038,7 +1050,7 @@ Used for Taxes and Charges

    - 69 + 70 rm_supp_cost Currency @@ -1052,7 +1064,7 @@ Used for Taxes and Charges

    - 70 + 71 landed_cost_voucher_amount Currency 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 e5ca6cfb..777c5bae 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 b5f0a219..a0778b83 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 150 - subscription + auto_repeat Link - Subscription + Auto Repeat @@ -2287,7 +2287,7 @@ Yes -Subscription +Auto Repeat @@ -2340,863 +2340,6 @@ Yes
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - add_remarks - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - add_timesheet_data - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_save - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_billing_amount_for_timesheet - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_credit_limit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_prev_docstatus - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - clear_unallocated_mode_of_payments - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_company_abbr - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_gl_entries - (self, warehouse_account=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_warehouse - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_customer_gl_entry - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gl_entries - (self, gl_entries=None, repost_future_gle=True, from_repost=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gle_for_change_amount - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gle_for_rounding_adjustment - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_item_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_pos_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_tax_gl_entries - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_write_off_gl_entry - (self, gl_entries) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_recurring - (self, reference_doc, subscription_doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_against_income_account - (self) -

    -

    Set against account for debit to account

    -
    -
    - - - - - -

    - - - set_billing_hours_and_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_income_account_for_fixed_assets - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_indicator - (self) -

    -

    Set indicator for portal

    -
    -
    - - - - - -

    - - - set_missing_values - (self, for_validate=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_paid_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_pos_fields - (self, for_validate=False) -

    -

    Set retail related fields from POS Profiles

    -
    -
    - - - - - -

    - - - set_serial_no_against_delivery_note - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - so_dn_required - (self) -

    -

    check in manage account if sales order / delivery note required or not.

    -
    -
    - - - - - -

    - - - update_billing_status_in_dn - (self, update_modified=True) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_current_stock - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_packing_list - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_serial_no - (self, in_cancel=False) -

    -

    update Sales Invoice refrence in Serial No

    -
    -
    - - - - - -

    - - - update_status_updater_args - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_time_sheet - (self, sales_invoice) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_time_sheet_detail - (self, timesheet, args, sales_invoice) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_timesheet_billing_for_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_account_for_change_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_auto_set_posting_time - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_c_form - (self) -

    -

    Blank C-form no if C-form applicable marked as 'No'

    -
    -
    - - - - - -

    - - - validate_c_form_on_cancel - (self) -

    -

    Display message if C-Form no exists on cancellation of Sales Invoice

    -
    -
    - - - - - -

    - - - validate_debit_to_acc - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_delivery_note - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dropship_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item_code - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_pos - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_pos_paid_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_proj_cust - (self) -

    -

    check for does customer belong to same project as entered..

    -
    -
    - - - - - -

    - - - validate_serial_against_delivery_note - (self) -

    - 
            validate if the serial numbers in Sales Invoice Items are same as in
-        Delivery Note Item
-
    -
    -
    - - - - - -

    - - - validate_serial_against_sales_invoice - (self) -

    -

    check if serial number is already used in other sales invoice

    -
    -
    - - - - - -

    - - - validate_serial_numbers - (self) -

    - 
            validate serial number agains Delivery Note and Sales Invoice
-
    -
    -
    - - - - - -

    - - - validate_time_sheets_are_submitted - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_warehouse - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_with_previous_doc - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_write_off_account - (self) -

    -

    No docs

    -
    -
    - -
    @@ -3403,6 +2546,15 @@ Yes +
  • + + +Subscription Invoice + +
    • + + +
  • 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 2f1ba9e1..580f4b62 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_advance.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_advance.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + 8 + clearance_date + + Date + + Clearance Date + + + + + 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 953a4255..61829048 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_missing_values - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -333,6 +291,15 @@ The tax rate you define here will be the standard tax rate for all **Items**. If +
  • + + +Subscription + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/accounts/share_balance.html b/foundation/www/docs/current/models/accounts/share_balance.html index f620030c..ed941a93 100644 --- a/foundation/www/docs/current/models/accounts/share_balance.html +++ b/foundation/www/docs/current/models/accounts/share_balance.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

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

    -

    No docs

    -
    -
    - - - - - -

    - - - basic_validations - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_save - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - folio_no_validation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_shareholder_doc - (self, shareholder) -

    -

    No docs

    -
    -
    - - - - - -

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

    -

    No docs

    -
    -
    - - - - - -

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

    -

    No docs

    -
    -
    - - - - - -

    - - - remove_shares - (self, shareholder) -

    -

    No docs

    -
    -
    - - - - - -

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

    -

    No docs

    -
    -
    - - - - - -

    - - - share_exists - (self, shareholder) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/share_type.html b/foundation/www/docs/current/models/accounts/share_type.html index 4c2b0063..bff57eb0 100644 --- a/foundation/www/docs/current/models/accounts/share_type.html +++ b/foundation/www/docs/current/models/accounts/share_type.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - before_save - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    Load address and contacts in __onload

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/accounts/shipping_rule.html b/foundation/www/docs/current/models/accounts/shipping_rule.html index 9bfc5736..be574a27 100644 --- a/foundation/www/docs/current/models/accounts/shipping_rule.html +++ b/foundation/www/docs/current/models/accounts/shipping_rule.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - add_shipping_rule_to_tax_table - (self, doc, shipping_amount) -

    -

    No docs

    -
    -
    - - - - - -

    - - - apply - (self, doc) -

    -

    Apply shipping rule on given doc. Called from accounts controller

    -
    -
    - - - - - -

    - - - get_shipping_amount_from_rules - (self, value) -

    -

    No docs

    -
    -
    - - - - - -

    - - - sort_shipping_rule_conditions - (self) -

    -

    Sort Shipping Rule Conditions based on increasing From Value

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_countries - (self, doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_from_to_values - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_overlapping_shipping_rule_conditions - (self) -

    -

    No docs

    -
    -
    - -
    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 d0101d5a..cf2779c9 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + + + + + +

    Subscriber

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabSubscriber

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1subscriber_name + Data + Subscriber Name + +
    2customer + Link + Customer + + + + + + +Customer + + + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.subscriber.subscriber

    + + + + + + + +

    Class Subscriber

    + +

    Inherits from frappe.model.document.Document + +

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

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/subscription.html b/foundation/www/docs/current/models/accounts/subscription.html index f4aa6097..8fc79789 100644 --- a/foundation/www/docs/current/models/accounts/subscription.html +++ b/foundation/www/docs/current/models/accounts/subscription.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - + 1 - section_break_1 + subscriber - Section Break + Link + Subscriber + + + + + + +Subscriber + + + + + + + + 2 + cancel_at_period_end + + Check + + Cancel At End Of Period - - 2 - naming_series - - Select - - Series - - - - 
    SUB-
    - - - 3 - reference_doctype + start - Link + Date - Reference Doctype - - - - - - - -DocType - - + Subscription Start Date + 4 - reference_document + cancelation_date - Dynamic Link + Date - Reference Document + Cancelation Date - - 
    reference_doctype
    - + 5 - column_break_5 - - Column Break + current_invoice_start - + Date + + Current Invoice Start Date @@ -115,11 +111,11 @@ 6 - start_date + current_invoice_end Date - Start Date + Current Invoice End Date @@ -127,11 +123,11 @@ 7 - end_date + trial_period_start Date - End Date + Trial Period Start Date @@ -139,11 +135,11 @@ 8 - submit_on_creation + trial_period_end - Check + Date - Submit on Creation + Trial Period End Date @@ -151,206 +147,18 @@ 9 - disabled + cb_1 + + Column Break - Check - - Disabled + - + 10 - section_break_10 - - Section Break - - - - - - - - - 11 - frequency - - Select - - Frequency - - - - 
    -Daily
-Weekly
-Monthly
-Quarterly
-Half-yearly
-Yearly
    - - - - - 12 - column_break_13 - - Column Break - - - - - - - - - 13 - repeat_on_day - - Int - - Repeat on Day - - - - - - - 14 - next_schedule_date - - Date - - Next Schedule Date - - - - - - - 15 - notification - - Section Break - - Notification - - - - - - - 16 - notify_by_email - - Check - - Notify by Email - - - - - - - 17 - subject - - Data - - Subject -

    - To add dynamic subject, use jinja tags like - -

    New {{ doc.doctype }} #{{ doc.name }}

    - - - - - - 18 - column_break_17 - - Column Break - - - - - - - - - 19 - recipients - - Small Text - - Recipients - - - - - - - 20 - print_format - - Link - - Print Format - - - - - - - -Print Format - - - - - - - - 21 - section_break_20 - - Section Break - - Message - - - - - - - 22 - message - - Text - - Message - - - - - - - 23 - section_break_16 - - Section Break - - - - - - - - - 24 status Select @@ -360,21 +168,58 @@ Yearly 
    -Draft
-Stopped
-Submitted
+Trialling
+Active
+Past Due Date
 Cancelled
-Completed
    +Unpaid - 25 - amended_from + 11 + days_until_due - Link + Int - Amended From + Days Until Due +

    + Number of days that the subscriber has to pay invoices generated by this subscription

    + + + + + + 12 + quantity + + Int + + Quantity + + + + + + + 13 + sb_4 + + Section Break + + Plans + + + + + + + 14 + plans + + Table + + Plans @@ -382,7 +227,137 @@ Completed -Subscription +Subscription Plan Detail + + + + + + + + 15 + sb_1 + + Section Break + + Taxes + + + + + + + 16 + tax_template + + Link + + Sales Taxes and Charges Template + + + + + + + +Sales Taxes and Charges Template + + + + + + + + 17 + sb_2 + + Section Break + + Discounts + + + + + + + 18 + apply_additional_discount + + Select + + Apply Additional Discount On + + + + 
    +Grand Total
+Net total
    + + + + + 19 + cb_2 + + Column Break + + + + + + + + + 20 + additional_discount_percentage + + Percent + + Additional DIscount Percentage + + + + + + + 21 + additional_discount_amount + + Currency + + Additional DIscount Amount + + + + + + + 22 + sb_3 + + Section Break + + Invoices + + + + + + + 23 + invoices + + Table + + Invoices + + + + + + + +Subscription Invoice @@ -411,188 +386,6 @@ Completed
    - - - -

    - - - before_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update_after_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_next_schedule_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - unlink_subscription_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status - (self, status=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_subscription_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_email_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_next_schedule_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_reference_doctype - (self) -

    -

    No docs

    -
    -
    - -
    @@ -601,14 +394,18 @@ Completed - -

    - - - erpnext.accounts.doctype.subscription.subscription.assign_task_to_owner - (name, msg, users) +

    Public API +
    /api/method/erpnext.accounts.doctype.subscription.subscription.cancel_subscription

    -

    No docs

    +

    + + + erpnext.accounts.doctype.subscription.subscription.cancel_subscription + (name) +

    + 
    Cancels a `Subscription`. This will stop the `Subscription` from further invoicing the
+`Subscriber` but all already outstanding invoices will not be affected.
+

    @@ -619,12 +416,13 @@ Completed

    - + - erpnext.accounts.doctype.subscription.subscription.create_documents - (data, schedule_date) + erpnext.accounts.doctype.subscription.subscription.get_all_subscriptions + ()

    -

    No docs

    + 
    Returns all `Subscription` documents
+

    @@ -635,74 +433,10 @@ Completed

    - + - erpnext.accounts.doctype.subscription.subscription.disable_subscription - (data) -

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.get_next_date - (dt, mcount, day=None) -

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.get_next_schedule_date - (start_date, frequency, repeat_on_day) -

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.get_subscription_entries - (date) -

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.make_new_document - (args, schedule_date) + erpnext.accounts.doctype.subscription.subscription.get_prorata_factor + (period_end, period_start)

    No docs

    @@ -714,15 +448,16 @@ Completed

    Public API -
    /api/method/erpnext.accounts.doctype.subscription.subscription.make_subscription +
    /api/method/erpnext.accounts.doctype.subscription.subscription.get_subscription_updates

    - + - erpnext.accounts.doctype.subscription.subscription.make_subscription - (doctype, docname) + erpnext.accounts.doctype.subscription.subscription.get_subscription_updates + (name)

    -

    No docs

    + 
    Use this to get the latest state of the given `Subscription`
+

    @@ -733,28 +468,13 @@ Completed

    - + - erpnext.accounts.doctype.subscription.subscription.make_subscription_entry - (date=None) -

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.notify_error_to_user + erpnext.accounts.doctype.subscription.subscription.process (data)

    -

    No docs

    + 
    Checks a `Subscription` and updates it status as necessary
+

    @@ -765,44 +485,13 @@ Completed

    - + - erpnext.accounts.doctype.subscription.subscription.notify_errors - (doc, doctype, party, owner, name) + erpnext.accounts.doctype.subscription.subscription.process_all + ()

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.send_notification - (new_rv, subscription_doc, print_format=Standard) -

    -

    Notify concerned persons about recurring document generation

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.set_subscription_period - (args, mcount, new_document) -

    -

    No docs

    + 
    Task to updates the status of all `Subscription` apart from those that are cancelled
+

    @@ -812,47 +501,17 @@ Completed

    Public API -
    /api/method/erpnext.accounts.doctype.subscription.subscription.stop_resume_subscription +
    /api/method/erpnext.accounts.doctype.subscription.subscription.restart_subscription

    - + - erpnext.accounts.doctype.subscription.subscription.stop_resume_subscription - (subscription, status) + erpnext.accounts.doctype.subscription.subscription.restart_subscription + (name)

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.subscription_doctype_query - (doctype, txt, searchfield, start, page_len, filters) -

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.accounts.doctype.subscription.subscription.update_doc - (new_document, reference_doc, args, schedule_date) -

    -

    No docs

    + 
    Restarts a cancelled `Subscription`. The `Subscription` will 'forget' the history of
+all invoices it has generated
+

    @@ -861,110 +520,6 @@ Completed -

    Linked In:

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

    Subscription Invoice

    +
    + + + Version 10.1.31 + + + Source + +
    + + +Child Table + + +

    Table Name: tabSubscription Invoice

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1invoice + Link + Invoice + + + + + + +Sales Invoice + + + +
    + + + + +

    Child Table Of

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

    Subscription Plan

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabSubscription Plan

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1plan_name + Data + Plan Name + +
    2item + Link + Item + + + + + + +Item + + + +
    3currency + Link + Currency + + + + + + +Currency + + + +
    4cost + Currency + Cost + +
    5billing_interval + Select + Billing Interval + + + 
    Day
+Week
+Month
+Year
    +
    6billing_interval_count + Int + Billing Interval Count +

    + Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days

    +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.subscription_plan.subscription_plan

    + + + + + + + +

    Class SubscriptionPlan

    + +

    Inherits from frappe.model.document.Document + +

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

    Linked In:

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

    Subscription Plan Detail

    +
    + + + Version 10.1.31 + + + Source + +
    + + +Child Table + + +

    Table Name: tabSubscription Plan Detail

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1plan + Link + Plan + + + + + + +Subscription Plan + + + +
    + + + + +

    Child Table Of

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

    Subscription Settings

    +
    + + + Version 10.1.31 + + + Source + +
    + +Single + + + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1grace_period + Int + Grace Period +

    + Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid

    +
    2cancel_after_grace + Check + Cancel Invoice After Grace Period + +
    3prorate + Check + Prorate + +
    + + +
    +

    Controller

    +

    erpnext.accounts.doctype.subscription_settings.subscription_settings

    + + + + + + + +

    Class SubscriptionSettings

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/accounts/tax_rule.html b/foundation/www/docs/current/models/accounts/tax_rule.html index 1d8065c8..8101fea5 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 10.1.2 + Version 10.1.31
    - - - -

    - - - __setup__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_filters - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_tax_template - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_use_for_shopping_cart - (self) -

    -

    If shopping cart is enabled and no tax rule exists for shopping cart, enable this one

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/__init__.py b/foundation/www/docs/current/models/agriculture/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/agriculture/_sidebar.json b/foundation/www/docs/current/models/agriculture/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/agriculture/_sidebar.json +++ b/foundation/www/docs/current/models/agriculture/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/agriculture/agriculture_analysis_criteria.html b/foundation/www/docs/current/models/agriculture/agriculture_analysis_criteria.html index 9cc6a88d..6332f097 100644 --- a/foundation/www/docs/current/models/agriculture/agriculture_analysis_criteria.html +++ b/foundation/www/docs/current/models/agriculture/agriculture_analysis_criteria.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/crop_cycle.html b/foundation/www/docs/current/models/agriculture/crop_cycle.html index f7b548c3..c0fd6462 100644 --- a/foundation/www/docs/current/models/agriculture/crop_cycle.html +++ b/foundation/www/docs/current/models/agriculture/crop_cycle.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - append_to_child - (self, obj_to_append) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_project - (self, period, crop_tasks) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_task - (self, crop_tasks, project_name, start_date) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_coordinates - (self, doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_geometry_type - (self, doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - import_disease_tasks - (self, disease, start_date) -

    -

    No docs

    -
    -
    - - - - - -

    - - - is_in_land_unit - (self, point, vs) -

    -

    No docs

    -
    -
    - - - - - -

    - - - reload_linked_analysis - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_disease - (self, disease_hashes) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/detected_disease.html b/foundation/www/docs/current/models/agriculture/detected_disease.html index 8de57cc3..17255433 100644 --- a/foundation/www/docs/current/models/agriculture/detected_disease.html +++ b/foundation/www/docs/current/models/agriculture/detected_disease.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/fertilizer.html b/foundation/www/docs/current/models/agriculture/fertilizer.html index d8cd447a..7b4c6438 100644 --- a/foundation/www/docs/current/models/agriculture/fertilizer.html +++ b/foundation/www/docs/current/models/agriculture/fertilizer.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - load_contents - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/fertilizer_content.html b/foundation/www/docs/current/models/agriculture/fertilizer_content.html index 19e5757b..162a7381 100644 --- a/foundation/www/docs/current/models/agriculture/fertilizer_content.html +++ b/foundation/www/docs/current/models/agriculture/fertilizer_content.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - add_child_property - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - feature_seperator - (self, child_feature=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_location_value - (self, features) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -475,6 +391,22 @@ Land Unit describing various land assets +

    + + + erpnext.agriculture.doctype.land_unit.land_unit.on_doctype_update + () +

    +

    No docs

    +
    +
    + + + + + + +

    diff --git a/foundation/www/docs/current/models/agriculture/linked_land_unit.html b/foundation/www/docs/current/models/agriculture/linked_land_unit.html index 7a64f4d1..e0443356 100644 --- a/foundation/www/docs/current/models/agriculture/linked_land_unit.html +++ b/foundation/www/docs/current/models/agriculture/linked_land_unit.html @@ -9,7 +9,7 @@

    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - load_contents - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/plant_analysis_criteria.html b/foundation/www/docs/current/models/agriculture/plant_analysis_criteria.html index 36c9fd72..b3f00528 100644 --- a/foundation/www/docs/current/models/agriculture/plant_analysis_criteria.html +++ b/foundation/www/docs/current/models/agriculture/plant_analysis_criteria.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - load_contents - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/soil_analysis_criteria.html b/foundation/www/docs/current/models/agriculture/soil_analysis_criteria.html index 09aeb747..8922f945 100644 --- a/foundation/www/docs/current/models/agriculture/soil_analysis_criteria.html +++ b/foundation/www/docs/current/models/agriculture/soil_analysis_criteria.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_soil_type - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - load_contents - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_soil_edit - (self, soil_type) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/soil_texture_criteria.html b/foundation/www/docs/current/models/agriculture/soil_texture_criteria.html index 8311c926..1b00f65c 100644 --- a/foundation/www/docs/current/models/agriculture/soil_texture_criteria.html +++ b/foundation/www/docs/current/models/agriculture/soil_texture_criteria.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - load_contents - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_lab_result_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/water_analysis_criteria.html b/foundation/www/docs/current/models/agriculture/water_analysis_criteria.html index 4b791b51..28f21af6 100644 --- a/foundation/www/docs/current/models/agriculture/water_analysis_criteria.html +++ b/foundation/www/docs/current/models/agriculture/water_analysis_criteria.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - load_contents - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/agriculture/weather_parameter.html b/foundation/www/docs/current/models/agriculture/weather_parameter.html index 21aa205b..31d12152 100644 --- a/foundation/www/docs/current/models/agriculture/weather_parameter.html +++ b/foundation/www/docs/current/models/agriculture/weather_parameter.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - delete_depreciation_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_depreciation_amount - (self, depreciable_value) -

    -

    No docs

    -
    -
    - - - - - -

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

    -

    No docs

    -
    -
    - - - - - -

    - - - get_status - (self) -

    -

    Returns status based on whether it is draft, submitted, scrapped or depreciated

    -
    -
    - - - - - -

    - - - make_depreciation_schedule - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_accumulated_depreciation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_missing_values - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_status - (self, status=None) -

    -

    Get and update status

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_asset_values - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_cancellation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_expected_value_after_useful_life - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/assets/asset_category.html b/foundation/www/docs/current/models/assets/asset_category.html index e71dd525..135d2ba4 100644 --- a/foundation/www/docs/current/models/assets/asset_category.html +++ b/foundation/www/docs/current/models/assets/asset_category.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/assets/asset_category_account.html b/foundation/www/docs/current/models/assets/asset_category_account.html index 6e5d0fb0..8d971f8d 100644 --- a/foundation/www/docs/current/models/assets/asset_category_account.html +++ b/foundation/www/docs/current/models/assets/asset_category_account.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - sync_maintenance_tasks - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/assets/asset_maintenance_log.html b/foundation/www/docs/current/models/assets/asset_maintenance_log.html index de2c2dc7..fd052649 100644 --- a/foundation/www/docs/current/models/assets/asset_maintenance_log.html +++ b/foundation/www/docs/current/models/assets/asset_maintenance_log.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_maintenance_task - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/assets/asset_maintenance_task.html b/foundation/www/docs/current/models/assets/asset_maintenance_task.html index e668bbf2..d8e5f628 100644 --- a/foundation/www/docs/current/models/assets/asset_maintenance_task.html +++ b/foundation/www/docs/current/models/assets/asset_maintenance_task.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_latest_warehouse_in_asset - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_asset - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_warehouses - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/assets/asset_repair.html b/foundation/www/docs/current/models/assets/asset_repair.html index 075ba0e4..054179d5 100644 --- a/foundation/www/docs/current/models/assets/asset_repair.html +++ b/foundation/www/docs/current/models/assets/asset_repair.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/assets/asset_settings.html b/foundation/www/docs/current/models/assets/asset_settings.html index e04bad95..03b6d1e8 100644 --- a/foundation/www/docs/current/models/assets/asset_settings.html +++ b/foundation/www/docs/current/models/assets/asset_settings.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/buying/index.html b/foundation/www/docs/current/models/buying/index.html index 2b6d190e..05ac965f 100644 --- a/foundation/www/docs/current/models/buying/index.html +++ b/foundation/www/docs/current/models/buying/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 8 - column_break1 - - Column Break - - - - - - - - - 9 - transaction_date - - Date - - Date - - - - - - - 10 - schedule_date - - Date - - Reqd By Date - - - - - - - 11 - amended_from + supplier_warehouse Link - Amended From + Supplier Warehouse @@ -192,7 +156,7 @@ Yes -Purchase Order +Warehouse @@ -200,7 +164,7 @@ Yes - 12 + 9 company Link @@ -220,8 +184,89 @@ Yes - + + 10 + column_break1 + + Column Break + + + + + + + + + 11 + transaction_date + + Date + + Date + + + + + + + 12 + schedule_date + + Date + + Reqd By Date + + + + + + 13 + order_confirmation_no + + Data + + Order Confirmation No + + + + + + + 14 + order_confirmation_date + + Date + + Order Confirmation Date + + + + + + + 15 + amended_from + + Link + + Amended From + + + + + + + +Purchase Order + + + + + + + + 16 drop_ship Section Break @@ -233,7 +278,7 @@ Yes - 14 + 17 customer Link @@ -254,7 +299,7 @@ Yes - 15 + 18 customer_name Data @@ -266,7 +311,7 @@ Yes - 16 + 19 column_break_19 Column Break @@ -278,7 +323,7 @@ Yes - 17 + 20 customer_contact_person Link @@ -299,7 +344,7 @@ Yes - 18 + 21 customer_contact_display Small Text @@ -311,7 +356,7 @@ Yes - 19 + 22 customer_contact_mobile Small Text @@ -323,7 +368,7 @@ Yes - 20 + 23 customer_contact_email Code @@ -337,7 +382,7 @@ Yes - 21 + 24 section_addresses Section Break @@ -349,7 +394,7 @@ Yes - 22 + 25 supplier_address Link @@ -370,7 +415,7 @@ Yes - 23 + 26 contact_person Link @@ -391,7 +436,7 @@ Yes - 24 + 27 address_display Small Text @@ -403,7 +448,7 @@ Yes - 25 + 28 contact_display Small Text @@ -415,7 +460,7 @@ Yes - 26 + 29 contact_mobile Small Text @@ -427,7 +472,7 @@ Yes - 27 + 30 contact_email Small Text @@ -439,7 +484,7 @@ Yes - 28 + 31 col_break_address Column Break @@ -451,7 +496,7 @@ Yes - 29 + 32 shipping_address Link @@ -472,7 +517,7 @@ Yes - 30 + 33 shipping_address_display Small Text @@ -484,7 +529,7 @@ Yes - 31 + 34 currency_and_price_list Section Break @@ -498,7 +543,7 @@ Yes - 32 + 35 currency Link @@ -519,7 +564,7 @@ Yes - 33 + 36 conversion_rate Float @@ -531,7 +576,7 @@ Yes - 34 + 37 cb_price_list Column Break @@ -543,7 +588,7 @@ Yes - 35 + 38 buying_price_list Link @@ -564,7 +609,7 @@ Yes - 36 + 39 price_list_currency Link @@ -585,7 +630,7 @@ Yes - 37 + 40 plc_conversion_rate Float @@ -597,7 +642,7 @@ Yes - 38 + 41 ignore_pricing_rule Check @@ -609,7 +654,7 @@ Yes - 39 + 42 items_section Section Break @@ -623,7 +668,7 @@ Yes - 40 + 43 items Table @@ -644,7 +689,7 @@ Yes - 41 + 44 get_last_purchase_rate Button @@ -656,7 +701,7 @@ Yes - 42 + 45 link_to_mrs Button @@ -668,7 +713,7 @@ Yes - 43 + 46 sb_last_purchase Section Break @@ -680,7 +725,7 @@ Yes - 44 + 47 base_total Currency @@ -694,7 +739,7 @@ Yes - 45 + 48 base_net_total Currency @@ -708,7 +753,7 @@ Yes - 46 + 49 column_break_26 Column Break @@ -720,7 +765,7 @@ Yes - 47 + 50 total Currency @@ -734,7 +779,7 @@ Yes - 48 + 51 net_total Currency @@ -748,7 +793,7 @@ Yes - 49 + 52 total_net_weight Float @@ -760,7 +805,7 @@ Yes - 50 + 53 taxes_section Section Break @@ -774,7 +819,7 @@ Yes - 51 + 54 taxes_and_charges Link @@ -795,7 +840,7 @@ Yes - 52 + 55 column_break_50 Column Break @@ -807,7 +852,7 @@ Yes - 53 + 56 shipping_rule Link @@ -828,7 +873,7 @@ Yes - 54 + 57 section_break_52 Section Break @@ -840,7 +885,7 @@ Yes - 55 + 58 taxes Table @@ -861,7 +906,7 @@ Yes - 56 + 59 sec_tax_breakup Section Break @@ -873,7 +918,7 @@ Yes - 57 + 60 other_charges_calculation Text @@ -885,7 +930,7 @@ Yes - 58 + 61 totals Section Break @@ -899,7 +944,7 @@ Yes - 59 + 62 base_taxes_and_charges_added Currency @@ -913,7 +958,7 @@ Yes - 60 + 63 base_taxes_and_charges_deducted Currency @@ -927,7 +972,7 @@ Yes - 61 + 64 base_total_taxes_and_charges Currency @@ -941,7 +986,7 @@ Yes - 62 + 65 column_break_39 Column Break @@ -953,7 +998,7 @@ Yes - 63 + 66 taxes_and_charges_added Currency @@ -967,7 +1012,7 @@ Yes - 64 + 67 taxes_and_charges_deducted Currency @@ -981,7 +1026,7 @@ Yes - 65 + 68 total_taxes_and_charges Currency @@ -995,7 +1040,7 @@ Yes - 66 + 69 discount_section Section Break @@ -1007,7 +1052,7 @@ Yes - 67 + 70 apply_discount_on Select @@ -1023,7 +1068,7 @@ Net Total - 68 + 71 base_discount_amount Currency @@ -1037,7 +1082,7 @@ Net Total - 69 + 72 column_break_45 Column Break @@ -1049,7 +1094,7 @@ Net Total - 70 + 73 additional_discount_percentage Float @@ -1061,7 +1106,7 @@ Net Total - 71 + 74 discount_amount Currency @@ -1075,7 +1120,7 @@ Net Total - 72 + 75 totals_section Section Break @@ -1087,7 +1132,7 @@ Net Total - 73 + 76 base_grand_total Currency @@ -1101,7 +1146,7 @@ Net Total - 74 + 77 base_rounding_adjustment Currency @@ -1115,7 +1160,7 @@ Net Total - 75 + 78 base_in_words Data @@ -1128,7 +1173,7 @@ Net Total - 76 + 79 base_rounded_total Currency @@ -1142,7 +1187,7 @@ Net Total - 77 + 80 column_break4 Column Break @@ -1154,7 +1199,7 @@ Net Total - 78 + 81 grand_total Currency @@ -1168,7 +1213,7 @@ Net Total - 79 + 82 rounding_adjustment Currency @@ -1182,7 +1227,7 @@ Net Total - 80 + 83 in_words Data @@ -1194,7 +1239,7 @@ Net Total - 81 + 84 advance_paid Currency @@ -1208,7 +1253,7 @@ Net Total - 82 + 85 payment_schedule_section Section Break @@ -1220,7 +1265,7 @@ Net Total - 83 + 86 payment_terms_template Link @@ -1241,7 +1286,7 @@ Net Total - 84 + 87 payment_schedule Table @@ -1262,7 +1307,7 @@ Net Total - 85 + 88 terms_section_break Section Break @@ -1276,7 +1321,7 @@ Net Total - 86 + 89 tc_name Link @@ -1297,7 +1342,7 @@ Net Total - 87 + 90 terms Text Editor @@ -1309,7 +1354,7 @@ Net Total - 88 + 91 more_info Section Break @@ -1321,7 +1366,7 @@ Net Total - 89 + 92 status Select @@ -1343,7 +1388,7 @@ Delivered - 90 + 93 ref_sq Data @@ -1355,7 +1400,7 @@ Delivered - 91 + 94 party_account_currency Link @@ -1376,7 +1421,7 @@ Delivered - 92 + 95 column_break_74 Column Break @@ -1388,7 +1433,7 @@ Delivered - 93 + 96 per_received Percent @@ -1400,7 +1445,7 @@ Delivered - 94 + 97 per_billed Percent @@ -1412,7 +1457,7 @@ Delivered - 95 + 98 column_break5 Section Break @@ -1424,7 +1469,7 @@ Delivered - 96 + 99 letter_head Link @@ -1445,7 +1490,7 @@ Delivered - 97 + 100 select_print_heading Link @@ -1466,7 +1511,7 @@ Delivered - 98 + 101 column_break_86 Column Break @@ -1478,7 +1523,7 @@ Delivered - 99 + 102 group_same_items Check @@ -1490,7 +1535,7 @@ Delivered - 100 + 103 language Data @@ -1502,7 +1547,7 @@ Delivered - 101 + 104 raw_material_details Section Break @@ -1514,7 +1559,7 @@ Delivered - 102 + 105 supplied_items_section Section Break @@ -1526,7 +1571,7 @@ Delivered - 103 + 106 supplied_items Table @@ -1547,7 +1592,7 @@ Delivered - 104 + 107 subscription_section Section Break @@ -1559,7 +1604,7 @@ Delivered - 105 + 108 from_date Date @@ -1571,7 +1616,7 @@ Delivered - 106 + 109 to_date Date @@ -1583,7 +1628,7 @@ Delivered - 107 + 110 column_break_97 Column Break @@ -1595,12 +1640,12 @@ Delivered - 108 - subscription + 111 + auto_repeat Link - Subscription + Auto Repeat @@ -1608,7 +1653,7 @@ Delivered -Subscription +Auto Repeat @@ -1637,328 +1682,6 @@ Delivered
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_for_closed_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_modified_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_last_purchase_rate - (self) -

    -

    get last purchase rates for all items

    -
    -
    - - - - - -

    - - - get_schedule_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_drop_ship_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - is_against_so - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_received_qty_for_drop_ship_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_delivered_qty_in_sales_order - (self) -

    -

    Update delivered qty in Sales Order for drop ship

    -
    -
    - - - - - -

    - - - update_ordered_qty - (self, po_item_rows=None) -

    -

    update requested qty (before ordered_qty is updated)

    -
    -
    - - - - - -

    - - - update_requested_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_reserved_qty_for_subcontract - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status - (self, status) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status_updater - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_bom_for_subcontracting_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_minimum_order_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_supplier - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_with_previous_doc - (self) -

    -

    No docs

    -
    -
    - -
    @@ -1986,6 +1709,22 @@ Delivered +

    + + + erpnext.buying.doctype.purchase_order.purchase_order.get_item_details + (items) +

    +

    No docs

    +
    +
    + + + + + + +

    diff --git a/foundation/www/docs/current/models/buying/purchase_order_item.html b/foundation/www/docs/current/models/buying/purchase_order_item.html index b049dd44..340fe791 100644 --- a/foundation/www/docs/current/models/buying/purchase_order_item.html +++ b/foundation/www/docs/current/models/buying/purchase_order_item.html @@ -9,7 +9,7 @@

    - Version 10.1.2 + Version 10.1.31 56 + include_exploded_items + + Check + + Include Exploded Items + + + + + + + 57 + section_break_56 + + Section Break + + + + + + + + + 58 stock_qty Float @@ -863,7 +887,7 @@ - 57 + 59 received_qty Float @@ -875,7 +899,7 @@ - 58 + 60 returned_qty Float @@ -887,7 +911,19 @@ - 59 + 61 + column_break_60 + + Column Break + + + + + + + + + 62 billed_amt Currency @@ -901,7 +937,7 @@ - 60 + 63 item_tax_rate Code @@ -915,7 +951,7 @@ Used for Taxes and Charges

    - 61 + 64 page_break Check 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 281e24e4..1a8b8d7b 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 10.1.2 + Version 10.1.31 1 main_item_code - Data + Link Item Code - + + + + + +Item + + + + 2 rm_item_code - Data + Link Raw Material Item Code - + + + + + +Item + + + + 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 9c2c9031..cc7187b7 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 10.1.2 + Version 10.1.31 1 main_item_code - Data + Link Item Code - + + + + + +Item + + + + 2 rm_item_code - Data + Link Raw Material Item Code - + + + + + +Item + + + + 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 d6248c67..80d854ee 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 10.1.2 + Version 10.1.31 13 - standard_reply + email_template Link - Standard Reply + Email Template @@ -239,7 +239,7 @@ -Standard Reply +Email Template @@ -466,244 +466,6 @@ Cancelled
    - - - -

    - - - create_user - (self, rfq_supplier, link) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_attachments - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_link - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - send_email - (self, data, sender, subject, message, attachments) -

    -

    No docs

    -
    -
    - - - - - -

    - - - send_to_supplier - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - supplier_rfq_mail - (self, data, update_password_link, rfq_link) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_contact_of_supplier - (self, rfq_supplier, user) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_email_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_rfq_supplier_status - (self, sup_name=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_supplier_contact - (self, rfq_supplier, link) -

    -

    Create a new user for the supplier if not set in contact

    -
    -
    - - - - - -

    - - - update_supplier_part_no - (self, args) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplicate_supplier - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_email_id - (self, args) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_supplier_list - (self) -

    -

    No docs

    -
    -
    - -
    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 4c456f51..86b685ea 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - after_rename - (self, olddn, newdn, merge=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - load_dashboard_info - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    Load address and contacts in __onload

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -626,6 +514,15 @@ Supplier of Goods or Services. +
  • + + +Bank Guarantee + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/buying/supplier_quotation.html b/foundation/www/docs/current/models/buying/supplier_quotation.html index 0ad18424..0325033c 100644 --- a/foundation/www/docs/current/models/buying/supplier_quotation.html +++ b/foundation/www/docs/current/models/buying/supplier_quotation.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 Section Break - Subscription Section + Auto Repeat Section @@ -1109,11 +1109,11 @@ Net Total 74 - subscription + auto_repeat Link - Subscription + Auto Repeat @@ -1121,7 +1121,7 @@ Net Total -Subscription +Auto Repeat @@ -1243,90 +1243,6 @@ No
    - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_rfq_supplier_status - (self, include_me) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_with_previous_doc - (self) -

    -

    No docs

    -
    -
    - -
    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 156bb33e..5180ff61 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - calculate_total_score - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_standing - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_criteria_weights - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_standings - (self) -

    -

    No docs

    -
    -
    - -
    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 0e549555..4c49ae55 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 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_formula - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_variables - (self) -

    -

    No docs

    -
    -
    - -
    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 f2025d84..bd6765a9 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 10.1.2 + Version 10.1.31
    - - - -

    - - - calculate_criteria - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_score - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_variables - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_weighted_score - (self, weighing_function) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_criteria_weights - (self) -

    -

    No docs

    -
    -
    - -
    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 3b87bb25..2158884d 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_path_exists - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/crm/__init__.py b/foundation/www/docs/current/models/crm/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/crm/_sidebar.json b/foundation/www/docs/current/models/crm/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/crm/_sidebar.json +++ b/foundation/www/docs/current/models/crm/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/crm/index.html b/foundation/www/docs/current/models/crm/index.html index 3cfd1851..5c4f8d70 100644 --- a/foundation/www/docs/current/models/crm/index.html +++ b/foundation/www/docs/current/models/crm/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 16 - column_break_14 - - Column Break - - - - - - - - - 17 - contact_date - - Datetime - - Next Contact Date - - - - - - - 18 contact_by Link @@ -326,8 +302,44 @@ Do Not Contact - + + 17 + column_break_14 + + Column Break + + + + + + + + + 18 + contact_date + + Datetime + + Next Contact Date + + + + + + 19 + ends_on + + Datetime + + Ends On + + + + + + + 20 contact_info Section Break @@ -341,7 +353,7 @@ Do Not Contact - 20 + 21 address_desc HTML @@ -353,7 +365,7 @@ Do Not Contact - 21 + 22 address_html HTML @@ -365,7 +377,7 @@ Do Not Contact - 22 + 23 column_break2 Column Break @@ -377,7 +389,7 @@ Do Not Contact - 23 + 24 contact_html HTML @@ -389,7 +401,7 @@ Do Not Contact - 24 + 25 phone Data @@ -401,7 +413,7 @@ Do Not Contact - 25 + 26 salutation Link @@ -422,7 +434,7 @@ Do Not Contact - 26 + 27 mobile_no Data @@ -434,7 +446,7 @@ Do Not Contact - 27 + 28 fax Data @@ -446,7 +458,7 @@ Do Not Contact - 28 + 29 website Data @@ -458,7 +470,7 @@ Do Not Contact - 29 + 30 territory Link @@ -479,7 +491,7 @@ Do Not Contact - 30 + 31 more_info Section Break @@ -493,7 +505,7 @@ Do Not Contact - 31 + 32 type Select @@ -510,7 +522,7 @@ Consultant - 32 + 33 market_segment Select @@ -527,7 +539,7 @@ Upper Income - 33 + 34 industry Link @@ -548,7 +560,7 @@ Upper Income - 34 + 35 request_type Select @@ -566,7 +578,7 @@ Other - 35 + 36 column_break3 Column Break @@ -578,7 +590,7 @@ Other - 36 + 37 company Link @@ -599,7 +611,7 @@ Other - 37 + 38 unsubscribed Check @@ -611,7 +623,7 @@ Other - 38 + 39 blog_subscriber Check @@ -644,174 +656,6 @@ Other
    - - - -

    - - - add_calendar_event - (self, opts=None, force=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_email_id_is_unique - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_customer - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_lost_quotation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_opportunity - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_quotation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_lead_name - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/crm/opportunity.html b/foundation/www/docs/current/models/crm/opportunity.html index 35b23885..efd241ea 100644 --- a/foundation/www/docs/current/models/crm/opportunity.html +++ b/foundation/www/docs/current/models/crm/opportunity.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - add_calendar_event - (self, opts=None, force=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - after_insert - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - declare_enquiry_lost - (self, arg) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_active_quotation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_lost_quotation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_ordered_quotation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_new_lead_if_required - (self) -

    -

    Set lead against new opportunity

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_cust_name - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_lead_cust - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/crm/opportunity_item.html b/foundation/www/docs/current/models/crm/opportunity_item.html index b7806411..81fb79a6 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -330,6 +302,15 @@
    • + +
  • + + +Student Report Generation Tool + +
    • + + diff --git a/foundation/www/docs/current/models/education/academic_year.html b/foundation/www/docs/current/models/education/academic_year.html index d08780fa..00647757 100644 --- a/foundation/www/docs/current/models/education/academic_year.html +++ b/foundation/www/docs/current/models/education/academic_year.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -267,6 +253,15 @@ + +
  • + + +Student Report Generation Tool + +
    • + + diff --git a/foundation/www/docs/current/models/education/assessment_criteria.html b/foundation/www/docs/current/models/education/assessment_criteria.html index b3d5288b..6bdd64db 100644 --- a/foundation/www/docs/current/models/education/assessment_criteria.html +++ b/foundation/www/docs/current/models/education/assessment_criteria.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/assessment_criteria_group.html b/foundation/www/docs/current/models/education/assessment_criteria_group.html index 1239d7dd..cb11514e 100644 --- a/foundation/www/docs/current/models/education/assessment_criteria_group.html +++ b/foundation/www/docs/current/models/education/assessment_criteria_group.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + +
  • + + +Student Report Generation Tool + +
    • + + diff --git a/foundation/www/docs/current/models/education/assessment_plan.html b/foundation/www/docs/current/models/education/assessment_plan.html index cf4ceea3..9bb2e012 100644 --- a/foundation/www/docs/current/models/education/assessment_plan.html +++ b/foundation/www/docs/current/models/education/assessment_plan.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - set_missing_field - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_assessment_criteria - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_max_score - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_overlap - (self) -

    -

    Validates overlap for Student Group, Instructor, Room

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/assessment_plan_criteria.html b/foundation/www/docs/current/models/education/assessment_plan_criteria.html index 98a5745d..35cb95e4 100644 --- a/foundation/www/docs/current/models/education/assessment_plan_criteria.html +++ b/foundation/www/docs/current/models/education/assessment_plan_criteria.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - set_missing_values - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplicate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_grade - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_maximum_score - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/assessment_result_detail.html b/foundation/www/docs/current/models/education/assessment_result_detail.html index 756961b4..2a5059c0 100644 --- a/foundation/www/docs/current/models/education/assessment_result_detail.html +++ b/foundation/www/docs/current/models/education/assessment_result_detail.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_assessment_criteria - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/course_assessment_criteria.html b/foundation/www/docs/current/models/education/course_assessment_criteria.html index 7ec5b6fb..e9930ff2 100644 --- a/foundation/www/docs/current/models/education/course_assessment_criteria.html +++ b/foundation/www/docs/current/models/education/course_assessment_criteria.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - + 7 + color + + Color + + Color + + + + + + + 8 section_break_6 Section Break @@ -156,7 +168,7 @@ - 8 + 9 schedule_date Date @@ -168,7 +180,7 @@ - 9 + 10 room Link @@ -189,7 +201,7 @@ - 10 + 11 column_break_9 Column Break @@ -201,7 +213,7 @@ - 11 + 12 from_time Time @@ -213,7 +225,7 @@ - 12 + 13 to_time Time @@ -225,7 +237,7 @@ - 13 + 14 title Data @@ -258,76 +270,6 @@
    - - - -

    - - - set_title - (self) -

    -

    Set document Title

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_course - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_date - (self) -

    -

    Validates if fromtime is greater than totime

    -
    -
    - - - - - -

    - - - validate_overlap - (self) -

    -

    Validates overlap for Student Group, Instructor, Room

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/course_scheduling_tool.html b/foundation/www/docs/current/models/education/course_scheduling_tool.html index d0ea9d8a..7a315b5d 100644 --- a/foundation/www/docs/current/models/education/course_scheduling_tool.html +++ b/foundation/www/docs/current/models/education/course_scheduling_tool.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - delete_course_schedule - (self, rescheduled, reschedule_errors) -

    -

    Delete all course schedule within the Date range and specified filters

    -
    -
    - - - - - -

    - - - make_course_schedule - (self, date) -

    -

    Makes a new Course Schedule.

    - -

    Parameters:

    - -
      -
    • date - Date on which Course Schedule will be created.
      • -
    -
    -
    - - - - - -

    - - - schedule_course - (self) -

    -

    Creates course schedules as per specified parameters

    -
    -
    - - - - - -

    - - - validate_date - (self) -

    -

    Validates if Course Start Date is greater than Course End Date

    -
    -
    - - - - - -

    - - - validate_mandatory - (self) -

    -

    Validates all mandatory fields

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/education_settings.html b/foundation/www/docs/current/models/education/education_settings.html index 6c537610..b3d45d03 100644 --- a/foundation/www/docs/current/models/education/education_settings.html +++ b/foundation/www/docs/current/models/education/education_settings.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_defaults - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    update defaults

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/fee_category.html b/foundation/www/docs/current/models/education/fee_category.html index e2d0341d..ad1730d5 100644 --- a/foundation/www/docs/current/models/education/fee_category.html +++ b/foundation/www/docs/current/models/education/fee_category.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - calculate_total_and_program - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_fees - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_dashboard_info - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -712,6 +642,22 @@ Successful + +

    + + + erpnext.education.doctype.fee_schedule.fee_schedule.get_students + (student_group, academic_year, academic_term=None, student_category=None) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.education.doctype.fee_schedule.fee_schedule.get_total_students

    diff --git a/foundation/www/docs/current/models/education/fee_schedule_program.html b/foundation/www/docs/current/models/education/fee_schedule_program.html index d7d48dcd..041508ad 100644 --- a/foundation/www/docs/current/models/education/fee_schedule_program.html +++ b/foundation/www/docs/current/models/education/fee_schedule_program.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - calculate_total - (self) -

    -

    Calculates total amount.

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/fees.html b/foundation/www/docs/current/models/education/fees.html index 3cba2737..bf9a0045 100644 --- a/foundation/www/docs/current/models/education/fees.html +++ b/foundation/www/docs/current/models/education/fees.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - calculate_total - (self) -

    -

    Calculates total amount.

    -
    -
    - - - - - -

    - - - get_student_emails - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gl_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_indicator - (self) -

    -

    Set indicator for portal

    -
    -
    - - - - - -

    - - - set_missing_accounts_and_fields - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/grading_scale.html b/foundation/www/docs/current/models/education/grading_scale.html index 78eb6c9d..a2dd4f39 100644 --- a/foundation/www/docs/current/models/education/grading_scale.html +++ b/foundation/www/docs/current/models/education/grading_scale.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/grading_scale_interval.html b/foundation/www/docs/current/models/education/grading_scale_interval.html index 911d06d3..79b5234e 100644 --- a/foundation/www/docs/current/models/education/grading_scale_interval.html +++ b/foundation/www/docs/current/models/education/grading_scale_interval.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - __setup__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - load_students - (self) -

    -

    Load students from the database

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    Load Students for quick view

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/guardian_interest.html b/foundation/www/docs/current/models/education/guardian_interest.html index 98741202..8013e4ff 100644 --- a/foundation/www/docs/current/models/education/guardian_interest.html +++ b/foundation/www/docs/current/models/education/guardian_interest.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/instructor_log.html b/foundation/www/docs/current/models/education/instructor_log.html index 959e43f0..20200465 100644 --- a/foundation/www/docs/current/models/education/instructor_log.html +++ b/foundation/www/docs/current/models/education/instructor_log.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + +
  • + + +Student Report Generation Tool + +
    • + + diff --git a/foundation/www/docs/current/models/education/program_course.html b/foundation/www/docs/current/models/education/program_course.html index d0c1d7fe..e2cc61dc 100644 --- a/foundation/www/docs/current/models/education/program_course.html +++ b/foundation/www/docs/current/models/education/program_course.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_courses - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_fee_records - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_student_joining_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplication - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/program_enrollment_course.html b/foundation/www/docs/current/models/education/program_enrollment_course.html index 3e9d1bee..068685cf 100644 --- a/foundation/www/docs/current/models/education/program_enrollment_course.html +++ b/foundation/www/docs/current/models/education/program_enrollment_course.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - enroll_students - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_students - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/program_enrollment_tool_student.html b/foundation/www/docs/current/models/education/program_enrollment_tool_student.html index 0dfe6f63..cc922b24 100644 --- a/foundation/www/docs/current/models/education/program_enrollment_tool_student.html +++ b/foundation/www/docs/current/models/education/program_enrollment_tool_student.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_unique - (self) -

    -

    Validates if the Student Applicant is Unique

    -
    -
    - - - - - -

    - - - update_applicant_status - (self) -

    -

    Updates Student Applicant status to Admitted

    -
    -
    - - - - - -

    - - - update_student_name_in_linked_doctype - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -705,6 +649,15 @@ Other +
  • + + +Student Report Generation Tool + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/education/student_admission.html b/foundation/www/docs/current/models/education/student_admission.html index bc19b144..a8e12c38 100644 --- a/foundation/www/docs/current/models/education/student_admission.html +++ b/foundation/www/docs/current/models/education/student_admission.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_title - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/student_admission_program.html b/foundation/www/docs/current/models/education/student_admission_program.html index d5f38246..cc5786a6 100644 --- a/foundation/www/docs/current/models/education/student_admission_program.html +++ b/foundation/www/docs/current/models/education/student_admission_program.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_payment_authorized - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update_after_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validation_from_student_admission - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/student_attendance.html b/foundation/www/docs/current/models/education/student_attendance.html index 190288b8..b74c041b 100644 --- a/foundation/www/docs/current/models/education/student_attendance.html +++ b/foundation/www/docs/current/models/education/student_attendance.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_course_schedule - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplication - (self) -

    -

    Check if the Attendance Record is Unique

    -
    -
    - - - - - -

    - - - validate_mandatory - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_student - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/student_attendance_tool.html b/foundation/www/docs/current/models/education/student_attendance_tool.html index 3edd39ab..93db16cb 100644 --- a/foundation/www/docs/current/models/education/student_attendance_tool.html +++ b/foundation/www/docs/current/models/education/student_attendance_tool.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + +
  • + + +Student Report Generation Tool + +
    • + + diff --git a/foundation/www/docs/current/models/education/student_category.html b/foundation/www/docs/current/models/education/student_category.html index 8bf217b0..92fdae6f 100644 --- a/foundation/www/docs/current/models/education/student_category.html +++ b/foundation/www/docs/current/models/education/student_category.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_and_set_child_table_fields - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_mandatory_fields - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_strength - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_students - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/student_group_creation_tool.html b/foundation/www/docs/current/models/education/student_group_creation_tool.html index ffe14530..b609f69d 100644 --- a/foundation/www/docs/current/models/education/student_group_creation_tool.html +++ b/foundation/www/docs/current/models/education/student_group_creation_tool.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - create_student_groups - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_courses - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/education/student_group_creation_tool_course.html b/foundation/www/docs/current/models/education/student_group_creation_tool_course.html index f667b61e..0f525c3a 100644 --- a/foundation/www/docs/current/models/education/student_group_creation_tool_course.html +++ b/foundation/www/docs/current/models/education/student_group_creation_tool_course.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + + + + + +

    Student Report Generation Tool

    +
    + + + Version 10.1.31 + + + Source + +
    + +Single + + + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1student + Link + Student + + + + + + +Student + + + +
    2student_name + Read Only + Student Name + +
    3program + Link + Program + + + + + + +Program + + + +
    4student_batch + Link + Batch + + + + + + +Student Batch Name + + + +
    5include_all_assessment + Check + Include All Assessment Group + +
    6show_marks + Check + Show Marks + +
    7add_letterhead + Check + Add letterhead + +
    8column_break_3 + Column Break + + +
    9assessment_group + Link + Assessment Group + + + + + + +Assessment Group + + + +
    10academic_year + Link + Academic Year + + + + + + +Academic Year + + + +
    11academic_term + Link + Academic Term + + + + + + +Academic Term + + + +
    12letter_head + Link + Letter Head + + + + + + +Letter Head + + + +
    13section_break_5 + Section Break + Print Section + +
    14parents_meeting + Data + Total Parents Teacher Meeting + +
    15parents_attendance + Data + Attended by Parents + +
    16terms + Link + Terms + + + + + + +Terms and Conditions + + + +
    17assessment_terms + Text Editor + Assessment Terms + +
    + + +
    +

    Controller

    +

    erpnext.education.doctype.student_report_generation_tool.student_report_generation_tool

    + + + + + + + +

    Class StudentReportGenerationTool

    + +

    Inherits from frappe.model.document.Document + +

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

    + + + erpnext.education.doctype.student_report_generation_tool.student_report_generation_tool.get_attendance_count + (student, academic_year, academic_term=None) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.education.doctype.student_report_generation_tool.student_report_generation_tool.get_courses_criteria + (courses) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.education.doctype.student_report_generation_tool.student_report_generation_tool.preview_report_card +

    +

    + + + erpnext.education.doctype.student_report_generation_tool.student_report_generation_tool.preview_report_card + (doc) +

    +

    No docs

    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/education/student_sibling.html b/foundation/www/docs/current/models/education/student_sibling.html index 1b15cb27..35a75afe 100644 --- a/foundation/www/docs/current/models/education/student_sibling.html +++ b/foundation/www/docs/current/models/education/student_sibling.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + + + + + +

    GoCardless Mandate

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabGoCardless Mandate

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1disabled + Check + Disabled + +
    2customer + Link + Customer + + + + + + +Customer + + + +
    3mandate + Data + Mandate + +
    4gocardless_customer + Data + GoCardless Customer + +
    + + +
    +

    Controller

    +

    erpnext.erpnext_integrations.doctype.gocardless_mandate.gocardless_mandate

    + + + + + + + +

    Class GoCardlessMandate

    + +

    Inherits from frappe.model.document.Document + +

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

    GoCardless Settings

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabGoCardless Settings

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1gateway_name + Data + Payment Gateway Name + +
    2section_break_2 + Section Break + + +
    3access_token + Data + Access Token + +
    4webhooks_secret + Data + Webhooks Secret + +
    5use_sandbox + Check + Use Sandbox + +
    + + +
    +

    Controller

    +

    erpnext.erpnext_integrations.doctype.gocardless_settings.gocardless_settings

    + + + + + + + +

    Class GoCardlessSettings

    + +

    Inherits from frappe.model.document.Document + +

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

    + + + erpnext.erpnext_integrations.doctype.gocardless_settings.gocardless_settings.get_gateway_controller + (doc) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.erpnext_integrations.doctype.gocardless_settings.gocardless_settings.gocardless_initialization + (doc) +

    +

    No docs

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

    Module erpnext_integrations

    +
    + + + Version 10.1.31 + + + Source + +
    + +

    DocTypes for erpnext_integrations

    + +{index} + + \ No newline at end of file diff --git a/foundation/www/docs/assets/img/accounts/shareholder/__init__.py b/foundation/www/docs/current/models/erpnext_integrations/index.txt similarity index 100% rename from foundation/www/docs/assets/img/accounts/shareholder/__init__.py rename to foundation/www/docs/current/models/erpnext_integrations/index.txt diff --git a/foundation/www/docs/current/models/erpnext_integrations/woocommerce_settings.html b/foundation/www/docs/current/models/erpnext_integrations/woocommerce_settings.html new file mode 100644 index 00000000..7f59226b --- /dev/null +++ b/foundation/www/docs/current/models/erpnext_integrations/woocommerce_settings.html @@ -0,0 +1,267 @@ + + + + + + + +

    Woocommerce Settings

    +
    + + + Version 10.1.31 + + + Source + +
    + +Single + + + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1enable_sync + Check + Enable Sync + +
    2sb_00 + Section Break + + +
    3woocommerce_server_url + Data + Woocommerce Server URL + +
    4secret + Code + Secret + +
    5cb_00 + Column Break + + +
    6api_consumer_key + Data + API consumer key + +
    7api_consumer_secret + Data + API consumer secret + +
    8sb_accounting_details + Section Break + Accounting Details + +
    9tax_account + Link + Tax Account + + + + + + +Account + + + +
    10column_break_10 + Column Break + + +
    11f_n_f_account + Link + Freight and Forwarding Account + + + + + + +Account + + + +
    12endpoints + Section Break + Endpoints + +
    13endpoint + Code + Endpoint + +
    + + +
    +

    Controller

    +

    erpnext.erpnext_integrations.doctype.woocommerce_settings.woocommerce_settings

    + + + + + + + +

    Class WoocommerceSettings

    + +

    Inherits from frappe.model.document.Document + +

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

    Public API +
    /api/method/erpnext.erpnext_integrations.doctype.woocommerce_settings.woocommerce_settings.generate_secret +

    +

    + + + erpnext.erpnext_integrations.doctype.woocommerce_settings.woocommerce_settings.generate_secret + () +

    +

    No docs

    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/fleet_management/__init__.py b/foundation/www/docs/current/models/fleet_management/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/fleet_management/_sidebar.json b/foundation/www/docs/current/models/fleet_management/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/fleet_management/_sidebar.json +++ b/foundation/www/docs/current/models/fleet_management/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/fleet_management/index.html b/foundation/www/docs/current/models/fleet_management/index.html index 4ed2cec3..89c570c4 100644 --- a/foundation/www/docs/current/models/fleet_management/index.html +++ b/foundation/www/docs/current/models/fleet_management/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + 3 + default_duration + + Int + + Default Duration +

    + In Minutes

    + + + + + + 4 + color + + Color + + Color + + + + + diff --git a/foundation/www/docs/current/models/healthcare/codification_table.html b/foundation/www/docs/current/models/healthcare/codification_table.html index e5128480..015ba7c3 100644 --- a/foundation/www/docs/current/models/healthcare/codification_table.html +++ b/foundation/www/docs/current/models/healthcare/codification_table.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Section Break - Drug Prescription + Medication @@ -443,7 +443,7 @@ Other Table - Drug Prescription + Medication @@ -546,62 +546,6 @@ Other
    - - - -

    - - - after_insert - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/diagnosis.html b/foundation/www/docs/current/models/healthcare/diagnosis.html index 7807da28..ed714167 100644 --- a/foundation/www/docs/current/models/healthcare/diagnosis.html +++ b/foundation/www/docs/current/models/healthcare/diagnosis.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/index.html b/foundation/www/docs/current/models/healthcare/index.html index b550d248..abb08cc5 100644 --- a/foundation/www/docs/current/models/healthcare/index.html +++ b/foundation/www/docs/current/models/healthcare/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - after_insert - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - load_test_from_template - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/lab_test_groups.html b/foundation/www/docs/current/models/healthcare/lab_test_groups.html index f8bedba1..7773d18e 100644 --- a/foundation/www/docs/current/models/healthcare/lab_test_groups.html +++ b/foundation/www/docs/current/models/healthcare/lab_test_groups.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - after_insert - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/lab_test_uom.html b/foundation/www/docs/current/models/healthcare/lab_test_uom.html index 7af837a6..2335c248 100644 --- a/foundation/www/docs/current/models/healthcare/lab_test_uom.html +++ b/foundation/www/docs/current/models/healthcare/lab_test_uom.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/medical_code_standard.html b/foundation/www/docs/current/models/healthcare/medical_code_standard.html index a2fceaa2..6996131e 100644 --- a/foundation/www/docs/current/models/healthcare/medical_code_standard.html +++ b/foundation/www/docs/current/models/healthcare/medical_code_standard.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - add_as_website_user - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - after_insert - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_age - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_patient_name - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - invoice_patient_registration - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/patient_appointment.html b/foundation/www/docs/current/models/healthcare/patient_appointment.html index bc46f33a..b7abf03e 100644 --- a/foundation/www/docs/current/models/healthcare/patient_appointment.html +++ b/foundation/www/docs/current/models/healthcare/patient_appointment.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 2 + department + + Link + + Department + + + + + + + +Medical Department + + + + + + + + 3 physician Link @@ -83,7 +104,7 @@ - 3 + 4 appointment_date Date @@ -95,7 +116,32 @@ - 4 + 5 + appointment_time + + Time + + Time + + + + + + + 6 + duration + + Int + + Duration +

    + In Minutes

    + + + + + + 7 check_availability Button @@ -107,7 +153,7 @@ - 5 + 8 column_break_1 Column Break @@ -119,7 +165,28 @@ - 6 + 9 + service_unit + + Link + + Service Unit + + + + + + + +Patient Service Unit + + + + + + + + 10 patient_name Data @@ -133,7 +200,7 @@ - 7 + 11 patient_sex Data @@ -147,7 +214,7 @@ - 8 + 12 patient_age Data @@ -159,7 +226,7 @@ - 9 + 13 status Select @@ -178,7 +245,7 @@ Cancelled - 10 + 14 appointment_type Link @@ -199,7 +266,7 @@ Cancelled - 11 + 15 section_break_1 Section Break @@ -211,32 +278,7 @@ Cancelled - 12 - appointment_time - - Time - - Time - - - - - - - 13 - duration - - Int - - Duration -

    - In Minutes

    - - - - - - 14 + 16 appointment_datetime Datetime @@ -248,7 +290,7 @@ Cancelled - 15 + 17 column_break_2 Column Break @@ -260,28 +302,7 @@ Cancelled - 16 - department - - Link - - Department - - - - - - - -Medical Department - - - - - - - - 17 + 18 sales_invoice Link @@ -302,7 +323,7 @@ Cancelled - 18 + 19 company Link @@ -323,7 +344,7 @@ Cancelled - 19 + 20 section_break_3 Section Break @@ -335,7 +356,7 @@ Cancelled - 20 + 21 notes Small Text @@ -347,7 +368,7 @@ Cancelled - 21 + 22 referring_physician Link @@ -368,7 +389,7 @@ Cancelled - 22 + 23 reminded Check @@ -401,48 +422,6 @@ Cancelled
    - - - -

    - - - after_insert - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - save - (self) -

    -

    No docs

    -
    -
    - -
    @@ -517,30 +496,12 @@ Cancelled -

    Public API -
    /api/method/erpnext.healthcare.doctype.patient_appointment.patient_appointment.create_invoice -

    -

    - - - erpnext.healthcare.doctype.patient_appointment.patient_appointment.create_invoice - (company, physician, patient, appointment_id, appointment_date) -

    -

    No docs

    -
    -
    - - - - - -

    erpnext.healthcare.doctype.patient_appointment.patient_appointment.create_invoice_items - (appointment_id, physician, company, invoice) + (physician, company, invoice)

    No docs

    @@ -621,6 +582,24 @@ Cancelled +

    Public API +
    /api/method/erpnext.healthcare.doctype.patient_appointment.patient_appointment.invoice_appointment +

    +

    + + + erpnext.healthcare.doctype.patient_appointment.patient_appointment.invoice_appointment + (appointment_doc) +

    +

    No docs

    +
    +
    + + + + + +

    diff --git a/foundation/www/docs/current/models/healthcare/patient_medical_record.html b/foundation/www/docs/current/models/healthcare/patient_medical_record.html index b2a7a72a..b933c55c 100644 --- a/foundation/www/docs/current/models/healthcare/patient_medical_record.html +++ b/foundation/www/docs/current/models/healthcare/patient_medical_record.html @@ -9,7 +9,7 @@

    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - after_insert - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/patient_relation.html b/foundation/www/docs/current/models/healthcare/patient_relation.html index 9c726248..5ce7e217 100644 --- a/foundation/www/docs/current/models/healthcare/patient_relation.html +++ b/foundation/www/docs/current/models/healthcare/patient_relation.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 + + + + + + +

    Patient Service Unit

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabPatient Service Unit

    + + +Patinet Service Unit + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1patient_service_unit_name + Data + Service Unit + +
    2parent_patient_service_unit + Link + Parent Service Unit + + + + + + +Patient Service Unit + + + +
    3is_group + Check + Is Group + +
    4overlap_appointments + Check + Allow Overlap + +
    5company + Link + Company + + + + + + +Company + + + +
    6lft + Int + lft + +
    7rgt + Int + rgt + +
    8old_parent + Link + Old Parent + + + + + + +Patient Service Unit + + + +
    + + +
    +

    Controller

    +

    erpnext.healthcare.doctype.patient_service_unit.patient_service_unit

    + + + + + + + +

    Class PatientServiceUnit

    + +

    Inherits from frappe.utils.nestedset.NestedSet + +

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

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/healthcare/physician.html b/foundation/www/docs/current/models/healthcare/physician.html index a539a7b5..177154b1 100644 --- a/foundation/www/docs/current/models/healthcare/physician.html +++ b/foundation/www/docs/current/models/healthcare/physician.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 15 - physician_schedule + physician_schedules - Link + Table - Physician Schedule + Physician Schedules @@ -258,40 +258,15 @@ -Physician Schedule +Physician Service Unit Schedule - - 16 - column_break_17 - - Column Break - - - - - - - - - 17 - time_per_appointment - - Data - - Time per Appointment -

    - In minutes

    - - - - - 18 + 16 charges Section Break @@ -303,7 +278,7 @@ - 19 + 17 op_consulting_charge Currency @@ -317,7 +292,7 @@ - 20 + 18 contacts_and_address Section Break @@ -329,7 +304,7 @@ - 21 + 19 address_html HTML @@ -341,7 +316,7 @@ - 22 + 20 column_break_19 Column Break @@ -353,7 +328,7 @@ - 23 + 21 contact_html HTML @@ -365,7 +340,7 @@ - 24 + 22 account_details Section Break @@ -377,7 +352,7 @@ - 25 + 23 accounts Table @@ -398,7 +373,7 @@ - 26 + 24 default_currency Link @@ -440,118 +415,6 @@
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplicate_user_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_for_enabled_user_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_schedule_and_time - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/physician_schedule.html b/foundation/www/docs/current/models/healthcare/physician_schedule.html index 901ab13c..17a8837e 100644 --- a/foundation/www/docs/current/models/healthcare/physician_schedule.html +++ b/foundation/www/docs/current/models/healthcare/physician_schedule.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - -
    @@ -136,7 +122,7 @@
  • -Physician +Physician Service Unit Schedule
    • diff --git a/foundation/www/docs/current/models/healthcare/physician_schedule_time_slot.html b/foundation/www/docs/current/models/healthcare/physician_schedule_time_slot.html index 65366b80..c7613d64 100644 --- a/foundation/www/docs/current/models/healthcare/physician_schedule_time_slot.html +++ b/foundation/www/docs/current/models/healthcare/physician_schedule_time_slot.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 + + + + + + +

    Physician Service Unit Schedule

    +
    + + + Version 10.1.31 + + + Source + +
    + + +Child Table + + +

    Table Name: tabPhysician Service Unit Schedule

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1schedule + Link + Schedule + + + + + + +Physician Schedule + + + +
    2service_unit + Link + Service Unit + + + + + + +Patient Service Unit + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/healthcare/prescription_dosage.html b/foundation/www/docs/current/models/healthcare/prescription_dosage.html index 31146f07..7c7062e3 100644 --- a/foundation/www/docs/current/models/healthcare/prescription_dosage.html +++ b/foundation/www/docs/current/models/healthcare/prescription_dosage.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_days - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_hours - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_minutes - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_months - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_weeks - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/healthcare/sample_collection.html b/foundation/www/docs/current/models/healthcare/sample_collection.html index 4690a6b7..2f5810df 100644 --- a/foundation/www/docs/current/models/healthcare/sample_collection.html +++ b/foundation/www/docs/current/models/healthcare/sample_collection.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hotels/__init__.py b/foundation/www/docs/current/models/hotels/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/hotels/_sidebar.json b/foundation/www/docs/current/models/hotels/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/hotels/_sidebar.json +++ b/foundation/www/docs/current/models/hotels/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/hotels/hotel_room.html b/foundation/www/docs/current/models/hotels/hotel_room.html index a4659268..f25a945b 100644 --- a/foundation/www/docs/current/models/hotels/hotel_room.html +++ b/foundation/www/docs/current/models/hotels/hotel_room.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hotels/hotel_room_amenity.html b/foundation/www/docs/current/models/hotels/hotel_room_amenity.html index e2b7c095..9939065e 100644 --- a/foundation/www/docs/current/models/hotels/hotel_room_amenity.html +++ b/foundation/www/docs/current/models/hotels/hotel_room_amenity.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hotels/hotel_room_pricing.html b/foundation/www/docs/current/models/hotels/hotel_room_pricing.html index 943528f3..40762ff2 100644 --- a/foundation/www/docs/current/models/hotels/hotel_room_pricing.html +++ b/foundation/www/docs/current/models/hotels/hotel_room_pricing.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_total_rooms - (self, item) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_rates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_availability - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hotels/hotel_room_reservation_item.html b/foundation/www/docs/current/models/hotels/hotel_room_reservation_item.html index 5bba19c3..e4edee58 100644 --- a/foundation/www/docs/current/models/hotels/hotel_room_reservation_item.html +++ b/foundation/www/docs/current/models/hotels/hotel_room_reservation_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - calculate_total - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_employee_name - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_existing_appraisal - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/appraisal_goal.html b/foundation/www/docs/current/models/hr/appraisal_goal.html index 9ceffa4f..5542ceb1 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_total_points - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 2be38a1d..0c66f9a7 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_leave_record - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_attendance_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplicate_record - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_employee - (self) -

    -

    No docs

    -
    -
    - -
    + + + + +

    + + + erpnext.hr.doctype.attendance.attendance.add_attendance + (events, start, end, conditions=None) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.hr.doctype.attendance.attendance.get_events +

    +

    + + + erpnext.hr.doctype.attendance.attendance.get_events + (start, end, filters=None) +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/hr/branch.html b/foundation/www/docs/current/models/hr/branch.html index d2fd81df..fbe6dc8c 100644 --- a/foundation/www/docs/current/models/hr/branch.html +++ b/foundation/www/docs/current/models/hr/branch.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_message_details - (self) -

    -

    Return args for template

    -
    -
    - - - - - -

    - - - send_mails - (self, dws_group, emails) -

    -

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

    -
    -
    - - - - - -

    - - - send_summary - (self) -

    -

    Send summary of all replies. Called at midnight

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/daily_work_summary_group.html b/foundation/www/docs/current/models/hr/daily_work_summary_group.html index e2af1550..bf60bd07 100644 --- a/foundation/www/docs/current/models/hr/daily_work_summary_group.html +++ b/foundation/www/docs/current/models/hr/daily_work_summary_group.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/daily_work_summary_group_user.html b/foundation/www/docs/current/models/hr/daily_work_summary_group_user.html index 25276274..a9d494ff 100644 --- a/foundation/www/docs/current/models/hr/daily_work_summary_group_user.html +++ b/foundation/www/docs/current/models/hr/daily_work_summary_group_user.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 2 + parent_department + + Link + + Parent Department + + + + + + + +Department + + + + + + + + 3 + is_group + + Check + + Is Group + + + + + + + 4 + section_break_4 + + Section Break + + + + + + + + + 5 leave_block_list Link @@ -74,6 +119,110 @@ + + 6 + leave_section + + Section Break + + Leave Approvers + + + + + + + 7 + leave_approver + + Table + + Leave Approver +

    + The first Leave Approver in the list will be set as the default Leave Approver.

    + + + + + + +Department Approver + + + + + + + + 8 + expense_section + + Section Break + + Expense Approvers + + + + + + + 9 + expense_approver + + Table + + Expense Approver +

    + The first Expense Approver in the list will be set as the default Expense Approver.

    + + + + + + +Department Approver + + + + + + + + 10 + lft + + Int + + lft + + + + + + + 11 + rgt + + Int + + rgt + + + + + + + 12 + old_parent + + Data + + Old Parent + + + + + @@ -90,7 +239,7 @@

    Class Department

    -

    Inherits from frappe.model.document.Document +

    Inherits from frappe.utils.nestedset.NestedSet

    @@ -101,6 +250,22 @@ + + + + +

    + + + erpnext.hr.doctype.department.department.on_doctype_update + () +

    +

    No docs

    +
    +
    + + + @@ -126,6 +291,15 @@ +
  • + + +Department + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/hr/employee_leave_approver.html b/foundation/www/docs/current/models/hr/department_approver.html similarity index 72% rename from foundation/www/docs/current/models/hr/employee_leave_approver.html rename to foundation/www/docs/current/models/hr/department_approver.html index b71e2f11..d06f5a2c 100644 --- a/foundation/www/docs/current/models/hr/employee_leave_approver.html +++ b/foundation/www/docs/current/models/hr/department_approver.html @@ -1,18 +1,18 @@ - + -

    Employee Leave Approver

    +

    Department Approver

    - Version 10.1.2 + Version 10.1.31 - Source
    @@ -21,10 +21,10 @@ Child Table -

    Table Name: tabEmployee Leave Approver

    +

    Table Name: tabDepartment Approver

    + -Users who can approve a specific employee's leave applications

    Fields

    @@ -42,11 +42,11 @@ Users who can approve a specific employee's leave applications 1 - leave_approver + approver Link - Leave Approver + Approver @@ -73,7 +73,7 @@ Users who can approve a specific employee's leave applications
  • -Employee +Department
    • diff --git a/foundation/www/docs/current/models/hr/designation.html b/foundation/www/docs/current/models/hr/designation.html index a6684284..3a35ee08 100644 --- a/foundation/www/docs/current/models/hr/designation.html +++ b/foundation/www/docs/current/models/hr/designation.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 8 + create_user_permission + + Check + + Create User Permission +

    + This will restrict user access to other employee records

    + + + + + + 9 create_user Button @@ -167,7 +180,7 @@ - 9 + 10 image Attach Image @@ -179,7 +192,7 @@ - 10 + 11 column_break1 Column Break @@ -191,7 +204,7 @@ - 11 + 12 employee_number Data @@ -203,7 +216,7 @@ - 12 + 13 date_of_joining Date @@ -215,7 +228,7 @@ - 13 + 14 date_of_birth Date @@ -228,7 +241,7 @@ - 14 + 15 gender Link @@ -249,7 +262,7 @@ - 15 + 16 employment_details Section Break @@ -261,7 +274,7 @@ - 16 + 17 status Select @@ -277,7 +290,7 @@ Left - 17 + 18 employment_type Link @@ -298,7 +311,7 @@ Left - 18 + 19 holiday_list Link @@ -320,7 +333,40 @@ Left - 19 + 20 + health_insurance_provider + + Link + + Health Insurance Provider + + + + + + + +    Health Insurance + + + + + + + + 21 + health_insurance_no + + Data + + Health Insurance No + + + + + + + 22 col_break_22 Column Break @@ -332,7 +378,7 @@ Left - 20 + 23 scheduled_confirmation_date Date @@ -344,7 +390,7 @@ Left - 21 + 24 final_confirmation_date Date @@ -356,7 +402,7 @@ Left - 22 + 25 contract_end_date Date @@ -368,7 +414,7 @@ Left - 23 + 26 date_of_retirement Date @@ -380,7 +426,7 @@ Left - 24 + 27 job_profile Section Break @@ -392,7 +438,7 @@ Left - 25 + 28 branch Link @@ -413,7 +459,7 @@ Left - 26 + 29 department Link @@ -434,7 +480,7 @@ Left - 27 + 30 designation Link @@ -455,22 +501,7 @@ Left - 28 - company_email - - Data - - Company Email -

    - Provide Email Address registered in company

    - - - 
    Email
    - - - - - 29 + 31 notice_number_of_days Int @@ -482,7 +513,7 @@ Left - 30 + 32 salary_information Column Break @@ -494,7 +525,7 @@ Left - 31 + 33 salary_mode Select @@ -511,7 +542,7 @@ Cheque - 32 + 34 bank_name Data @@ -523,7 +554,7 @@ Cheque - 33 + 35 bank_ac_no Data @@ -535,7 +566,7 @@ Cheque - 34 + 36 organization_profile Section Break @@ -547,7 +578,7 @@ Cheque - 35 + 37 reports_to Link @@ -564,33 +595,11 @@ Cheque - - - - - 36 - leave_approvers - - Table - - Leave Approvers -

    - The first Leave Approver in the list will be set as the default Leave Approver

    - - - - - - -Employee Leave Approver - - - - 37 + 38 contact_details Section Break @@ -602,7 +611,19 @@ Cheque - 38 + 39 + cell_number + + Data + + Cell Number + + + + + + + 40 prefered_contact_email Select @@ -619,7 +640,7 @@ User ID - 39 + 41 prefered_email Data @@ -633,19 +654,22 @@ User ID - 40 - cell_number + 42 + company_email Data - Cell Number - + Company Email +

    + Provide Email Address registered in company

    + + + 
    Email
    - - 41 + 43 personal_email Data @@ -659,7 +683,7 @@ User ID - 42 + 44 unsubscribed Check @@ -671,7 +695,7 @@ User ID - 43 + 45 person_to_be_contacted Data @@ -683,7 +707,7 @@ User ID - 44 + 46 relation Data @@ -695,7 +719,7 @@ User ID - 45 + 47 emergency_phone_number Data @@ -707,7 +731,7 @@ User ID - 46 + 48 column_break4 Column Break @@ -719,7 +743,7 @@ User ID - 47 + 49 permanent_accommodation_type Select @@ -735,7 +759,7 @@ Owned - 48 + 50 permanent_address Small Text @@ -747,7 +771,7 @@ Owned - 49 + 51 current_accommodation_type Select @@ -763,7 +787,7 @@ Owned - 50 + 52 current_address Small Text @@ -775,7 +799,7 @@ Owned - 51 + 53 sb53 Section Break @@ -787,7 +811,7 @@ Owned - 52 + 54 bio Text Editor @@ -800,7 +824,7 @@ Owned - 53 + 55 personal_details Section Break @@ -812,7 +836,7 @@ Owned - 54 + 56 passport_number Data @@ -824,7 +848,7 @@ Owned - 55 + 57 date_of_issue Date @@ -836,7 +860,7 @@ Owned - 56 + 58 valid_upto Date @@ -848,7 +872,7 @@ Owned - 57 + 59 place_of_issue Data @@ -860,7 +884,7 @@ Owned - 58 + 60 column_break6 Column Break @@ -872,7 +896,7 @@ Owned - 59 + 61 marital_status Select @@ -890,7 +914,7 @@ Widowed - 60 + 62 blood_group Select @@ -912,7 +936,7 @@ O- - 61 + 63 family_background Small Text @@ -925,7 +949,7 @@ O- - 62 + 64 health_details Small Text @@ -938,7 +962,7 @@ O- - 63 + 65 educational_qualification Section Break @@ -950,7 +974,7 @@ O- - 64 + 66 education Table @@ -971,7 +995,7 @@ O- - 65 + 67 previous_work_experience Section Break @@ -985,7 +1009,7 @@ O- - 66 + 68 external_work_history Table @@ -1006,7 +1030,7 @@ O- - 67 + 69 history_in_company Section Break @@ -1020,7 +1044,7 @@ O- - 68 + 70 internal_work_history Table @@ -1041,7 +1065,7 @@ O- - 69 + 71 exit Section Break @@ -1053,7 +1077,7 @@ O- - 70 + 72 resignation_letter_date Date @@ -1065,7 +1089,7 @@ O- - 71 + 73 relieving_date Date @@ -1077,7 +1101,7 @@ O- - 72 + 74 reason_for_leaving Data @@ -1089,7 +1113,7 @@ O- - 73 + 75 leave_encashed Select @@ -1105,7 +1129,7 @@ No - 74 + 76 encashment_date Date @@ -1117,7 +1141,7 @@ No - 75 + 77 exit_interview_details Column Break @@ -1129,7 +1153,7 @@ No - 76 + 78 held_on Date @@ -1141,7 +1165,7 @@ No - 77 + 79 reason_for_resignation Select @@ -1157,7 +1181,7 @@ Health Concerns - 78 + 80 new_workplace Data @@ -1169,7 +1193,7 @@ Health Concerns - 79 + 81 feedback Small Text @@ -1181,7 +1205,7 @@ Health Concerns - 80 + 82 lft Int @@ -1193,7 +1217,7 @@ Health Concerns - 81 + 83 rgt Int @@ -1205,7 +1229,7 @@ Health Concerns - 82 + 84 old_parent Data @@ -1238,216 +1262,6 @@ Health Concerns
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_nsm_model - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_user - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_user_permissions - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplicate_user_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_email - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_employee_leave_approver - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_for_enabled_user_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_prefered_email - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_reports_to - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_status - (self) -

    -

    No docs

    -
    -
    - -
    @@ -1478,7 +1292,7 @@ Health Concerns erpnext.hr.doctype.employee.employee.create_user - (employee, user=None) + (employee, user=None, email=None)

    No docs

    @@ -1631,6 +1445,22 @@ Health Concerns +

    + + + erpnext.hr.doctype.employee.employee.on_doctype_update + () +

    +

    No docs

    +
    +
    + + + + + + +

    @@ -1745,24 +1575,6 @@ Health Concerns -

  • - - -Employee Loan - -
    • - - - -
  • - - -Employee Loan Application - -
    • - - -
  • diff --git a/foundation/www/docs/current/models/hr/employee_advance.html b/foundation/www/docs/current/models/hr/employee_advance.html index b0d922a4..4591ea93 100644 --- a/foundation/www/docs/current/models/hr/employee_advance.html +++ b/foundation/www/docs/current/models/hr/employee_advance.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 11 + due_advance_amount + + Currency + + Due Advance Amount + + + + 
    Company:company:default_currency
    + + + + + 12 claimed_amount Currency @@ -192,7 +206,7 @@ - 12 + 13 section_break_7 Section Break @@ -204,7 +218,7 @@ - 13 + 14 status Select @@ -222,7 +236,7 @@ Cancelled - 14 + 15 company Link @@ -243,7 +257,7 @@ Cancelled - 15 + 16 amended_from Link @@ -264,7 +278,7 @@ Cancelled - 16 + 17 column_break_18 Column Break @@ -276,7 +290,7 @@ Cancelled - 17 + 18 advance_account Link @@ -297,7 +311,7 @@ Cancelled - 18 + 19 mode_of_payment Link @@ -339,90 +353,6 @@ Cancelled
    - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_advance_paid - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_claimed_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -446,6 +376,24 @@ Cancelled +

    Public API +
    /api/method/erpnext.hr.doctype.employee_advance.employee_advance.get_due_advance_amount +

    +

    + + + erpnext.hr.doctype.employee_advance.employee_advance.get_due_advance_amount + (employee, posting_date) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.hr.doctype.employee_advance.employee_advance.make_bank_entry

    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 06c8eb33..8295a60f 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 2 - total_claimed_amount - - Currency - - Total Claimed Amount - - - - 
    Company:company:default_currency
    - - - - - 3 - total_sanctioned_amount - - Currency - - Total Sanctioned Amount - - - - 
    Company:company:default_currency
    - - - - - 4 - is_paid - - Check - - Is Paid - - - - - - - 5 - expense_details - - Section Break - - - - - - - - - 6 - expenses - - Table - - Expenses - - - - - - - -    Expense Claim Detail - - - - - - - - 7 - sb1 - - Section Break - - - - - - 
    Simple
    - - - - - 8 - posting_date - - Date - - Posting Date - - - - - - - 9 employee Link @@ -175,7 +76,7 @@ - 10 + 3 employee_name Data @@ -188,8 +89,156 @@ + + 4 + expense_approver + + Link + + Expense Approver + + + + + + + +User + + + + + + + + 5 + column_break_5 + + Column Break + + + + + + + + + 6 + approval_status + + Select + + Approval Status + + + + 
    Draft
+Approved
+Rejected
    + + + + + 7 + total_claimed_amount + + Currency + + Total Claimed Amount + + + + 
    Company:company:default_currency
    + + + + + 8 + total_sanctioned_amount + + Currency + + Total Sanctioned Amount + + + + 
    Company:company:default_currency
    + + + + + 9 + is_paid + + Check + + Is Paid + + + + + + + 10 + expense_details + + Section Break + + + + + + + 11 + expenses + + Table + + Expenses + + + + + + + +Expense Claim Detail + + + + + + + + 12 + sb1 + + Section Break + + + + + + 
    Simple
    + + + + + 13 + posting_date + + Date + + Posting Date + + + + + + + 14 vehicle_log Link @@ -210,7 +259,7 @@ - 12 + 15 project Link @@ -231,7 +280,7 @@ - 13 + 16 task Link @@ -252,7 +301,7 @@ - 14 + 17 cb1 Column Break @@ -264,7 +313,7 @@ - 15 + 18 total_amount_reimbursed Currency @@ -278,7 +327,7 @@ - 16 + 19 remark Small Text @@ -290,7 +339,7 @@ - 17 + 20 title Data @@ -302,7 +351,7 @@ - 18 + 21 email_id Data @@ -314,7 +363,7 @@ - 19 + 22 accounting_details Section Break @@ -326,7 +375,7 @@ - 20 + 23 company Link @@ -347,7 +396,7 @@ - 21 + 24 mode_of_payment Link @@ -368,7 +417,7 @@ - 22 + 25 column_break_24 Column Break @@ -380,7 +429,7 @@ - 23 + 26 payable_account Link @@ -401,7 +450,7 @@ - 24 + 27 cost_center Link @@ -422,7 +471,7 @@ - 25 + 28 more_details Section Break @@ -434,7 +483,7 @@ - 26 + 29 status Select @@ -453,7 +502,7 @@ Cancelled - 27 + 30 amended_from Link @@ -474,7 +523,7 @@ Cancelled - 28 + 31 advance_payments Section Break @@ -486,7 +535,7 @@ Cancelled - 29 + 32 advances Table @@ -507,7 +556,7 @@ Cancelled - 30 + 33 total_advance_amount Currency @@ -557,244 +606,6 @@ Cancelled
    - - - -

    - - - calculate_total_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_gl_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_gl_entries - (self, cancel=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_cost_center - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_expense_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_payable_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_claimed_amount_in_employee_advance - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_task - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_task_and_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_account_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_advances - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_sanctioned_amount - (self) -

    -

    No docs

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

    Public API +
    /api/method/erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim +

    +

    + + + erpnext.hr.doctype.expense_claim.expense_claim.get_expense_claim + (employee_name, company, employee_advance_name, posting_date, paid_amount, claimed_amount) +

    +

    No docs

    +
    +
    + + + + + +

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

    diff --git a/foundation/www/docs/current/models/hr/expense_claim_account.html b/foundation/www/docs/current/models/hr/expense_claim_account.html index 131efecf..37aba876 100644 --- a/foundation/www/docs/current/models/hr/expense_claim_account.html +++ b/foundation/www/docs/current/models/hr/expense_claim_account.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_accounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_repeating_companies - (self) -

    -

    Error when Same Company is entered multiple times in accounts

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

    Health Insurance

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabHealth Insurance

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1health_insurance_name + Data + Health Insurance Name + +
    + + +
    +

    Controller

    +

    erpnext.hr.doctype.health_insurance.health_insurance

    + + + + + + + +

    Class HealthInsurance

    + +

    Inherits from frappe.model.document.Document + +

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

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hr/holiday.html b/foundation/www/docs/current/models/hr/holiday.html index b32a0c72..93897667 100644 --- a/foundation/www/docs/current/models/hr/holiday.html +++ b/foundation/www/docs/current/models/hr/holiday.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + + 8 + section_break_9 + + Section Break + + + + + + + + + 9 + color + + Color + + Color + + + + + @@ -168,90 +192,6 @@ Saturday
    - - - -

    - - - clear_table - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_weekly_off_date_list - (self, start_date, end_date) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_weekly_off_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_days - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_values - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/hr_settings.html b/foundation/www/docs/current/models/hr/hr_settings.html index 5dd59d44..c376c49e 100644 --- a/foundation/www/docs/current/models/hr/hr_settings.html +++ b/foundation/www/docs/current/models/hr/hr_settings.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 4 + leave_approval_notification_template + + Link + + Leave Approval Notification Template + + + + + + + +Email Template + + + + + + + + 5 + leave_status_notification_template + + Link + + Leave Status Notification Template + + + + + + + +Email Template + + + + + + + + 6 column_break_4 Column Break @@ -93,7 +135,7 @@ Full Name - 5 + 7 stop_birthday_reminders Check @@ -106,7 +148,7 @@ Full Name - 6 + 8 maintain_bill_work_hours_same Check @@ -117,8 +159,32 @@ Full Name + + 9 + leave_approver_mandatory_in_leave_application + + Check + + Leave Approver Mandatory In Leave Application + + + + + + + 10 + expense_approver_mandatory_in_expense_claim + + Check + + Expense Approver Mandatory In Expense Claim + + + + + - 7 + 11 payroll_settings Section Break @@ -130,7 +196,7 @@ Full Name - 8 + 12 include_holidays_in_total_working_days Check @@ -143,7 +209,7 @@ Full Name - 9 + 13 email_salary_slip_to_employee Check @@ -156,7 +222,7 @@ Full Name - 10 + 14 max_working_hours_against_timesheet Float @@ -167,6 +233,30 @@ Full Name + + 15 + leave_settings + + Section Break + + Leave Settings + + + + + + + 16 + show_leaves_of_all_department_members_in_calendar + + Check + + Show Leaves Of All Department Members In Calendar + + + + + @@ -189,20 +279,6 @@ Full Name
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/index.html b/foundation/www/docs/current/models/hr/index.html index 07a8b720..b20f70c4 100644 --- a/foundation/www/docs/current/models/hr/index.html +++ b/foundation/www/docs/current/models/hr/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_email_id_is_unique - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/job_offer.html b/foundation/www/docs/current/models/hr/job_offer.html index 872de816..01a530a8 100644 --- a/foundation/www/docs/current/models/hr/job_offer.html +++ b/foundation/www/docs/current/models/hr/job_offer.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/leave_allocation.html b/foundation/www/docs/current/models/hr/leave_allocation.html index c817969f..4fa394ff 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 10.1.2 + Version 10.1.31
    - - - -

    - - - on_update_after_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_leaves_allocated - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_against_leave_applications - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_allocation_overlap - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_back_dated_allocation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_lwp - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_new_leaves_allocated_value - (self) -

    -

    validate that leave allocation is in multiples of 0.5

    -
    -
    - - - - - -

    - - - validate_period - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_total_leaves_allocated - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/leave_application.html b/foundation/www/docs/current/models/hr/leave_application.html index 90f3e042..d3e56f66 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 10.1.2 + Version 10.1.31 2 - leave_type - - Link - - Leave Type - - - - - - - -Leave Type - - - - - - - - 3 - leave_balance - - Float - - Leave Balance Before Application - - - - - - - 4 - section_break_5 - - Section Break - - - - - - - - - 5 - from_date - - Date - - From Date - - - - - - - 6 - to_date - - Date - - To Date - - - - - - - 7 - half_day - - Check - - Half Day - - - - - - - 8 - half_day_date - - Date - - Half Day Date - - - - - - - 9 - total_leave_days - - Float - - Total Leave Days - - - - - - - 10 - column_break1 - - Column Break - - - - - - - - - 11 - description - - Small Text - - Reason - - - - - - - 12 - section_break_7 - - Section Break - - - - - - - - - 13 employee Link @@ -217,7 +76,7 @@ Apply / Approve Leaves - 14 + 3 employee_name Data @@ -228,9 +87,150 @@ Apply / Approve Leaves + + 4 + column_break_4 + + Column Break + + + + + + + + + 5 + leave_type + + Link + + Leave Type + + + + + + + +Leave Type + + + + + + + + 6 + leave_balance + + Float + + Leave Balance Before Application + + + + + + + 7 + section_break_5 + + Section Break + + + + + + + + + 8 + from_date + + Date + + From Date + + + + + + + 9 + to_date + + Date + + To Date + + + + + + + 10 + half_day + + Check + + Half Day + + + + + + + 11 + half_day_date + + Date + + Half Day Date + + + + + + + 12 + total_leave_days + + Float + + Total Leave Days + + + + + + + 13 + column_break1 + + Column Break + + + + + + + + + 14 + description + + Small Text + + Reason + + + + + 15 - sb10 + section_break_7 Section Break @@ -242,23 +242,32 @@ Apply / Approve Leaves 16 - posting_date + leave_approver - Date + Link - Posting Date + Leave Approver + + + + + + + +User + + - 17 - follow_via_email + leave_approver_name - Check + Data - Follow via Email + Leave Approver Name @@ -266,7 +275,7 @@ Apply / Approve Leaves 18 - column_break_17 + column_break_18 Column Break @@ -278,6 +287,83 @@ Apply / Approve Leaves 19 + status + + Select + + Status + + + + 
    Open
+Approved
+Rejected
+Cancelled
    + + + + + 20 + sb10 + + Section Break + + + + + + + + + 21 + posting_date + + Date + + Posting Date + + + + + + + 22 + follow_via_email + + Check + + Follow via Email + + + + + + + 23 + color + + Color + + Color + + + + + + + 24 + column_break_17 + + Column Break + + + + + + + + + 25 company Link @@ -298,7 +384,7 @@ Apply / Approve Leaves - 20 + 26 letter_head Link @@ -319,7 +405,7 @@ Apply / Approve Leaves - 21 + 27 amended_from Link @@ -391,258 +477,6 @@ Apply / Approve Leaves
    - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_total_leaves_on_half_day - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - notify - (self, args) -

    -

    No docs

    -
    -
    - - - - - -

    - - - notify_employee - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - show_block_day_warning - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - throw_overlap_error - (self, d) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_attendance - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_back_dated_application - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_balance_leaves - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_block_days - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates_across_allocation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_leave_overlap - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_max_days - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_salary_processed_days - (self) -

    -

    No docs

    -
    -
    - -
    @@ -749,7 +583,7 @@ Apply / Approve Leaves erpnext.hr.doctype.leave_application.leave_application.add_leaves - (events, start, end, match_conditions=None) + (events, start, end, filter_conditions=None)

    No docs

    @@ -794,7 +628,9 @@ Apply / Approve Leaves - +

    Public API +
    /api/method/erpnext.hr.doctype.leave_application.leave_application.get_holidays +

    @@ -844,6 +680,24 @@ Apply / Approve Leaves +

    Public API +
    /api/method/erpnext.hr.doctype.leave_application.leave_application.get_mandatory_approval +

    +

    + + + erpnext.hr.doctype.leave_application.leave_application.get_mandatory_approval + (doctype) +

    +

    No docs

    +
    +
    + + + + + +

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

    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 d13ed9d8..cf46b7ec 100644 --- a/foundation/www/docs/current/models/hr/leave_block_list.html +++ b/foundation/www/docs/current/models/hr/leave_block_list.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 13fe00aa..17007be1 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - allocate_leave - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_employees - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - to_date_validation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_values - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/leave_type.html b/foundation/www/docs/current/models/hr/leave_type.html index 54292dad..49f54c22 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 10.1.2 + Version 10.1.31 + -

    Employee Loan

    +

    Loan

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

    Table Name: tabEmployee Loan

    +

    Table Name: tabLoan

    @@ -42,46 +42,52 @@ 1 - employee + applicant_type - Link + Select - Employee + Applicant Type - - - - -Employee - - - + 
    Employee
+Member
    2 - employee_name + applicant - Read Only + Dynamic Link - Employee Name + Applicant - 
    employee.employee_name
    + 
    applicant_type
    3 - employee_loan_application + applicant_name + + Data + + Applicant Name + + + + + + + 4 + loan_application Link - Employee Loan Application + Loan Application @@ -89,7 +95,7 @@ -Employee Loan Application +Loan Application @@ -97,7 +103,7 @@ - 4 + 5 loan_type Link @@ -118,7 +124,7 @@ - 5 + 6 column_break_3 Column Break @@ -130,7 +136,7 @@ - 6 + 7 posting_date Date @@ -142,7 +148,7 @@ - 7 + 8 company Link @@ -163,7 +169,7 @@ - 8 + 9 status Select @@ -173,14 +179,13 @@ 
    Sanctioned
-Partially Disbursed
-Fully Disbursed
+Disbursed
 Repaid/Closed
    - 9 + 10 repay_from_salary Check @@ -192,7 +197,7 @@ Repaid/Closed - 10 + 11 section_break_8 Section Break @@ -204,7 +209,7 @@ Repaid/Closed - 11 + 12 loan_amount Currency @@ -218,7 +223,7 @@ Repaid/Closed - 12 + 13 rate_of_interest Percent @@ -232,7 +237,7 @@ Repaid/Closed - 13 + 14 disbursement_date Date @@ -244,7 +249,19 @@ Repaid/Closed - 14 + 15 + repayment_start_date + + Date + + Repayment Start Date + + + + + + + 16 column_break_11 Column Break @@ -256,7 +273,7 @@ Repaid/Closed - 15 + 17 repayment_method Select @@ -272,7 +289,7 @@ Repay Over Number of Periods - 16 + 18 repayment_periods Int @@ -284,7 +301,7 @@ Repay Over Number of Periods - 17 + 19 monthly_repayment_amount Currency @@ -298,7 +315,7 @@ Repay Over Number of Periods - 18 + 20 account_info Section Break @@ -310,7 +327,7 @@ Repay Over Number of Periods - 19 + 21 mode_of_payment Link @@ -331,7 +348,7 @@ Repay Over Number of Periods - 20 + 22 payment_account Link @@ -352,7 +369,7 @@ Repay Over Number of Periods - 21 + 23 column_break_9 Column Break @@ -364,12 +381,12 @@ Repay Over Number of Periods - 22 - employee_loan_account + 24 + loan_account Link - Employee Loan Account + Loan Account @@ -385,7 +402,7 @@ Repay Over Number of Periods - 23 + 25 interest_income_account Link @@ -406,7 +423,7 @@ Repay Over Number of Periods - 24 + 26 section_break_15 Section Break @@ -418,7 +435,7 @@ Repay Over Number of Periods - 25 + 27 repayment_schedule Table @@ -439,7 +456,7 @@ Repay Over Number of Periods - 26 + 28 section_break_17 Section Break @@ -451,7 +468,7 @@ Repay Over Number of Periods - 27 + 29 total_payment Currency @@ -465,7 +482,7 @@ Repay Over Number of Periods - 28 + 30 column_break_19 Column Break @@ -477,7 +494,7 @@ Repay Over Number of Periods - 29 + 31 total_interest_payable Currency @@ -491,7 +508,21 @@ Repay Over Number of Periods - 30 + 32 + total_amount_paid + + Currency + + Total Amount Paid + + + + 
    Company:company:default_currency
    + + + + + 33 amended_from Link @@ -504,7 +535,7 @@ Repay Over Number of Periods -Employee Loan +Loan @@ -517,7 +548,7 @@ Repay Over Number of Periods

    Controller

    -

    erpnext.hr.doctype.employee_loan.employee_loan

    +

    erpnext.hr.doctype.loan.loan

    @@ -525,7 +556,7 @@ Repay Over Number of Periods -

    Class EmployeeLoan

    +

    Class Loan

    Inherits from erpnext.controllers.accounts_controller.AccountsController @@ -533,76 +564,6 @@ Repay Over Number of Periods

    - - - -

    - - - calculate_totals - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_jv_entry - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_repayment_schedule - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_repayment_period - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -613,9 +574,9 @@ Repay Over Number of Periods

    - + - erpnext.hr.doctype.employee_loan.employee_loan.check_repayment_method + erpnext.hr.doctype.loan.loan.check_repayment_method (repayment_method, loan_amount, monthly_repayment_amount, repayment_periods)

    No docs

    @@ -628,13 +589,13 @@ Repay Over Number of Periods

    Public API -
    /api/method/erpnext.hr.doctype.employee_loan.employee_loan.get_employee_loan_application +
    /api/method/erpnext.hr.doctype.loan.loan.get_loan_application

    - + - erpnext.hr.doctype.employee_loan.employee_loan.get_employee_loan_application - (employee_loan_application) + erpnext.hr.doctype.loan.loan.get_loan_application + (loan_application)

    No docs

    @@ -647,9 +608,9 @@ Repay Over Number of Periods

    - + - erpnext.hr.doctype.employee_loan.employee_loan.get_monthly_repayment_amount + erpnext.hr.doctype.loan.loan.get_monthly_repayment_amount (repayment_method, loan_amount, rate_of_interest, repayment_periods)

    No docs

    @@ -662,13 +623,31 @@ Repay Over Number of Periods

    Public API -
    /api/method/erpnext.hr.doctype.employee_loan.employee_loan.make_jv_entry +
    /api/method/erpnext.hr.doctype.loan.loan.make_jv_entry

    - + - erpnext.hr.doctype.employee_loan.employee_loan.make_jv_entry - (employee_loan, company, employee_loan_account, employee, loan_amount, payment_account=None) + erpnext.hr.doctype.loan.loan.make_jv_entry + (loan, company, loan_account, applicant_type, applicant, loan_amount, payment_account=None) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.hr.doctype.loan.loan.make_repayment_entry +

    +

    + + + erpnext.hr.doctype.loan.loan.make_repayment_entry + (payment_rows, loan, company, loan_account, applicant_type, applicant, payment_account=None, interest_income_account=None)

    No docs

    @@ -681,9 +660,25 @@ Repay Over Number of Periods

    - + - erpnext.hr.doctype.employee_loan.employee_loan.update_disbursement_status + erpnext.hr.doctype.loan.loan.update_disbursement_status + (doc) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.hr.doctype.loan.loan.update_total_amount_paid (doc)

    No docs

    @@ -702,7 +697,7 @@ Repay Over Number of Periods
  • -Employee Loan +Loan
    • diff --git a/foundation/www/docs/current/models/hr/employee_loan_application.html b/foundation/www/docs/current/models/hr/loan_application.html similarity index 72% rename from foundation/www/docs/current/models/hr/employee_loan_application.html rename to foundation/www/docs/current/models/hr/loan_application.html index c0ae1df5..7ef6f0d2 100644 --- a/foundation/www/docs/current/models/hr/employee_loan_application.html +++ b/foundation/www/docs/current/models/hr/loan_application.html @@ -1,18 +1,18 @@ - + -

    Employee Loan Application

    +

    Loan Application

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

    Table Name: tabEmployee Loan Application

    +

    Table Name: tabLoan Application

    @@ -42,49 +42,43 @@ 1 - posting_date + applicant_type - Date + Select - Posting Date + Applicant Type - + + 
    Employee
+Member
    + 2 - employee + applicant - Link + Dynamic Link - Employee + Applicant - - - - -Employee - - - + 
    applicant_type
    3 - employee_name + applicant_name - Read Only + Data - Employee Name + Applicant Name - - 
    employee.employee_name
    - + @@ -101,6 +95,18 @@ 5 + posting_date + + Date + + Posting Date + + + + + + + 6 status Select @@ -116,7 +122,7 @@ Rejected - 6 + 7 company Link @@ -137,7 +143,7 @@ Rejected - 7 + 8 section_break_4 Section Break @@ -149,7 +155,7 @@ Rejected - 8 + 9 loan_type Link @@ -170,7 +176,7 @@ Rejected - 9 + 10 loan_amount Currency @@ -184,7 +190,7 @@ Rejected - 10 + 11 required_by_date Date @@ -196,7 +202,7 @@ Rejected - 11 + 12 column_break_7 Column Break @@ -208,7 +214,7 @@ Rejected - 12 + 13 description Small Text @@ -220,7 +226,7 @@ Rejected - 13 + 14 repayment_info Section Break @@ -232,7 +238,7 @@ Rejected - 14 + 15 repayment_method Select @@ -248,7 +254,7 @@ Repay Over Number of Periods - 15 + 16 rate_of_interest Percent @@ -262,7 +268,7 @@ Repay Over Number of Periods - 16 + 17 total_payable_interest Currency @@ -276,7 +282,7 @@ Repay Over Number of Periods - 17 + 18 column_break_11 Column Break @@ -288,7 +294,7 @@ Repay Over Number of Periods - 18 + 19 repayment_amount Currency @@ -302,7 +308,7 @@ Repay Over Number of Periods - 19 + 20 repayment_periods Int @@ -314,7 +320,7 @@ Repay Over Number of Periods - 20 + 21 total_payable_amount Currency @@ -328,7 +334,7 @@ Repay Over Number of Periods - 21 + 22 amended_from Link @@ -341,7 +347,7 @@ Repay Over Number of Periods -Employee Loan Application +Loan Application @@ -354,7 +360,7 @@ Repay Over Number of Periods

    Controller

    -

    erpnext.hr.doctype.employee_loan_application.employee_loan_application

    +

    erpnext.hr.doctype.loan_application.loan_application

    @@ -362,7 +368,7 @@ Repay Over Number of Periods -

    Class EmployeeLoanApplication

    +

    Class LoanApplication

    Inherits from frappe.model.document.Document @@ -370,62 +376,6 @@ Repay Over Number of Periods

    - - - -

    - - - calculate_payable_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_repayment_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_loan_amount - (self) -

    -

    No docs

    -
    -
    - -
    @@ -435,12 +385,12 @@ Repay Over Number of Periods

    Public API -
    /api/method/erpnext.hr.doctype.employee_loan_application.employee_loan_application.make_employee_loan +
    /api/method/erpnext.hr.doctype.loan_application.loan_application.make_loan

    - + - erpnext.hr.doctype.employee_loan_application.employee_loan_application.make_employee_loan + erpnext.hr.doctype.loan_application.loan_application.make_loan (source_name, target_doc=None)

    No docs

    @@ -459,7 +409,7 @@ Repay Over Number of Periods
  • -Employee Loan +Loan
    • @@ -468,7 +418,7 @@ Repay Over Number of Periods
  • -Employee Loan Application +Loan Application
    • diff --git a/foundation/www/docs/current/models/hr/loan_type.html b/foundation/www/docs/current/models/hr/loan_type.html index e406826c..f4c7269a 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 10.1.2 + Version 10.1.31 -Employee Loan +Loan @@ -160,7 +160,7 @@
  • -Employee Loan Application +Loan Application
    • diff --git a/foundation/www/docs/current/models/hr/offer_term.html b/foundation/www/docs/current/models/hr/offer_term.html index b55f28b0..2b03528b 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_mandatory - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_salary_slips - (self) -

    - 
            Creates salary slip for selected employees if already not created
-
    -
    -
    - - - - - -

    - - - fill_employee_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_account - (self, component_dict=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_default_payroll_payable_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_emp_list - (self) -

    - 
            Returns list of active employees based on selected criteria
-        and for which salary structure exists
-
    -
    -
    - - - - - -

    - - - get_filter_condition - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_joining_releiving_condition - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_loan_details - (self) -

    - 
            Get loan details from submitted salary slip based on selected criteria
-
    -
    -
    - - - - - -

    - - - get_sal_slip_list - (self, ss_status, as_dict=False) -

    - 
            Returns list of salary slips based on selected criteria
-
    -
    -
    - - - - - -

    - - - get_salary_component_account - (self, salary_component) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_salary_component_total - (self, component_type=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_salary_components - (self, component_type) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_total_salary_amount - (self) -

    - 
            Get total salary amount from submitted salary slip based on selected criteria
-
    -
    -
    - - - - - -

    - - - make_accural_jv_entry - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_payment_entry - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_start_end_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - submit_salary_slips - (self) -

    - 
            Submit all salary slips based on selected criteria
-
    -
    -
    - - - - - -

    - - - update_salary_slip_status - (self, jv_name=None) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/repayment_schedule.html b/foundation/www/docs/current/models/hr/repayment_schedule.html index 0253210c..8926f60e 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 10.1.2 + Version 10.1.31 + + 6 + paid + + Check + + Paid + + + + + @@ -120,7 +132,7 @@
  • -Employee Loan +Loan
    • diff --git a/foundation/www/docs/current/models/hr/salary_component.html b/foundation/www/docs/current/models/hr/salary_component.html index b72da1fb..d5bf647d 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 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_abbr - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/salary_detail.html b/foundation/www/docs/current/models/hr/salary_detail.html index d5caf044..340c8c76 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Table - Employee Loan + Loan @@ -825,426 +825,6 @@ Daily
    - - - -

    - - - add_earning_for_hourly_wages - (self, doc, salary_component, amount) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_component_amounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_lwp - (self, holidays, working_days) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_net_pay - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_existing - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_sal_struct - (self, joining_date, relieving_date) -

    -

    No docs

    -
    -
    - - - - - -

    - - - email_salary_slip - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - eval_condition_and_formula - (self, d, data) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_data_for_eval - (self) -

    -

    Returns data for evaluating formula

    -
    -
    - - - - - -

    - - - get_date_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_emp_and_leave_details - (self) -

    -

    First time, load all the components from salary structure

    -
    -
    - - - - - -

    - - - get_employee_loan_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_holidays_for_employee - (self, start_date, end_date) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_leave_details - (self, joining_date=None, relieving_date=None, lwp=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_payment_days - (self, joining_date, relieving_date) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - process_salary_structure - (self) -

    -

    Calculate salary after salary structure details have been updated

    -
    -
    - - - - - -

    - - - pull_emp_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - pull_sal_struct - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_loan_repayment - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_status - (self, status=None) -

    -

    Get and update status

    -
    -
    - - - - - -

    - - - set_time_sheet - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - sum_components - (self, component_type, total_field) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_component_row - (self, struct_row, amount, key) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status - (self, salary_slip=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/salary_slip_loan.html b/foundation/www/docs/current/models/hr/salary_slip_loan.html index fd3aa29e..7079bdcc 100644 --- a/foundation/www/docs/current/models/hr/salary_slip_loan.html +++ b/foundation/www/docs/current/models/hr/salary_slip_loan.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 1 - employee_loan + loan Link - Employee Loan + Loan @@ -54,7 +54,7 @@ -Employee Loan +Loan @@ -63,11 +63,11 @@ 2 - employee_loan_account + loan_account Link - Employee Loan Account + Loan Account 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 d1245574..664aa03b 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_ss_values - (self, employee) -

    -

    No docs

    -
    -
    - - - - - -

    - - - strip_condition_and_formula_fields - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_date - (self) -

    -

    No docs

    -
    -
    - -
    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 277066f7..ffb0397e 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 18bede12..8007f2dd 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/training_program.html b/foundation/www/docs/current/models/hr/training_program.html index b73b7232..da20d6b0 100644 --- a/foundation/www/docs/current/models/hr/training_program.html +++ b/foundation/www/docs/current/models/hr/training_program.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 3d17b70c..2e34f09a 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/vehicle_log.html b/foundation/www/docs/current/models/hr/vehicle_log.html index 75da2668..16476ef2 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 10.1.2 + Version 10.1.31
    - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/hr/vehicle_service.html b/foundation/www/docs/current/models/hr/vehicle_service.html index 6008daf6..b9a3dc89 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 3 + hub_username + + Data + + Hub Username + + + + + + + 4 user Link @@ -83,8 +95,44 @@ + + 5 + column_break_0 + + Column Break + + + + + + + + + 6 + hub_user_status + + Data + + Status + + + + + + + 7 + language + + Data + + Language + + + + + - 4 + 8 seller_profile_section Section Break @@ -96,7 +144,19 @@ - 5 + 9 + company_registered + + Check + + Company Registered + + + + + + + 10 company Link @@ -117,7 +177,19 @@ - 6 + 11 + company_email + + Data + + Company Email + + + + + + + 12 country Link @@ -138,7 +210,19 @@ - 7 + 13 + company_logo + + Attach Image + + Company Logo + + + + + + + 14 seller_description Text Editor @@ -150,7 +234,40 @@ - 8 + 15 + users_sb + + Section Break + + Enabled Users + + + + + + + 16 + users + + Table + + Users + + + + + + + +Hub Users + + + + + + + + 17 publish_section Section Break @@ -162,7 +279,7 @@ - 9 + 18 publish Check @@ -174,7 +291,7 @@ - 10 + 19 publish_pricing Check @@ -186,7 +303,7 @@ - 11 + 20 selling_price_list Link @@ -207,7 +324,7 @@ - 12 + 21 publish_availability Check @@ -219,7 +336,7 @@ - 13 + 22 last_sync_datetime Datetime @@ -230,8 +347,20 @@ + + 23 + custom_data + + Code + + Custom Data + + + + + - 14 + 24 unregister_section Section Break @@ -243,7 +372,7 @@ - 15 + 25 unregister_from_hub Button @@ -276,90 +405,6 @@
    - - - -

    - - - create_hub_connector - (self, message) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_hub_url - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - register - (self) -

    -

    Create a User on hub.erpnext.org and return username/password

    -
    -
    - - - - - -

    - - - sync - (self) -

    -

    Create and execute Data Migration Run for Hub Sync plan

    -
    -
    - - - - - -

    - - - unregister - (self) -

    -

    Disable the User on hub.erpnext.org

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -382,6 +427,21 @@ +

    Class OAuth2Session

    + +

    Inherits from builtins.object + +

    +
    +
    + +
    +
    + + + + +

    diff --git a/foundation/www/docs/current/models/hub_node/hub_tracked_item.html b/foundation/www/docs/current/models/hub_node/hub_tracked_item.html new file mode 100644 index 00000000..e1aebc17 --- /dev/null +++ b/foundation/www/docs/current/models/hub_node/hub_tracked_item.html @@ -0,0 +1,89 @@ + + + + + + + +

    Hub Tracked Item

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabHub Tracked Item

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1item_code + Data + Item Code + +
    + + +
    +

    Controller

    +

    erpnext.hub_node.doctype.hub_tracked_item.hub_tracked_item

    + + + + + + + +

    Class HubTrackedItem

    + +

    Inherits from frappe.model.document.Document + +

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

    Hub Users

    +
    + + + Version 10.1.31 + + + Source + +
    + + +Child Table + + +

    Table Name: tabHub Users

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1user + Link + User + + + + + + +User + + + +
    + + + + +

    Child Table Of

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/hub_node/index.html b/foundation/www/docs/current/models/hub_node/index.html index 15101c6f..89d25ccc 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_serial_no_added - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_schedule_list - (self, start_date, end_date, no_of_visit, sales_person) -

    -

    No docs

    -
    -
    - - - - - -

    - - - generate_schedule - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_amc_date - (self, serial_nos, amc_expiry_date=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates_with_periodicity - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_maintenance_detail - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_sales_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_schedule - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_schedule_date_for_holiday_list - (self, schedule_date, sales_person) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_serial_no - (self, serial_nos, amc_start_date) -

    -

    No docs

    -
    -
    - -
    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 3938ae66..bfc3cdec 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_if_last_visit - (self) -

    -

    check if last maintenance visit against same sales order/ Warranty Claim

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_customer_issue - (self, flag) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_serial_no - (self) -

    -

    No docs

    -
    -
    - -
    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 5458d9ed..ba054129 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - + 13 + allow_alternative_item + + Check + + Allow Alternative Item + + + + + + + 14 currency_detail Section Break @@ -231,7 +243,7 @@ Price List - 14 + 15 company Link @@ -252,7 +264,7 @@ Price List - 15 + 16 column_break_12 Column Break @@ -264,7 +276,7 @@ Price List - 16 + 17 currency Link @@ -285,7 +297,7 @@ Price List - 17 + 18 conversion_rate Float @@ -297,7 +309,7 @@ Price List - 18 + 19 operations_section Section Break @@ -310,7 +322,7 @@ Price List - 19 + 20 operations Table @@ -331,7 +343,7 @@ Price List - 20 + 21 materials_section Section Break @@ -343,7 +355,7 @@ Price List - 21 + 22 items Table @@ -364,7 +376,7 @@ Price List - 22 + 23 scrap_section Section Break @@ -376,7 +388,7 @@ Price List - 23 + 24 scrap_items Table @@ -397,7 +409,7 @@ Price List - 24 + 25 costing Section Break @@ -409,7 +421,7 @@ Price List - 25 + 26 operating_cost Currency @@ -423,7 +435,7 @@ Price List - 26 + 27 raw_material_cost Currency @@ -437,7 +449,7 @@ Price List - 27 + 28 scrap_material_cost Currency @@ -451,7 +463,7 @@ Price List - 28 + 29 cb1 Column Break @@ -463,7 +475,7 @@ Price List - 29 + 30 base_operating_cost Currency @@ -477,7 +489,7 @@ Price List - 30 + 31 base_raw_material_cost Currency @@ -491,7 +503,7 @@ Price List - 31 + 32 base_scrap_material_cost Data @@ -505,7 +517,7 @@ Price List - 32 + 33 total_cost_of_bom Section Break @@ -517,7 +529,7 @@ Price List - 33 + 34 total_cost Currency @@ -531,7 +543,7 @@ Price List - 34 + 35 column_break_26 Column Break @@ -543,7 +555,7 @@ Price List - 35 + 36 base_total_cost Currency @@ -557,7 +569,7 @@ Price List - 36 + 37 more_info_section Section Break @@ -569,7 +581,7 @@ Price List - 37 + 38 project Link @@ -590,7 +602,7 @@ Price List - 38 + 39 amended_from Link @@ -611,7 +623,7 @@ Price List - 39 + 40 col_break23 Column Break @@ -623,7 +635,7 @@ Price List - 40 + 41 uom Link @@ -644,7 +656,7 @@ Price List - 41 + 42 section_break_25 Section Break @@ -656,7 +668,7 @@ Price List - 42 + 43 description Small Text @@ -668,7 +680,7 @@ Price List - 43 + 44 column_break_27 Column Break @@ -680,7 +692,7 @@ Price List - 44 + 45 image Attach @@ -692,7 +704,7 @@ Price List - 45 + 46 image_view Image @@ -706,7 +718,7 @@ Price List - 46 + 47 section_break0 Section Break @@ -718,7 +730,7 @@ Price List - 47 + 48 exploded_items Table @@ -739,7 +751,7 @@ Price List - 48 + 49 website_section Section Break @@ -751,7 +763,7 @@ Price List - 49 + 50 show_in_website Check @@ -763,7 +775,7 @@ Price List - 50 + 51 route Small Text @@ -775,7 +787,7 @@ Price List - 51 + 52 website_image Attach Image @@ -788,7 +800,7 @@ Price List - 52 + 53 thumbnail Data @@ -800,7 +812,7 @@ Price List - 53 + 54 sb_web_spec Section Break @@ -812,7 +824,7 @@ Price List - 54 + 55 web_long_description Text Editor @@ -824,7 +836,7 @@ Price List - 55 + 56 show_items Check @@ -836,7 +848,7 @@ Price List - 56 + 57 show_operations Check @@ -869,568 +881,6 @@ Price List
    - - - -

    - - - add_exploded_items - (self) -

    -

    Add items to Flat BOM table

    -
    -
    - - - - - -

    - - - add_to_cur_exploded_items - (self, args) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_cost - (self) -

    -

    Calculate bom totals

    -
    -
    - - - - - -

    - - - calculate_op_cost - (self) -

    -

    Update workstation rate and calculates totals

    -
    -
    - - - - - -

    - - - calculate_rm_cost - (self) -

    -

    Fetch RM rate as per today's valuation rate and calculate totals

    -
    -
    - - - - - -

    - - - calculate_sm_cost - (self) -

    -

    Fetch RM rate as per today's valuation rate and calculate totals

    -
    -
    - - - - - -

    - - - check_recursion - (self) -

    -

    Check whether recursion occurs in any bom

    -
    -
    - - - - - -

    - - - clear_operations - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - company_currency - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_bom_material_detail - (self, args=None) -

    -

    Get raw material details like uom, desc and rate

    -
    -
    - - - - - -

    - - - get_bom_unitcost - (self, bom_no) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_child_exploded_items - (self, bom_no, stock_qty) -

    -

    Add all items from Flat BOM of child BOM

    -
    -
    - - - - - -

    - - - get_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_exploded_items - (self) -

    -

    Get all raw materials including items from child bom

    -
    -
    - - - - - -

    - - - get_item_det - (self, item_code) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_rm_rate - (self, arg) -

    - 
    Get raw material rate as per selected method, if bom exists takes bom cost
-
    -
    -
    - - - - - -

    - - - get_valuation_rate - (self, args) -

    -

    Get weighted average of valuation rate from all warehouses

    -
    -
    - - - - - -

    - - - manage_default_bom - (self) -

    -

    Uncheck others if current one is selected as default, - update default bom in item master

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update_after_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_bom_material_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_conversion_rate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - traverse_tree - (self, bom_list=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_cost - (self, update_parent=True, from_child_bom=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_cost_and_exploded_items - (self, bom_list=[]) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_exploded_items - (self) -

    -

    Update Flat BOM, following will be correct data

    -
    -
    - - - - - -

    - - - update_parent_cost - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_stock_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_bom_currecny - (self, item) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_bom_links - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_currency - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_main_item - (self) -

    -

    Validate main FG item

    -
    -
    - - - - - -

    - - - validate_materials - (self) -

    -

    Validate raw material entries

    -
    -
    - - - - - -

    - - - validate_operations - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_rm_item - (self, item) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_uom_is_interger - (self) -

    -

    No docs

    -
    -
    - -
    @@ -1579,24 +1029,6 @@ Price List -
  • - - -Production Order - -
    • - - - -
  • - - -Production Order Operation - -
    • - - -
  • @@ -1659,6 +1091,24 @@ Price List
    • + +
  • + + +Work Order + +
    • + + + +
  • + + +Work Order Operation + +
    • + + 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 badec2e5..85419876 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html +++ b/foundation/www/docs/current/models/manufacturing/bom_explosion_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_parent_boms - (self, bom, bom_list=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - replace_bom - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_new_bom - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_bom - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/manufacturing/bom_website_item.html b/foundation/www/docs/current/models/manufacturing/bom_website_item.html index 5a548c47..872d826c 100644 --- a/foundation/www/docs/current/models/manufacturing/bom_website_item.html +++ b/foundation/www/docs/current/models/manufacturing/bom_website_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Disable Capacity Planning and Time Tracking

    - Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order

    + Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order

    @@ -167,6 +167,19 @@ Material Transferred for Manufacture 11 + material_consumption + + Check + + Allow Multiple Material Consumption +

    + Allow multiple Material Consumption against a Work Order

    + + + + + + 12 update_bom_costs_automatically Check @@ -179,7 +192,7 @@ Material Transferred for Manufacture - 12 + 13 column_break_11 Column Break @@ -191,7 +204,7 @@ Material Transferred for Manufacture - 13 + 14 default_wip_warehouse Link @@ -212,7 +225,7 @@ Material Transferred for Manufacture - 14 + 15 default_fg_warehouse Link diff --git a/foundation/www/docs/current/models/manufacturing/material_request_plan_item.html b/foundation/www/docs/current/models/manufacturing/material_request_plan_item.html index 884da88d..02d8ec56 100644 --- a/foundation/www/docs/current/models/manufacturing/material_request_plan_item.html +++ b/foundation/www/docs/current/models/manufacturing/material_request_plan_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -154,7 +140,7 @@
  • -Production Order Operation +Timesheet Detail
    • @@ -163,7 +149,7 @@
  • -Timesheet Detail +Work Order Operation
    • diff --git a/foundation/www/docs/current/models/manufacturing/production_plan.html b/foundation/www/docs/current/models/manufacturing/production_plan.html index 8e95989d..16576e41 100644 --- a/foundation/www/docs/current/models/manufacturing/production_plan.html +++ b/foundation/www/docs/current/models/manufacturing/production_plan.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 Button - Get Items For Production Order + Get Items For Work Order @@ -600,370 +600,6 @@ Material Requested
    - - - -

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

    -

    No docs

    -
    -
    - - - - - -

    - - - add_items - (self, items) -

    -

    No docs

    -
    -
    - - - - - -

    - - - add_mr_in_table - (self, pending_mr) -

    -

    Add Material Requests in the table

    -
    -
    - - - - - -

    - - - add_so_in_table - (self, open_so) -

    -

    Add sales orders in the table

    -
    -
    - - - - - -

    - - - calculate_total_planned_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_total_produced_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_production_order - (self, item) -

    -

    No docs

    -
    -
    - - - - - -

    - - - delete_draft_production_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_items_for_material_requests - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_itemwise_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_mr_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_open_sales_orders - (self) -

    -

    Pull sales orders which are pending to deliver based on criteria selected

    -
    -
    - - - - - -

    - - - get_pending_material_requests - (self) -

    -

    Pull Material Requests that are pending based on criteria selected

    -
    -
    - - - - - -

    - - - get_production_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_so_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_subitems - (self, data, bom_wise_item_details, bom_no, parent_qty) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_material_request - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_production_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_ordered_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_produced_qty - (self, produced_qty, production_plan_item) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_requested_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_data - (self) -

    -

    No docs

    -
    -
    - -
    @@ -1006,7 +642,7 @@ Material Requested
  • -Production Order +Production Plan
    • @@ -1015,7 +651,7 @@ Material Requested
  • -Production Plan +Work 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 16177a38..4b7af0bf 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 + -

    Production Order

    +

    Work Order

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

    Table Name: tabProduction Order

    +

    Table Name: tabWork Order

    @@ -64,7 +64,7 @@ - 
    PRO-
    + 
    WO-
    @@ -146,6 +146,18 @@ Cancelled 7 + allow_alternative_item + + Check + + Allow Alternative Item + + + + + + + 8 column_break1 Column Break @@ -157,7 +169,7 @@ Cancelled - 8 + 9 qty Float @@ -169,7 +181,7 @@ Cancelled - 9 + 10 material_transferred_for_manufacturing Float @@ -181,7 +193,7 @@ Cancelled - 10 + 11 produced_qty Float @@ -193,7 +205,7 @@ Cancelled - 11 + 12 sales_order Link @@ -214,7 +226,7 @@ Cancelled - 12 + 13 project Link @@ -235,7 +247,7 @@ Cancelled - 13 + 14 skip_transfer Check @@ -248,7 +260,7 @@ Cancelled - 14 + 15 warehouses Section Break @@ -262,7 +274,7 @@ Cancelled - 15 + 16 wip_warehouse Link @@ -283,7 +295,7 @@ Cancelled - 16 + 17 fg_warehouse Link @@ -304,7 +316,7 @@ Cancelled - 17 + 18 column_break_12 Column Break @@ -316,7 +328,7 @@ Cancelled - 18 + 19 scrap_warehouse Link @@ -337,7 +349,7 @@ Cancelled - 19 + 20 required_items_section Section Break @@ -349,7 +361,7 @@ Cancelled - 20 + 21 required_items Table @@ -362,7 +374,7 @@ Cancelled -Production Order Item +Work Order Item @@ -370,7 +382,7 @@ Cancelled - 21 + 22 time Section Break @@ -384,7 +396,7 @@ Cancelled - 22 + 23 planned_start_date Datetime @@ -396,7 +408,7 @@ Cancelled - 23 + 24 actual_start_date Datetime @@ -408,7 +420,7 @@ Cancelled - 24 + 25 column_break_13 Column Break @@ -420,7 +432,7 @@ Cancelled - 25 + 26 planned_end_date Datetime @@ -432,7 +444,7 @@ Cancelled - 26 + 27 actual_end_date Datetime @@ -444,7 +456,7 @@ Cancelled - 27 + 28 expected_delivery_date Date @@ -456,7 +468,7 @@ Cancelled - 28 + 29 operations_section Section Break @@ -470,7 +482,7 @@ Cancelled - 29 + 30 operations Table @@ -483,7 +495,7 @@ Cancelled -Production Order Operation +Work Order Operation @@ -491,7 +503,7 @@ Cancelled - 30 + 31 section_break_22 Section Break @@ -503,7 +515,7 @@ Cancelled - 31 + 32 planned_operating_cost Currency @@ -517,7 +529,7 @@ Cancelled - 32 + 33 actual_operating_cost Currency @@ -531,7 +543,7 @@ Cancelled - 33 + 34 additional_operating_cost Currency @@ -545,7 +557,7 @@ Cancelled - 34 + 35 column_break_24 Column Break @@ -557,7 +569,7 @@ Cancelled - 35 + 36 total_operating_cost Currency @@ -571,7 +583,7 @@ Cancelled - 36 + 37 more_info Section Break @@ -585,7 +597,7 @@ Cancelled - 37 + 38 description Small Text @@ -597,7 +609,7 @@ Cancelled - 38 + 39 stock_uom Link @@ -618,7 +630,7 @@ Cancelled - 39 + 40 company Link @@ -639,7 +651,7 @@ Cancelled - 40 + 41 column_break2 Column Break @@ -651,7 +663,7 @@ Cancelled - 41 + 42 material_request Link @@ -673,7 +685,7 @@ Cancelled - 42 + 43 material_request_item Data @@ -685,7 +697,7 @@ Cancelled - 43 + 44 sales_order_item Data @@ -697,7 +709,7 @@ Cancelled - 44 + 45 production_plan Link @@ -718,7 +730,7 @@ Cancelled - 45 + 46 production_plan_item Data @@ -730,7 +742,7 @@ Cancelled - 46 + 47 amended_from Link @@ -743,7 +755,7 @@ Cancelled -Production Order +Work Order @@ -756,7 +768,7 @@ Cancelled

    Controller

    -

    erpnext.manufacturing.doctype.production_order.production_order

    +

    erpnext.manufacturing.doctype.work_order.work_order

    @@ -809,546 +821,6 @@ Cancelled -

    Class ProductionOrder

    - -

    Inherits from frappe.model.document.Document - -

    -
    -
    - - - - -

    - - - before_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_operating_cost - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_time - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_operation_fits_in_working_hours - (self, d) -

    -

    Raises expection if operation is longer than working hours in the given workstation.

    -
    -
    - - - - - -

    - - - delete_timesheet - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_holidays - (self, workstation) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_items_and_operations_from_bom - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_operations_data - (self, data) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_start_end_time - (self, timesheet, operation_id) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_status - (self, status=None) -

    -

    Return the status based on stock entries against this production order

    -
    -
    - - - - - -

    - - - make_time_logs - (self, open_new=False) -

    -

    Capacity Planning. Plan time logs based on earliest availablity of workstation after - Planned Start Date. Time logs will be created and remain in Draft mode and must be submitted - before manufacturing entry can be made.

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_actual_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_available_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_default_warehouse - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_production_order_operations - (self) -

    -

    Fetch operations from BOM and set in 'Production Order'

    -
    -
    - - - - - -

    - - - set_required_items - (self, reset_only_qty=False) -

    -

    set required_items for production to keep track of reserved qty

    -
    -
    - - - - - -

    - - - set_start_end_time_for_workstation - (self, data, index) -

    -

    Set start and end time for given operation. If first operation, set start as - planned_start_date, else add time diff to end time of earlier operation.

    -
    -
    - - - - - -

    - - - update_completed_qty_in_material_request - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_operation_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_ordered_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_planned_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_production_order_qty - (self) -

    -

    Update Manufactured Qty and Material Transferred for Qty in Production Order - based on Stock Entry

    -
    -
    - - - - - -

    - - - update_production_plan_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_required_items - (self) -

    - 
        update bin reserved_qty_for_production
-    called from Stock Entry for production, after submit, cancel
-
    -
    -
    - - - - - -

    - - - update_reserved_qty_for_production - (self, items=None) -

    -

    update reservedqtyfor_production in bins

    -
    -
    - - - - - -

    - - - update_status - (self, status=None) -

    -

    Update status of production order if unknown

    -
    -
    - - - - - -

    - - - update_transaferred_qty_for_required_items - (self) -

    -

    update transferred qty from submitted stock entries for that item against - the production order

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_operation_time - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_production_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_production_order_against_so - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_sales_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_warehouse_belongs_to_company - (self) -

    -

    No docs

    -
    -
    - - -
    -
    - - - - -

    Class StockOverProductionError

    Inherits from frappe.exceptions.ValidationError @@ -1364,14 +836,29 @@ Cancelled +

    Class WorkOrder

    + +

    Inherits from frappe.model.document.Document + +

    +
    +
    + +
    +
    + + + + +

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.add_timesheet_detail +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.add_timesheet_detail

    - + - erpnext.manufacturing.doctype.production_order.production_order.add_timesheet_detail + erpnext.manufacturing.doctype.work_order.work_order.add_timesheet_detail (timesheet, args)

    No docs

    @@ -1384,12 +871,12 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.check_if_scrap_warehouse_mandatory +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.check_if_scrap_warehouse_mandatory

    - + - erpnext.manufacturing.doctype.production_order.production_order.check_if_scrap_warehouse_mandatory + erpnext.manufacturing.doctype.work_order.work_order.check_if_scrap_warehouse_mandatory (bom_no)

    No docs

    @@ -1402,12 +889,12 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.get_default_warehouse +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.get_default_warehouse

    - + - erpnext.manufacturing.doctype.production_order.production_order.get_default_warehouse + erpnext.manufacturing.doctype.work_order.work_order.get_default_warehouse ()

    No docs

    @@ -1420,12 +907,12 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.get_item_details +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.get_item_details

    - + - erpnext.manufacturing.doctype.production_order.production_order.get_item_details + erpnext.manufacturing.doctype.work_order.work_order.get_item_details (item, project=None)

    No docs

    @@ -1438,12 +925,12 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.make_new_timesheet +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.make_new_timesheet

    - + - erpnext.manufacturing.doctype.production_order.production_order.make_new_timesheet + erpnext.manufacturing.doctype.work_order.work_order.make_new_timesheet (source_name, target_doc=None)

    No docs

    @@ -1456,13 +943,13 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.make_stock_entry +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.make_stock_entry

    - + - erpnext.manufacturing.doctype.production_order.production_order.make_stock_entry - (production_order_id, purpose, qty=None) + erpnext.manufacturing.doctype.work_order.work_order.make_stock_entry + (work_order_id, purpose, qty=None)

    No docs

    @@ -1474,13 +961,13 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.make_timesheet +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.make_timesheet

    - + - erpnext.manufacturing.doctype.production_order.production_order.make_timesheet - (production_order, company) + erpnext.manufacturing.doctype.work_order.work_order.make_timesheet + (work_order, company)

    No docs

    @@ -1492,12 +979,12 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.query_sales_order +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.query_sales_order

    - + - erpnext.manufacturing.doctype.production_order.production_order.query_sales_order + erpnext.manufacturing.doctype.work_order.work_order.query_sales_order (production_item)

    No docs

    @@ -1510,12 +997,12 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.set_production_order_ops +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.set_work_order_ops

    - + - erpnext.manufacturing.doctype.production_order.production_order.set_production_order_ops + erpnext.manufacturing.doctype.work_order.work_order.set_work_order_ops (name)

    No docs

    @@ -1528,13 +1015,13 @@ Cancelled

    Public API -
    /api/method/erpnext.manufacturing.doctype.production_order.production_order.stop_unstop +
    /api/method/erpnext.manufacturing.doctype.work_order.work_order.stop_unstop

    - + - erpnext.manufacturing.doctype.production_order.production_order.stop_unstop - (production_order, status) + erpnext.manufacturing.doctype.work_order.work_order.stop_unstop + (work_order, status)

    Called from client side on Stop/Unstop event

    @@ -1552,15 +1039,6 @@ Cancelled
  • -Production Order - -
    • - - - -
  • - - Stock Entry
    • @@ -1575,6 +1053,15 @@ Cancelled + +
  • + + +Work Order + +
    • + + diff --git a/foundation/www/docs/current/models/manufacturing/production_order_item.html b/foundation/www/docs/current/models/manufacturing/work_order_item.html similarity index 87% rename from foundation/www/docs/current/models/manufacturing/production_order_item.html rename to foundation/www/docs/current/models/manufacturing/work_order_item.html index 9c4a357f..e0c69902 100644 --- a/foundation/www/docs/current/models/manufacturing/production_order_item.html +++ b/foundation/www/docs/current/models/manufacturing/work_order_item.html @@ -1,18 +1,18 @@ - + -

    Production Order Item

    +

    Work Order Item

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

    Table Name: tabProduction Order Item

    +

    Table Name: tabWork Order Item

    @@ -156,6 +156,18 @@ 9 + allow_alternative_item + + Check + + Allow Alternative Item + + + + + + + 10 column_break_9 Column Break @@ -167,7 +179,7 @@ - 10 + 11 available_qty_at_source_warehouse Float @@ -179,7 +191,7 @@ - 11 + 12 available_qty_at_wip_warehouse Float @@ -202,7 +214,7 @@
  • -Production Order +Work Order
    • diff --git a/foundation/www/docs/current/models/manufacturing/production_order_operation.html b/foundation/www/docs/current/models/manufacturing/work_order_operation.html similarity index 95% rename from foundation/www/docs/current/models/manufacturing/production_order_operation.html rename to foundation/www/docs/current/models/manufacturing/work_order_operation.html index d3421403..c13523ae 100644 --- a/foundation/www/docs/current/models/manufacturing/production_order_operation.html +++ b/foundation/www/docs/current/models/manufacturing/work_order_operation.html @@ -1,18 +1,18 @@ - + -

    Production Order Operation

    +

    Work Order Operation

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

    Table Name: tabProduction Order Operation

    +

    Table Name: tabWork Order Operation

    @@ -345,7 +345,7 @@ Updated via 'Time Log'

  • -Production Order +Work Order
    • diff --git a/foundation/www/docs/current/models/manufacturing/workstation.html b/foundation/www/docs/current/models/manufacturing/workstation.html index 2518034d..76fc3b40 100644 --- a/foundation/www/docs/current/models/manufacturing/workstation.html +++ b/foundation/www/docs/current/models/manufacturing/workstation.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_bom_operation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_overlap_for_operation_timings - (self) -

    -

    Check if there is no overlap in setting Workstation Operating Hours

    -
    -
    - -
    @@ -450,7 +394,7 @@
  • -Production Order Operation +Timesheet Detail
    • @@ -459,7 +403,7 @@
  • -Timesheet Detail +Work Order Operation
    • 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 0ba811bb..4191d7d7 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - enable - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/non_profit/chapter_member.html b/foundation/www/docs/current/models/non_profit/chapter_member.html index ef22b83f..ce1e9b98 100644 --- a/foundation/www/docs/current/models/non_profit/chapter_member.html +++ b/foundation/www/docs/current/models/non_profit/chapter_member.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - onload - (self) -

    -

    Load address and contacts in __onload

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/non_profit/donor_type.html b/foundation/www/docs/current/models/non_profit/donor_type.html index c36bae14..1cbe5245 100644 --- a/foundation/www/docs/current/models/non_profit/donor_type.html +++ b/foundation/www/docs/current/models/non_profit/donor_type.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    Load address and contacts in __onload

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/non_profit/index.html b/foundation/www/docs/current/models/non_profit/index.html index 881caf73..fcf412af 100644 --- a/foundation/www/docs/current/models/non_profit/index.html +++ b/foundation/www/docs/current/models/non_profit/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 1 + naming_series + + Select + + Series + + + + 
    MEM-
    + + + + + 2 member_name Data @@ -53,7 +67,7 @@ - 2 + 3 membership_expiry_date Date @@ -65,7 +79,7 @@ - 3 + 4 column_break_5 Column Break @@ -77,7 +91,7 @@ - 4 + 5 membership_type Link @@ -98,7 +112,7 @@ - 5 + 6 email Link @@ -119,7 +133,7 @@ - 6 + 7 image Attach Image @@ -131,7 +145,7 @@ - 7 + 8 customer_section Section Break @@ -143,7 +157,7 @@ - 8 + 9 customer Link @@ -164,7 +178,7 @@ - 9 + 10 customer_name Data @@ -178,7 +192,7 @@ - 10 + 11 supplier_section Section Break @@ -190,7 +204,7 @@ - 11 + 12 supplier Link @@ -211,7 +225,7 @@ - 12 + 13 address_contacts Section Break @@ -225,7 +239,7 @@ - 13 + 14 address_html HTML @@ -237,7 +251,7 @@ - 14 + 15 column_break_9 Column Break @@ -249,7 +263,7 @@ - 15 + 16 contact_html HTML @@ -282,48 +296,6 @@
    - - - -

    - - - onload - (self) -

    -

    Load address and contacts in __onload

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_email_type - (self, email) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/non_profit/membership.html b/foundation/www/docs/current/models/non_profit/membership.html index 9988785e..9f7556ad 100644 --- a/foundation/www/docs/current/models/non_profit/membership.html +++ b/foundation/www/docs/current/models/non_profit/membership.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_payment_authorized - (self, status_changed_to=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/non_profit/membership_type.html b/foundation/www/docs/current/models/non_profit/membership_type.html index 5cadcf13..eb51804f 100644 --- a/foundation/www/docs/current/models/non_profit/membership_type.html +++ b/foundation/www/docs/current/models/non_profit/membership_type.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - onload - (self) -

    -

    Load address and contacts in __onload

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/non_profit/volunteer_skill.html b/foundation/www/docs/current/models/non_profit/volunteer_skill.html index 8b0d2b74..ab85733a 100644 --- a/foundation/www/docs/current/models/non_profit/volunteer_skill.html +++ b/foundation/www/docs/current/models/non_profit/volunteer_skill.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - setup_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 4f997e28..2c2a48cc 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/projects/__init__.py b/foundation/www/docs/current/models/projects/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/projects/_sidebar.json b/foundation/www/docs/current/models/projects/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/projects/_sidebar.json +++ b/foundation/www/docs/current/models/projects/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/projects/activity_cost.html b/foundation/www/docs/current/models/projects/activity_cost.html index 78a7f42e..7a70f186 100644 --- a/foundation/www/docs/current/models/projects/activity_cost.html +++ b/foundation/www/docs/current/models/projects/activity_cost.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_unique - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_title - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/projects/activity_type.html b/foundation/www/docs/current/models/projects/activity_type.html index 3dc32066..4f7b6842 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 37 + total_consumed_material_cost + + Currency + + Total Consumed Material Cost (via Stock Entry) + + + + + + + 38 cost_center Link @@ -574,7 +586,7 @@ High - 38 + 39 margin Section Break @@ -586,7 +598,7 @@ High - 39 + 40 gross_margin Currency @@ -600,7 +612,7 @@ High - 40 + 41 column_break_37 Column Break @@ -612,7 +624,7 @@ High - 41 + 42 per_gross_margin Percent @@ -623,6 +635,151 @@ High + + 43 + monitor_progress + + Section Break + + Monitor Progress + + + + + + + 44 + collect_progress + + Check + + Collect Progress + + + + + + + 45 + frequency + + Select + + Frequency To Collect Progress + + + + 
    Hourly
+Twice Daily
+Daily
+Weekly
    + + + + + 46 + column_break_45 + + Column Break + + + + + + + + + 47 + from + + Time + + From + + + + + + + 48 + to + + Time + + To + + + + + + + 49 + first_email + + Time + + First Email + + + + + + + 50 + second_email + + Time + + Second Email + + + + + + + 51 + daily_time_to_send + + Time + + Time to send + + + + + + + 52 + day_to_send + + Select + + Day to Send + + + + 
    Monday
+Tuesday
+Wednesday
+Thursday
+Friday
+Saturday
+Sunday
    + + + + + 53 + weekly_time_to_send + + Time + + Time to send + + + + + @@ -645,300 +802,6 @@ High
    - - - -

    - - - __setup__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - after_insert - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_tasks - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - load_tasks - (self) -

    -

    Load tasks from the database

    -
    -
    - - - - - -

    - - - map_custom_fields - (self, source, target) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    Load project tasks for quick view

    -
    -
    - - - - - -

    - - - send_welcome_email - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - sync_tasks - (self) -

    -

    sync tasks and remove table

    -
    -
    - - - - - -

    - - - update_billed_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_costing - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_dependencies_on_duplicated_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_percent_complete - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_purchase_costing - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_sales_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_project_name - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_weights - (self) -

    -

    No docs

    -
    -
    - -
    @@ -947,6 +810,58 @@ High +

    Public API +
    /api/method/erpnext.projects.doctype.project.project.create_kanban_board_if_not_exists +

    +

    + + + erpnext.projects.doctype.project.project.create_kanban_board_if_not_exists + (project) +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.projects.doctype.project.project.create_project_update + (project) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.projects.doctype.project.project.daily_reminder +

    +

    + + + erpnext.projects.doctype.project.project.daily_reminder + () +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.projects.doctype.project.project.get_cost_center_name

    @@ -1026,6 +941,78 @@ High + + + +

    Public API +
    /api/method/erpnext.projects.doctype.project.project.hourly_reminder +

    +

    + + + erpnext.projects.doctype.project.project.hourly_reminder + () +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.projects.doctype.project.project.times_check +

    +

    + + + erpnext.projects.doctype.project.project.times_check + (from1, to, first_email, second_email, daily_time_to_send, weekly_time_to_send) +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.projects.doctype.project.project.twice_daily_reminder +

    +

    + + + erpnext.projects.doctype.project.project.twice_daily_reminder + () +

    +

    No docs

    +
    +
    + + + + + + +

    Public API +
    /api/method/erpnext.projects.doctype.project.project.weekly +

    +

    + + + erpnext.projects.doctype.project.project.weekly + () +

    +

    No docs

    +
    +
    + + + @@ -1144,7 +1131,7 @@ High
  • -Production Order +Production Plan
    • @@ -1153,7 +1140,7 @@ High
  • -Production Plan +Project Update
    • @@ -1257,6 +1244,15 @@ High + +
  • + + +Work Order + +
    • + + diff --git a/foundation/www/docs/current/models/projects/project_task.html b/foundation/www/docs/current/models/projects/project_task.html index 048ca686..ba881d41 100644 --- a/foundation/www/docs/current/models/projects/project_task.html +++ b/foundation/www/docs/current/models/projects/project_task.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/projects/project_update.html b/foundation/www/docs/current/models/projects/project_update.html new file mode 100644 index 00000000..e1094663 --- /dev/null +++ b/foundation/www/docs/current/models/projects/project_update.html @@ -0,0 +1,280 @@ + + + + + + + +

    Project Update

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabProject Update

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1project + Link + Project + + + + + + +Project + + + +
    2column_break_2 + Column Break + + +
    3date + Date + Date + +
    4time + Time + Time + +
    5section_break_5 + Section Break + + +
    6progress + Select + How is the Project Progressing Right Now? + + + 
    Not Updated
+Great/Quickly
+Good/Steady
+Challenging/Slow
+Problematic/Stuck
    +
    7users + Table + Users + + + + + + +Project User + + + +
    8progress_details + Text Editor + Progress Details + +
    9amended_from + Link + Amended From + + + + + + +Project Update + + + +
    10naming_series + Data + Series + + + 
    UPDATE-.project.-.YY.MM.DD.-.####
    +
    + + +
    +

    Controller

    +

    erpnext.projects.doctype.project_update.project_update

    + + + + + + + +

    Class ProjectUpdate

    + +

    Inherits from frappe.model.document.Document + +

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

    Public API +
    /api/method/erpnext.projects.doctype.project_update.project_update.daily_reminder +

    +

    + + + erpnext.projects.doctype.project_update.project_update.daily_reminder + () +

    +

    No docs

    +
    +
    + + + + + + + +

    + + + erpnext.projects.doctype.project_update.project_update.email_sending + (project_name, frequency, date_start, date_end, progress, number_of_drafts, update) +

    +

    No docs

    +
    +
    + + + + + + +

    Linked In:

    + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/projects/project_user.html b/foundation/www/docs/current/models/projects/project_user.html index 025c6fba..93dd2b0e 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 10.1.2 + Version 10.1.31 Project + + +
  • + + +Project Update +
    • diff --git a/foundation/www/docs/current/models/projects/projects_settings.html b/foundation/www/docs/current/models/projects/projects_settings.html index fa773818..7e6ccf5f 100644 --- a/foundation/www/docs/current/models/projects/projects_settings.html +++ b/foundation/www/docs/current/models/projects/projects_settings.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - + 16 + color + + Color + + Color + + + + + + + 17 section_break0 Section Break @@ -265,7 +277,7 @@ Urgent - 17 + 18 description Text Editor @@ -277,7 +289,7 @@ Urgent - 18 + 19 section_break Section Break @@ -289,7 +301,7 @@ Urgent - 19 + 20 depends_on Table @@ -310,7 +322,7 @@ Urgent - 20 + 21 depends_on_tasks Data @@ -322,7 +334,7 @@ Urgent - 21 + 22 actual Section Break @@ -334,7 +346,7 @@ Urgent - 22 + 23 act_start_date Date @@ -346,7 +358,7 @@ Urgent - 23 + 24 actual_time Float @@ -358,7 +370,7 @@ Urgent - 24 + 25 column_break_15 Column Break @@ -370,7 +382,7 @@ Urgent - 25 + 26 act_end_date Date @@ -382,7 +394,7 @@ Urgent - 26 + 27 section_break_17 Section Break @@ -394,7 +406,7 @@ Urgent - 27 + 28 total_costing_amount Currency @@ -408,7 +420,7 @@ Urgent - 28 + 29 total_expense_claim Currency @@ -422,7 +434,7 @@ Urgent - 29 + 30 column_break_20 Column Break @@ -434,7 +446,7 @@ Urgent - 30 + 31 total_billing_amount Currency @@ -446,7 +458,7 @@ Urgent - 31 + 32 more_details Section Break @@ -458,7 +470,7 @@ Urgent - 32 + 33 review_date Date @@ -470,7 +482,7 @@ Urgent - 33 + 34 closing_date Date @@ -482,7 +494,7 @@ Urgent - 34 + 35 column_break_22 Column Break @@ -494,7 +506,7 @@ Urgent - 35 + 36 company Link @@ -515,7 +527,7 @@ Urgent - 36 + 37 lft Int @@ -527,7 +539,7 @@ Urgent - 37 + 38 rgt Int @@ -539,7 +551,7 @@ Urgent - 38 + 39 old_parent Data @@ -587,258 +599,6 @@ Urgent
    - - - -

    - - - check_recursion - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_customer_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_project_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_webform_permission - (doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - reschedule_dependent_tasks - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - unassign_todo - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_depends_on - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_nsm_model - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_time_and_costing - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_total_expense_claim - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_progress - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_status - (self) -

    -

    No docs

    -
    -
    - -
    @@ -935,6 +695,22 @@ Urgent + +

    + + + erpnext.projects.doctype.task.task.on_doctype_update + () +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.projects.doctype.task.task.set_multiple_status

    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 c1fe419f..cec2ee7b 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 1 + title + + Data + + Title + + + + + + + 2 naming_series Select @@ -56,7 +68,7 @@ TLB- - 2 + 3 company Link @@ -77,7 +89,7 @@ TLB- - 3 + 4 sales_invoice Link @@ -98,7 +110,7 @@ TLB- - 4 + 5 column_break_3 Column Break @@ -110,7 +122,7 @@ TLB- - 5 + 6 salary_slip Link @@ -131,7 +143,7 @@ TLB- - 6 + 7 status Select @@ -150,7 +162,7 @@ Cancelled - 7 + 8 employee_detail Section Break @@ -162,7 +174,7 @@ Cancelled - 8 + 9 employee Link @@ -183,7 +195,7 @@ Cancelled - 9 + 10 employee_name Data @@ -195,7 +207,7 @@ Cancelled - 10 + 11 user Link @@ -216,7 +228,7 @@ Cancelled - 11 + 12 column_break_9 Column Break @@ -228,7 +240,7 @@ Cancelled - 12 + 13 start_date Date @@ -240,7 +252,7 @@ Cancelled - 13 + 14 end_date Date @@ -252,24 +264,24 @@ Cancelled - 14 - production_detail + 15 + work_detail Section Break - Production Detail + Work Detail - 15 - production_order + 16 + work_order Link - Production Order + Work Order @@ -277,7 +289,7 @@ Cancelled -Production Order +Work Order @@ -285,7 +297,7 @@ Cancelled - 16 + 17 section_break_5 Section Break @@ -297,7 +309,7 @@ Cancelled - 17 + 18 time_logs Table @@ -318,7 +330,7 @@ Cancelled - 18 + 19 working_hours Section Break @@ -330,7 +342,7 @@ Cancelled - 19 + 20 total_hours Float @@ -342,7 +354,7 @@ Cancelled - 20 + 21 billing_details Section Break @@ -354,7 +366,7 @@ Cancelled - 21 + 22 total_billable_hours Float @@ -366,7 +378,7 @@ Cancelled - 22 + 23 total_billed_hours Float @@ -378,7 +390,7 @@ Cancelled - 23 + 24 total_costing_amount Float @@ -390,7 +402,7 @@ Cancelled - 24 + 25 column_break_10 Column Break @@ -402,7 +414,7 @@ Cancelled - 25 + 26 total_billable_amount Float @@ -414,7 +426,7 @@ Cancelled - 26 + 27 total_billed_amount Float @@ -426,7 +438,7 @@ Cancelled - 27 + 28 per_billed Percent @@ -438,7 +450,7 @@ Cancelled - 28 + 29 section_break_18 Section Break @@ -450,7 +462,7 @@ Cancelled - 29 + 30 note Text Editor @@ -462,7 +474,7 @@ Cancelled - 30 + 31 amended_from Link @@ -496,7 +508,7 @@ Cancelled -

    Class OverProductionLoggedError

    +

    Class OverWorkLoggedError

    Inherits from frappe.exceptions.ValidationError @@ -534,412 +546,6 @@ Cancelled

    - - - -

    - - - before_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_percentage_billed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_total_amounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_workstation_timings - (self, args) -

    -

    Checks if Time Log is between operating hours of the Workstation.

    -
    -
    - - - - - -

    - - - check_workstation_working_day - (self, data) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_actual_timesheet_summary - (self, operation_id) -

    -

    Returns 'Actual Operating Time'.

    -
    -
    - - - - - -

    - - - get_last_working_slot - (self, time_sheet, workstation) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_overlap_for - (self, fieldname, args, value) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_to_time - (self, data) -

    -

    No docs

    -
    -
    - - - - - -

    - - - move_to_next_day - (self, data) -

    -

    Move start and end time one day forward

    -
    -
    - - - - - -

    - - - move_to_next_non_overlapping_slot - (self, data) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - schedule_for_production_order - (self, index) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_employee_name - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_billing_hours - (self, args) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_cost - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_production_order - (self, time_sheet) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_task_and_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_time_rates - (self, ts_detail) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_mandatory_fields - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_overlap - (self, data) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_overlap_for - (self, fieldname, args, value, ignore_validation=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_time_logs - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/projects/timesheet_detail.html b/foundation/www/docs/current/models/projects/timesheet_detail.html index 5c4829b0..12682e8d 100644 --- a/foundation/www/docs/current/models/projects/timesheet_detail.html +++ b/foundation/www/docs/current/models/projects/timesheet_detail.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 4 + expected_hours + + Float + + Expected Hrs + + + + + + + 5 hours Float @@ -98,7 +110,7 @@ - 5 + 6 to_time Datetime @@ -109,8 +121,20 @@ + + 7 + completed + + Check + + Completed + + + + + - 6 + 8 section_break_7 Section Break @@ -122,7 +146,7 @@ - 7 + 9 completed_qty Float @@ -134,7 +158,7 @@ - 8 + 10 workstation Link @@ -155,7 +179,7 @@ - 9 + 11 column_break_12 Column Break @@ -167,7 +191,7 @@ - 10 + 12 operation Link @@ -188,7 +212,7 @@ - 11 + 13 operation_id Data @@ -200,7 +224,7 @@ - 12 + 14 project_details Section Break @@ -212,7 +236,7 @@ - 13 + 15 project Link @@ -233,7 +257,7 @@ - 14 + 16 column_break_2 Column Break @@ -245,7 +269,7 @@ - 15 + 17 task Link @@ -266,7 +290,7 @@ - 16 + 18 section_break_6 Section Break @@ -278,7 +302,7 @@ - 17 + 19 billable Check @@ -290,7 +314,7 @@ - 18 + 20 column_break_8 Column Break @@ -302,7 +326,7 @@ - 19 + 21 billing_hours Float @@ -314,7 +338,7 @@ - 20 + 22 section_break_11 Section Break @@ -326,7 +350,7 @@ - 21 + 23 billing_rate Currency @@ -338,7 +362,7 @@ - 22 + 24 billing_amount Currency @@ -350,7 +374,7 @@ - 23 + 25 column_break_14 Column Break @@ -362,7 +386,7 @@ - 24 + 26 costing_rate Currency @@ -374,7 +398,7 @@ - 25 + 27 costing_amount Currency @@ -386,7 +410,7 @@ - 26 + 28 reference Section Break @@ -398,7 +422,7 @@ - 27 + 29 sales_invoice Link diff --git a/foundation/www/docs/current/models/regional/__init__.py b/foundation/www/docs/current/models/regional/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/regional/_sidebar.json b/foundation/www/docs/current/models/regional/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/regional/_sidebar.json +++ b/foundation/www/docs/current/models/regional/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/regional/gst_hsn_code.html b/foundation/www/docs/current/models/regional/gst_hsn_code.html index 0f85fc32..62e8a97c 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/regional/index.html b/foundation/www/docs/current/models/regional/index.html index aae8924d..49679d11 100644 --- a/foundation/www/docs/current/models/regional/index.html +++ b/foundation/www/docs/current/models/regional/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - clear_item_price - (self, price_list=None) -

    -

    clear all item prices for this menu

    -
    -
    - - - - - -

    - - - get_price_list - (self) -

    -

    Create price list for menu if missing

    -
    -
    - - - - - -

    - - - make_price_list - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    clear prices

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    Sync Price List

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/restaurant/restaurant_menu_item.html b/foundation/www/docs/current/models/restaurant/restaurant_menu_item.html index 6d7c7cfa..87a657b7 100644 --- a/foundation/www/docs/current/models/restaurant/restaurant_menu_item.html +++ b/foundation/www/docs/current/models/restaurant/restaurant_menu_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/restaurant/restaurant_table.html b/foundation/www/docs/current/models/restaurant/restaurant_table.html index 347423e6..e0bb7fff 100644 --- a/foundation/www/docs/current/models/restaurant/restaurant_table.html +++ b/foundation/www/docs/current/models/restaurant/restaurant_table.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/schools/__init__.py b/foundation/www/docs/current/models/schools/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/schools/_sidebar.json b/foundation/www/docs/current/models/schools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/schools/_sidebar.json +++ b/foundation/www/docs/current/models/schools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/schools/index.html b/foundation/www/docs/current/models/schools/index.html index 0f4827f0..0adf7295 100644 --- a/foundation/www/docs/current/models/schools/index.html +++ b/foundation/www/docs/current/models/schools/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/selling/customer.html b/foundation/www/docs/current/models/selling/customer.html index 3d3865b4..fa5f3c7a 100644 --- a/foundation/www/docs/current/models/selling/customer.html +++ b/foundation/www/docs/current/models/selling/customer.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - after_insert - (self) -

    -

    If customer created from Lead, update customer id in quotations, opportunities

    -
    -
    - - - - - -

    - - - after_rename - (self, olddn, newdn, merge=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_customer_group_or_territory_change - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_lead_address_contact - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_primary_address - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_primary_contact - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_customer_name - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - load_dashboard_info - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    Load address and contacts in __onload

    -
    -
    - - - - - -

    - - - update_lead_status - (self) -

    -

    If Customer created from Lead, update lead status to "Converted" - update Customer link in Quotation, Opportunity

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_credit_limit_on_change - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_name_with_customer_group - (self) -

    -

    No docs

    -
    -
    - -
    @@ -1186,6 +947,15 @@ Individual +
  • + + +GoCardless Mandate + +
    • + + +
  • @@ -1411,6 +1181,15 @@ Individual +
  • + + +Subscriber + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/selling/index.html b/foundation/www/docs/current/models/selling/index.html index be833551..8134fc04 100644 --- a/foundation/www/docs/current/models/selling/index.html +++ b/foundation/www/docs/current/models/selling/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_item_table - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_prevdoc_serial_no - (self, prevdoc_detail_docname) -

    -

    No docs

    -
    -
    - - - - - -

    - - - is_serial_no_added - (self, item_code, serial_no) -

    -

    No docs

    -
    -
    - - - - - -

    - - - is_serial_no_exist - (self, item_code, serial_no) -

    -

    No docs

    -
    -
    - - - - - -

    - - - is_serial_no_match - (self, cur_s_no, prevdoc_s_no, prevdoc_docname) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_installation_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_serial_no - (self) -

    -

    No docs

    -
    -
    - -
    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 d08f31ba..432f28fb 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_child_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_main_item - (self) -

    -

    Validates, main Item is not a stock 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 4003c705..e9c620fe 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Section Break - Subscription Section + Auto Repeat Section @@ -1279,11 +1279,11 @@ Net Total 83 - subscription + auto_repeat Link - Subscription + Auto Repeat @@ -1291,7 +1291,7 @@ Net Total -Subscription +Auto Repeat @@ -1474,202 +1474,6 @@ Replied
    - - - -

    - - - declare_order_lost - (self, arg) -

    -

    No docs

    -
    -
    - - - - - -

    - - - has_sales_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_recurring - (self, reference_doc, subscription_doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - print_other_charges - (self, docname) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_indicator - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_lead - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_opportunity - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_opportunity_status - (self, opportunity=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_order_type - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_quotation_to - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_valid_till - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/selling/quotation_item.html b/foundation/www/docs/current/models/selling/quotation_item.html index 0deb651a..4340e07f 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Section Break - Subscription Section + Auto Repeat Section @@ -1722,11 +1722,11 @@ Closed 113 - subscription + auto_repeat Link - Subscription + Auto Repeat @@ -1734,7 +1734,7 @@ Closed -Subscription +Auto Repeat @@ -1763,412 +1763,6 @@ Closed
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_update_after_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_credit_limit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_modified_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_nextdoc_docstatus - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_production_order_items - (self) -

    -

    Returns items with BOM that already do not have a linked production order

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_recurring - (self, reference_doc, subscription_doc) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - product_bundle_has_stock_item - (self, product_bundle) -

    -

    Returns true if product bundle has stock item

    -
    -
    - - - - - -

    - - - set_indicator - (self) -

    -

    Set indicator for portal

    -
    -
    - - - - - -

    - - - update_delivery_status - (self) -

    -

    Update delivery status from Purchase Order for drop shipping

    -
    -
    - - - - - -

    - - - update_enquiry_status - (self, prevdoc, flag) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_prevdoc_status - (self, flag) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_project - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_reserved_qty - (self, so_item_rows=None) -

    -

    update requested qty (before ordered_qty is updated)

    -
    -
    - - - - - -

    - - - update_status - (self, status) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_delivery_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_drop_ship - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_for_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_order_type - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_po - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_proj_cust - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_sales_mntc_quotation - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_supplier_after_submit - (self) -

    -

    Check that supplier is the same after submit if PO is already made

    -
    -
    - - - - - -

    - - - validate_warehouse - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_with_previous_doc - (self) -

    -

    No docs

    -
    -
    - -
    @@ -2358,24 +1952,6 @@ Closed -

    Public API -
    /api/method/erpnext.selling.doctype.sales_order.sales_order.make_production_orders -

    -

    - - - erpnext.selling.doctype.sales_order.sales_order.make_production_orders - (items, sales_order, company, project=None) -

    -

    Make Production Orders against the given Sales Order for the given items

    -
    -
    - - - - - -

    Public API
    /api/method/erpnext.selling.doctype.sales_order.sales_order.make_project

    @@ -2430,6 +2006,24 @@ Closed +

    Public API +
    /api/method/erpnext.selling.doctype.sales_order.sales_order.make_work_orders +

    +

    + + + erpnext.selling.doctype.sales_order.sales_order.make_work_orders + (items, sales_order, company, project=None) +

    +

    Make Work Orders against the given Sales Order for the given items

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.selling.doctype.sales_order.sales_order.update_status

    @@ -2488,15 +2082,6 @@ Closed -
  • - - -Production Order - -
    • - - -
  • @@ -2559,6 +2144,15 @@ Closed
    • + +
  • + + +Work 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 4c89e77d..34890efb 100644 --- a/foundation/www/docs/current/models/selling/sales_order_item.html +++ b/foundation/www/docs/current/models/selling/sales_order_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 7 + default_valid_till + + Data + + Default Quotation Validity Days + + + + + + + 8 column_break_5 Column Break @@ -157,7 +169,7 @@ Naming Series - 8 + 9 so_required Select @@ -172,7 +184,7 @@ Yes - 9 + 10 dn_required Select @@ -187,7 +199,7 @@ Yes - 10 + 11 maintain_same_sales_rate Check @@ -199,7 +211,7 @@ Yes - 11 + 12 editable_price_list_rate Check @@ -211,7 +223,7 @@ Yes - 12 + 13 allow_multiple_items Check @@ -223,7 +235,7 @@ Yes - 13 + 14 allow_against_multiple_purchase_orders Check @@ -235,7 +247,7 @@ Yes - 14 + 15 validate_selling_price Check @@ -247,7 +259,7 @@ Yes - 15 + 16 hide_tax_id Check @@ -280,62 +292,6 @@ Yes
    - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_default_customer_group_and_territory - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - toggle_hide_tax_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/selling/sms_center.html b/foundation/www/docs/current/models/selling/sms_center.html index c06a4b0e..878c413f 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 10.1.2 + Version 10.1.31
    - - - -

    - - - create_receiver_list - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_receiver_nos - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - send_sms - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/setup/__init__.py b/foundation/www/docs/current/models/setup/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/setup/_sidebar.json b/foundation/www/docs/current/models/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/setup/_sidebar.json +++ b/foundation/www/docs/current/models/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/setup/authorization_control.html b/foundation/www/docs/current/models/setup/authorization_control.html index 306d74b4..52759bfd 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 10.1.2 + Version 10.1.31
    - - - -

    - - - bifurcate_based_on_type - (self, doctype_name, total, av_dis, based_on, doc_obj, val, company) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_appr_user_role - (self, det, doctype_name, total, based_on, condition, item, company) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_approver_name - (self, doctype_name, total, doc_obj=) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_value_based_rule - (self, doctype_name, employee, total_claimed_amount, company) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_approving_authority - (self, doctype_name, company, total, doc_obj=) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_auth_rule - (self, doctype_name, total, based_on, cond, company, item=) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/setup/authorization_rule.html b/foundation/www/docs/current/models/setup/authorization_rule.html index e98448f2..a8c9e526 100644 --- a/foundation/www/docs/current/models/setup/authorization_rule.html +++ b/foundation/www/docs/current/models/setup/authorization_rule.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_duplicate_entry - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_rule - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/setup/brand.html b/foundation/www/docs/current/models/setup/brand.html index 4220bec1..1016cd9d 100644 --- a/foundation/www/docs/current/models/setup/brand.html +++ b/foundation/www/docs/current/models/setup/brand.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - _set_default_account - (self, fieldname, account_type) -

    -

    No docs

    -
    -
    - - - - - -

    - - - abbreviate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - after_rename - (self, olddn, newdn, merge=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_country_change - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_if_transactions_exist - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_default_accounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_default_cost_center - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_default_tax_template - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - create_default_warehouses - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    - 
            Trash accounts and cost centers for this company if no gl entry exists
-
    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_default_accounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_mode_of_payment_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_abbr - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_coa_input - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_currency - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_default_accounts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_perpetual_inventory - (self) -

    -

    No docs

    -
    -
    - -
    @@ -1740,24 +1459,6 @@ Existing Company -
  • - - -Employee Loan - -
    • - - - -
  • - - -Employee Loan Application - -
    • - - -
  • @@ -1956,6 +1657,24 @@ Existing Company +
  • + + +Loan + +
    • + + + +
  • + + +Loan Application + +
    • + + +
  • @@ -2028,6 +1747,15 @@ Existing Company +
  • + + +Patient Service Unit + +
    • + + +
  • @@ -2082,15 +1810,6 @@ Existing Company -
  • - - -Production Order - -
    • - - -
  • @@ -2387,6 +2106,15 @@ Existing Company
    • + +
  • + + +Work Order + +
    • + + diff --git a/foundation/www/docs/current/models/setup/currency_exchange.html b/foundation/www/docs/current/models/setup/currency_exchange.html index 626bdcd5..ceb9a3aa 100644 --- a/foundation/www/docs/current/models/setup/currency_exchange.html +++ b/foundation/www/docs/current/models/setup/currency_exchange.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/setup/customer_group.html b/foundation/www/docs/current/models/setup/customer_group.html index 479ac4d1..3a4df912 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 10.1.2 + Version 10.1.31
    - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_name_with_customer - (self) -

    -

    No docs

    -
    -
    - -
    @@ -302,6 +274,22 @@ + + + + +

    + + + erpnext.setup.doctype.customer_group.customer_group.on_doctype_update + () +

    +

    No docs

    +
    +
    + + + @@ -345,6 +333,15 @@ +
  • + + +Item Customer Detail + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/setup/email_digest.html b/foundation/www/docs/current/models/setup/email_digest.html index e6c20e87..1331bccf 100644 --- a/foundation/www/docs/current/models/setup/email_digest.html +++ b/foundation/www/docs/current/models/setup/email_digest.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - fmt_money - (self, value, absol=True) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_bank_balance - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_calendar_events - (self) -

    -

    Get calendar events for given user

    -
    -
    - - - - - -

    - - - get_credit_balance - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_expense_year_to_date - (self) -

    -

    Get income to date

    -
    -
    - - - - - -

    - - - get_expenses_booked - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_from_to_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_income - (self) -

    -

    Get income for given period

    -
    -
    - - - - - -

    - - - get_income_year_to_date - (self) -

    -

    Get income to date

    -
    -
    - - - - - -

    - - - get_invoiced_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_issue_count - (self) -

    -

    Get count of Issue

    -
    -
    - - - - - -

    - - - get_issue_list - (self, user_id=None) -

    -

    Get issue list

    -
    -
    - - - - - -

    - - - get_msg_html - (self) -

    -

    Build email digest content

    -
    -
    - - - - - -

    - - - get_new_quotations - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_next_sending - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_notifications - (self) -

    -

    Get notifications for user

    -
    -
    - - - - - -

    - - - get_payables - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_pending_purchase_orders - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_pending_quotations - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_pending_sales_orders - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_period_amounts - (self, accounts, fieldname) -

    -

    Get amounts for current and past periods

    -
    -
    - - - - - -

    - - - get_project_count - (self) -

    -

    Get count of Project

    -
    -
    - - - - - -

    - - - get_project_list - (self, user_id=None) -

    -

    Get project list

    -
    -
    - - - - - -

    - - - get_purchase_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_root_type_accounts - (self, root_type) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_sales_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_summary_of_doc - (self, doc_type, fieldname) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_summary_of_pending - (self, doc_type, fieldname, getfield) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_summary_of_pending_quotations - (self, fieldname) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_todo_count - (self, user_id=None) -

    -

    Get count of Todo

    -
    -
    - - - - - -

    - - - get_todo_list - (self, user_id=None) -

    -

    Get to-do list

    -
    -
    - - - - - -

    - - - get_total_on - (self, doc_type, from_date, to_date) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_type_balance - (self, fieldname, account_type, root_type=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_users - (self) -

    -

    get list of users

    -
    -
    - - - - - -

    - - - get_year_to_date_balance - (self, root_type, fieldname) -

    -

    Get income to date

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - send - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_accounting_cards - (self, context) -

    -

    Create accounting cards if checked

    -
    -
    - - - - - -

    - - - set_dates - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_style - (self, context) -

    -

    Set standard digest style

    -
    -
    - - - - - -

    - - - set_title - (self, context) -

    -

    Set digest title

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/setup/global_defaults.html b/foundation/www/docs/current/models/setup/global_defaults.html index f39c9927..bfeeb0b4 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 10.1.2 + Version 10.1.31
    - - - -

    - - - get_defaults - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    update defaults

    -
    -
    - - - - - -

    - - - toggle_in_words - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - toggle_rounded_total - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/setup/index.html b/foundation/www/docs/current/models/setup/index.html index b050ee87..ec4a8a32 100644 --- a/foundation/www/docs/current/models/setup/index.html +++ b/foundation/www/docs/current/models/setup/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_route - (self) -

    -

    Make website route

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_name_with_item - (self) -

    -

    No docs

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

    - - - check_duplicate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_current - (self, arg=None) -

    -

    get series current

    -
    -
    - - - - - -

    - - - get_options - (self, arg=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_transactions - (self, arg=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - insert_series - (self, series) -

    -

    insert series if missing

    -
    -
    - - - - - -

    - - - parse_naming_series - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - scrub_options_list - (self, ol) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_series_for - (self, doctype, ol) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_series - (self, arg=None) -

    -

    update series list

    -
    -
    - - - - - -

    - - - update_series_start - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_series_name - (self, n) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/setup/notification_control.html b/foundation/www/docs/current/models/setup/notification_control.html deleted file mode 100644 index 5a1d1a18..00000000 --- a/foundation/www/docs/current/models/setup/notification_control.html +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - - -

    Notification Control

    -
    - - - Version 10.1.2 - - - Source - -
    - -Single - - - - -Send automatic emails to Contacts on Submitting transactions. - -

    Fields

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    SrFieldnameTypeLabelOptions
    1send_autonotification_for - Section Break - Prompt for Email on Submission of -

    - When any of the checked transactions are "Submitted", an email pop-up automatically opened to send an email to the associated "Contact" in that transaction, with the transaction as an attachment. The user may or may not send the email.

    -
    2sales - Column Break - Sales - -
    3quotation - Check - Quotation - -
    4sales_order - Check - Sales Order - -
    5delivery_note - Check - Delivery Note - -
    6sales_invoice - Check - Sales Invoice - -
    7purchase - Column Break - Purchase - -
    8purchase_order - Check - Purchase Order - -
    9purchase_receipt - Check - Purchase Receipt - -
    10expense_claim - Check - Expense Claim - -
    11customize_the_notification - Section Break - Customize the Notification -

    - Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.

    -
    12select_transaction - Select - Select Transaction - - - 
    -Quotation
-Sales Order
-Delivery Note
-Sales Invoice
-Purchase Order
-Purchase Receipt
-Expense Claim
-Expense Claim Approved
-Expense Claim Rejected
    -
    13custom_message - Text Editor - Custom Message - -
    14quotation_message - Text - Quotation Message - -
    15sales_order_message - Text - Sales Order Message - -
    16delivery_note_message - Text - Delivery Note Message - -
    17sales_invoice_message - Text - Sales Invoice Message - -
    18purchase_order_message - Text - Purchase Order Message - -
    19purchase_receipt_message - Text - Purchase Receipt Message - -
    20expense_claim_approved_message - Text - Expense Claim Approved Message - -
    21expense_claim_rejected_message - Text - Expense Claim Rejected Message - -
    - - -
    -

    Controller

    -

    erpnext.setup.doctype.notification_control.notification_control

    - - - - - - - -

    Class NotificationControl

    - -

    Inherits from frappe.model.document.Document - -

    -
    -
    - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - -
    -
    - - - - - - - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/models/setup/party_type.html b/foundation/www/docs/current/models/setup/party_type.html index fe2ccff4..55ede747 100644 --- a/foundation/www/docs/current/models/setup/party_type.html +++ b/foundation/www/docs/current/models/setup/party_type.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    Load address and contacts in __onload

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/setup/sales_person.html b/foundation/www/docs/current/models/setup/sales_person.html index 3f6eaba5..5c7c8031 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 10.1.2 + Version 10.1.31
    - - - -

    - - - get_email_id - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_employee_id - (self) -

    -

    No docs

    -
    -
    - -
    + + + + +

    + + + erpnext.setup.doctype.sales_person.sales_person.on_doctype_update + () +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/setup/setup_progress.html b/foundation/www/docs/current/models/setup/setup_progress.html index 165cd6cb..f2eefa61 100644 --- a/foundation/www/docs/current/models/setup/setup_progress.html +++ b/foundation/www/docs/current/models/setup/setup_progress.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -274,6 +260,15 @@ Examples: +
  • + + +Student Report Generation Tool + +
    • + + +
  • diff --git a/foundation/www/docs/current/models/setup/territory.html b/foundation/www/docs/current/models/setup/territory.html index 8b19be02..0981b6d4 100644 --- a/foundation/www/docs/current/models/setup/territory.html +++ b/foundation/www/docs/current/models/setup/territory.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    + + + + +

    + + + erpnext.setup.doctype.territory.territory.on_doctype_update + () +

    +

    No docs

    +
    +
    + + + diff --git a/foundation/www/docs/current/models/setup/uom.html b/foundation/www/docs/current/models/setup/uom.html index f700ba1d..6225a1ec 100644 --- a/foundation/www/docs/current/models/setup/uom.html +++ b/foundation/www/docs/current/models/setup/uom.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - - -Production Order - -
    • - - -
  • @@ -386,6 +377,15 @@
    • + +
  • + + +Work Order + +
    • + + 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 914c580c..fd494338 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_shipping_rules - (self, shipping_territory) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_tax_master - (self, billing_territory) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_exchange_rates_exist - (self) -

    -

    check if exchange rates exist for all Price List currencies (to company's currency)

    -
    -
    - - - - - -

    - - - validate_tax_rule - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/stock/__init__.py b/foundation/www/docs/current/models/stock/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/stock/_sidebar.json b/foundation/www/docs/current/models/stock/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/stock/_sidebar.json +++ b/foundation/www/docs/current/models/stock/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/stock/batch.html b/foundation/www/docs/current/models/stock/batch.html index c372cd55..81fd555d 100644 --- a/foundation/www/docs/current/models/stock/batch.html +++ b/foundation/www/docs/current/models/stock/batch.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - after_delete - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    Generate random ID for batch if not specified

    -
    -
    - - - - - -

    - - - before_save - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_name_from_naming_series - (self) -

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

    - - - item_has_batch_enabled - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/stock/bin.html b/foundation/www/docs/current/models/stock/bin.html index 7b6151f9..08c4e599 100644 --- a/foundation/www/docs/current/models/stock/bin.html +++ b/foundation/www/docs/current/models/stock/bin.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_first_sle - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_projected_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_qty - (self, args) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_reserved_qty_for_production - (self) -

    -

    Update qty reserved for production from Production Item tables - in open production orders

    -
    -
    - - - - - -

    - - - update_reserved_qty_for_sub_contracting - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_stock - (self, args, allow_negative_stock=False, via_landed_cost_voucher=False) -

    -

    Called from erpnext.stock.utils.update_bin

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_mandatory - (self) -

    -

    No docs

    -
    -
    - -
    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 fd3e8e91..0a32f228 100644 --- a/foundation/www/docs/current/models/stock/customs_tariff_number.html +++ b/foundation/www/docs/current/models/stock/customs_tariff_number.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - + 81 - payment_terms_template_section - - Section Break - - - - - - - - - 82 - payment_terms_template - - Link - - Payment Terms Template - - - - - - - -Payment Terms Template - - - - - - - - 83 - terms_section - - Section Break - - - - - - - - - 84 tc_name Link @@ -1271,7 +1226,7 @@ Net Total - 85 + 82 terms Text Editor @@ -1283,7 +1238,7 @@ Net Total - 86 + 83 transporter_info Section Break @@ -1297,7 +1252,7 @@ Net Total - 87 + 84 transporter_name Data @@ -1309,7 +1264,7 @@ Net Total - 88 + 85 col_break34 Column Break @@ -1321,7 +1276,7 @@ Net Total - 89 + 86 lr_no Data @@ -1333,7 +1288,7 @@ Net Total - 90 + 87 lr_date Date @@ -1345,7 +1300,7 @@ Net Total - 91 + 88 more_info Section Break @@ -1359,7 +1314,7 @@ Net Total - 92 + 89 project Link @@ -1381,7 +1336,7 @@ Net Total - 93 + 90 campaign Link @@ -1402,7 +1357,7 @@ Net Total - 94 + 91 source Link @@ -1423,7 +1378,7 @@ Net Total - 95 + 92 column_break5 Column Break @@ -1435,7 +1390,7 @@ Net Total - 96 + 93 per_billed Percent @@ -1447,7 +1402,7 @@ Net Total - 97 + 94 customer_group Link @@ -1468,7 +1423,7 @@ Net Total - 98 + 95 territory Link @@ -1489,7 +1444,7 @@ Net Total - 99 + 96 printing_details Section Break @@ -1501,7 +1456,7 @@ Net Total - 100 + 97 letter_head Link @@ -1522,7 +1477,7 @@ Net Total - 101 + 98 select_print_heading Link @@ -1543,7 +1498,7 @@ Net Total - 102 + 99 language Data @@ -1555,7 +1510,7 @@ Net Total - 103 + 100 column_break_88 Column Break @@ -1567,7 +1522,7 @@ Net Total - 104 + 101 print_without_amount Check @@ -1579,7 +1534,7 @@ Net Total - 105 + 102 section_break_83 Section Break @@ -1591,7 +1546,7 @@ Net Total - 106 + 103 status Select @@ -1610,7 +1565,7 @@ Closed - 107 + 104 per_installed Percent @@ -1623,7 +1578,7 @@ Closed - 108 + 105 installation_status Select @@ -1635,7 +1590,7 @@ Closed - 109 + 106 column_break_89 Column Break @@ -1647,7 +1602,7 @@ Closed - 110 + 107 to_warehouse Link @@ -1669,7 +1624,7 @@ Closed - 111 + 108 excise_page Data @@ -1681,7 +1636,7 @@ Closed - 112 + 109 instructions Text @@ -1693,7 +1648,7 @@ Closed - 113 + 110 subscription_section Section Break @@ -1705,12 +1660,12 @@ Closed - 114 - subscription + 111 + auto_repeat Link - Subscription + Auto Repeat @@ -1718,7 +1673,7 @@ Closed -Subscription +Auto Repeat @@ -1726,7 +1681,7 @@ Closed - 115 + 112 sales_team_section_break Section Break @@ -1740,7 +1695,7 @@ Closed - 116 + 113 sales_partner Link @@ -1761,7 +1716,7 @@ Closed - 117 + 114 column_break7 Column Break @@ -1773,7 +1728,7 @@ Closed - 118 + 115 commission_rate Float @@ -1785,7 +1740,7 @@ Closed - 119 + 116 total_commission Currency @@ -1799,7 +1754,7 @@ Closed - 120 + 117 section_break1 Section Break @@ -1811,7 +1766,7 @@ Closed - 121 + 118 sales_team Table @@ -1853,260 +1808,6 @@ Closed
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_print - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - cancel_packing_slips - (self) -

    - 
            Cancel submitted packing slips related to this delivery note
-
    -
    -
    - - - - - -

    - - - check_credit_limit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_next_docstatus - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_actual_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - so_required - (self) -

    -

    check in manage account if sales order required or not

    -
    -
    - - - - - -

    - - - update_billing_status - (self, update_modified=True) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_current_stock - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status - (self, status) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_for_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_packed_qty - (self) -

    - 
            Validate that if packed qty exists, it should be equal to qty
-
    -
    -
    - - - - - -

    - - - validate_proj_cust - (self) -

    -

    check for does customer belong to same project as entered..

    -
    -
    - - - - - -

    - - - validate_warehouse - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_with_previous_doc - (self) -

    -

    No docs

    -
    -
    - -
    @@ -2147,6 +1848,24 @@ Closed +

    Public API +
    /api/method/erpnext.stock.doctype.delivery_note.delivery_note.make_delivery_trip +

    +

    + + + erpnext.stock.doctype.delivery_note.delivery_note.make_delivery_trip + (source_name, target_doc=None) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note

    @@ -2266,6 +1985,15 @@ Closed +
  • + + +Delivery Stop + +
    • + + +
  • 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 102de689..37079037 100644 --- a/foundation/www/docs/current/models/stock/delivery_note_item.html +++ b/foundation/www/docs/current/models/stock/delivery_note_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 51 - serial_no - - Text - - Serial No - - - - - - - 52 batch_no Link @@ -776,7 +764,7 @@ Amount - 53 + 52 actual_qty Float @@ -788,7 +776,7 @@ Amount - 54 + 53 actual_batch_qty Float @@ -799,6 +787,18 @@ Amount + + 54 + serial_no + + Text + + Serial No + + + + + 55 item_group diff --git a/foundation/www/docs/current/models/stock/delivery_stop.html b/foundation/www/docs/current/models/stock/delivery_stop.html index 9bd30ba9..2bf76941 100644 --- a/foundation/www/docs/current/models/stock/delivery_stop.html +++ b/foundation/www/docs/current/models/stock/delivery_stop.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 13 - select_delivery_notes + delivery_note - Button + Link - Select/Unselect Delivery Notes + Delivery Note - - - - - 14 - column_break_14 - - Column Break - + + + +Delivery Note + + + - - - - - 15 - delivery_notes - - Text - - Delivery Notes - - - - 16 + 14 section_break_14 Section Break @@ -260,7 +245,7 @@ - 17 + 15 notified_by_email Check @@ -272,7 +257,7 @@ - 18 + 16 column_break_18 Column Break @@ -284,7 +269,7 @@ - 19 + 17 email_sent_to Data diff --git a/foundation/www/docs/current/models/stock/delivery_trip.html b/foundation/www/docs/current/models/stock/delivery_trip.html index 251f8c13..d2ca7b60 100644 --- a/foundation/www/docs/current/models/stock/delivery_trip.html +++ b/foundation/www/docs/current/models/stock/delivery_trip.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 Standard Reply +Email Template @@ -418,24 +418,6 @@ -

    Public API -
    /api/method/erpnext.stock.doctype.delivery_trip.delivery_trip.get_delivery_notes -

    -

    - - - erpnext.stock.doctype.delivery_trip.delivery_trip.get_delivery_notes - (customer) -

    -

    No docs

    -
    -
    - - - - - -

    Public API
    /api/method/erpnext.stock.doctype.delivery_trip.delivery_trip.notify_customers

    diff --git a/foundation/www/docs/current/models/stock/index.html b/foundation/www/docs/current/models/stock/index.html index 45366c09..0f92e240 100644 --- a/foundation/www/docs/current/models/stock/index.html +++ b/foundation/www/docs/current/models/stock/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 12 + allow_alternative_item + + Check + + Allow Alternative Item + + + + + + + 13 is_stock_item Check @@ -217,7 +229,7 @@ A Product or a Service that is bought, sold or kept in stock. - 13 + 14 opening_stock Float @@ -229,7 +241,7 @@ A Product or a Service that is bought, sold or kept in stock. - 14 + 15 valuation_rate Currency @@ -241,7 +253,7 @@ A Product or a Service that is bought, sold or kept in stock. - 15 + 16 standard_rate Currency @@ -253,7 +265,7 @@ A Product or a Service that is bought, sold or kept in stock. - 16 + 17 is_fixed_asset Check @@ -265,7 +277,7 @@ A Product or a Service that is bought, sold or kept in stock. - 17 + 18 asset_category Link @@ -286,7 +298,7 @@ A Product or a Service that is bought, sold or kept in stock. - 18 + 19 tolerance Float @@ -298,7 +310,7 @@ A Product or a Service that is bought, sold or kept in stock. - 19 + 20 image Attach Image @@ -312,7 +324,7 @@ A Product or a Service that is bought, sold or kept in stock. - 20 + 21 section_break_11 Section Break @@ -324,7 +336,7 @@ A Product or a Service that is bought, sold or kept in stock. - 21 + 22 brand Link @@ -345,7 +357,7 @@ A Product or a Service that is bought, sold or kept in stock. - 22 + 23 description Text Editor @@ -357,7 +369,7 @@ A Product or a Service that is bought, sold or kept in stock. - 23 + 24 sb_barcodes Section Break @@ -369,7 +381,7 @@ A Product or a Service that is bought, sold or kept in stock. - 24 + 25 barcodes Table @@ -390,7 +402,7 @@ A Product or a Service that is bought, sold or kept in stock. - 25 + 26 inventory Section Break @@ -404,7 +416,7 @@ A Product or a Service that is bought, sold or kept in stock. - 26 + 27 default_warehouse Link @@ -425,7 +437,7 @@ A Product or a Service that is bought, sold or kept in stock. - 27 + 28 shelf_life_in_days Int @@ -437,7 +449,7 @@ A Product or a Service that is bought, sold or kept in stock. - 28 + 29 end_of_life Date @@ -449,7 +461,7 @@ A Product or a Service that is bought, sold or kept in stock. - 29 + 30 default_material_request_type Select @@ -466,7 +478,7 @@ Manufacture - 30 + 31 column_break1 Column Break @@ -478,7 +490,7 @@ Manufacture - 31 + 32 valuation_method Select @@ -494,7 +506,7 @@ Moving Average - 32 + 33 warranty_period Data @@ -506,7 +518,7 @@ Moving Average - 33 + 34 weight_per_unit Float @@ -518,7 +530,7 @@ Moving Average - 34 + 35 weight_uom Link @@ -539,7 +551,7 @@ Moving Average - 35 + 36 reorder_section Section Break @@ -553,7 +565,7 @@ Moving Average - 36 + 37 reorder_levels Table @@ -575,7 +587,7 @@ Moving Average - 37 + 38 unit_of_measure_conversion Section Break @@ -587,7 +599,7 @@ Moving Average - 38 + 39 uoms Table @@ -609,7 +621,7 @@ Moving Average - 39 + 40 serial_nos_and_batches Section Break @@ -621,7 +633,7 @@ Moving Average - 40 + 41 has_batch_no Check @@ -633,7 +645,7 @@ Moving Average - 41 + 42 create_new_batch Check @@ -645,7 +657,7 @@ Moving Average - 42 + 43 has_expiry_date Check @@ -657,7 +669,7 @@ Moving Average - 43 + 44 retain_sample Check @@ -669,7 +681,7 @@ Moving Average - 44 + 45 sample_quantity Int @@ -682,7 +694,7 @@ Moving Average - 45 + 46 column_break_37 Column Break @@ -694,7 +706,7 @@ Moving Average - 46 + 47 has_serial_no Check @@ -706,7 +718,7 @@ Moving Average - 47 + 48 serial_no_series Data @@ -720,7 +732,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 48 + 49 variants_section Section Break @@ -732,7 +744,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 49 + 50 has_variants Check @@ -745,7 +757,7 @@ If series is set and Serial No is not mentioned in transactions, then automatic - 50 + 51 variant_based_on Select @@ -760,7 +772,7 @@ Manufacturer - 51 + 52 attributes Table @@ -781,7 +793,7 @@ Manufacturer - 52 + 53 purchase_details Section Break @@ -795,7 +807,7 @@ Manufacturer - 53 + 54 is_purchase_item Check @@ -807,7 +819,7 @@ Manufacturer - 54 + 55 purchase_uom Link @@ -828,7 +840,7 @@ Manufacturer - 55 + 56 min_order_qty Float @@ -840,7 +852,7 @@ Manufacturer - 56 + 57 safety_stock Float @@ -852,7 +864,7 @@ Manufacturer - 57 + 58 purchase_details_cb Column Break @@ -864,7 +876,7 @@ Manufacturer - 58 + 59 lead_time_days Int @@ -877,7 +889,7 @@ Manufacturer - 59 + 60 buying_cost_center Link @@ -898,7 +910,7 @@ Manufacturer - 60 + 61 expense_account Link @@ -919,7 +931,7 @@ Manufacturer - 61 + 62 last_purchase_rate Float @@ -931,7 +943,7 @@ Manufacturer - 62 + 63 supplier_details Section Break @@ -943,7 +955,7 @@ Manufacturer - 63 + 64 default_supplier Link @@ -964,7 +976,7 @@ Manufacturer - 64 + 65 delivered_by_supplier Check @@ -976,7 +988,7 @@ Manufacturer - 65 + 66 manufacturer Link @@ -997,7 +1009,7 @@ Manufacturer - 66 + 67 manufacturer_part_no Data @@ -1009,7 +1021,7 @@ Manufacturer - 67 + 68 column_break2 Column Break @@ -1021,7 +1033,7 @@ Manufacturer - 68 + 69 supplier_items Table @@ -1042,7 +1054,7 @@ Manufacturer - 69 + 70 foreign_trade_details Section Break @@ -1054,7 +1066,7 @@ Manufacturer - 70 + 71 country_of_origin Link @@ -1075,7 +1087,7 @@ Manufacturer - 71 + 72 column_break_59 Column Break @@ -1087,7 +1099,7 @@ Manufacturer - 72 + 73 customs_tariff_number Link @@ -1108,7 +1120,7 @@ Manufacturer - 73 + 74 sales_details Section Break @@ -1121,18 +1133,6 @@ Manufacturer - - 74 - is_sales_item - - Check - - Is Sales Item - - - - - 75 sales_uom @@ -1177,6 +1177,30 @@ Manufacturer 77 + is_sales_item + + Check + + Is Sales Item + + + + + + + 78 + column_break3 + + Column Break + + + + + + + + + 79 selling_cost_center Link @@ -1197,19 +1221,31 @@ Manufacturer - 78 - column_break3 - - Column Break + 80 + max_discount - Customer Item Codes + Float + + Max Discount (%) + + + + + + + 81 + customer_details + + Section Break + + Customer Details - 79 + 82 customer_items Table @@ -1229,20 +1265,8 @@ Manufacturer - - 80 - max_discount - - Float - - Max Discount (%) - - - - - - 81 + 83 item_tax_section_break Section Break @@ -1256,7 +1280,7 @@ Manufacturer - 82 + 84 taxes Table @@ -1278,7 +1302,7 @@ Manufacturer - 83 + 85 inspection_criteria Section Break @@ -1292,7 +1316,7 @@ Manufacturer - 84 + 86 inspection_required_before_purchase Check @@ -1304,7 +1328,7 @@ Manufacturer - 85 + 87 inspection_required_before_delivery Check @@ -1316,7 +1340,7 @@ Manufacturer - 86 + 88 quality_inspection_template Link @@ -1337,7 +1361,7 @@ Manufacturer - 87 + 89 manufacturing Section Break @@ -1351,7 +1375,7 @@ Manufacturer - 88 + 90 default_bom Link @@ -1372,7 +1396,7 @@ Manufacturer - 89 + 91 is_sub_contracted_item Check @@ -1385,7 +1409,7 @@ Manufacturer - 90 + 92 column_break_74 Column Break @@ -1397,7 +1421,7 @@ Manufacturer - 91 + 93 customer_code Data @@ -1409,7 +1433,7 @@ Manufacturer - 92 + 94 website_section Section Break @@ -1423,7 +1447,7 @@ Manufacturer - 93 + 95 show_in_website Check @@ -1435,7 +1459,7 @@ Manufacturer - 94 + 96 show_variant_in_website Check @@ -1447,7 +1471,7 @@ Manufacturer - 95 + 97 route Small Text @@ -1459,7 +1483,7 @@ Manufacturer - 96 + 98 weightage Int @@ -1472,7 +1496,7 @@ Manufacturer - 97 + 99 slideshow Link @@ -1494,7 +1518,7 @@ Manufacturer - 98 + 100 website_image Attach @@ -1507,7 +1531,7 @@ Manufacturer - 99 + 101 thumbnail Data @@ -1519,7 +1543,7 @@ Manufacturer - 100 + 102 cb72 Column Break @@ -1531,7 +1555,7 @@ Manufacturer - 101 + 103 website_warehouse Link @@ -1553,7 +1577,7 @@ Manufacturer - 102 + 104 website_item_groups Table @@ -1575,7 +1599,7 @@ Manufacturer - 103 + 105 sb72 Section Break @@ -1587,7 +1611,7 @@ Manufacturer - 104 + 106 copy_from_item_group Button @@ -1599,7 +1623,7 @@ Manufacturer - 105 + 107 website_specifications Table @@ -1620,7 +1644,7 @@ Manufacturer - 106 + 108 web_long_description Text Editor @@ -1632,7 +1656,7 @@ Manufacturer - 107 + 109 total_projected_qty Float @@ -1644,7 +1668,7 @@ Manufacturer - 108 + 110 hub_publishing_sb Section Break @@ -1656,7 +1680,7 @@ Manufacturer - 109 + 111 publish_in_hub Check @@ -1669,7 +1693,7 @@ Manufacturer - 110 + 112 hub_category_to_publish Data @@ -1681,7 +1705,7 @@ Manufacturer - 111 + 113 hub_warehouse Link @@ -1703,7 +1727,7 @@ Manufacturer - 112 + 114 synced_with_hub Check @@ -1751,622 +1775,6 @@ Manufacturer
    - - - -

    - - - add_default_uom_in_conversion_factor_table - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - add_price - (self, price_list=None) -

    -

    Add a new price

    -
    -
    - - - - - -

    - - - after_insert - (self) -

    -

    set opening stock and item price

    -
    -
    - - - - - -

    - - - after_rename - (self, old_name, new_name, merge) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_insert - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_rename - (self, old_name, new_name, merge=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_for_active_boms - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_item_tax - (self) -

    -

    Check whether Tax Rate is not entered twice for same Tax Type

    -
    -
    - - - - - -

    - - - copy_specification_from_item_group - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - fill_customer_code - (self) -

    -

    Append all the customer codes and insert into "customer_code" field of item table

    -
    -
    - - - - - -

    - - - get_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_route - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - make_thumbnail - (self) -

    -

    Make a thumbnail of website_image

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - recalculate_bin_qty - (self, new_name) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_attribute_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_disabled_attributes - (self, context) -

    -

    Disable selection options of attribute combinations that do not result in a variant

    -
    -
    - - - - - -

    - - - set_last_purchase_rate - (self, new_name) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_opening_stock - (self) -

    -

    set opening stock

    -
    -
    - - - - - -

    - - - set_variant_context - (self, context) -

    -

    No docs

    -
    -
    - - - - - -

    - - - stock_ledger_created - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_bom_item_desc - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_item_price - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_template_item - (self) -

    -

    Set Show in Website for Template Item if True for its Variant

    -
    -
    - - - - - -

    - - - update_template_tables - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_variants - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_attributes - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_barcode - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_conversion_factor - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_description - (self) -

    -

    Clean HTML description if set

    -
    -
    - - - - - -

    - - - validate_fixed_asset - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_has_variants - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item_type - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_name_with_item_group - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_retain_sample - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_stock_exists_for_template_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_uom - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_variant_attributes - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_warehouse_for_reorder - (self) -

    -

    Validate Reorder level table for duplicate and conditional mandatory

    -
    -
    - - - - - -

    - - - validate_website_image - (self) -

    -

    Validate if the website image is a public file

    -
    -
    - -
    @@ -2684,6 +2092,15 @@ Manufacturer +
  • + + +Item Alternative + +
    • + + +
  • @@ -2810,24 +2227,6 @@ Manufacturer -
  • - - -Production Order - -
    • - - - -
  • - - -Production Order Item - -
    • - - -
  • @@ -2864,6 +2263,15 @@ Manufacturer +
  • + + +Purchase Order Item Supplied + +
    • + + +
  • @@ -2873,6 +2281,15 @@ Manufacturer +
  • + + +Purchase Receipt Item Supplied + +
    • + + +
  • @@ -2981,6 +2398,15 @@ Manufacturer +
  • + + +Subscription Plan + +
    • + + +
  • @@ -2998,6 +2424,24 @@ Manufacturer
    • + +
  • + + +Work Order + +
    • + + + +
  • + + +Work Order Item + +
    • + + diff --git a/foundation/www/docs/current/models/stock/item_alternative.html b/foundation/www/docs/current/models/stock/item_alternative.html new file mode 100644 index 00000000..70d8bf3b --- /dev/null +++ b/foundation/www/docs/current/models/stock/item_alternative.html @@ -0,0 +1,187 @@ + + + + + + + +

    Item Alternative

    +
    + + + Version 10.1.31 + + + Source + +
    + + + + + +

    Table Name: tabItem Alternative

    + + + + +

    Fields

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SrFieldnameTypeLabelOptions
    1item_code + Link + Item Code + + + + + + +Item + + + +
    2alternative_item_code + Link + Alternative Item Code + + + + + + +Item + + + +
    3two_way + Check + Two-way + +
    4column_break_4 + Column Break + + +
    5item_name + Read Only + Item Name + + + 
    item_code.item_name
    +
    6alternative_item_name + Read Only + Alternative Item Name + + + 
    alternative_item_code.item_name
    +
    + + +
    +

    Controller

    +

    erpnext.stock.doctype.item_alternative.item_alternative

    + + + + + + + +

    Class ItemAlternative

    + +

    Inherits from frappe.model.document.Document + +

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

    + + + erpnext.stock.doctype.item_alternative.item_alternative.get_alternative_items + (doctype, txt, searchfield, start, page_len, filters) +

    +

    No docs

    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/foundation/www/docs/current/models/stock/item_attribute.html b/foundation/www/docs/current/models/stock/item_attribute.html index c7a7dd3f..86688d76 100644 --- a/foundation/www/docs/current/models/stock/item_attribute.html +++ b/foundation/www/docs/current/models/stock/item_attribute.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - __setup__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_duplication - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_exising_items - (self) -

    -

    Validate that if there are existing items with attributes, they are valid

    -
    -
    - - - - - -

    - - - validate_numeric - (self) -

    -

    No docs

    -
    -
    - -
    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 2151f7e0..db1f8a0e 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 1 - customer_name + customer_name Link @@ -63,6 +63,27 @@ For the convenience of customers, these codes can be used in print formats like 2 + customer_group + + Link + + Customer Group + + + + + + + +Customer Group + + + + + + + + 3 ref_code Data diff --git a/foundation/www/docs/current/models/stock/item_price.html b/foundation/www/docs/current/models/stock/item_price.html index a6d7893a..406e9926 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 10.1.2 + Version 10.1.31 11 + brand + + Read Only + + Brand + + + + 
    item_code.brand
    + + + + + 12 item_name Data @@ -206,7 +220,7 @@ Multiple Item prices. - 12 + 13 item_description Text @@ -239,90 +253,6 @@ Multiple Item prices.
    - - - -

    - - - check_duplicate_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_item_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_price_list_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_price_list - (self) -

    -

    No docs

    -
    -
    - -
    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 4bb21627..1d3c1941 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - + 3 + allow_rename_attribute_value + + Check + + Allow Rename Attribute Value +

    + Rename Attribute Value in Item Attribute.

    + + + + + + 4 copy_fields_to_variant Section Break @@ -76,7 +89,7 @@ - 4 + 5 fields Table @@ -118,20 +131,6 @@
    - - - -

    - - - set_default_fields - (self) -

    -

    No docs

    -
    -
    - -
    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 ede9bf75..bf9fb019 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - check_mandatory - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_items_from_purchase_receipts - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_taxes_and_charges - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_landed_cost - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_rate_in_serial_no - (self, receipt_document) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_applicable_charges_for_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_purchase_receipts - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/stock/manufacturer.html b/foundation/www/docs/current/models/stock/manufacturer.html index f51e52e0..ccc5d210 100644 --- a/foundation/www/docs/current/models/stock/manufacturer.html +++ b/foundation/www/docs/current/models/stock/manufacturer.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - before_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_save - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_if_already_pulled - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_modified_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_title - (self) -

    -

    Set title as comma separated list of items

    -
    -
    - - - - - -

    - - - status_can_change - (self, status) -

    - 
        validates that `status` is acceptable for the present controller status
-    and throws an Exception if otherwise.
-
    -
    -
    - - - - - -

    - - - update_completed_qty - (self, mr_items=None, update_modified=True) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_requested_qty - (self, mr_item_rows=None) -

    -

    update requested qty (before ordered_qty is updated)

    -
    -
    - - - - - -

    - - - update_requested_qty_in_production_plan - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status - (self, status) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_qty_against_so - (self) -

    -

    No docs

    -
    -
    - -
    @@ -759,12 +533,12 @@ Transferred

    Public API -
    /api/method/erpnext.stock.doctype.material_request.material_request.raise_production_orders +
    /api/method/erpnext.stock.doctype.material_request.material_request.raise_work_orders

    - + - erpnext.stock.doctype.material_request.material_request.raise_production_orders + erpnext.stock.doctype.material_request.material_request.raise_work_orders (material_request)

    No docs

    @@ -837,15 +611,6 @@ Transferred -
  • - - -Production Order - -
    • - - -
  • @@ -899,6 +664,15 @@ Transferred
    • + +
  • + + +Work Order + +
    • + + 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 db0caab9..4c5afd59 100644 --- a/foundation/www/docs/current/models/stock/material_request_item.html +++ b/foundation/www/docs/current/models/stock/material_request_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 22 + sales_order_item + + Data + + Sales Order Item + + + + + + + 23 project Link @@ -377,7 +389,7 @@ - 23 + 24 production_plan Link @@ -398,7 +410,7 @@ - 24 + 25 material_request_plan_item Data @@ -410,7 +422,7 @@ - 25 + 26 col_break3 Column Break @@ -422,7 +434,7 @@ - 26 + 27 min_order_qty Float @@ -434,7 +446,7 @@ - 27 + 28 projected_qty Float @@ -446,7 +458,7 @@ - 28 + 29 actual_qty Float @@ -458,7 +470,7 @@ - 29 + 30 ordered_qty Float @@ -470,7 +482,7 @@ - 30 + 31 page_break Check diff --git a/foundation/www/docs/current/models/stock/packed_item.html b/foundation/www/docs/current/models/stock/packed_item.html index 34a1d224..ea204ff0 100644 --- a/foundation/www/docs/current/models/stock/packed_item.html +++ b/foundation/www/docs/current/models/stock/packed_item.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_details_for_packing - (self) -

    - 
            Returns
-        * 'Delivery Note Items' query result as a list of dict
-        * Item Quantity dict of current packing slip doc
-        * No. of Cases of this packing slip
-
    -
    -
    - - - - - -

    - - - get_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_recommended_case_no - (self) -

    - 
            Returns the next case no. for a new packing slip for a delivery
-        note
-
    -
    -
    - - - - - -

    - - - recommend_new_qty - (self, item, ps_item_qty, no_of_cases) -

    - 
            Recommend a new quantity and raise a validation exception
-
    -
    -
    - - - - - -

    - - - update_item_details - (self) -

    - 
            Fill empty columns in Packing Slip Item
-
    -
    -
    - - - - - -

    - - - validate - (self) -

    - 
            * Validate existence of submitted Delivery Note
-        * Case nos do not overlap
-        * Check if packed qty doesn't exceed actual qty of delivery note
-
-        It is necessary to validate case nos before checking quantity
-
    -
    -
    - - - - - -

    - - - validate_case_nos - (self) -

    - 
            Validate if case nos overlap. If they do, recommend next case no.
-
    -
    -
    - - - - - -

    - - - validate_delivery_note - (self) -

    - 
            Validates if delivery note has status as draft
-
    -
    -
    - - - - - -

    - - - validate_items_mandatory - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_qty - (self) -

    -

    Check packed qty across packing slips and delivery note

    -
    -
    - -
    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 1464072e..c8401097 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_default_if_missing - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_item_price - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 4a622189..1a200e80 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 Section Break - Subscription Detail + Auto Repeat Detail @@ -1359,11 +1359,11 @@ Closed 91 - subscription + auto_repeat Link - Subscription + Auto Repeat @@ -1371,7 +1371,7 @@ Closed -Subscription +Auto Repeat @@ -1564,202 +1564,6 @@ Closed
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_for_closed_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_next_docstatus - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_already_received_qty - (self, po, po_detail) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_current_stock - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_gl_entries - (self, warehouse_account=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_po_qty_and_warehouse - (self, po_detail) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - po_required - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_billing_status - (self, update_modified=True) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status - (self, status) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_with_previous_doc - (self) -

    -

    No docs

    -
    -
    - -
    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 767b86c9..9c10ac05 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 10.1.2 + Version 10.1.31 65 + include_exploded_items + + Check + + Include Exploded Items + + + + + + + 66 billed_amt Currency @@ -964,7 +976,7 @@ - 66 + 67 landed_cost_voucher_amount Currency @@ -976,7 +988,7 @@ - 67 + 68 brand Link @@ -997,7 +1009,7 @@ - 68 + 69 item_group Link @@ -1018,7 +1030,7 @@ - 69 + 70 rm_supp_cost Currency @@ -1032,7 +1044,7 @@ - 70 + 71 item_tax_amount Currency @@ -1046,7 +1058,7 @@ - 71 + 72 valuation_rate Currency @@ -1060,7 +1072,7 @@ - 72 + 73 item_tax_rate Code @@ -1074,7 +1086,7 @@ Used for Taxes and Charges

    - 73 + 74 page_break Check diff --git a/foundation/www/docs/current/models/stock/quality_inspection.html b/foundation/www/docs/current/models/stock/quality_inspection.html index 39d9f4f0..4261f927 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 10.1.2 + Version 10.1.31
    - - - -

    - - - get_item_specification_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_quality_inspection_template - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_qc_reference - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    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 459d40f4..9e2beac0 100644 --- a/foundation/www/docs/current/models/stock/quality_inspection_reading.html +++ b/foundation/www/docs/current/models/stock/quality_inspection_reading.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 6 + batch_no + + Data + + Batch No + + + + + + + 7 column_break1 Column Break @@ -132,7 +144,7 @@ Distinct unit of an Item - 7 + 8 item_name Data @@ -144,7 +156,7 @@ Distinct unit of an Item - 8 + 9 description Text @@ -156,7 +168,7 @@ Distinct unit of an Item - 9 + 10 item_group Link @@ -177,7 +189,7 @@ Distinct unit of an Item - 10 + 11 brand Link @@ -198,7 +210,7 @@ Distinct unit of an Item - 11 + 12 purchase_details Section Break @@ -210,7 +222,7 @@ Distinct unit of an Item - 12 + 13 column_break2 Column Break @@ -222,7 +234,7 @@ Distinct unit of an Item - 13 + 14 purchase_document_type Link @@ -243,7 +255,7 @@ Distinct unit of an Item - 14 + 15 purchase_document_no Dynamic Link @@ -257,7 +269,7 @@ Distinct unit of an Item - 15 + 16 purchase_date Date @@ -269,7 +281,7 @@ Distinct unit of an Item - 16 + 17 purchase_time Time @@ -281,7 +293,7 @@ Distinct unit of an Item - 17 + 18 purchase_rate Currency @@ -295,7 +307,7 @@ Distinct unit of an Item - 18 + 19 column_break3 Column Break @@ -307,7 +319,7 @@ Distinct unit of an Item - 19 + 20 supplier Link @@ -328,7 +340,7 @@ Distinct unit of an Item - 20 + 21 supplier_name Data @@ -340,7 +352,7 @@ Distinct unit of an Item - 21 + 22 delivery_details Section Break @@ -352,7 +364,7 @@ Distinct unit of an Item - 22 + 23 delivery_document_type Link @@ -373,7 +385,7 @@ Distinct unit of an Item - 23 + 24 delivery_document_no Dynamic Link @@ -387,7 +399,7 @@ Distinct unit of an Item - 24 + 25 delivery_date Date @@ -399,7 +411,7 @@ Distinct unit of an Item - 25 + 26 delivery_time Time @@ -411,7 +423,7 @@ Distinct unit of an Item - 26 + 27 is_cancelled Select @@ -427,7 +439,7 @@ No - 27 + 28 column_break5 Column Break @@ -439,7 +451,7 @@ No - 28 + 29 customer Link @@ -460,7 +472,7 @@ No - 29 + 30 customer_name Data @@ -472,7 +484,7 @@ No - 30 + 31 invoice_details Section Break @@ -484,7 +496,7 @@ No - 31 + 32 sales_invoice Link @@ -505,7 +517,7 @@ No - 32 + 33 warranty_amc_details Section Break @@ -517,7 +529,7 @@ No - 33 + 34 column_break6 Column Break @@ -529,7 +541,7 @@ No - 34 + 35 maintenance_status Select @@ -547,7 +559,7 @@ Out of AMC - 35 + 36 warranty_period Int @@ -559,7 +571,7 @@ Out of AMC - 36 + 37 column_break7 Column Break @@ -571,7 +583,7 @@ Out of AMC - 37 + 38 warranty_expiry_date Date @@ -583,7 +595,7 @@ Out of AMC - 38 + 39 amc_expiry_date Date @@ -595,7 +607,7 @@ Out of AMC - 39 + 40 more_info Section Break @@ -607,7 +619,7 @@ Out of AMC - 40 + 41 serial_no_details Text Editor @@ -619,7 +631,7 @@ Out of AMC - 41 + 42 company Link @@ -661,188 +673,20 @@ Out of AMC
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    +
    +
    - - - - -

    - - - after_rename - (self, old, new, merge=False) -

    -

    rename serial_no text fields

    -
    -
    + + - +

    Class SerialNoBatchError

    +

    Inherits from frappe.exceptions.ValidationError -

    - - - before_rename - (self, old, new, merge=False) -

    -

    No docs

    +

    -
    - - - - - -

    - - - get_last_sle - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_stock_ledger_entries - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_stock_ledger_entry - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_maintenance_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_purchase_details - (self, purchase_sle) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_sales_details - (self, delivery_sle) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item - (self) -

    - 
            Validate whether serial no is required for this item
-
    -
    -
    - - - - - -

    - - - validate_warehouse - (self) -

    -

    No docs

    -
    -
    - +
    diff --git a/foundation/www/docs/current/models/stock/stock_entry.html b/foundation/www/docs/current/models/stock/stock_entry.html index 6425e66f..a6d12076 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 10.1.2 + Version 10.1.31 @@ -121,11 +122,11 @@ Subcontract 6 - production_order + work_order Link - Production Order + Work Order @@ -133,7 +134,7 @@ Subcontract -Production Order +Work Order @@ -414,6 +415,39 @@ Subcontract 25 + source_warehouse_address + + Link + + Source Warehouse Address + + + + + + + +Address + + + + + + + + 26 + source_address_display + + Small Text + + Source Warehouse Address + + + + + + + 27 cb0 Column Break @@ -425,7 +459,7 @@ Subcontract - 26 + 28 to_warehouse Link @@ -445,8 +479,41 @@ Subcontract + + 29 + target_warehouse_address + + Link + + Target Warehouse Name + + + + + + + +Address + + + + + + + + 30 + target_address_display + + Small Text + + Target Warehouse Address + + + + + - 27 + 31 sb0 Section Break @@ -460,7 +527,7 @@ Subcontract - 28 + 32 items Table @@ -481,7 +548,7 @@ Subcontract - 29 + 33 get_stock_and_rate Button @@ -495,7 +562,7 @@ Subcontract - 30 + 34 section_break_19 Section Break @@ -507,7 +574,7 @@ Subcontract - 31 + 35 total_incoming_value Currency @@ -521,7 +588,7 @@ Subcontract - 32 + 36 column_break_22 Column Break @@ -533,7 +600,7 @@ Subcontract - 33 + 37 total_outgoing_value Currency @@ -547,7 +614,7 @@ Subcontract - 34 + 38 value_difference Currency @@ -561,7 +628,7 @@ Subcontract - 35 + 39 additional_costs_section Section Break @@ -573,7 +640,7 @@ Subcontract - 36 + 40 additional_costs Table @@ -594,7 +661,7 @@ Subcontract - 37 + 41 total_additional_costs Currency @@ -608,7 +675,7 @@ Subcontract - 38 + 42 contact_section Section Break @@ -620,7 +687,7 @@ Subcontract - 39 + 43 supplier Link @@ -641,7 +708,7 @@ Subcontract - 40 + 44 supplier_name Data @@ -653,7 +720,7 @@ Subcontract - 41 + 45 supplier_address Link @@ -674,7 +741,7 @@ Subcontract - 42 + 46 address_display Small Text @@ -686,7 +753,7 @@ Subcontract - 43 + 47 column_break_39 Column Break @@ -698,7 +765,7 @@ Subcontract - 44 + 48 customer Link @@ -719,7 +786,7 @@ Subcontract - 45 + 49 customer_name Data @@ -731,7 +798,7 @@ Subcontract - 46 + 50 customer_address Small Text @@ -743,7 +810,7 @@ Subcontract - 47 + 51 printing_settings Section Break @@ -755,7 +822,7 @@ Subcontract - 48 + 52 select_print_heading Link @@ -776,7 +843,7 @@ Subcontract - 49 + 53 letter_head Link @@ -797,7 +864,7 @@ Subcontract - 50 + 54 more_info Section Break @@ -809,7 +876,7 @@ Subcontract - 51 + 55 project Link @@ -830,7 +897,7 @@ Subcontract - 52 + 56 remarks Text @@ -842,7 +909,7 @@ Subcontract - 53 + 57 col5 Column Break @@ -854,7 +921,7 @@ Subcontract - 54 + 58 total_amount Currency @@ -868,7 +935,7 @@ Subcontract - 55 + 59 amended_from Link @@ -889,7 +956,7 @@ Subcontract - 56 + 60 credit_note Link @@ -923,7 +990,7 @@ Subcontract -

    Class DuplicateEntryForProductionOrderError

    +

    Class DuplicateEntryForWorkOrderError

    Inherits from frappe.exceptions.ValidationError @@ -991,611 +1058,6 @@ Subcontract

    - - - -

    - - - add_to_stock_entry_detail - (self, item_dict, bom_no=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - calculate_rate_and_amount - (self, force=False, update_finished_item_rate=True, raise_error_if_no_rate=True) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_duplicate_entry_for_production_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_if_operations_completed - (self) -

    -

    Check if Time Sheets are completed against before manufacturing to capture operating costs.

    -
    -
    - - - - - -

    - - - distribute_additional_costs - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_args_for_incoming_rate - (self, item) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_bom_raw_materials - (self, qty) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_bom_scrap_material - (self, qty) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_gl_entries - (self, warehouse_account) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_item_details - (self, args=None, for_update=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_pending_raw_materials - (self) -

    - 
            issue (item quantity) that is pending to issue or desire to transfer,
-        whichever is less
-
    -
    -
    - - - - - -

    - - - get_pro_order_required_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_stock_and_rate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_transfered_raw_materials - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - load_items_from_bom - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_actual_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_basic_rate - (self, force=False, update_finished_item_rate=True, raise_error_if_no_rate=True) -

    -

    get stock and incoming rate on posting date

    -
    -
    - - - - - -

    - - - set_basic_rate_for_finished_goods - (self, raw_material_cost, scrap_material_cost) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_incoming_rate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_production_order_details - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_serial_nos - (self, production_order) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_total_incoming_outgoing_value - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_transfer_qty - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_production_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_purchase_order_supplied_items - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_stock_ledger - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_valuation_rate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_batch - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_bom - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_finished_goods - (self) -

    -

    validation: finished good quantity should be same as manufacturing quantity

    -
    -
    - - - - - -

    - - - validate_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_production_order - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_purchase_order - (self) -

    -

    Throw exception if more raw material is transferred against Purchase Order than in - the raw materials supplied table

    -
    -
    - - - - - -

    - - - validate_purpose - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_warehouse - (self) -

    -

    perform various (sometimes conditional) validations on warehouse

    -
    -
    - - - - - -

    - - - validate_with_material_request - (self) -

    -

    No docs

    -
    -
    - -
    @@ -1609,7 +1071,7 @@ Subcontract erpnext.stock.doctype.stock_entry.stock_entry.get_additional_costs - (production_order=None, bom_no=None, fg_qty=None) + (work_order=None, bom_no=None, fg_qty=None)

    No docs

    @@ -1625,25 +1087,7 @@ Subcontract erpnext.stock.doctype.stock_entry.stock_entry.get_operating_cost_per_unit - (production_order=None, bom_no=None) -

    -

    No docs

    -
    -
    - - - - - - -

    Public API -
    /api/method/erpnext.stock.doctype.stock_entry.stock_entry.get_production_order_details -

    -

    - - - erpnext.stock.doctype.stock_entry.stock_entry.get_production_order_details - (production_order) + (work_order=None, bom_no=None)

    No docs

    @@ -1678,6 +1122,22 @@ Subcontract + +

    + + + erpnext.stock.doctype.stock_entry.stock_entry.get_used_alternative_items + (purchase_order=None, work_order=None) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details

    @@ -1696,6 +1156,24 @@ Subcontract +

    Public API +
    /api/method/erpnext.stock.doctype.stock_entry.stock_entry.get_work_order_details +

    +

    + + + erpnext.stock.doctype.stock_entry.stock_entry.get_work_order_details + (work_order) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse

    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 92b19713..299e25c5 100644 --- a/foundation/www/docs/current/models/stock/stock_entry_detail.html +++ b/foundation/www/docs/current/models/stock/stock_entry_detail.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 42 + allow_alternative_item + + Check + + Allow Alternative Item + + + + + + + 43 col_break6 Column Break @@ -650,7 +662,7 @@ - 43 + 44 material_request Link @@ -672,7 +684,7 @@ - 44 + 45 material_request_item Link @@ -689,6 +701,27 @@ + + + + + 46 + original_item + + Link + + Original Item + + + + + + + +Item + + + 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 7d990f88..bc3261a5 100644 --- a/foundation/www/docs/current/models/stock/stock_ledger_entry.html +++ b/foundation/www/docs/current/models/stock/stock_ledger_entry.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - actual_amt_check - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - block_transactions_against_group_warehouse - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_stock_frozen_date - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - scrub_posting_time - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_and_set_fiscal_year - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_batch - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_mandatory - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/stock/stock_reconciliation.html b/foundation/www/docs/current/models/stock/stock_reconciliation.html index 1657a4e1..618d7d04 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 10.1.2 + Version 10.1.31 3 - amended_from + purpose - Link + Select - Amended From + Purpose - - - - -Stock Reconciliation - - - + 
    Opening Stock
+Stock Reconciliation
    @@ -269,6 +263,27 @@ This tool helps you to update or fix the quantity and valuation of stock in the + + 16 + amended_from + + Link + + Amended From + + + + + + + +Stock Reconciliation + + + + + + @@ -321,234 +336,6 @@ This tool helps you to update or fix the quantity and valuation of stock in the
    - - - -

    - - - __init__ - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - delete_and_repost_sle - (self) -

    - 
    Delete Stock Ledger Entries related to this voucher
-        and repost future Stock Ledger Entries
-
    -
    -
    - - - - - -

    - - - get_gl_entries - (self, warehouse_account=None) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_items_for - (self, warehouse) -

    -

    No docs

    -
    -
    - - - - - -

    - - - insert_entries - (self, row) -

    -

    Insert Stock Ledger Entries

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - remove_items_with_no_change - (self) -

    -

    Remove items if qty or rate is not changed

    -
    -
    - - - - - -

    - - - set_total_qty_and_amount - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - submit - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_stock_ledger - (self) -

    - 
    find difference between current and expected entries
-        and create stock ledger entries based on the difference
-
    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_data - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_expense_account - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_item - (self, item_code, row_num) -

    -

    No docs

    -
    -
    - -
    @@ -557,6 +344,24 @@ This tool helps you to update or fix the quantity and valuation of stock in the +

    Public API +
    /api/method/erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_difference_account +

    +

    + + + erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_difference_account + (purpose, company) +

    +

    No docs

    +
    +
    + + + + + +

    Public API
    /api/method/erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_items

    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 376de7da..1d7e2ef6 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - + 16 + set_qty_in_transactions_based_on_serial_no_input + + Check + + Set Qty in Transactions based on Serial No Input + + + + + + + 17 auto_material_request Section Break @@ -274,7 +286,7 @@ Moving Average - 17 + 18 auto_indent Check @@ -286,7 +298,7 @@ Moving Average - 18 + 19 reorder_email_notify Check @@ -298,7 +310,7 @@ Moving Average - 19 + 20 freeze_stock_entries Section Break @@ -310,7 +322,7 @@ Moving Average - 20 + 21 stock_frozen_upto Date @@ -322,7 +334,7 @@ Moving Average - 21 + 22 stock_frozen_upto_days Int @@ -334,7 +346,7 @@ Moving Average - 22 + 23 stock_auth_role Link @@ -355,7 +367,7 @@ Moving Average - 23 + 24 batch_id_sb Section Break @@ -367,7 +379,7 @@ Moving Average - 24 + 25 use_naming_series Check @@ -379,7 +391,7 @@ Moving Average - 25 + 26 naming_series_prefix Data @@ -412,48 +424,6 @@ Moving Average
    - - - -

    - - - cant_change_valuation_method - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate_clean_description_html - (self) -

    -

    No docs

    -
    -
    - -
    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 8426ca87..c83d2182 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 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 8 + address_and_contact + + Section Break + + Address and Contact + + + + + + + 9 + address_html + + HTML + + Address HTML + + + + + + + 10 + column_break_10 + + Column Break + + + + + + + + + 11 + contact_html + + HTML + + Contact HTML + + + + + + + 12 warehouse_contact_info Section Break @@ -155,7 +203,7 @@ A logical Warehouse against which stock entries are made. - 9 + 13 email_id Data @@ -167,7 +215,7 @@ A logical Warehouse against which stock entries are made. - 10 + 14 phone_no Data @@ -181,7 +229,7 @@ A logical Warehouse against which stock entries are made. - 11 + 15 mobile_no Data @@ -195,7 +243,7 @@ A logical Warehouse against which stock entries are made. - 12 + 16 column_break0 Column Break @@ -207,7 +255,7 @@ A logical Warehouse against which stock entries are made. - 13 + 17 address_line_1 Data @@ -219,7 +267,7 @@ A logical Warehouse against which stock entries are made. - 14 + 18 address_line_2 Data @@ -231,7 +279,7 @@ A logical Warehouse against which stock entries are made. - 15 + 19 city Data @@ -243,7 +291,7 @@ A logical Warehouse against which stock entries are made. - 16 + 20 state Data @@ -255,7 +303,7 @@ A logical Warehouse against which stock entries are made. - 17 + 21 pin Data @@ -267,7 +315,7 @@ A logical Warehouse against which stock entries are made. - 18 + 22 tree_details Section Break @@ -279,7 +327,7 @@ A logical Warehouse against which stock entries are made. - 19 + 23 parent_warehouse Link @@ -300,7 +348,7 @@ A logical Warehouse against which stock entries are made. - 20 + 24 lft Int @@ -312,7 +360,7 @@ A logical Warehouse against which stock entries are made. - 21 + 25 rgt Int @@ -324,7 +372,7 @@ A logical Warehouse against which stock entries are made. - 22 + 26 old_parent Link @@ -366,216 +414,6 @@ A logical Warehouse against which stock entries are made.
    - - - -

    - - - after_rename - (self, old_name, new_name, merge=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - autoname - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - before_rename - (self, old_name, new_name, merge=False) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_if_child_exists - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - check_if_sle_exists - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - convert_to_group - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - convert_to_group_or_ledger - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - convert_to_ledger - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - get_new_warehouse_name_without_abbr - (self, name) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_trash - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - onload - (self) -

    -

    load account name for General Ledger Report

    -
    -
    - - - - - -

    - - - recalculate_bin_qty - (self, new_name) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_nsm_model - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    @@ -777,24 +615,6 @@ A logical Warehouse against which stock entries are made. -
  • - - -Production Order - -
    • - - - -
  • - - -Production Order Item - -
    • - - -
  • @@ -831,6 +651,15 @@ A logical Warehouse against which stock entries are made. +
  • + + +Purchase Order + +
    • + + +
  • @@ -974,6 +803,24 @@ A logical Warehouse against which stock entries are made.
    • + +
  • + + +Work Order + +
    • + + + +
  • + + +Work Order Item + +
    • + + diff --git a/foundation/www/docs/current/models/subscription/__init__.py b/foundation/www/docs/current/models/subscription/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/subscription/_sidebar.json b/foundation/www/docs/current/models/subscription/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/subscription/_sidebar.json +++ b/foundation/www/docs/current/models/subscription/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/subscription/index.html b/foundation/www/docs/current/models/subscription/index.html index e148437f..b1aa3f77 100644 --- a/foundation/www/docs/current/models/subscription/index.html +++ b/foundation/www/docs/current/models/subscription/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 8 + email_account + + Link + + Email Account + + + + + + + +Email Account + + + + + + + + 9 customer Link @@ -166,7 +187,7 @@ Closed - 9 + 10 section_break_7 Section Break @@ -178,7 +199,7 @@ Closed - 10 + 11 description Text Editor @@ -190,7 +211,7 @@ Closed - 11 + 12 response Section Break @@ -202,7 +223,7 @@ Closed - 12 + 13 mins_to_first_response Float @@ -214,7 +235,7 @@ Closed - 13 + 14 first_responded_on Datetime @@ -226,7 +247,7 @@ Closed - 14 + 15 additional_info Section Break @@ -240,7 +261,7 @@ Closed - 15 + 16 lead Link @@ -261,7 +282,7 @@ Closed - 16 + 17 contact Link @@ -282,7 +303,7 @@ Closed - 17 + 18 column_break_16 Column Break @@ -294,7 +315,7 @@ Closed - 18 + 19 customer_name Data @@ -306,7 +327,7 @@ Closed - 19 + 20 project Link @@ -327,7 +348,7 @@ Closed - 20 + 21 company Link @@ -348,7 +369,7 @@ Closed - 21 + 22 section_break_19 Section Break @@ -360,7 +381,7 @@ Closed - 22 + 23 resolution_details Text Editor @@ -372,7 +393,7 @@ Closed - 23 + 24 column_break1 Column Break @@ -384,7 +405,7 @@ Closed - 24 + 25 opening_date Date @@ -396,7 +417,7 @@ Closed - 25 + 26 opening_time Time @@ -408,7 +429,7 @@ Closed - 26 + 27 resolution_date Datetime @@ -420,7 +441,7 @@ Closed - 27 + 28 content_type Data @@ -432,7 +453,7 @@ Closed - 28 + 29 attachment Attach @@ -465,62 +486,6 @@ Closed
    - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - set_lead_contact - (self, email_id) -

    -

    No docs

    -
    -
    - - - - - -

    - - - update_status - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/support/issue_type.html b/foundation/www/docs/current/models/support/issue_type.html index c1b8fa91..6855325b 100644 --- a/foundation/www/docs/current/models/support/issue_type.html +++ b/foundation/www/docs/current/models/support/issue_type.html @@ -9,7 +9,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31
    - - - -

    - - - get_feed - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_cancel - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - on_update - (self) -

    -

    No docs

    -
    -
    - - - - - -

    - - - validate - (self) -

    -

    No docs

    -
    -
    - -
    diff --git a/foundation/www/docs/current/models/utilities/__init__.py b/foundation/www/docs/current/models/utilities/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/current/models/utilities/_sidebar.json b/foundation/www/docs/current/models/utilities/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/current/models/utilities/_sidebar.json +++ b/foundation/www/docs/current/models/utilities/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/current/models/utilities/index.html b/foundation/www/docs/current/models/utilities/index.html index 1088b446..16574b30 100644 --- a/foundation/www/docs/current/models/utilities/index.html +++ b/foundation/www/docs/current/models/utilities/index.html @@ -7,7 +7,7 @@
    - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 - Version 10.1.2 + Version 10.1.31 +# Krankenversicherung + +Krankenversicherung ist eine wichtige Information, die dem Arbeitnehmer beigefügt ist. + +Um Krankenversicherungssätze anzulegen: + +> Personalwesen > Krankenversicherung > Neu + +Employee + +Im Datensatz Mitarbeiter können Sie den Leistungserbringer anhängen und die Krankenkassennummer eingeben. + +Employee + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/human-resources/offer-letter.md b/foundation/www/docs/user/manual/de/human-resources/job-offer.md similarity index 100% rename from foundation/www/docs/user/manual/de/human-resources/offer-letter.md rename to foundation/www/docs/user/manual/de/human-resources/job-offer.md diff --git a/foundation/www/docs/user/manual/de/human-resources/setup/_sidebar.json b/foundation/www/docs/user/manual/de/human-resources/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/human-resources/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/de/human-resources/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/human-resources/tools/_sidebar.json b/foundation/www/docs/user/manual/de/human-resources/tools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/human-resources/tools/_sidebar.json +++ b/foundation/www/docs/user/manual/de/human-resources/tools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/introduction/_sidebar.json b/foundation/www/docs/user/manual/de/introduction/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/introduction/_sidebar.json +++ b/foundation/www/docs/user/manual/de/introduction/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/manufacturing/_sidebar.json b/foundation/www/docs/user/manual/de/manufacturing/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/_sidebar.json +++ b/foundation/www/docs/user/manual/de/manufacturing/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/manufacturing/index.txt b/foundation/www/docs/user/manual/de/manufacturing/index.txt index 3b932a52..13f07010 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/index.txt +++ b/foundation/www/docs/user/manual/de/manufacturing/index.txt @@ -1,6 +1,6 @@ introduction bill-of-materials -production-order +work-order workstation operation subcontracting diff --git a/foundation/www/docs/user/manual/de/manufacturing/production-order.md b/foundation/www/docs/user/manual/de/manufacturing/production-order.md deleted file mode 100644 index 49767eba..00000000 --- a/foundation/www/docs/user/manual/de/manufacturing/production-order.md +++ /dev/null @@ -1,100 +0,0 @@ - -# Fertigungsauftrag -Beigetragen von CWT Connector & Wire Technology GmbH - -Der Fertigungsauftrag (auch als Arbeitsauftrag bezeichnet) ist ein Dokument welches vom Produktionsplaner als Startsignal in die Fertigung gegeben wird, um eine bestimmte Anzahl eines bestimmten Artikels zu produzieren. Der Fertigungsauftrag unterstützt Sie auch dabei den Materialbedarf (Lagerbuchung) für diesen Artikel aus der **Stückliste** zu generieren. - -Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generiert, basierend auf den Kundenaufträgen. Sie können weiterhin direkt einen Fertigungsauftrag erstellen über: - -> Fertigung > Dokumente > Fertigungsauftrag > Neu - -Fertigungsauftrag - -### Einen Fertigungsauftrag erstellen - -* Wählen Sie den Artikel aus, der gefertigt werden soll. -* Die Standard-Stückliste für diesen Artikel wird aus dem System gezogen. Sie können die Stückliste auch ändern. -* Wenn die ausgewählte Stückliste auch Arbeitsgänge mit berücksichtigt, sollte das System alle Arbeitsgänge aus der Stückliste übernehmen. -* Geben Sie das geplante Startdatum an (ein geschätztes Datum zu dem die Produktion beginnen soll). -* Wählen Sie das Lager aus. Das Fertigungslager ist der Ort zu dem die Artikel gelangen, wenn Sie mit der Herstellung beginnen, und das Eingangslager ist der Ort, wo fertige Erzeugnisse lagern, bevor sie versandt werden. - -> Anmerkung: Sie können einen Fertigungsauftrag abspeichern ohne ein Lager auszuwählen. Lager sind jedoch zwingend erforderlich um einen Fertigungsauftrag zu übertragen. - -### Arbeitsplätze neu zuordnen/Dauer von Arbeitsgängen - -* Als Voreinstellung zieht das System Arbeitsplätze und die Dauer von Arbeitsgängen aus der gewählten Stückliste. - -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 - -* Wählen Sie den betreffenden Arbeitsgang aus und ändern Sie seinen Arbeitsplatz. -* Sie können auch die Dauer des Arbeitsgangs ändern. - -### Kapazitätsplanung im Fertigungsauftrag - -* Wenn ein Fertigungsauftrag basierend auf dem geplanten Startdatum und der Verfügbarkeit des Arbeitsplatzes übertragen wird, plant das System alle Arbeitsgänge für den Fertigungsauftrag ein (wenn der Fertigungsauftrag selbst Arbeitsgänge enthält). - -### Material der Fertigung übergeben - -* Wenn Sie Ihren Fertigungsauftrags übertragen haben, müssen Sie das Rohmaterial übertragen um den Fertigungsprozess zu starten. -* 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 - -* Geben Sie die Menge des Materials an, das übertragen werden soll. - -Materialübertrag - Menge - -* Übertragen Sie die Lagerbuchung. - -Lagerbuchung zum Kundenauftrag - -* Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Fertigungsauftrag aktualisiert. - -Lagerbuchung zum Fertigungsauftrag - -### Zeitprotokoll erstellen - -* 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 - -### Fertige Erzeugnisse aktualisieren - -* Wenn Sie den Fertigungsauftrag fertiggestellt haben, müssen Sie die Fertigen Erzeugnisse aktualisieren. -* Das erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager "Fertige Erzeugnisse" gutschreibt. -* Klicken Sie auf "Fertige Erzeugnisse aktualisieren". - -Fertigerzeugnisse aktualiseren - -* Geben Sie die Menge des übertragenen Materials an. - -Menge der Fertigerzeugnisse aktualisieren - ->Tipp: Sie können einen Fertigungsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren. - -### Einen Fertigungsauftrag anhalten - -* Wenn Sie einen Fertigungsauftrag anhalten, wird sein Status auf "Angehalten" gesetzt, mit der Folge, dass alle Herstellungsprozesse für diesen Fertigungsauftrag eingestellt werden. -* Um den Fertigungsauftrag anzuhalten klicken Sie auf die Schaltfläche "Anhalten". - -1. Wenn Sie den Fertigungsauftrag übertragen, reserviert das System für jeden Arbeitsgang des Fertigungsauftrags in Serie gemäß dem geplanten Startdatum basierend auf der Verfügbarkeit des Arbeitsplatzes ein Zeitfenster. Die Verfügbarkeit des Arbeitsplatzes hängt von den Arbeitszeiten des Arbeitsplatzes und der Urlaubsliste ab und davon, ob ein anderer Arbeitsgang des Fertigungsauftrages in diesem Zeitfenster eingeplant wurde. Sie können in den Fertigungseinstellungen die Anzahl der Tage angeben, in denen das System versucht den Arbeitsgang einzuplanen. Standardmäßig ist dieser Wert auf 30 Tage eingestellt. Wenn der Arbeitsgang über das verfügbare Zeitfenster hinaus Zeit benötigt, fragt Sie das System, ob der Arbeitsgang pausieren soll. Wenn das System die Terminplanung erstellen konnte, legt es Zeitprotokolle an und speichert sie. Sie können diese verändern und später übertragen. -2. Sie können außerdem zusätzliche Zeitprotokolle für einen Arbeitsgang erstellen. Hierzu wählen Sie den betreffenden Arbeitsgang aus und klicken Sie auf "Zeitprotokoll erstellen". -3. Rohmaterial übertragen: Dieser Schritt erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um dem Fertigungsauftrag abzuschliessen, und dem Fertigungslager hinzugefügt werden müssen (Unterartikel werden entweder als EIN Artikel mit Stücklister ODER in aufgelöster Form gemäß Ihren Einstellungen hinzugefügt). -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 - -* Sie können auch einen angehaltenen Fertigungsauftrag wieder weiter laufen lassen. - -> Anmerkung: Um einen Fertigungsauftrag zu einem Artikel zu erstellen müssen Sie auf dem Artikelformular das Feld "Fertigungsauftrag zulassen" ankreuzen. - -{next} diff --git a/foundation/www/docs/user/manual/de/manufacturing/setup/_sidebar.json b/foundation/www/docs/user/manual/de/manufacturing/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/de/manufacturing/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/manufacturing/tools/_sidebar.json b/foundation/www/docs/user/manual/de/manufacturing/tools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/tools/_sidebar.json +++ b/foundation/www/docs/user/manual/de/manufacturing/tools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/manufacturing/tools/index.txt b/foundation/www/docs/user/manual/de/manufacturing/tools/index.txt index 1f798d06..bdd357cd 100644 --- a/foundation/www/docs/user/manual/de/manufacturing/tools/index.txt +++ b/foundation/www/docs/user/manual/de/manufacturing/tools/index.txt @@ -1,2 +1 @@ -production-planning-tool -bom-replace-tool +bom-update-tool \ No newline at end of file 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 deleted file mode 100644 index 7d661a11..00000000 --- a/foundation/www/docs/user/manual/de/manufacturing/tools/production-planning-tool.md +++ /dev/null @@ -1,52 +0,0 @@ - -# Werkzeug zur Fertigungsplanung -Beigetragen von CWT Connector & Wire Technology GmbH - -Das Werkzeug zur Fertigungsplanung unterstützt Sie dabei die Fertigung zu planen und Artikel für eine Periode einzukaufen (normalerweise eine Woche oder ein Monat). - -Die Liste der Artikel kann über die offenen Kundenaufträge im System erstellt werden. Folgendes wird angelegt: - -* Fertigungsaufträge für jeden Artikel. -* Materialanforderung für Artikel deren vorhergesagte Menge wahrscheinlich unter 0 fällt. - -Um das Werkzeug zur Fertigungsplanung zu nutzen, gehen Sie zu: - -> Fertigung > Werkzeuge > 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 - -### Schritt 2: Artikel aus Kundenaufträgen abrufen - -Sie können Artikel hinzufügen, entfernen oder die Menge dieser Artikel verändern. - -Werkzeug zur Fertigungsplanung - -### Schritt 3: Fertigungsaufträge erstellen - -Werkzeug zur Fertigungsplanung - -### Schritt 4: Materialanfragen erstellen - -Erstellen Sie für Artikel mit prognostiziertem Engpass Materialanfragen. - -Werkzeug zur Fertigungsplanung - -Das Werkzeug zur Fertigungsplanung wird auf zwei Ebenend verwendet: - -* Auswahl von offenen Kundenaufträge einer Periode auf Basis des erwarteten Lieferdatums. -* Auswahl von Artikeln aus diesen Kundenaufträgen. - -Das Werkzeug erstellt eine Aktualisierung, wenn Sie bereits einen Kundenauftrag für einen bestimmten Artikel zu einem Kundenauftrag erstellt haben ("geplante Menge"). - -Sie könnenjederzeit die Artikelliste bearbeiten und die zur Fertigung geplante Menge erhöhen bzw. vermindern. - -> Anmerkung: Wie ändern Sie einen Fertigungsplan? Des Ergebnis des Werkzeuges zur Produktionsplanung ist der Fertigungsauftrag. Sobald Ihre Aufträge erstellt wurden, können Sie sie ändern, indem Sie die Fertigungsaufträge ändern. - -{next} diff --git a/foundation/www/docs/user/manual/de/manufacturing/work-order.md b/foundation/www/docs/user/manual/de/manufacturing/work-order.md new file mode 100644 index 00000000..7d5cb705 --- /dev/null +++ b/foundation/www/docs/user/manual/de/manufacturing/work-order.md @@ -0,0 +1,100 @@ + +# Arbeitsauftrag +Beigetragen von CWT Connector & Wire Technology GmbH + +Der Arbeitsauftrag (auch als Arbeitsauftrag bezeichnet) ist ein Dokument welches vom Produktionsplaner als Startsignal in die Fertigung gegeben wird, um eine bestimmte Anzahl eines bestimmten Artikels zu produzieren. Der Arbeitsauftrag unterstützt Sie auch dabei den Materialbedarf (Lagerbuchung) für diesen Artikel aus der **Stückliste** zu generieren. + +Der **Arbeitsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generiert, basierend auf den Kundenaufträgen. Sie können weiterhin direkt einen Arbeitsauftrag erstellen über: + +> Fertigung > Dokumente > Arbeitsauftrag > Neu + +Arbeitsauftrag + +### Einen Arbeitsauftrag erstellen + +* Wählen Sie den Artikel aus, der gefertigt werden soll. +* Die Standard-Stückliste für diesen Artikel wird aus dem System gezogen. Sie können die Stückliste auch ändern. +* Wenn die ausgewählte Stückliste auch Arbeitsgänge mit berücksichtigt, sollte das System alle Arbeitsgänge aus der Stückliste übernehmen. +* Geben Sie das geplante Startdatum an (ein geschätztes Datum zu dem die Produktion beginnen soll). +* Wählen Sie das Lager aus. Das Fertigungslager ist der Ort zu dem die Artikel gelangen, wenn Sie mit der Herstellung beginnen, und das Eingangslager ist der Ort, wo fertige Erzeugnisse lagern, bevor sie versandt werden. + +> Anmerkung: Sie können einen Arbeitsauftrag abspeichern ohne ein Lager auszuwählen. Lager sind jedoch zwingend erforderlich um einen Arbeitsauftrag zu übertragen. + +### Arbeitsplätze neu zuordnen/Dauer von Arbeitsgängen + +* Als Voreinstellung zieht das System Arbeitsplätze und die Dauer von Arbeitsgängen aus der gewählten Stückliste. + +Arbeitsauftrag - Arbeitsgänge + +* Wenn Sie den Arbeitsplatz für einen bestimmten Arbeitsgang im Arbeitsauftrag neu zuordnen möchten, können Sie das tun, bevor Sie den Arbeitsauftrag übertragen. + +Arbeitsauftrag - 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. + +### Kapazitätsplanung im Arbeitsauftrag + +* Wenn ein Arbeitsauftrag basierend auf dem geplanten Startdatum und der Verfügbarkeit des Arbeitsplatzes übertragen wird, plant das System alle Arbeitsgänge für den Arbeitsauftrag ein (wenn der Arbeitsauftrag selbst Arbeitsgänge enthält). + +### Material der Fertigung übergeben + +* Wenn Sie Ihren Arbeitsauftrags übertragen haben, müssen Sie das Rohmaterial übertragen um den Fertigungsprozess zu starten. +* Das erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um diesen Arbeitsauftrag 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 + +* Geben Sie die Menge des Materials an, das übertragen werden soll. + +Materialübertrag - Menge + +* Übertragen Sie die Lagerbuchung. + +Lagerbuchung zum Kundenauftrag + +* Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Arbeitsauftrag aktualisiert. + +Lagerbuchung zum Arbeitsauftrag + +### Zeitprotokoll erstellen + +* Der Fortschritt des Arbeitsauftrages kann über ein [Zeitprotokoll]Make TL against PO mitprotokolliert werden. +* Zeitprotokolle werden zu den Arbeitsgängen des Arbeitsauftrages erstellt. +* Vorlagen für Zeitprotokolle werden für die eingeplanten Arbeitsgänge zum Zeitpunkt des Übertragens des Arbeitsauftrages erstellt. +* Um weitere Zeitprotokolle zu einem Arbeitsgang zu erstellen, wählen Sie "Zeitprotokoll erstellen" im betreffenden Arbeitsgang aus. + +Zeitprotokoll zum Arbeitsauftrag erstellen + +### Fertige Erzeugnisse aktualisieren + +* Wenn Sie den Arbeitsauftrag fertiggestellt haben, müssen Sie die Fertigen Erzeugnisse aktualisieren. +* Das erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager "Fertige Erzeugnisse" gutschreibt. +* Klicken Sie auf "Fertige Erzeugnisse aktualisieren". + +Fertigerzeugnisse aktualiseren + +* Geben Sie die Menge des übertragenen Materials an. + +Menge der Fertigerzeugnisse aktualisieren + +>Tipp: Sie können einen Arbeitsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren. + +### Einen Arbeitsauftrag anhalten + +* Wenn Sie einen Arbeitsauftrag anhalten, wird sein Status auf "Angehalten" gesetzt, mit der Folge, dass alle Herstellungsprozesse für diesen Arbeitsauftrag eingestellt werden. +* Um den Arbeitsauftrag anzuhalten klicken Sie auf die Schaltfläche "Anhalten". + +1. Wenn Sie den Arbeitsauftrag übertragen, reserviert das System für jeden Arbeitsgang des Arbeitsauftrags in Serie gemäß dem geplanten Startdatum basierend auf der Verfügbarkeit des Arbeitsplatzes ein Zeitfenster. Die Verfügbarkeit des Arbeitsplatzes hängt von den Arbeitszeiten des Arbeitsplatzes und der Urlaubsliste ab und davon, ob ein anderer Arbeitsgang des Arbeitsauftrages in diesem Zeitfenster eingeplant wurde. Sie können in den Fertigungseinstellungen die Anzahl der Tage angeben, in denen das System versucht den Arbeitsgang einzuplanen. Standardmäßig ist dieser Wert auf 30 Tage eingestellt. Wenn der Arbeitsgang über das verfügbare Zeitfenster hinaus Zeit benötigt, fragt Sie das System, ob der Arbeitsgang pausieren soll. Wenn das System die Terminplanung erstellen konnte, legt es Zeitprotokolle an und speichert sie. Sie können diese verändern und später übertragen. +2. Sie können außerdem zusätzliche Zeitprotokolle für einen Arbeitsgang erstellen. Hierzu wählen Sie den betreffenden Arbeitsgang aus und klicken Sie auf "Zeitprotokoll erstellen". +3. Rohmaterial übertragen: Dieser Schritt erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um dem Arbeitsauftrag abzuschliessen, und dem Fertigungslager hinzugefügt werden müssen (Unterartikel werden entweder als EIN Artikel mit Stücklister ODER in aufgelöster Form gemäß Ihren Einstellungen hinzugefügt). +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 Arbeitsauftrag erstellten Zeitprotokolle anzusehen, klicken Sie auf "Zeitprotokolle anzeigen". + +Arbeitsauftrag anhalten + +* Sie können auch einen angehaltenen Arbeitsauftrag wieder weiter laufen lassen. + +> Anmerkung: Um einen Arbeitsauftrag zu einem Artikel zu erstellen müssen Sie auf dem Artikelformular das Feld "Arbeitsauftrag zulassen" ankreuzen. + +{next} diff --git a/foundation/www/docs/user/manual/de/projects/_sidebar.json b/foundation/www/docs/user/manual/de/projects/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/projects/_sidebar.json +++ b/foundation/www/docs/user/manual/de/projects/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/selling/_sidebar.json b/foundation/www/docs/user/manual/de/selling/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/selling/_sidebar.json +++ b/foundation/www/docs/user/manual/de/selling/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/selling/setup/_sidebar.json b/foundation/www/docs/user/manual/de/selling/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/selling/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/de/selling/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/setting-up/_sidebar.json b/foundation/www/docs/user/manual/de/setting-up/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/setting-up/_sidebar.json +++ b/foundation/www/docs/user/manual/de/setting-up/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/setting-up/data/_sidebar.json b/foundation/www/docs/user/manual/de/setting-up/data/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/setting-up/data/_sidebar.json +++ b/foundation/www/docs/user/manual/de/setting-up/data/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/setting-up/email/_sidebar.json b/foundation/www/docs/user/manual/de/setting-up/email/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/setting-up/email/_sidebar.json +++ b/foundation/www/docs/user/manual/de/setting-up/email/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/setting-up/print/_sidebar.json b/foundation/www/docs/user/manual/de/setting-up/print/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/setting-up/print/_sidebar.json +++ b/foundation/www/docs/user/manual/de/setting-up/print/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/setting-up/settings/_sidebar.json b/foundation/www/docs/user/manual/de/setting-up/settings/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/setting-up/settings/_sidebar.json +++ b/foundation/www/docs/user/manual/de/setting-up/settings/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/_sidebar.json b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/setting-up/setup-wizard/_sidebar.json +++ b/foundation/www/docs/user/manual/de/setting-up/setup-wizard/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/_sidebar.json b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/_sidebar.json +++ b/foundation/www/docs/user/manual/de/setting-up/users-and-permissions/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/stock/_sidebar.json b/foundation/www/docs/user/manual/de/stock/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/stock/_sidebar.json +++ b/foundation/www/docs/user/manual/de/stock/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/_sidebar.json b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/_sidebar.json +++ b/foundation/www/docs/user/manual/de/stock/accounting-of-inventory-stock/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/stock/articles/_sidebar.json b/foundation/www/docs/user/manual/de/stock/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/stock/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/de/stock/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/stock/setup/_sidebar.json b/foundation/www/docs/user/manual/de/stock/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/stock/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/de/stock/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/stock/tools/_sidebar.json b/foundation/www/docs/user/manual/de/stock/tools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/stock/tools/_sidebar.json +++ b/foundation/www/docs/user/manual/de/stock/tools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/support/_sidebar.json b/foundation/www/docs/user/manual/de/support/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/support/_sidebar.json +++ b/foundation/www/docs/user/manual/de/support/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/using-erpnext/_sidebar.json b/foundation/www/docs/user/manual/de/using-erpnext/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/using-erpnext/_sidebar.json +++ b/foundation/www/docs/user/manual/de/using-erpnext/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/website/_sidebar.json b/foundation/www/docs/user/manual/de/website/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/website/_sidebar.json +++ b/foundation/www/docs/user/manual/de/website/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/de/website/setup/_sidebar.json b/foundation/www/docs/user/manual/de/website/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/de/website/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/de/website/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/CRM/_sidebar.json b/foundation/www/docs/user/manual/en/CRM/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/CRM/_sidebar.json +++ b/foundation/www/docs/user/manual/en/CRM/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/CRM/customer.md b/foundation/www/docs/user/manual/en/CRM/customer.md index 30c81fff..5547f713 100644 --- a/foundation/www/docs/user/manual/en/CRM/customer.md +++ b/foundation/www/docs/user/manual/en/CRM/customer.md @@ -70,6 +70,16 @@ 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/user/manual/en/CRM/setup/sales-person.html) against a customer. + +
    + +
    + +
    +
    + ### Sales Partner A Sales Partner is a third party distributor / dealer / commission agent / diff --git a/foundation/www/docs/user/manual/en/CRM/index.md b/foundation/www/docs/user/manual/en/CRM/index.md index 817f4cb6..6a843a96 100644 --- a/foundation/www/docs/user/manual/en/CRM/index.md +++ b/foundation/www/docs/user/manual/en/CRM/index.md @@ -6,4 +6,12 @@ ERPNext helps you track business **Opportunities** from **Leads** and The CRM Module helps maintain Leads, Oppurtunities and Customers. +
    +
    + +
    +
    + + {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/CRM/newsletter.md b/foundation/www/docs/user/manual/en/CRM/newsletter.md index be013086..65965039 100644 --- a/foundation/www/docs/user/manual/en/CRM/newsletter.md +++ b/foundation/www/docs/user/manual/en/CRM/newsletter.md @@ -19,4 +19,9 @@ send the email to all the intended receipients by clicking on the send button. Newsletter - Test +
    + +
    + {next} diff --git a/foundation/www/docs/user/manual/en/CRM/setup/_sidebar.json b/foundation/www/docs/user/manual/en/CRM/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/CRM/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/CRM/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/_sidebar.json b/foundation/www/docs/user/manual/en/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/_sidebar.json +++ b/foundation/www/docs/user/manual/en/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/_sidebar.json b/foundation/www/docs/user/manual/en/accounts/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/accounts/_sidebar.json +++ b/foundation/www/docs/user/manual/en/accounts/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/advance-payment-entry.md b/foundation/www/docs/user/manual/en/accounts/advance-payment-entry.md index 1a02342a..ec7e0dba 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 @@ -60,4 +60,10 @@ advance in the advances table. The accounting will be adjusted accordingly. Save and submit the Sales Invoice. + +
    + +
    + {next} diff --git a/foundation/www/docs/user/manual/en/accounts/articles/_sidebar.json b/foundation/www/docs/user/manual/en/accounts/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/accounts/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/bulk-payment-entry.md b/foundation/www/docs/user/manual/en/accounts/articles/bulk-payment-entry.md new file mode 100644 index 00000000..a466cc9b --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/articles/bulk-payment-entry.md @@ -0,0 +1,14 @@ + +# Bulk Payment Entry + +If you want to create a single payment entry adjusting against multiple invoices, follow the steps given below. + +* Make a "New Payment Entry". +* Select a Party Type and Party. On selection of a Party, all the outstanding invoices will be fetched for that Customer/Supplier. +* Enter the Payment Amount. +* Allocate the amount against invoices/orders as needed. +* Save and Submit Payment Entry. + +### Demo of Bulk Payment Entry + +Bulk Payment \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/exchange-rate-field-frozen.md b/foundation/www/docs/user/manual/en/accounts/articles/exchange-rate-field-frozen.md new file mode 100644 index 00000000..cf3fc0f0 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/articles/exchange-rate-field-frozen.md @@ -0,0 +1,15 @@ + +# Exchange Rate Field Frozen + +In ERPNext, you can fetch Exchange Rates between currencies in real-time, or save specific exchange rates as well. In ERPNext, saved exchange rates are also referred as Stale Exchange Rate. + +In your sales and purchase transactions, if the field of Currency Exchange Rate is frozen, that is because the feature of allowing stale exchange rates in transactions is enabled. To you wish to make Currency Exchange Rate field editable again, then disable the feature of Stale Exchange Rate from: + +* Accounts > Setup > Accounts Settings +* Uncheck field "Allow Stale Exchange Rates". + Exchange Rate Frozen +* Save Account Settings +* Refresh your ERPNext account +* Check Sales / Purchase transaction once again + +After this setting, the Exchange Rate field in the transactions should become editable once again. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/how-to-manage-subscriptions-with-erpnext.md b/foundation/www/docs/user/manual/en/accounts/articles/how-to-manage-subscriptions-with-erpnext.md new file mode 100644 index 00000000..38505904 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/articles/how-to-manage-subscriptions-with-erpnext.md @@ -0,0 +1,105 @@ + +# How To Manage Subscriptions With ERPNext + +ERPNext now allows you to manage your subscriptions easily. A single subscription can contain multiple plans. At +the same time, A single subscriber can also have multiple subscriptions. ERPNext also automatically manages your +subscriptions for you by generating new invoices when due and changing the subscription status for you. + +## Related Doctypes +### Subscriber +Like its name suggests, the Subscriber Doctype represents your subscribers and each record is linked to a single +Customer. + +Subscriber form + +### Subscription Plan +Each Subscription Plan is linked to a single Item and contains billing and pricing information on the Item. You can have +multiple Subscription Plans for a single Item. An example of a situation where you would want this is where you have +different prices for the same Item like when you have a basic option and premium option for a service. + +Subscription Plan Form + +### Subscription Settings +Subscription Settings is where you tweak the behaviour of the Subscription Doctype. For example, you can set a grace +period for overdue invoices from it. You can also elect to have a subscription cancelled if an overdue invoice is not +paid after the grace period. + +Subscription Settings Form + +## Creating A Subscription +To create a Subscription, go to the Subscription creation form +`Explore > Accounts > Subscriptions` + +Subscription form + +Select a Subscriber. + +If you want to cancel a subscription at the end of the present billing cycle, check the 'Cancel At End Of Period' +check box. + +Select the start date for the subscription. By default, the start date is today's date. (Optional). + +If you are giving the subscriber a trial, enter the Trial Period Start Date and Trial Period End Date. + +If your invoice is not payable immediately, you can set the number of days before the invoice will be due in the +'Days Until Due' field. + +If you require more than one unit of a plan, set it in the 'Quantity' field. For instance, a web developer is subscribed +to your web hosting service. The developer buys a plan for each customer. Instead of having multiple subscriptions for +the same plan, you can simply increase the quantity as needed. + +In the 'Plan' table, add Subscription Plans as required. You may have multiple Subscription Plans in a single +Subscription as long as they all have the same billing period cycle. If the same Subscriber needs to subscribe to +plans with different billing cycles, you will have to use a separate subscription. + +Select a Sales Taxes and Charges Template if you need to charge tax in your invoices. + +Fill the relevant fields in the 'Discounts' section if you need to add discounts to your invoices. + +Click Save. + +### Subscription Status +ERPNext Subscription has five status values: +- **Trialling** - A subscription that is in trial period +- **Active** - A subscription that does not have any unpaid invoice +- **Past Due** - A subscription whose most recent invoice is unpaid but is still within the grace period +- **Unpaid** - A subscription whose most recent invoice is unpaid and past the grace period +- **Canceled** - A subscription whose most recent invoice is unpaid and past the grace period. In this state, ERPNext no longer monitors the subscription. + +### Subscription Processing In The Background +Every one hour interval, ERPNext processes all Subscriptions and updates each for any change in status. It will +create new invoices if need be. When an outstanding invoice is paid, ERPNext updates the subscription accordingly. + +### Manually Updating Subscriptions +Once you have saved a subscription, you can change the 'Days Until Due', 'Quantity', 'Plans', 'Sales Taxes and Charges +Template', 'Apply Additional Discount On', 'Additional Discount Percentage' and 'Additional Discount Amount' fields. + +Note that changing any of the values will reflect in newly generated invoices only. Previously generated invoices will +not be changed. + +### Cancelling Subscriptions +To cancel a Subscription, simply click the 'Cancel Subscription' button. The subscription will update its 'Cancellation +Date' field and the subscription will no longer be monitored. + +If you are cancelling an active subscription, an invoice will immediately be generated. The generated invoice will be on +pro-rata basis by default. If you want ERPNext always create an invoice for the full amount, uncheck the 'Prorate' field +in Subsciption Settings. + +### Restarting Subscriptions +To restart a canceled subscription, simply click the 'Restart Subscription' button. Note the Subscription will empty +its invoices table. Note that the invoices will still exist but the Subscription will no longer track them. The start +date of the subscription will also be changed to the date the Subscription is restarted. The start of the billing +cycle will also be set to the date the Subscription is restarted. + +### Recalculating Subscriptions +Some times, a Subscription's status might have changed but might not yet be reflected in the Subscription. You can force +ERPNext to update the subscription by clicking 'Fetch Subscription Updates'. + +### Subscription Settings +**Grace Period** represents the number of days after a subscriber's invoice becomes overdue that ERPNext should delay +before changing the Subscription status to 'Canceled' or 'Unpaid'. + +**Cancel Invoice After Grace Period** would cause ERPNext to automatically cancel a subscription if it is not paid before the grace period elapses. This setting is off by default. + +**Prorate** would cause ERPNext to generate a prorated invoice when an active subscription is canceled by default. +If you would prefer a full invoice, uncheck the setting. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/index.txt b/foundation/www/docs/user/manual/en/accounts/articles/index.txt index af8572c2..419196a0 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/index.txt +++ b/foundation/www/docs/user/manual/en/accounts/articles/index.txt @@ -14,4 +14,7 @@ withdrawing-salary-from-owners-equity-account adjust-withhold-amount-payment-entry common-receivable-account.md types-in-tax-template -freeze-account \ No newline at end of file +freeze-account +round-off-account-validation +exchange-rate-field-frozen +bulk-payment-entry \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/articles/round-off-account-validation.md b/foundation/www/docs/user/manual/en/accounts/articles/round-off-account-validation.md new file mode 100644 index 00000000..b3080dc9 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/articles/round-off-account-validation.md @@ -0,0 +1,31 @@ + +# Round of Account Validation Message + +**Question** + +When submitting an invoice, why does it ask for a Round Off Account? How to update it? + +Fees Section + +**Answer** + +In the Purchase Invoice, Grand Total is calculated based on various calculations like: + +- Qty * Rate = Amount +- Tax and other charges applied to each item +- Discount applied to some or all the items +- Multiplication with exchange rate, in case of multiple currencies + +As a result of multiple calculations, there could be some rounding loss in the final amount. This rounding loss is generally very marginal like 0.034. But for the accounting accuracy, has to be posted in the accounts. Hence, you need to define a default Round-Off account in the Company master in which such amount availed as a result of rounding loss can be booked. + +You need to create Round-off Account in the Chart of Accounts and update in the Company master. Steps here. + +* Accounts > Chart of Accounts +* In the Chart of Account, check or create new Account under Expense > Direct Expense. Ignore if account for this purpose already existing +* Come to Company master + Account > Company +* Open Company in which Round-Off account has to be updated. +* In the Company master, scroll to Accounts Settings and select Round-Off account and Cost Center. + Fees Section + +Once Round-Off account this updated in the Company master, then try to submit Purchase Invoice once again. 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 eaf46712..16dd82d2 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,5 +1,5 @@ -#Tracking Project Profibitability using Cost Center +#Tracking Project Profitability 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. @@ -78,4 +78,4 @@ To check Budget Variance report, go to: [Click here to learn how to do budgeting from Cost Center](/docs/user/manual/en/accounts/budgeting.html). - \ No newline at end of file + diff --git a/foundation/www/docs/user/manual/en/accounts/budgeting.md b/foundation/www/docs/user/manual/en/accounts/budgeting.md index 7336e4a0..fbb4b457 100644 --- a/foundation/www/docs/user/manual/en/accounts/budgeting.md +++ b/foundation/www/docs/user/manual/en/accounts/budgeting.md @@ -56,4 +56,9 @@ Accounts > Budget and Cost Center > 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 adf257c9..0ea4309f 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 @@ -156,4 +156,14 @@ Typically, you might want to create Accounts for * Types of Sales (for example, Product Sales, Service Sales etc.) under Income. * Types of Assets (building, machinery, furniture etc.) under Fixed Assets. + +
    +
    + +
    +
    + + + {next} diff --git a/foundation/www/docs/user/manual/en/accounts/index.md b/foundation/www/docs/user/manual/en/accounts/index.md index c58f53aa..156b391d 100644 --- a/foundation/www/docs/user/manual/en/accounts/index.md +++ b/foundation/www/docs/user/manual/en/accounts/index.md @@ -11,6 +11,11 @@ In ERPNext, your accounting operations consists of 3 main transactions: * Purchase Invoice: Bills that your Suppliers give you for their products or services. * Journal Entries: For accounting entries, like payments, credit and other types. +
    + +
    + ### Topics {index} diff --git a/foundation/www/docs/user/manual/en/accounts/index.txt b/foundation/www/docs/user/manual/en/accounts/index.txt index 41cb243d..8520d86d 100644 --- a/foundation/www/docs/user/manual/en/accounts/index.txt +++ b/foundation/www/docs/user/manual/en/accounts/index.txt @@ -2,6 +2,7 @@ chart-of-accounts opening-accounts sales-invoice point-of-sale-pos-invoice +point-of-sales purchase-invoice payments journal-entry 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 bca15194..518f45ad 100644 --- a/foundation/www/docs/user/manual/en/accounts/opening-accounts.md +++ b/foundation/www/docs/user/manual/en/accounts/opening-accounts.md @@ -105,4 +105,12 @@ Here, select the company and type of invoice (sales or purchase) and add a line Opening Invoice Creation Tool + +
    +
    + +
    +
    + {next} diff --git a/foundation/www/docs/user/manual/en/accounts/payment-terms.md b/foundation/www/docs/user/manual/en/accounts/payment-terms.md index ccfa1738..02fa9511 100644 --- a/foundation/www/docs/user/manual/en/accounts/payment-terms.md +++ b/foundation/www/docs/user/manual/en/accounts/payment-terms.md @@ -11,6 +11,10 @@ The documents you can attach Payment Terms to are: Note that the introduction of Payment Terms removes "Credit Days" and "Credit Days Based On" fields in Customer/Supplier master. Payment Term contains the same information and makes it more flexible to use. +
    + +
    + ## Payment Terms Navigate to the Payment Term list page and click "New". > Accounts > Payment Term > New Payment Term 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 b41b335e..484185a9 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 @@ -1,119 +1,23 @@ # Point of Sale Invoice -For retail operations, the delivery of goods, accrual of sale and payment all happens in one event, that is usually called the “Point of Sale” (POS). +The one-screen point-of-sale software, for the one-stop-shop retail business. It does everything your store needs, right from POS billing, +to purchasing, to customer relationship management. - +POS Invoice -###Offline POS +### Offline POS In the retails business, invoicing needs to done very quickly, hence should less dependency. In the ERPNext, you can create POS Invoices, even when not connected to the internet. -POS Invoices created in the offline mode will be saved locally in the browser. If internet connection is lost which creating POS Invoice, you will still be able can proceed forward. Once internet connection is available again, offline invoices will be synced, and pushed onto your ERPNext account. To learn more on how POS Invoices can be created when offline, [check here.](https://frappe.io/blog/blog/erpnext-features/offline-pos-in-erpnext-7) +POS Invoice -#### POS Profile +### POS Demo -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: +Here is the quick demonstration on the Point of Sale feature of ERPNext. -1. Enable POS View via (Setup > Customize > Feature Setup) -2. Create a [POS Profile](/docs/user/manual/en/setting-up/pos-setting.html) record - -#### Different sections of the POS - - * Update Stock: If this is checked, Stock Ledger Entries will be made when you “Submit” this Sales Invoice thereby eliminating the need for a separate Delivery Note. - * In your Items table, update inventory information like Warehouse (saved as default), Serial Number, or Batch Number if applicable. - * Update Payment Details like your Bank / Cash Account, Paid amount etc. - * If you are writing off certain amount. For example when you receive extra cash as a result of not having exact denomination of change, check on ‘Write off Outstanding Amount’ and set the Account. - - -### Customer - -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 - -### Adding an Item - -At the billing counter, the retailer needs to select Items which the consumer buys. In the POS interface you can select an Item by two methods. One, is by clicking on the Item image and the other, is through the Barcode / Serial No. - -**Select Item** \- To select a product click on the Item image and add it into the cart. A cart is an area that prepares a customer for checkout by allowing to edit product information, adjust taxes and add discounts. - -**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 - -> 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. - -If your product list is very long use the Search field, type the product name -in Search box. - -### Removing an Item from the Cart - -1. Select row in the cart and clik on delete button in the numeric keypad - -POS Item - - -2. Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item. - - * If Item's Qty is 1, click on a minus sign to make it zero. - - * Manually enter 0(zero) quantity. - -### Make Payment - -After all the Items and their quantities are added into the cart, you are -ready to make the Payment. Payment process is divided into 3 steps - - - 1. Click on “Make Payment” to get the Payment window. - 2. Select your “Mode of Payment”. - 3. Click on “Pay” button to Save the document. - -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. - -### Write off Amount - -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 - -System books the write off amount into the ledger which has selected on the POS Profile. - -### Change Amount - -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 - -### 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 - -#### Accounting entries (GL Entry) for a Point of Sale: - -Debits: - - * Customer (grand total) - * Bank / Cash (payment) - -Credits: - - * Income (net total, minus taxes for each Item) - * Taxes (liabilities to be paid to the government) - * Customer (payment) - * Write Off (optional) - * Account for Change Amount (optional) - -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 -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/point-of-sales.md b/foundation/www/docs/user/manual/en/accounts/point-of-sales.md new file mode 100644 index 00000000..37697703 --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/point-of-sales.md @@ -0,0 +1,118 @@ + +# Point of Sale Invoice + +For retail operations, the delivery of goods, accrual of sale and payment all happens in one event, that is usually called the “Point of Sale” (POS). + + + +###Offline POS + +In the retails business, invoicing needs to done very quickly, hence should less dependency. In the ERPNext, you can create POS Invoices, even when not connected to the internet. + +POS Invoices created in the offline mode will be saved locally in the browser. If internet connection is lost which creating POS Invoice, you will still be able can proceed forward. Once internet connection is available again, offline invoices will be synced, and pushed onto your ERPNext account. To learn more on how POS Invoices can be created when offline, [check here.](https://frappe.io/blog/blog/erpnext-features/offline-pos-in-erpnext-7) + +#### POS Profile + +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 Profile](/docs/user/manual/en/setting-up/pos-setting.html) record + +#### Different sections of the POS + + * Update Stock: If this is checked, Stock Ledger Entries will be made when you “Submit” this Sales Invoice thereby eliminating the need for a separate Delivery Note. + * In your Items table, update inventory information like Warehouse (saved as default), Serial Number, or Batch Number if applicable. + * Update Payment Details like your Bank / Cash Account, Paid amount etc. + * If you are writing off certain amount. For example when you receive extra cash as a result of not having exact denomination of change, check on ‘Write off Outstanding Amount’ and set the Account. + +### Customer + +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 + +### Adding an Item + +At the billing counter, the retailer needs to select Items which the consumer buys. In the POS interface you can select an Item by two methods. One, is by clicking on the Item image and the other, is through the Barcode / Serial No. + +**Select Item** \- To select a product click on the Item image and add it into the cart. A cart is an area that prepares a customer for checkout by allowing to edit product information, adjust taxes and add discounts. + +**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 + +> 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. + +If your product list is very long use the Search field, type the product name +in Search box. + +### Removing an Item from the Cart + +1. Select row in the cart and clik on delete button in the numeric keypad + +POS Item + + +2. Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item. + + * If Item's Qty is 1, click on a minus sign to make it zero. + + * Manually enter 0(zero) quantity. + +### Make Payment + +After all the Items and their quantities are added into the cart, you are +ready to make the Payment. Payment process is divided into 3 steps - + + 1. Click on “Make Payment” to get the Payment window. + 2. Select your “Mode of Payment”. + 3. Click on “Pay” button to Save the document. + +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. + +### Write off Amount + +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 + +System books the write off amount into the ledger which has selected on the POS Profile. + +### Change Amount + +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 + +### 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 + +#### Accounting entries (GL Entry) for a Point of Sale: + +Debits: + + * Customer (grand total) + * Bank / Cash (payment) + +Credits: + + * Income (net total, minus taxes for each Item) + * Taxes (liabilities to be paid to the government) + * Customer (payment) + * Write Off (optional) + * Account for Change Amount (optional) + +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 +After sync of an order, email sent to the customer with the print of the bill in the attachment + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/setup/_sidebar.json b/foundation/www/docs/user/manual/en/accounts/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/accounts/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/accounts/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/setup/cost-center.md b/foundation/www/docs/user/manual/en/accounts/setup/cost-center.md index 111ec01a..d4c094b3 100644 --- a/foundation/www/docs/user/manual/en/accounts/setup/cost-center.md +++ b/foundation/www/docs/user/manual/en/accounts/setup/cost-center.md @@ -35,6 +35,6 @@ To setup your Chart of Cost Centers go to: > Accounts > Setup > Chart of Cost Centers -Cost Center +Cost Center {next} diff --git a/foundation/www/docs/user/manual/en/accounts/share/__init__.py b/foundation/www/docs/user/manual/en/accounts/share/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/accounts/share/_sidebar.json b/foundation/www/docs/user/manual/en/accounts/share/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/accounts/share/_sidebar.json +++ b/foundation/www/docs/user/manual/en/accounts/share/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/tools/_sidebar.json b/foundation/www/docs/user/manual/en/accounts/tools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/accounts/tools/_sidebar.json +++ b/foundation/www/docs/user/manual/en/accounts/tools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/foundation/www/docs/user/manual/en/accounts/tools/bank-reconciliation.md index a000f20c..340f0da1 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 @@ -5,7 +5,7 @@ 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. -The Bank Reconciliation Report provide the difference between the bank balance shown in an organisation's bank statement, as provided by the ban against amount shown in the companies Chart of Accounts. +The Bank Reconciliation Report provide the difference between the bank balance shown in an organisation's bank statement, as provided by the bank against amount shown in the companies Chart of Accounts. ####Bank Reconciliation Statement diff --git a/foundation/www/docs/user/manual/en/agriculture/__init__.py b/foundation/www/docs/user/manual/en/agriculture/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/agriculture/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/agriculture/_sidebar.json +++ b/foundation/www/docs/user/manual/en/agriculture/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/analytics/__init__.py b/foundation/www/docs/user/manual/en/agriculture/analytics/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/agriculture/analytics/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/analytics/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/agriculture/analytics/_sidebar.json +++ b/foundation/www/docs/user/manual/en/agriculture/analytics/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/__init__.py b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/agriculture/crops_and_land/_sidebar.json +++ b/foundation/www/docs/user/manual/en/agriculture/crops_and_land/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/__init__.py b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json +++ b/foundation/www/docs/user/manual/en/agriculture/diseases_and_fertilizer/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/agriculture/index.md b/foundation/www/docs/user/manual/en/agriculture/index.md index 5ed981c4..8f6d6915 100644 --- a/foundation/www/docs/user/manual/en/agriculture/index.md +++ b/foundation/www/docs/user/manual/en/agriculture/index.md @@ -1,11 +1,17 @@ -# Agriculture +# ERPNext for Agriculture Farmers know that even a small operation requires intensive recordkeeping. A well-run farm requires proper management of accounting, payroll, suppliers, customers and logistics to name a few areas. ERPNext already helps organize these activities. +Land Unit + +### Capture Land Units and Manage Crops + A farm requires additional attention to manage its productive units (plots of land), time sensitive crop activities (such as planting, irrigating, fertilizing, etc.), recording environmental and crop data for analysis, and reports to help make effective decisions. -Task +Soil Texture + +### ERPNext Agriculture Demo The Agriculture module in ERPNext helps you keep track of your farming operations. It allows you keep records for each field where you farm, such as geospatial and soil texture characteristics. It allows you to: @@ -16,8 +22,12 @@ The Agriculture module in ERPNext helps you keep track of your farming operation * Record sale of the harvest or transfer to warehouse for further processing * View reports -Task +To see feature of ERPNext Agriculture in action, check the following demo video. -### Topics +
    + +
    + +### Agriculture User Manual {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/asset/__init__.py b/foundation/www/docs/user/manual/en/asset/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/asset/_sidebar.json b/foundation/www/docs/user/manual/en/asset/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/asset/_sidebar.json +++ b/foundation/www/docs/user/manual/en/asset/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/asset/assets.md b/foundation/www/docs/user/manual/en/asset/assets.md index 3d8130fc..c361427b 100644 --- a/foundation/www/docs/user/manual/en/asset/assets.md +++ b/foundation/www/docs/user/manual/en/asset/assets.md @@ -53,6 +53,8 @@ In the depreciation entry, the "Accumulated Depreciation Account" is credited an If you are required to calculate the depreciation based on your Fiscal Year and prorated by the number of days left, select the corresponding option in "Account Settings". +Asset + The system will automatically set the fiscal year end date as the next depreciation date and calculate the depreciation amount prorata temporis based on the Available-for-use Date (IFRS16) Asset diff --git a/foundation/www/docs/user/manual/en/buying/_sidebar.json b/foundation/www/docs/user/manual/en/buying/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/buying/_sidebar.json +++ b/foundation/www/docs/user/manual/en/buying/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/buying/articles/_sidebar.json b/foundation/www/docs/user/manual/en/buying/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/buying/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/buying/index.md b/foundation/www/docs/user/manual/en/buying/index.md index d7c2e8f4..ef8a0c1f 100644 --- a/foundation/www/docs/user/manual/en/buying/index.md +++ b/foundation/www/docs/user/manual/en/buying/index.md @@ -11,6 +11,11 @@ profitability. ERPNext contains a set of transactions that will make your buying process as efficient and seamless as possible. +
    + +
    + ### Topics {index} 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 1d412277..c3d0c255 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 @@ -9,6 +9,11 @@ In ERPNext, You can create Request for Quotation directly by going to: After creation of Request for Quotation, there are two ways to generate Supplier Quotation from Request for Quotation. +
    + +
    + #### For User @@ -53,3 +58,5 @@ __Step 4:__ On submission, system will create Supplier Quotation (draft mode) ag If a supplier indicates that they will not provide a quotation for the item, this can be indicated in the RFQ document by checking the 'No Quote' box after the Request for Quotation has been submitted. ![Request For Quotation]({{docs_base_url}}/assets/img/buying/request-for-quotation.gif) + + diff --git a/foundation/www/docs/user/manual/en/buying/setup/_sidebar.json b/foundation/www/docs/user/manual/en/buying/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/buying/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/buying/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/buying/supplier.md b/foundation/www/docs/user/manual/en/buying/supplier.md index 85d81171..2110fa3d 100644 --- a/foundation/www/docs/user/manual/en/buying/supplier.md +++ b/foundation/www/docs/user/manual/en/buying/supplier.md @@ -9,6 +9,13 @@ You can create a new Supplier from: 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. diff --git a/foundation/www/docs/user/manual/en/customer-portal/_sidebar.json b/foundation/www/docs/user/manual/en/customer-portal/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/customer-portal/_sidebar.json +++ b/foundation/www/docs/user/manual/en/customer-portal/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/_sidebar.json b/foundation/www/docs/user/manual/en/customize-erpnext/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/_sidebar.json +++ b/foundation/www/docs/user/manual/en/customize-erpnext/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/_sidebar.json b/foundation/www/docs/user/manual/en/customize-erpnext/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/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 e278b5c2..afa567df 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 @@ -7,7 +7,10 @@ There are three kind of reports in ERPNext. Report Builder is an in-built report customization tool in ERPNext. This allows you to define specific fields of the form which shall be added in the report. Also you can set required filters, sorting and give preferred name to report. - +
    + +
    ### 2. Query Report 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..3f174515 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 @@ -23,7 +23,7 @@ By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just l ---- Quotation
    ---- Sales Invoice
    ---- Employee
    ----- Production Order
    +---- Work Order
    .. and so on. So linking this field with parent Doctype will list all the Doctype records. 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 ed442865..52e68f14 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 @@ -2,7 +2,7 @@ # 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 +Sales Invoices, Work Order are added as Doctype in the backend. Let's assume we are creating a Custom Doctype for a Book. Custom Doctype allows you to insert custom forms in ERPNext as per your requirement. 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 6a3ed040..2d641067 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 @@ -72,4 +72,9 @@ After inserting required details for the Custom Field, Update Customize Form. On Given a permission, user will be able to delete Custom Fields. Incase Custom Field is deleted by mistake, if you add another Custom Field with same name. Then you shall see new field auto-mapped with old-deleted Custom Field. +
    + +
    + {next} diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/_sidebar.json b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/_sidebar.json +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/_sidebar.json b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/_sidebar.json +++ b/foundation/www/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json b/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json +++ b/foundation/www/docs/user/manual/en/education/Assessment/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md index aa232e2f..1b5fee1c 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_criteria.md @@ -16,8 +16,6 @@ Assessment Criteria is be used when scheduling Assessment Plan for Student Group
    -
    diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md index 4c73c40b..83efcecd 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_group.md @@ -16,8 +16,6 @@ On the same lines, you can also define multiple Assessment Group bases on assess
    -
    diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md index ba6d0abf..b40f26f7 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_plan.md @@ -22,8 +22,6 @@ To schedule an assessment/examination for a Student Group, for specific Course,
    -
    diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md index cfb86d7d..d1e50c4a 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result.md @@ -9,8 +9,6 @@ Assessment Result is a log of marks/grades earned by the student for specific As
    -
    diff --git a/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md index eb97f928..29703b93 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/assessment_result_tool.md @@ -12,8 +12,6 @@ As you go on entering marks for a Student, and switch to next student, in the ba
    -
    diff --git a/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md b/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md index 2d16d46e..313976e7 100644 --- a/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md +++ b/foundation/www/docs/user/manual/en/education/Assessment/grading_scale.md @@ -10,8 +10,6 @@ In the Grading Scale, you can define various grades and threshold for them. Base
    -
    diff --git a/foundation/www/docs/user/manual/en/education/Attendance/_sidebar.json b/foundation/www/docs/user/manual/en/education/Attendance/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/education/Attendance/_sidebar.json +++ b/foundation/www/docs/user/manual/en/education/Attendance/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md index 478684f1..6ff23481 100644 --- a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance-tool.md @@ -18,8 +18,6 @@ Student detials will be autofetched and you can mark the attendance of the given
    -
    diff --git a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md index 17807b97..21f4a1c4 100644 --- a/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-attendance.md @@ -18,8 +18,6 @@ Select the **Student, Course Schedule and Student Group** for which attendance i
    -
    diff --git a/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md b/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md index ae873dbd..e9128f5c 100644 --- a/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md +++ b/foundation/www/docs/user/manual/en/education/Attendance/student-leave-application.md @@ -16,8 +16,6 @@ Once a Leave Application is recorded for a student it will not be recorded in th
    -
    diff --git a/foundation/www/docs/user/manual/en/education/_sidebar.json b/foundation/www/docs/user/manual/en/education/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/education/_sidebar.json +++ b/foundation/www/docs/user/manual/en/education/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/admission/_sidebar.json b/foundation/www/docs/user/manual/en/education/admission/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/education/admission/_sidebar.json +++ b/foundation/www/docs/user/manual/en/education/admission/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md b/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md index 2479cded..a9ff3bde 100644 --- a/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md +++ b/foundation/www/docs/user/manual/en/education/admission/program-enrollment-tool.md @@ -23,8 +23,6 @@ For promoting the students, the new academic year, academic term and program can
    -
    diff --git a/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md b/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md index 63b2bd44..a8c48f5a 100644 --- a/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md +++ b/foundation/www/docs/user/manual/en/education/admission/program-enrollment.md @@ -22,7 +22,6 @@ Student Category: For the Institutions having multiple Fees Structure, this fiel
    -
    diff --git a/foundation/www/docs/user/manual/en/education/admission/student-applicant.md b/foundation/www/docs/user/manual/en/education/admission/student-applicant.md index a8a33e7b..427aec10 100644 --- a/foundation/www/docs/user/manual/en/education/admission/student-applicant.md +++ b/foundation/www/docs/user/manual/en/education/admission/student-applicant.md @@ -33,7 +33,6 @@ the system shall create a student against that applicant and redirect you to the
    -
    diff --git a/foundation/www/docs/user/manual/en/education/admission/student_admission.md b/foundation/www/docs/user/manual/en/education/admission/student_admission.md index 8178e8fa..90c51d9b 100644 --- a/foundation/www/docs/user/manual/en/education/admission/student_admission.md +++ b/foundation/www/docs/user/manual/en/education/admission/student_admission.md @@ -5,7 +5,7 @@ The admission process begins with filling the admission form. The Student Admiss To create a Student Admission record go to : -**education** >> **Admissions** >> **Student Admission** >> +> **education** > **Admissions** > **Student Admission** > Student Applicant diff --git a/foundation/www/docs/user/manual/en/education/fees/_sidebar.json b/foundation/www/docs/user/manual/en/education/fees/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/education/fees/_sidebar.json +++ b/foundation/www/docs/user/manual/en/education/fees/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/fees/fee-structure.md b/foundation/www/docs/user/manual/en/education/fees/fee-structure.md index 738f9e6b..18a42325 100644 --- a/foundation/www/docs/user/manual/en/education/fees/fee-structure.md +++ b/foundation/www/docs/user/manual/en/education/fees/fee-structure.md @@ -25,8 +25,6 @@ If you are going to use this in the Fee Schedule, you must select the Accounts c
    -
    diff --git a/foundation/www/docs/user/manual/en/education/index.md b/foundation/www/docs/user/manual/en/education/index.md index e22eaf6d..f665500f 100644 --- a/foundation/www/docs/user/manual/en/education/index.md +++ b/foundation/www/docs/user/manual/en/education/index.md @@ -1,9 +1,48 @@ -# Education + +# ERPNext for Education +The Education domain in ERPNext is designed to meet requirements of any organization which imparts knowledge and believe in doing it in an organized fashion. It has already been used at the schools, colleges and even at the private firms. -The Education Domain in ERPNext is designed to meet requirements of any educational Institute whether that is a school, college or any other private firm. ERPNext provides a centralized system, which can be used to maintain and update all the activities related to an Institution. It will provide a complete package for every funcationality required in any institute like Online Admission, Fees, Attendance, Examination. +It helps you effectively manage administrative side and allows you to focus on what is most important for your institute, **to educate!** -Fees Section +School Hero + +### Contents of ERPNext Education Domain + +Using Education module of ERPNext, you can effectively manage operations like: + +- Managing Student +- Program and Courses +- Online Admissions +- Student Attendance +- Course Scheduling +- Assessment Planning and Assessment Result +- Fee Structure and Fee Receipt + +For an online demonstration on each functionality of ERPNext Education module, [click here.](https://www.youtube.com/watch?v=f6foQOyGzdA&list=PL3lFfCEoMxvxyjnARY_C1zLoOE55LcMKB) + +Fees Section + +### Who Uses ERPNext + +The very first implementation of ERPNext was driven by a school teacher herself. She explains what it takes to get implementation right at your education institute. + +
    +
    + +
    +
    + +### User Manual + +Education Institute needs lots more than Education module, and ERPNext has all of it available built-in. + +- You track your books of accounts using [Accounts module](/docs/user/manual/en/accounts.html). +- Manage payroll, leaves and claims of your admin and teaching staff in the [HR module](/docs/user/manual/en/human-resources.html). +- Organize your [purchases](/docs/user/manual/en/buying.html) and place an approval system. + +Here is the stepwise guide on each functionality of ERPNext Education module. {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json b/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json +++ b/foundation/www/docs/user/manual/en/education/schedule/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md b/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md index 757f23d3..14abbb28 100644 --- a/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md +++ b/foundation/www/docs/user/manual/en/education/schedule/course-schedule.md @@ -10,8 +10,6 @@ You can see the overall course schedule in the Calendar view.
    -
    diff --git a/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md b/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md index 5ce1faf5..70ddbcad 100644 --- a/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md +++ b/foundation/www/docs/user/manual/en/education/schedule/scheduling-tool.md @@ -24,7 +24,6 @@ This tool can be used to create 'Course Schedules'. #### Video Tutorial on Scheduling Tool
    -
    diff --git a/foundation/www/docs/user/manual/en/education/setup/_sidebar.json b/foundation/www/docs/user/manual/en/education/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/education/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/education/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/education/setup/course.md b/foundation/www/docs/user/manual/en/education/setup/course.md index b0b37e4d..ab6ed9c4 100644 --- a/foundation/www/docs/user/manual/en/education/setup/course.md +++ b/foundation/www/docs/user/manual/en/education/setup/course.md @@ -15,9 +15,7 @@ The Course form is further linked to **Program, Student Group and Assessment Pla -
    - +
    diff --git a/foundation/www/docs/user/manual/en/education/setup/instructor.md b/foundation/www/docs/user/manual/en/education/setup/instructor.md index 365dcc53..e1adaa74 100644 --- a/foundation/www/docs/user/manual/en/education/setup/instructor.md +++ b/foundation/www/docs/user/manual/en/education/setup/instructor.md @@ -21,8 +21,6 @@ Further, the log for the Instructor can be entered in the Instructor Log table w
    -
    diff --git a/foundation/www/docs/user/manual/en/education/setup/program.md b/foundation/www/docs/user/manual/en/education/setup/program.md index 3a1ff0b5..499e6d10 100644 --- a/foundation/www/docs/user/manual/en/education/setup/program.md +++ b/foundation/www/docs/user/manual/en/education/setup/program.md @@ -20,9 +20,7 @@ The Program Doctype is further linked to the **Student applicant**, **Program en #### Video Tutorial on Program and Courses -
    - +
    diff --git a/foundation/www/docs/user/manual/en/education/student/_sidebar.json b/foundation/www/docs/user/manual/en/education/student/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/education/student/_sidebar.json +++ b/foundation/www/docs/user/manual/en/education/student/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/erpnext_integration/_sidebar.json b/foundation/www/docs/user/manual/en/erpnext_integration/_sidebar.json new file mode 100644 index 00000000..906a7228 --- /dev/null +++ b/foundation/www/docs/user/manual/en/erpnext_integration/_sidebar.json @@ -0,0 +1,22 @@ +[ + { + "route": "/docs", + "title": "Docs Home" + }, + { + "route": "/docs/user", + "title": "User Guide" + }, + { + "route": "/docs/current/api", + "title": "Server API" + }, + { + "route": "/docs/current/models", + "title": "Models (Reference)" + }, + { + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "title": "Improve Docs" + } +] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/erpnext_integration/woocommerce_integration.md b/foundation/www/docs/user/manual/en/erpnext_integration/woocommerce_integration.md new file mode 100644 index 00000000..bb355028 --- /dev/null +++ b/foundation/www/docs/user/manual/en/erpnext_integration/woocommerce_integration.md @@ -0,0 +1,58 @@ + + +# WooCommerce Integration + +#### Setting Up WooCommerce on ERPNEXT:- + +Steps:- + +1. From Awesome-bar, go to "Woocommerce Settings" doctype. + +2. From your woocommerce site, generate "API consumer key" and "API consumer secret" using Keys/Apps tab. + +3. Paste those generated "API consumer key" and "API consumer secret" into "Woocommerce Settings" doctype. + +4. In "Woocommerce Server URL" paste the url of your site where ERPNEXT is installed. + +5. Make sure "Enable Sync" is checked. + +6. Select Account type from Account Details Section. + +7. Click Save. + +8. After saving, "Secret" and "Endpoint" are generated automatically and can be seen on "Woocommerce Settings" doctype. + +9. Now from your woocommerce site, click on webhooks option and click on "Add Webhook". + +10. Give name to the webhook of your choice. Click on Status dropdown and select "Active". Select Topic as "Order Created". Copy the "Endpoint" from "Woocommerce Settings" doctype and paste it in "Delivery URL" field. Copy "Secret" from "Woocommerce Settings" doctype and paste it in "Secret" field. Keep API VERSION as it is and click on Save Webhook. + +11. Now the WooCommerce is successful setup on your system. + +Woocommerce Integration + + +### Note:- In above gif, inplace of delivery url on woocommerce website, you need to paste the url you will obtain after saving the "Woocommerce Settings" page (i.e. Endpoint from "Woocommerce Settings"). I pasted other url because I was using localhost. Please paste your endpoint in place of Delivery URL. + + + +#### WooCommerce Integration Working:- + +Steps:- + +1. From your Woocommerce website, register yourself as a user. + +2. Now Click on Address Details and provide the required details. + +3. For start shopping, click on Shop option and now available products can be seen. + +4. Add the desired products into cart and click on View Cart. + +5. From Cart, once you have added the desired products, you can click on proceed to checkout. + +6. All billing details and Order details can be seen now. Once you are ok with it, click on Place Order button. + +7. "Order Received" message can been seen indicating that the order is placed successfully. + +8. Now on system where ERPNEXT is installed check the following doctypes: Customer, Address, Item, Sales Order. + +Woocommerce Integration \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/fleet_management/_sidebar.json b/foundation/www/docs/user/manual/en/fleet_management/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/fleet_management/_sidebar.json +++ b/foundation/www/docs/user/manual/en/fleet_management/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/healthcare/_sidebar.json b/foundation/www/docs/user/manual/en/healthcare/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/healthcare/_sidebar.json +++ b/foundation/www/docs/user/manual/en/healthcare/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/healthcare/index.md b/foundation/www/docs/user/manual/en/healthcare/index.md index d8a94383..5c1322b1 100755 --- a/foundation/www/docs/user/manual/en/healthcare/index.md +++ b/foundation/www/docs/user/manual/en/healthcare/index.md @@ -1,14 +1,35 @@ -# Healthcare +# ERPNext for Healthcare -ERPNext Healthcare helps you manage your Clinic or Practice efficiently by scheduling **Appointments** and recording **Patient Encounters** (Consultations). You can easily pull out a **Patient's Health Record** anytime to review all the history of treatments assisting you in providing effective, high quality care. +Life is priceless, and you as a medical practioner needs a best tools to honour it. ERPNext Healthcare domain is a humble initiative to help you serve your patients better. -ERPNext Healthcare +ERPNext Healthcare -Patients can view various documents relevant to them and book Appointments via the **ERPNext Portal**. The healthcare module is integrated with **Accounts** and **Human Resources** modules, helping you in **Billing**, **Payroll Management** etc. and benefit from other rich features of ERPNext. You can configure the **Selling** and **Stock** modules manage your Pharmacy. +### What Healthcare Module Covers -ERPNext Healthcare also includes features for effectively managing the functions of an associated **Laboratory** by helping you record **Sample Collection**, emailing and printing **Lab Test** results etc. ERPNext Healthcare allows you to upload **Medical Code Standards** like **ICD10** and attach to Consultations. +ERPNext Healthcare helps you manage your clinic or practice efficiently by scheduling **Appointments** and recording **Patient Encounters** (Consultations). You can easily pull out a **Patient's Health Record** anytime to review all the history of treatments assisting you in providing effective, high quality care. -### Topics +ERPNext Healthcare -{index} +### Contributors of ERPNext Healthcare module + +The healthcare domain of ERPNext is a first domain to be competely contributed by a ERPNext community member, Earthians. Listen to Anoop, founder of Earthian on what motivated him to venture into Healthcare domain and how it benefit all the stack-holders of the community. + +
    +
    + +
    +
    + +### User Manual + +A clinic needs lots more than Healthcare module to operate efficiently. ERPNext has all of it available built-in. + +- You track your books of accounts using [Accounts module](/docs/user/manual/en/accounts.html). +- Manage payroll, leaves and claims of your support staff in the [HR module](/docs/user/manual/en/human-resources.html). +- Organize your [purchases](/docs/user/manual/en/buying.html) and place an approval system. + +Here is the stepwise guide on each functionality of ERPNext Healthcare module. + +{index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/healthcare/setup/_sidebar.json b/foundation/www/docs/user/manual/en/healthcare/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/healthcare/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/healthcare/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/hospitality/__init__.py b/foundation/www/docs/user/manual/en/hospitality/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/hospitality/_sidebar.json b/foundation/www/docs/user/manual/en/hospitality/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/hospitality/_sidebar.json +++ b/foundation/www/docs/user/manual/en/hospitality/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/_sidebar.json b/foundation/www/docs/user/manual/en/human-resources/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/human-resources/_sidebar.json +++ b/foundation/www/docs/user/manual/en/human-resources/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/articles/_sidebar.json b/foundation/www/docs/user/manual/en/human-resources/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/human-resources/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/human-resources/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/articles/index.txt b/foundation/www/docs/user/manual/en/human-resources/articles/index.txt index 3019af5d..d1e355c5 100644 --- a/foundation/www/docs/user/manual/en/human-resources/articles/index.txt +++ b/foundation/www/docs/user/manual/en/human-resources/articles/index.txt @@ -1,3 +1,3 @@ -employees-loan-management +loan-management leave-calculation-in-salary-slip working-days-in-salary-slip \ No newline at end of file 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/loan-management.md similarity index 69% rename from foundation/www/docs/user/manual/en/human-resources/articles/employees-loan-management.md rename to foundation/www/docs/user/manual/en/human-resources/articles/loan-management.md index 4b9de42d..e61da902 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/loan-management.md @@ -1,17 +1,17 @@ -

    Employees Loan Management

    +

    Loan Management

    -Employee Loan is an sum of money paid by Employer to Employee based on certain terms and condition. There are multiple ways accounting for the Employee loan can be managed. Company could collect loan from an employee separately. Or they can choose to deduct loan installment from the employee's salary. +Loan is an sum of money paid by Employer to Employee based on certain terms and condition. There are multiple ways accounting for the loan can be managed. Company could collect loan from an employee separately. Or they can choose to deduct loan installment from the employee's salary. -Let's check below how accounting can be managed for Employee Loan in ERPNext. +Let's check below how accounting can be managed for Loan in ERPNext. ### 1. Setup Masters Create following Groups and Ledgers in Chart of Accounts if not there. -#### 1.1 Employee Loan Account +#### 1.1 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/user/manual/en/setting-up/articles/managing-tree-structure-masters) +Create Group as 'Loans' under Current Assets and create 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) @@ -27,7 +27,7 @@ Create Ledger as 'Interest on Loan' under Indirect Income. ### 2. Book Loan Amount -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. +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 loan account. ![Loan Entry]({{docs_base_url}}/assets/img/articles/Selection_435.png) diff --git a/foundation/www/docs/user/manual/en/human-resources/employee-advance.md b/foundation/www/docs/user/manual/en/human-resources/employee-advance.md index 666cc6f7..3c88e816 100644 --- a/foundation/www/docs/user/manual/en/human-resources/employee-advance.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee-advance.md @@ -30,4 +30,8 @@ On submission of payment entry, the paid amount and status will be updated in Em ### Adjust advances on Expense Claim Later when employee claims the expense and advance record can be fetched in Expense Claim and linked to the claim record. -Employee Advance Payment via Payment Entry \ No newline at end of file +Employee Advance Payment via Payment Entry + +
    + +
    \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md b/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md deleted file mode 100644 index acad6252..00000000 --- a/foundation/www/docs/user/manual/en/human-resources/employee-loan-management.md +++ /dev/null @@ -1,57 +0,0 @@ - -# Employee Loan Management -This module enables companies which provides employee loans to define and manage employee loans. -Employees can request loans, which are then reviewed and approved. For the approved loans, -repayment schedule for the entire loan cycle can be generated and automatic deduction from salary can also be set up. - -### Loan Type -To create a new Loan Type go to: - -> Human Resources > Employee Loan Management > Loan Type > New Loan Type - -Configure Loan limit and Rate of interest. - -Loan Type - -### Employee Loan Application - -Employee can apply for loan by going to: - -> Human Resources > Employee Loan Management > Employee Loan Application > New Employee Loan Application - -Employee Loan Application - -#### In the Employee Loan Application, - - * Enter Employee details and Loan details - * Select the repayment method, and based on your selection enter Repayment Period in Months or repayment Amount - -On save, Employee can see Repayment Information and make changes if required before submitting. - -Employee Loan Application - -### Employee Loan - -Once the Loan is approved, Manager can create Employee Loan record for the Employee. - -> Human Resources > Employee Loan Management > Employee Loan > New Employee Loan - -Employee Loan Application - -#### In the Employee Loan, - - * Enter Employee and Loan Application - * Check "Repay from Salary" if the loan repayment will be deducted from the salary - * Enter Disbursement Date and Account Info - * As soon as you hit save, the repayment schedule is generated. - -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 - - - \ 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 846148b3..d67dcb2f 100644 --- a/foundation/www/docs/user/manual/en/human-resources/employee.md +++ b/foundation/www/docs/user/manual/en/human-resources/employee.md @@ -9,4 +9,8 @@ To create new Employee go to: 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 5779e321..424dfe4b 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 @@ -12,6 +12,12 @@ To make a new Expense Claim, go to: 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 diff --git a/foundation/www/docs/user/manual/en/human-resources/health-insurance.md b/foundation/www/docs/user/manual/en/human-resources/health-insurance.md new file mode 100644 index 00000000..72fe9507 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/health-insurance.md @@ -0,0 +1,16 @@ + +# Health Insurance + +Health Insurance is an important information attached to Employee. + +To create Health Insurance Provider: + +> Human Resources > Health Insurance > New + +Employee + +In Employee, you can attached the provider and fill in the Health Insurance No. + +Employee + +{next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/index.txt b/foundation/www/docs/user/manual/en/human-resources/index.txt index 758c4197..479e2dde 100644 --- a/foundation/www/docs/user/manual/en/human-resources/index.txt +++ b/foundation/www/docs/user/manual/en/human-resources/index.txt @@ -17,5 +17,5 @@ holiday-list human-resource-setup daily-work-summary fleet-management -employee-loan-management +loan-management articles 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 f0403aff..ac5c90d4 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 @@ -24,4 +24,10 @@ settings. See the earlier discussion on [Setting Up Permissions](/docs/user/manu for more info. 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/loan-management.md b/foundation/www/docs/user/manual/en/human-resources/loan-management.md new file mode 100644 index 00000000..e139ff52 --- /dev/null +++ b/foundation/www/docs/user/manual/en/human-resources/loan-management.md @@ -0,0 +1,70 @@ + +# Loan Management +This module enables companies which provides loans to define and manage loans. +Employees can request loans, which are then reviewed and approved. For the approved loans, +repayment schedule for the entire loan cycle can be generated and automatic deduction from salary can also be set up. + +### Loan Type +To create a new Loan Type go to: + +> Human Resources > Loan Management > Loan Type > New Loan Type + +Configure Loan limit and Rate of interest. + +Loan Type + +### Loan Application + +Employee can apply for loan by going to: + +> Human Resources > Loan Management > Loan Application > New Loan Application + +Loan Application + +#### In the Loan Application, + + * Enter Employee details and Loan details + * Select the repayment method, and based on your selection enter Repayment Period in Months or repayment Amount + +On save, Employee can see Repayment Information and make changes if required before submitting. + +Loan Application + +### Loan + +Once the Loan is approved, Manager can create Loan record for the Employee. + +> Human Resources > Loan Management > Loan > New Loan + +Loan Application + +#### In the Loan, + + * Enter Employee and Loan Application + * Check "Repay from Salary" if the loan repayment will be deducted from the salary + * Enter Disbursement Date, Repayment Start Date, and Account Info + * If the amount has been disbursed and status is set to "Disbursed", as soon as you hit save, the repayment schedule is generated. + * The first repayment payment date would be set as per the "Repayment Start Date". + +repayment Schedule + +#### Loan Repayment for Members + +* After submitting the document, if the status is "Disbursed" and "Repay from Salary" is unchecked, you can click on "Make Repayment Entry" and select the payments which haven't been paid till date. +* After selecting the rows, you will be routed to Journal Entry where the selected payments will be added and placed in their respective Debit/ Credit accounts. +* On submitting the Journal Entry, "Paid" will be checked in the payment rows of the Repayment Schedule, for which the Journal entry has been created. + +Make Repayment + +#### Loan repayment deduction from Salary + +To auto deduct the Loan repayment from Salary, check "Repay from Salary" in Loan. It will appear as Loan repayment in Salary Slip. + +Salary Slip + +
    + +
    + +{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 6a7052a9..b2a0d0df 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 @@ -170,6 +170,9 @@ created. Process Payroll - +
    + +
    {next} diff --git a/foundation/www/docs/user/manual/en/human-resources/setup/_sidebar.json b/foundation/www/docs/user/manual/en/human-resources/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/human-resources/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/human-resources/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/human-resources/tools/_sidebar.json b/foundation/www/docs/user/manual/en/human-resources/tools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/human-resources/tools/_sidebar.json +++ b/foundation/www/docs/user/manual/en/human-resources/tools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/introduction/_sidebar.json b/foundation/www/docs/user/manual/en/introduction/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/introduction/_sidebar.json +++ b/foundation/www/docs/user/manual/en/introduction/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md b/foundation/www/docs/user/manual/en/introduction/concepts-and-terms.md index 3062457a..ee528577 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 @@ -165,7 +165,7 @@ Customer's request to price an item or service. #### Sales Order A note confirming the terms of delivery and price of an Item (product or -service) by the Customer. Deliveries, Production Orders and Invoices are made +service) by the Customer. Deliveries, Work Orders and Invoices are made on basis of Sales Orders. > Selling > Sales Order @@ -361,16 +361,16 @@ direct cost of the product. > Manufacturing > Workstation -#### Production Order +#### Work Order A document signaling production (manufacture) of a particular Item with specified quantities. -> Manufacturing > Production Order +> Manufacturing > Work Order #### Production Planning Tool -A tool for automatic creation of Production Orders and Purchase Requests based +A tool for automatic creation of Work Orders and Purchase Requests based on Open Sales Orders in a given period. > Manufacturing > Production Planning Tool 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 8d21825a..fb0d84f1 100644 --- a/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md +++ b/foundation/www/docs/user/manual/en/introduction/implementation-strategy.md @@ -15,7 +15,7 @@ implementation should happen in two phases. * Create Customer Groups, Item Groups, Warehouses, Supplier Groups, so that you can classify your Items. * Complete a standard sales cycle - Lead > Opportunity > Quotation > Sales Order > Delivery Note > Sales Invoice > Payment (Journal Entry) * Complete a standard purchase cycle - Material Request > Purchase Order > Purchase Receipt > Payment (Journal Entry). - * Complete a manufacturing cycle (if applicable) - BOM > Production Planning Tool > Production Order > Material Issue + * Complete a manufacturing cycle (if applicable) - BOM > Production Planning Tool > Work Order > Material Issue * Replicate a real life scenario into the system. * Create custom fields, print formats etc as required. diff --git a/foundation/www/docs/user/manual/en/introduction/index.md b/foundation/www/docs/user/manual/en/introduction/index.md index 3322230b..a5ad6db1 100644 --- a/foundation/www/docs/user/manual/en/introduction/index.md +++ b/foundation/www/docs/user/manual/en/introduction/index.md @@ -42,6 +42,12 @@ Among other things, ERPNext will help you to: And a lot lot lot more. +
    +
    + +
    +
    ### Topics diff --git a/foundation/www/docs/user/manual/en/manufacturing/_sidebar.json b/foundation/www/docs/user/manual/en/manufacturing/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/_sidebar.json +++ b/foundation/www/docs/user/manual/en/manufacturing/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/_sidebar.json b/foundation/www/docs/user/manual/en/manufacturing/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md b/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md index f7a36bf3..cd2410f4 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/capacity-planning.md @@ -1,5 +1,5 @@ -# Capacity Planning based on Production Order +# Capacity Planning based on Work Order Capacity Planning functionality helps you in tracking production jobs allocated on each Workstation. @@ -25,19 +25,19 @@ Follow are the steps to use Capacity Planning Feature in your ERPNext account. In a BOM, with the list of raw material needed, for manufacturing, you can also list operation and workstations through which those raw materials will be processed. -4. Production Order: +4. Work Order: - On submission of Production Order, Timesheet for Operations. This helps you allocate production jobs on each Workstation, as well as you can update actual time taken for each Operation. + On submission of Work Order, Timesheet for Operations. This helps you allocate production jobs on each Workstation, as well as you can update actual time taken for each Operation. ### Error due to Capacity Planning -**Question:** On Submission of Production Order, we are getting following error message. +**Question:** On Submission of Work Order, we are getting following error message. Role Desk Permission -**Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Production Order. +**Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Work Order. -On submission of Production Order, Operations (as added in the BOM) are allocated on the workstation. Each operation should start and end on the same day. If a system is not able to schedule that operation in a day, then system request you to divide that Project, so that system can allocate smaller operations in a day. +On submission of Work Order, Operations (as added in the BOM) are allocated on the workstation. Each operation should start and end on the same day. If a system is not able to schedule that operation in a day, then system request you to divide that Project, so that system can allocate smaller operations in a day. If you have update working hours in the Workstation, but still getting this issue, that because one of your operation is taking too long, and cannot be completed in a day. Please divide that operation into smaller operations, so that it can be allocated on Workstation and completed on the same day. diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/material_consumption.md b/foundation/www/docs/user/manual/en/manufacturing/articles/material_consumption.md new file mode 100644 index 00000000..72ab4bf3 --- /dev/null +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/material_consumption.md @@ -0,0 +1,35 @@ + +#Material consumption + +Material Consumption functionality allows you to have multiple consumption `Stock Entry` against a Work Order. To enable this, go to Manufacturing > Manufacturing Settings. + +Item Alternative + +Once enabled, a `Material Consumption` button will be available in Work Order once started. + +Item Alternative + +When button is clicked, it will do the following: + +1. It will create Stock Entry with purpose `Material Consumption for Manufacture`. + +Item Alternative + +2. If the "Backflush Raw Materials Based On" in the Manufacturing Settings is set to `BOM`, if will propose to consume all required qty for manufacture. +3. If the "Backflush Raw Materials Based On" in the Manufacturing Settings is set to `Material Transferred for Manufacture`, if will propose to consume all transferred qty for manufacture. +4. Once submitted, it will update `Consumed Qty` column in the Work Order. + +Item Alternative + +5. In succeeding Material Consumption, it will suggest unconsumed qty. +6. Once "Finish" button is clicked in Work Order, it will take into account consumed qty. + +### Validations + +* If "Allow Multiple Material Consumption" is not set in Manufacturing Settings but "Material Consumption for Manufacture" is use in Stock Entry. + +Item Alternative + +* Cannot cancel "Material Consumption for Manufacture" for completed Work Order. + +Item Alternative 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..a26a3e7a 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 @@ -7,4 +7,4 @@ Production Planning Tool has field called "Use Multi-Level BOM", checking which -`Use Multi-Level BOM` field is also there in the Production Order and Stock Entry. If checked, raw-materials of sub-assembly item will be consumed in the manufacturing process, and not the sub-assembly item itself. +`Use Multi-Level BOM` field is also there in the Work Order and Stock Entry. If checked, raw-materials of sub-assembly item will be consumed in the manufacturing process, and not the sub-assembly item itself. 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 1eb618a5..a4a51a4f 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 @@ -6,6 +6,12 @@ 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 have its own BOM hence forming a tree of Items with multiple levels. +
    + +
    + + To make accurate Purchase Requests, you must always maintain correct BOMs. To make a new BOM: @@ -19,7 +25,7 @@ To make a new BOM: * 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. - * Workstations are defined only for product costing and Production Order Operations scheduling purposes not inventory. + * Workstations are defined only for product costing and Work Order Operations scheduling purposes not inventory. * Inventory is tracked in Warehouses not Workstations. ###Costing of a BOM diff --git a/foundation/www/docs/user/manual/en/manufacturing/index.md b/foundation/www/docs/user/manual/en/manufacturing/index.md index a2e22e4f..37c332f2 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/index.md +++ b/foundation/www/docs/user/manual/en/manufacturing/index.md @@ -1,11 +1,33 @@ -# Manufacturing +# ERPNext for Manufacturers -The Manufacturing module in ERPNext helps you to maintain multi-level Bill of -Materials (BOMs) for your Items. -It helps in product costing, production planning, creating production orders for your manufacturing shop floors and -planning inventory by getting your material requirement via BOMs (also called Material Requirements Planning MRP). +ERPNext comes batteries included for all requirements of a manufacturing business like Bill of Materials tracking, Production Order planning and execution, procurement and lot more. -### Topics +BOM + +### Bill of Material, Production Order and More + +The Manufacturing module in ERPNext helps you to maintain multi-level Bill of Materials (BOMs) for your Items. It helps in product costing, production planning, creating work orders for your manufacturing shop floors and planning inventory by getting your material requirement via BOMs (also called Material Requirements Planning MRP). + +BOM + +You can also effectively track operations like: + +* Production Orders against customer's Sales Order +* Material Planning +* Purchasing based on Material Planning an reorder level. +* Track actual material transfer against a Production Order +* Despatched manufactured items to the Customers. +* View reports + +### ERPNext Manufacturing Demo + +Check the following video to educate yourself on each feature in the manufacturing module. + +
    + +
    + +### User Manual {index} diff --git a/foundation/www/docs/user/manual/en/manufacturing/index.txt b/foundation/www/docs/user/manual/en/manufacturing/index.txt index 3b932a52..9befc663 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/index.txt +++ b/foundation/www/docs/user/manual/en/manufacturing/index.txt @@ -1,9 +1,10 @@ introduction bill-of-materials -production-order +work-order workstation operation subcontracting +item-alternative tools setup articles diff --git a/foundation/www/docs/user/manual/en/manufacturing/introduction.md b/foundation/www/docs/user/manual/en/manufacturing/introduction.md index 90fcafca..79f57ffa 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/introduction.md +++ b/foundation/www/docs/user/manual/en/manufacturing/introduction.md @@ -22,6 +22,6 @@ with the Projects module.. You can track work-in-progress by creating work-in-progress Warehouses. ERPNext will help you track material movement by automatically creating Stock -Entries from your Production Orders by building from Bill of Materials. +Entries from your Work Orders by building from Bill of Materials. {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/item-alternative.md b/foundation/www/docs/user/manual/en/manufacturing/item-alternative.md new file mode 100644 index 00000000..e4b724ff --- /dev/null +++ b/foundation/www/docs/user/manual/en/manufacturing/item-alternative.md @@ -0,0 +1,33 @@ + +# Item Alternative + +Item alternative feature is very useful in manufacturing industries, if the raw material defined in the BOM is not available during the production process then their respective available alternative item used to complete the production process. + +To make item alaternative for an item, kindly enable the "Allow Alternative Item" in the item. +Item + +* To make item alternative, goto module Stock > Items and Pricing > Item Alternative +Item Alternative + +The user can enable Two-Way between an item and their alternative item if both can be used as an alternative to each other + + +### Item Alternative for work order + +To allow to use alternative items in the manufacturing process user can configure allow an alternative item in the BOM/Work Order + +##### Provision to allow alternative item in the bom +Item + +##### Provision to allow alternative item in the work order +User can also enable/disable allow alternative item in the work order +Item + +##### How it works for work order +Item + +### Item Alternative for subcontract +In subcontract, the user has to transfer raw materials to the subcontracted supplier to get finished good from them. If the raw material is not available in the stock, with this feature, the user can transfer the alternate item of the subcontracted raw material to the supplier. + +##### How it works for subcontract +Item \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/operation.md b/foundation/www/docs/user/manual/en/manufacturing/operation.md index 54b934ae..fe158e8d 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/operation.md +++ b/foundation/www/docs/user/manual/en/manufacturing/operation.md @@ -11,4 +11,9 @@ You can also create a Operation by: Operation +
    + +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/production-plan.md b/foundation/www/docs/user/manual/en/manufacturing/production-plan.md index cdb51645..79265745 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/production-plan.md +++ b/foundation/www/docs/user/manual/en/manufacturing/production-plan.md @@ -21,7 +21,7 @@ To use the Production Plan, go to: Sales Orders -* Click on Get Items for Production Order to fetch the items from the above sales orders. +* Click on Get Items for Work Order to fetch the items from the above sales orders. Sales Order Item * Include Exploded Items :- To include subassembly items of raw materials in the production. @@ -36,7 +36,7 @@ To use the Production Plan, go to: Material Requests -* Click on Get Items for Production Order to fetch the items from the above material requests. +* Click on Get Items for Work Order to fetch the items from the above material requests. Material Request Item @@ -49,6 +49,6 @@ To use the Production Plan, go to: * Include Subcontracted Items :- To add subcontracted item's raw materials if include exploded items is disabled * Ignore Existing Ordered Quantity :- If enabled then system will not check the projected quantity to make material request. -# Options To Make Production Order and Material Request +# Options To Make Work Order and Material Request Make PO or MR diff --git a/foundation/www/docs/user/manual/en/manufacturing/setup/_sidebar.json b/foundation/www/docs/user/manual/en/manufacturing/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/manufacturing/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md index 4b37a763..929b04ba 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 @@ -9,7 +9,7 @@ Manufacturing Settings can be found at: ####Disable Capacity Planning and Time Tracking -As per Capacity Planning feature, when Production Order is created for an item, for each Operation, Time Log is created. Based on actual Operation Time, Time Logs is updated. This also provides total Operations Cost against Production Order. +As per Capacity Planning feature, when Work Order is created for an item, for each Operation, Time Log is created. Based on actual Operation Time, Time Logs is updated. This also provides total Operations Cost against Work Order. If you don't track actual operations time, and want to disable creation of Time Log based on Operations, you should check "Disable Capacity Planning and Time Tracking" in the Manufacturing Settings. @@ -29,11 +29,11 @@ Holiday of a company can be recorded in the [Holiday List](/docs/user/manual/en/ ####Over Production Allowance Percentage -While making Production Orders against a Sales Order, the system will only allow production item quantity to be lesser than or equal to the quantity in the Sales Order. In case you wish to allow Production Orders to be raised with greater quantity, you can mention the Over Production Allowance Percentage here. +While making Work Orders against a Sales Order, the system will only allow production item quantity to be lesser than or equal to the quantity in the Sales Order. In case you wish to allow Work Orders to be raised with greater quantity, you can mention the Over Production Allowance Percentage here. ####Back-flush Raw Materials Based On -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". +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 Work Order instead, then you should set Back-flush Raw Materials Based On "Material Transferred for Manufacture". Manufacturing Settings @@ -47,8 +47,8 @@ Time gap between two production operations. ####Default Work In Progress Warehouse -This Warehouse will be auto-updated in the Work In Progress Warehouse field of Production Order. +This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Order. ####Default Finished Goods Warehouse -This Warehouse will be auto-updated in the Work In Progress Warehouse field of Production Order. +This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Order. diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/_sidebar.json b/foundation/www/docs/user/manual/en/manufacturing/tools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/tools/_sidebar.json +++ b/foundation/www/docs/user/manual/en/manufacturing/tools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/manufacturing/tools/index.txt b/foundation/www/docs/user/manual/en/manufacturing/tools/index.txt index a3851545..bdd357cd 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/tools/index.txt +++ b/foundation/www/docs/user/manual/en/manufacturing/tools/index.txt @@ -1,2 +1 @@ -production-planning-tool bom-update-tool \ No newline at end of file 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 deleted file mode 100644 index 26c49822..00000000 --- a/foundation/www/docs/user/manual/en/manufacturing/tools/production-planning-tool.md +++ /dev/null @@ -1,71 +0,0 @@ - -# Production Planning Tool - -Production Planning Tool helps you plan production and purchase of Items for a -period (usually a week or a month). - -This list of Items can be generated from the open Sales Orders or pending Material Requests that can be Manufactured in the system -and will generate: - - * Production Orders for each Item. - * Purchase Requests for Items whose Projected Quantity is likely to fall below zero. - -To use the Production Planning Tool, go to: - -> Manufacturing > Tools > Production Planning Tool - -Production Planing Tool - -#### Step 1: Specify source to get Production Items - -* You can select Sales Order or Material Request according to where you want to source the items from -* If you plan to add items manually, keep the "Get items from" field empty - - - -#### Step 2: Select and get Sales Order / Material Request - -* Use filters to get the Sales Order / Material Request -* Click on Get Sales Order / Get Material Requests to generate a list. - -Production Planing Tool - - - -#### Step 3: Get Items - -* Get the items for the Sales Order / Material request list -* You can add/remove or change quantity of these Items. - -Production Planing Tool - -#### Step 4: Create Production Orders - -Production Planing Tool - - - -#### Step 5: Create Material Request - -Create Material Request for Items with projected shortfall. - -Production Planing Tool - - - -The Production Planning Tool is used in two stages: - - * Selection of open Sales Orders / pending Material Request for the period based on “Expected Delivery Date”. - * Selection of Items from those Sales Orders / Material Requests - -The tool will update if you have already created Production Orde rs for a -particular Item against its Sales Order (“Planned Quantity”) or Material Request. - -You can always edit the Item list and increase / reduce quantities to plan -your production. - -> Note: How do you change a Production Plan? The output of the Production -Planning Tool is the Production Order. Once your orders are created, you can -change them by amending the Production Orders. - -{next} diff --git a/foundation/www/docs/user/manual/en/manufacturing/production-order.md b/foundation/www/docs/user/manual/en/manufacturing/work-order.md similarity index 54% rename from foundation/www/docs/user/manual/en/manufacturing/production-order.md rename to foundation/www/docs/user/manual/en/manufacturing/work-order.md index 1dde4f76..ca4efaee 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/production-order.md +++ b/foundation/www/docs/user/manual/en/manufacturing/work-order.md @@ -1,22 +1,27 @@ -# Production Order +# Work Order -Production Order -A Production Order (also known as a Work Order) is a document that is given to +Work Order +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 +a certain quantity of a certain Item. The Work Order also helps to generate the material requirements (Stock Entry) for the Item to be produced from its **Bill of Materials**. -The **Production Order** is generated from the **Production Planning -Tool** based on Sales Orders. You can also create a direct Production Order +The **Work Order** is generated from the **Production Planning +Tool** based on Sales Orders. You can also create a direct Work Order by: -> Manufacturing > Documents > Production Order > New +> Manufacturing > Documents > Work Order > New -Production Order +Work Order -### Creating Production Orders +
    + +
    + +### Creating Work Orders * Select the Item to be produced. * The default BOM for that item will be fetched by the system. You can also change BOM. @@ -24,36 +29,36 @@ by: * If the selected BOM has operartion mentioned in it, the system shall fetch all operations from BOM. * Mention the Planned Start Date (an Estimated Date at which you want the Production to begin.) * Select Warehouses: - * Source Warehouses: The warehouse where you store your raw materials. Each required item can have separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of Production Order, the raw mateirals will be reserved in these warehouses for production usage. + * Source Warehouses: The warehouse where you store your raw materials. Each required item can have separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of Work Order, the raw mateirals will be reserved in these warehouses for production usage. * Work-in-Progress Warehouse: The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as Work-in-Progress warehouse. * Target Warehouse: The warehouse where you store finished Items before they are shipped. * Scrap Warehouse: Scrap Items will be stored in this warehouse. * Required Items: All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the default source warehouse for any item. And during the production, you can track transferred raw materials from this table. -> Note : You can save a Production Order without selecting the warehouses, but warehouses are mandatory for submitting a Production Order +> Note : You can save a Work Order without selecting the warehouses, but warehouses are mandatory for submitting a Work Order ###Reassigning Workstation/Duration for Operations -* By default the system fetchs workstation and duration for Production Order Operations from the selected BOM. +* By default the system fetchs workstation and duration for Work Order Operations from the selected BOM. 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. +* If you wish to reassign the workstation for a particular opeeration in the Work Order, you can do so before submitting the Work Order. PO reassigning Operations * Select the respective operation, and change its workstation. * You can also change the Operating Time for that operation -### Capacity Planning in Production Order +### Capacity Planning in Work Order -* When a Production Order is submitted, based on the Planned Start Date and the availability of the workstations, system schedules all operations for the Production Order (if Production Order has operations specified). +* When a Work Order is submitted, based on the Planned Start Date and the availability of the workstations, system schedules all operations for the Work Order (if Work Order has operations specified). * Drafts of Time Logs are also created based on the scheduled operations. ### Transfering Materials for Manufacturing -* Once you have submitted your Production Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process. -* This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above). +* Once you have submitted your Work Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process. +* This will create a Stock Entry with all the Items required to complete this Work Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above). * Click on 'Start'. @@ -67,29 +72,29 @@ by: Stock Entry for PO -* Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry. +* Material Transfered for Manufacturing will be updated in the Work Order based on the Stock Entry. Stock Entry for PO #### Material Transfer through Stock Entry Use cases for this option are: -* If material transfer is done in bulk and/or is not required to be tracked against a particular Production Order +* If material transfer is done in bulk and/or is not required to be tracked against a particular Work Order * If the responsibility for Material Transfer and Production Entry lies with two separate users If this is the case, you can select the Skip Material Transfer check box, which will allow you to make the “Manufacture” Stock Entry directly by clicking on the ‘Finish’ button. ### Making Time Logs -* 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. +* Progress in the Work Order can be tracked using [Timesheet](/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.html) +* Timesheet's time slots are created against Work Order Operations. +* Drafts of Timesheet are created based on the scheduled operations when an Work Order is Submitted. * To create more Timesheets against an operation click 'Make Timesheet' button. Make timesheet against PO ###Updating Finished Goods -* Once you are done with the Production Order you need to update the Finished Goods. +* Once you are done with the Work Order you need to update the 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. * Click on 'Finish'. @@ -99,23 +104,23 @@ If this is the case, you can select the Skip Material Transfer check box, which Update Finished Goods Qty - > Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry. + > Tip : You can also partially complete a Work Order by updating the Finished Goods stock creating a Stock Entry. -### Stopping a Production Order +### Stopping a Work Order -* When you stop a Production Order its status is changed to Stop indicating that all production process against that Production Order is to be ceased. -* To stop the Production Order click on the 'Stop' Button +* When you stop a Work Order its status is changed to Stop indicating that all production process against that Work Order is to be ceased. +* To stop the Work Order click on the 'Stop' Button - 1. On Submitting the Production Order, the system will reserve a slot for each of the Production Order Operations serially after the planned start date based on the workstation availability. The Workstation availability depends on the Workstation timings, holiday list and if some other Production Order Operation was scheduled in that slot. You can mention the number of days for the system to try scheduling the operations in the Manufacturing Settings. This is set to 30 Days by default. If the operation requires time exceeding the available slot, system shall ask you to break the operations. Once the scheduling is done system shall create Time Logs and save them. You can Modify them and submit them later. + 1. On Submitting the Work Order, the system will reserve a slot for each of the Work Order Operations serially after the planned start date based on the workstation availability. The Workstation availability depends on the Workstation timings, holiday list and if some other Work Order Operation was scheduled in that slot. You can mention the number of days for the system to try scheduling the operations in the Manufacturing Settings. This is set to 30 Days by default. If the operation requires time exceeding the available slot, system shall ask you to break the operations. Once the scheduling is done system shall create Time Logs and save them. You can Modify them and submit them later. 2. You can also create additional time logs against an Operation. For doing so select the respective operation and click on 'Make Time Log' - 3. Transfer Raw Material: This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above). + 3. Transfer Raw Material: This will create a Stock Entry with all the Items required to complete this Work Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above). 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' + 5. To check all Time Logs made against the Work Order click on 'Show Time Logs' PO - stop -* You can also re-start a stopped Production Order. +* You can also re-start a stopped Work Order. -> Note : In order to make a Production Order against an Item you must specify 'Yes' to "Allow Production Order" on the Item form. +> Note : In order to make a Work Order against an Item you must specify 'Yes' to "Allow Work Order" on the Item form. {next} diff --git a/foundation/www/docs/user/manual/en/manufacturing/workstation.md b/foundation/www/docs/user/manual/en/manufacturing/workstation.md index 4f5b50bd..6053b72f 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/workstation.md +++ b/foundation/www/docs/user/manual/en/manufacturing/workstation.md @@ -15,8 +15,14 @@ You can also create a Workstation by: 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. +While scheduling Work 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/user/manual/en/manufacturing/setup/manufacturing-settings.html) + +
    + +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Chapter/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Chapter/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Chapter/_sidebar.json +++ b/foundation/www/docs/user/manual/en/non_profit/Chapter/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json +++ b/foundation/www/docs/user/manual/en/non_profit/Donor/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json +++ b/foundation/www/docs/user/manual/en/non_profit/Grant Application/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json +++ b/foundation/www/docs/user/manual/en/non_profit/Membership/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json +++ b/foundation/www/docs/user/manual/en/non_profit/Volunteer/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/_sidebar.json b/foundation/www/docs/user/manual/en/non_profit/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/non_profit/_sidebar.json +++ b/foundation/www/docs/user/manual/en/non_profit/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/non_profit/index.md b/foundation/www/docs/user/manual/en/non_profit/index.md index 589e422b..c1b2a13e 100644 --- a/foundation/www/docs/user/manual/en/non_profit/index.md +++ b/foundation/www/docs/user/manual/en/non_profit/index.md @@ -1,24 +1,29 @@ -# Non Profit +# ERPNext for Non-Profit Organizations +People who change the world need the tools to do it! The Non Profit Modules of ERPNext is designed for an non-profit organization, so that they can deliver well on their noble cause of a better world. -The Non Profit Modules in ERPNext is designed to meet requirements of NGO and Non Profit Organization. This is a centralized system, which maintains and updates all the activities related to an Organization. +Non Profit -This will track all activity related to Memberships, Chapters, Volunteer Management, -Donor Management, Event and Grant etc +### Manager Members, Donors, Voluteers and More +This is a centralized system, which maintains and updates all the activities related to an Organization. -### Desk Page - +This will track all activity related to Memberships, Chapters, Volunteer Management, Donor Management, Event and Grant etc. -
    -
    - Non Profit Domain -
    -
    +Non Profit -### Non Profit Domain -Non Profit +### Demonstration of ERPNext Non-Profit Domain + +Check the following video to educate yourself on each feature in the non-profit module. + +
    +
    + +
    +
    + +### User Manual {index} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/_sidebar.json b/foundation/www/docs/user/manual/en/projects/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/projects/_sidebar.json +++ b/foundation/www/docs/user/manual/en/projects/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/articles/_sidebar.json b/foundation/www/docs/user/manual/en/projects/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/projects/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/projects/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/index.md b/foundation/www/docs/user/manual/en/projects/index.md index 8713a172..74e7ae2b 100644 --- a/foundation/www/docs/user/manual/en/projects/index.md +++ b/foundation/www/docs/user/manual/en/projects/index.md @@ -1,16 +1,43 @@ -# Projects +# ERPNext for Services + +For a services business, which doesn't have a tangible product to showcase their value, needs to get many things right to stay afloat and grow in the industry. ERPNext helps services company effectively manage business aspects like Projects Management, Customer Support, Sales and Purchase Management to list a few. + +Gannt + +### Project Management in ERPNext ERPNext helps you manage your Projects by breaking them into Tasks and allocating them to different people. -Purchasing and selling can also be tracked against Projects and this can help -the company keep tabs on its budget, delivery and profitability for a Project. +Project Projects can be used to manage internal projects, manufacturing jobs or -service jobs. For service jobs, Time Sheets can also be created that can be -used to bill Customers if billing is done on a Time & Money basis. +service jobs. For service jobs, Time Sheets can also be created that can be used to bill Customers if billing is done on a Time & Money basis. -### Topics +### Sales, Purchase Management, Customer Support + +Purchasing and selling can also be tracked against Projects and this can help the company keep tabs on its budget, delivery and profitability for a Project. + +Non Profit + +### Demo on ERPNext for the Service Business + +Check the following video to educate yourself on the ERPNext features for services business. + +
    +
    + +
    +
    + +### User Manual + +A services company needs lots more than projects module to operate efficiently. ERPNext has all of it available built-in. + +- You track your books of accounts using [Accounts module](/docs/user/manual/en/accounts.html). +- Manage payroll, leaves and claims of your support staff in the [HR module](/docs/user/manual/en/human-resources.html). +- Attend customer's support queries better with [Support](/docs/user/manual/en/support.html) module of ERPNext. {index} diff --git a/foundation/www/docs/user/manual/en/projects/project.md b/foundation/www/docs/user/manual/en/projects/project.md index 86e91778..f8f3f899 100644 --- a/foundation/www/docs/user/manual/en/projects/project.md +++ b/foundation/www/docs/user/manual/en/projects/project.md @@ -5,6 +5,11 @@ Project management in ERPNext is Task driven. You can create Project and assign Project +
    + +
    + You can also track % Completion of a Project using different methods. 1. Task Completion diff --git a/foundation/www/docs/user/manual/en/projects/tasks.md b/foundation/www/docs/user/manual/en/projects/tasks.md index 931d1572..fc37305f 100644 --- a/foundation/www/docs/user/manual/en/projects/tasks.md +++ b/foundation/www/docs/user/manual/en/projects/tasks.md @@ -59,4 +59,8 @@ The system shall update the total amount from expense claims in the costing sect Task - Total Expense Claim +
    + +
    + {next} diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/_sidebar.json b/foundation/www/docs/user/manual/en/projects/timesheet/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/_sidebar.json +++ b/foundation/www/docs/user/manual/en/projects/timesheet/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/index.md b/foundation/www/docs/user/manual/en/projects/timesheet/index.md index f087e6aa..40378bd3 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/index.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/index.md @@ -4,7 +4,7 @@ Timesheet can be used for track actual hours worked. It can be used for multiple purposes like: * Billable work to Customers -* Production Order Operations +* Work Order Operations * Creating Salary Slip based on hours worked. * Tasks * Project diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/index.txt b/foundation/www/docs/user/manual/en/projects/timesheet/index.txt index 47d5ea1e..287d5263 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/index.txt +++ b/foundation/www/docs/user/manual/en/projects/timesheet/index.txt @@ -1,3 +1,4 @@ salary-slip-from-timesheet sales-invoice-from-timesheet -timesheet-against-production-order \ No newline at end of file +timesheet-against-work-order +timer-in-timesheet diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/timer-in-timesheet.md b/foundation/www/docs/user/manual/en/projects/timesheet/timer-in-timesheet.md new file mode 100644 index 00000000..1af8930b --- /dev/null +++ b/foundation/www/docs/user/manual/en/projects/timesheet/timer-in-timesheet.md @@ -0,0 +1,27 @@ + + +# Timer in Timesheet + +Timesheets can be tracked against Project and Tasks along with a Timer. + +Timer + +#### Steps to start a Timer: + +- On clicking, **Start Timer**, a dialog pops up and starts the timer for already present activity for which checkbox `completed` is unchecked. + +Timer in Progress + +- If no activities are present, fill up the activity details, i.e. activity type, expected hours or project in the dialog itself, on clicking **Start**, a new row is added into the Timesheet Details child table and timer begins. + +- On clicking, **Complete**, the `hours` and `to_time` fields are updated for that particular activity. + +Timer Completed + +- At any point of time, if the dialog is closed without completing the activity, on opening the dialog again, the timer resumes by calculating how much time has elapsed since `from_time` of the activity. + +- If any activities are already present in the Timesheet with completed unchecked, clicking on **Resume Timer** fetches the activity and starts its timer. + +- If the time exceeds the `expected_hours`, an alert box appears. + +Timer Exceeded 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 87ec4c70..3e4acfb6 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 @@ -5,6 +5,11 @@ Timesheets can be tracked against Project and Tasks so that you can get reports 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/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.html). 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-work-order.md similarity index 59% rename from foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md rename to foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.md index 6ba2edf1..691db2e4 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-work-order.md @@ -1,40 +1,40 @@ -#Timesheet based on Production Order +#Timesheet based on Work 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. +Creating Timesheet for Work 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. +When a Work Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet. 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. -####Production Order +####Work Order 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. +On submission on Work Order, Timesheet will be created automatically. -Sales Invoice +Sales Invoice -####Time Sheet created from Production Order +####Time Sheet created from Work 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. +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 Work 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. +On the submission of Timesheet, Total Hours is calculated. Also, in the Work Order, for each Operation, actual Start and End Time is updated. -Sales Invoice +Sales Invoice diff --git a/foundation/www/docs/user/manual/en/regional/_sidebar.json b/foundation/www/docs/user/manual/en/regional/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/regional/_sidebar.json +++ b/foundation/www/docs/user/manual/en/regional/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/regional/france/_sidebar.json b/foundation/www/docs/user/manual/en/regional/france/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/regional/france/_sidebar.json +++ b/foundation/www/docs/user/manual/en/regional/france/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/regional/france/local_overrides.md b/foundation/www/docs/user/manual/en/regional/france/local_overrides.md index b6a9cbde..25505e13 100644 --- a/foundation/www/docs/user/manual/en/regional/france/local_overrides.md +++ b/foundation/www/docs/user/manual/en/regional/france/local_overrides.md @@ -6,3 +6,13 @@ In order to be compliant with the latest finance law applicable to POS software, If your country is set to "France", the deletion of sales and payment transactions will also not be permitted, even if the appropriate permissions are given to the user. Please note that ERPNext is not yet fully compliant with the 2016 Finance Law. + +# Chained log Report + +A dedicated report called "Transaction Log Report" is available to verify that the logged chain has not been broken. + +If the status of the column "Chain Integrity" is "True", the chain has not been broken. +It means that you can consult the full chain of events that occurred in your system. + +If the status of the column "Chain Integrity" is "False", it means that there is a discrepancy in the chain. +In this case, the previous row has been removed or altered in the database. It is a probable effect of a fraudulent behavior. diff --git a/foundation/www/docs/user/manual/en/regional/india/_sidebar.json b/foundation/www/docs/user/manual/en/regional/india/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/regional/india/_sidebar.json +++ b/foundation/www/docs/user/manual/en/regional/india/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/__init__.py b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json +++ b/foundation/www/docs/user/manual/en/regional/united_arab_emirates/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/__init__.py b/foundation/www/docs/user/manual/en/schools/Assessment/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/_sidebar.json b/foundation/www/docs/user/manual/en/schools/Assessment/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/_sidebar.json +++ b/foundation/www/docs/user/manual/en/schools/Assessment/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/__init__.py b/foundation/www/docs/user/manual/en/schools/Attendance/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/Attendance/_sidebar.json b/foundation/www/docs/user/manual/en/schools/Attendance/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/schools/Attendance/_sidebar.json +++ b/foundation/www/docs/user/manual/en/schools/Attendance/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/__init__.py b/foundation/www/docs/user/manual/en/schools/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/_sidebar.json b/foundation/www/docs/user/manual/en/schools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/schools/_sidebar.json +++ b/foundation/www/docs/user/manual/en/schools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/admission/__init__.py b/foundation/www/docs/user/manual/en/schools/admission/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/admission/_sidebar.json b/foundation/www/docs/user/manual/en/schools/admission/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/schools/admission/_sidebar.json +++ b/foundation/www/docs/user/manual/en/schools/admission/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/fees/__init__.py b/foundation/www/docs/user/manual/en/schools/fees/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/fees/_sidebar.json b/foundation/www/docs/user/manual/en/schools/fees/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/schools/fees/_sidebar.json +++ b/foundation/www/docs/user/manual/en/schools/fees/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/schedule/__init__.py b/foundation/www/docs/user/manual/en/schools/schedule/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/schedule/_sidebar.json b/foundation/www/docs/user/manual/en/schools/schedule/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/schools/schedule/_sidebar.json +++ b/foundation/www/docs/user/manual/en/schools/schedule/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/setup/__init__.py b/foundation/www/docs/user/manual/en/schools/setup/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/setup/_sidebar.json b/foundation/www/docs/user/manual/en/schools/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/schools/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/schools/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/schools/student/__init__.py b/foundation/www/docs/user/manual/en/schools/student/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/schools/student/_sidebar.json b/foundation/www/docs/user/manual/en/schools/student/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/schools/student/_sidebar.json +++ b/foundation/www/docs/user/manual/en/schools/student/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/_sidebar.json b/foundation/www/docs/user/manual/en/selling/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/selling/_sidebar.json +++ b/foundation/www/docs/user/manual/en/selling/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/articles/_sidebar.json b/foundation/www/docs/user/manual/en/selling/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/selling/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md b/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md index f379e991..cd5cee99 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 @@ -44,4 +44,9 @@ You can notify, Suppliers by sending a email after submitting Purchase Order by ###Video Help on Drop Ship - \ No newline at end of file +
    + +
    + +{next} \ No newline at end of file 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 4e39d416..5e3462c3 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 @@ -41,6 +41,9 @@ ERPNext is the permission controlled system. Users access system based on permis You can also refer to help video on User and Permissions setting in ERPNext. - +
    + +
    \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/index.md b/foundation/www/docs/user/manual/en/selling/index.md index dfe9a39d..ca885597 100644 --- a/foundation/www/docs/user/manual/en/selling/index.md +++ b/foundation/www/docs/user/manual/en/selling/index.md @@ -10,3 +10,9 @@ organized and searchable manner. ### Topics {index} + + +
    + +
    diff --git a/foundation/www/docs/user/manual/en/selling/setup/_sidebar.json b/foundation/www/docs/user/manual/en/selling/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/selling/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/setup/item-price.md b/foundation/www/docs/user/manual/en/selling/setup/item-price.md index 82a68b4d..ba8061fb 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 @@ -5,11 +5,11 @@ 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. -> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price +> Selling/Buying/Stock > Setup > Item Price > New Item Price Or -> Item >> Add/Edit Prices >> Click on "+" >> New Item Price +> Item > Add/Edit Prices > Click on "+" >> New Item Price Following are the steps to create new Item Price. @@ -17,7 +17,7 @@ Step 1: Select Price List You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. -+Item Price list +Item Price list On selection of Price List, its currency and for selling or buying property will be fetched as well. @@ -27,20 +27,28 @@ 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 To check all Item Price together, go to: -Stock >> Main Report >> Itemwise Price List Rate +> Stock > Main Report > Itemwise Price List Rate You will find option to create new Item Price record (+) in this report as well. +div> + +
    + +
    +
    + {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md b/foundation/www/docs/user/manual/en/setting-up/authorization-rule.md index 5fa1a776..00eaff80 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 @@ -11,7 +11,7 @@ To create new Authorization Rule, go to: Let's consider an example of Authorization Rule to learn better. -Assume that Sales Manager needs to authorize Sales Orders, only if its Grand Total value exceeds 10000. If Sales Orer values is less than 10000, then even Sales User will be able to submit it. It means Submit permision of Sales User will be restricted only upto Sales Order of Grand Total less than 10000. +Assume that Sales Manager needs to authorize Sales Orders, only if its Grand Total value exceeds 10000. If Sales Order values is less than 10000, then even Sales User will be able to submit it. It means Submit permision of Sales User will be restricted only upto Sales Order of Grand Total less than 10000. **Step 1:** diff --git a/foundation/www/docs/user/manual/en/setting-up/data/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/data/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/data/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/data/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/data/data-export-tool.md b/foundation/www/docs/user/manual/en/setting-up/data/data-export-tool.md new file mode 100644 index 00000000..91cb1fc5 --- /dev/null +++ b/foundation/www/docs/user/manual/en/setting-up/data/data-export-tool.md @@ -0,0 +1,33 @@ + +# Data Export Tool + +Use this tool to export data in Excel or CSV format + +To open the Data Export Tool, you can either go to Setup > Data Export OR simply type `Data Export` in Global Search. + +Data Export + +### Options + +1. Select Doctype + + You will be provided with the list of document types which you can export. Scroll through the list or type the name of the Doctype you want to export. + +2. File Type + + Select File format of the data to be exported (Excel or CSV). + +3. Add Filter (optional) + + Add filters to export only required data. + This filter is similar to the filter in list view. + + eg. If you want the data of project related to specific company, you can use the filter to select the company. + +4. Field Multicheck (optional) + + Only checked fields will be exported. + +**Note:** + + If you do not want a child table to be exported simply deselect all the fields of that child table. diff --git a/foundation/www/docs/user/manual/en/setting-up/email/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/email/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/email/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/email/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/email/email-account.md b/foundation/www/docs/user/manual/en/setting-up/email/email-account.md index 257270c5..e29d8c05 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 @@ -43,4 +43,9 @@ If you would like ERPNext to notify you if an email is unreplied for a certain a Incoming EMail + +
    + +
    + {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/feedback/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/feedback/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/feedback/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md b/foundation/www/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md index d3035c38..0378767a 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 @@ -5,7 +5,7 @@ We can also send the feedback request to Customer/User without configuring the 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. +and click on Request Feedback option in Menu. Setting Condition diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/integrations/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/gocardless-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/gocardless-integration.md new file mode 100644 index 00000000..3a3c92b3 --- /dev/null +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/gocardless-integration.md @@ -0,0 +1,45 @@ + +# Setting up GoCardless + +To setup GoCardless, go to `Explore > Integrations > GoCardless Settings` + +## Setup GoCardless + +To enable GoCardless in your ERPNext account, you need to configure the following parameters and Access Token and optionally (but highly recommended), a Webhooks Secret key. + + +You can setup several GoCardless payment gateways if needed. The choice of payment gateway account will determine which GoCardless account is used for the payment. + +![GoCardless Settings](/docs/assets/img/setup/integrations/gocardless_account.png) + +On enabling service, the system will create a Payment Gateway record and an Account head in chart of account with account type as Bank. + +![GoCardless COA](/docs/assets/img/setup/integrations/gocardless_coa.png) + +It will also create a payment gateway account. You can change the default bank account if needed and create a template for the payment request. + +![Payment Gateway Account](/docs/assets/img/setup/integrations/payment_gateway_account_gocardless.png) + +After configuring the Payment Gateway Account, your system is able to accept online payments through GoCardless. + +## SEPA Payments Flow + +When a new payment SEPA payment in initiated, the customer is asked to enter his IBAN (or local account number) and to validate a SEPA mandate. + +Upon validation of the mandate, a payment request is sent to GoCardless and processed. + +If the customer has already a valid SEPA mandate, when instead of sending a payment request to the customer, the payment request is directly sent to GoCardless without the need for the customer to validate it. +The customer will only receive a confirmation email from GoCardless informing him that a payment has been processed. + + +## Mandate cancellation + +You can setup a Webhook in GoCardless to automatically disabled cancelled or expired mandates in ERPNext. + +The Endpoint URL of your webhook should be: https://yoursite.com/api/method/erpnext.erpnext_integrations.doctype.gocardless_settings.webhooks + +In this case do not forget to configure your Webhooks Secret Key in your GoCardless account settings in ERPNext. + + +## Supported transaction currencies + "EUR", "DKK", "GBP", "SEK" diff --git a/foundation/www/docs/user/manual/en/setting-up/print/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/print/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/print/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md b/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md index 92aa65f9..4648066a 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 @@ -5,6 +5,11 @@ Each company has default Letter Head for their company. This Letter Head values In the Letter Head master, you can track Header and Footer details of the company. These details will appear in the Print Format of the transactions like Sales Order, Sales Invoice, Salary Slip, Purchase Order etc. +
    + +
    + ####Step 1: Go to Setup `Explore > Setup > Printing > Letter Head > New Letter Head` 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..b57f44f2 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 @@ -9,6 +9,11 @@ You can create a new Print Format either by going to: or Open the document for which you want to make a print format. Click the Printer icon, or go to Menu > Print and click on the **Edit** button. Note: You must have System Manager permission to do this. +
    + +
    + ### Step 1: Make a new Format Send Email 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 3e07a0ef..f6786c28 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 @@ -17,4 +17,10 @@ Example of a change in print heading is shown below: Print Heading + +
    + +
    + {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 d9d51462..5a31fb7c 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 @@ -98,5 +98,13 @@ Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both. + +
    +
    + +
    +
    + {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/settings/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/settings/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/settings/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/settings/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/settings/naming-series.md b/foundation/www/docs/user/manual/en/setting-up/settings/naming-series.md index d692a5fa..a2b51437 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 @@ -45,9 +45,8 @@ See how to set the naming series Naming Series -{next} - ### 4. Custom Field in Naming Series + Some companies prefers to make use of "short-codes" for suppliers, i.e. WN for company "Web Notes" that later can be used in naming series for quick identification. #### Example: @@ -56,3 +55,14 @@ See how to set the naming series Then under Naming Series, we should allow something like PO-.YY.MM.-.vendor_id.-.##### Resulting in "PO-1503-WN-00001" + + +
    +
    + +
    +
    + + +{next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/__init__.py b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/_sidebar.json b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/_sidebar.json +++ b/foundation/www/docs/user/manual/en/setting-up/users-and-permissions/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/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..1fa551f7 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 @@ -21,9 +21,12 @@ To add a new user, click on "New" Add user details such as First Name, Last Name, Email etc. +Add User Details + 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 After adding these details, save the user. 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 23c2e6f8..ddb1afb2 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 @@ -9,6 +9,13 @@ roles and permissions. The most important role is the "System Manager". Any user having this role can add other users and set roles to all users. +
    +
    + +
    +
    + ### Topics {index} 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 e55bb5a7..b550c2eb 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,7 +1,7 @@ # User Permissions -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: +Along with Role based permissions, you can also set user level permissions that are based on rules that are evaluated against the data contained in the document being accessed. This is particularly useful when you want to restrict based on: 1. Allow user to access data belonging to one Company 1. Allow user to access data related to a specific Customer or Territory @@ -18,28 +18,14 @@ When you create a new record you will have to specify Creating a new user permission -If you want to apply the permissions to all Roles for that user, keep the "Apply Permissions for all Roles of this User" checked. If you check this, it will automatically setup the rules for Roles to check for User Permissions. - -### Choosing Which Roles to Apply - -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. - -Note that the "Apply User Permissions" is already checked for this role. Then click on "Select Document Types" - -Select Document Types to Edit the Setting - -Here you will see that Company has already been checked. If you want user permissions not be applied for that particular rule, you can un check it. - -Select Document Types to Edit the Setting - ### Ignoring User Permissions on Certain Fields -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** +Another way of allowing documents to be seen that have been restricted by User Permissions is to check "Ignore User Permissions" on a particular field by going to **Customize Form** -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" +For example you don't want Assets to be restricted for any user, then select **Asset** in **Customize Form** and in the Company field, check on "Ignore User Permissions" -Ignore User Permissions on specific properties +Ignore User Permissions on specific properties ### Strict Permissions 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 a574ec45..7e901531 100644 --- a/foundation/www/docs/user/manual/en/setting-up/workflows.md +++ b/foundation/www/docs/user/manual/en/setting-up/workflows.md @@ -43,9 +43,21 @@ submit button / option if you have not specified it in the workflow. > Note 4: If you wish to give the option to cancel, you will have to write a workflow transition step that says from submitted you can cancel. - +#### Conditions -#### Example of a Leave Application Process: +> New in Version 11 + +In Version 11, you can also add a condition for the transition to be applicable. For example in this case if someone applies to leave for more than 5 days, a particular role must approve. For this in the particular transition you can set a property for `Condition` as: + +``` +doc.total_leave_days <= 5 +``` + +Then if someone applied for leave for less than 5 days, only that particular transition will apply. + +This can be extended to any property of the document. + +#### Example of a Leave Application Process: When a Leave Application is saved by Employee, the status of the document changes to "Applied" @@ -60,4 +72,9 @@ When the Leave Approver opens the Leave Application page, he can finally "Approv Workflow +
    + +
    + {next} diff --git a/foundation/www/docs/user/manual/en/stock/_sidebar.json b/foundation/www/docs/user/manual/en/stock/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/stock/_sidebar.json +++ b/foundation/www/docs/user/manual/en/stock/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/_sidebar.json b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/_sidebar.json +++ b/foundation/www/docs/user/manual/en/stock/accounting-of-inventory-stock/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/_sidebar.json b/foundation/www/docs/user/manual/en/stock/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/stock/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/articles/index.txt b/foundation/www/docs/user/manual/en/stock/articles/index.txt index acf13752..4875de51 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/index.txt +++ b/foundation/www/docs/user/manual/en/stock/articles/index.txt @@ -5,7 +5,7 @@ maintain-stock-field-frozen-in-item-master manage-rejected-finished-goods-items managing-batch-wise-inventory managing-fractions-in-uom -opening-stock-balance-entry-for-the-serialized-and-batch-item +opening-stock-balance-entry-for-serialized-and-batch-item repack-entry serial-no-naming stock-entry-purpose 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 dfc3b24f..f873c9a7 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 @@ -34,3 +34,10 @@ To check batch-wise stock balance report, go to: Stock > Standard Reports > Batch-wise Balance History Batchwise Stock Balance + +
    + +
    + +{next} \ 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-serialized-and-batch-item.md similarity index 91% rename from foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md rename to foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-serialized-and-batch-item.md index 2ac67dfb..253a7997 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-serialized-and-batch-item.md @@ -1,5 +1,5 @@ -#Opening Stock Balance Entry for the Serialized and Batch Item +#Opening Stock Balance Entry for 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/user/manual/en/stock/serial-no.html). @@ -58,4 +58,11 @@ As per perpetual inventory valuation system, accounting entry is created for eve On submission of Stock Entry, stock ledger posting will be posted, and opening balance will be updated for the items on a given Posting Date. +
    +
    + +
    +
    + \ 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 c330b3ba..afce52ed 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 @@ -27,13 +27,13 @@ Material Transfer entry is created for the inter-warehouse Material Transfer. #### 4.Purpose: Material Transfer for Manufacture -In the manufacturing process, raw-materials are issued from the stores to the production department (generally WIP warehouse). This Material Transfer entry is created from Production Order. Items in this entry are fetched from the BOM of production Item, as selected in Production Order. +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 Work Order. Items in this entry are fetched from the BOM of production Item, as selected in Work Order. 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 is created from Work Order. In this entry, both raw-material item as well as production item are fetched from the BOM, selected in the Work 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 Work 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 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..4f0c0cc0 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 @@ -12,7 +12,7 @@ You can access this report from `Stock > Main Report > Stock Projected Quantity` This report list item wise - warehouse wise stock level of an item considering all the stock transactions. With Actual Quantity of an item, it also provide other details like: 1. Actual Qty: Quantity available in the warehouse. -2. Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured. +2. Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured. 3. Requested Qty: Quantity requested for purchase, but not ordered. 4. Ordered Qty: Quantity ordered for purchase, but not received. 5. Reserved Qty: Quantity ordered for sale, but not delivered. diff --git a/foundation/www/docs/user/manual/en/stock/batch.md b/foundation/www/docs/user/manual/en/stock/batch.md index 7bb04a62..6bf30683 100644 --- a/foundation/www/docs/user/manual/en/stock/batch.md +++ b/foundation/www/docs/user/manual/en/stock/batch.md @@ -35,7 +35,7 @@ You can also split the batch into smaller one by clicking on "Split". This will ### Transacting Items with Batches Batch master is created before creation of Purchase Receipt. -Hence eveytime there is Purchase Receipt or Production Order being made for a batch item, +Hence eveytime there is Purchase Receipt or Work Order being made for a batch item, you will first create its Batch No, and then select it in Purchase order or Production Entry. On every stock transaction (Purchase Receipt, Delivery Note, POS Invoice) made for batch item, diff --git a/foundation/www/docs/user/manual/en/stock/index.md b/foundation/www/docs/user/manual/en/stock/index.md index 1e2e65b3..d5c7d7a6 100644 --- a/foundation/www/docs/user/manual/en/stock/index.md +++ b/foundation/www/docs/user/manual/en/stock/index.md @@ -1,30 +1,41 @@ -# Stock +# ERPNext for Distributors -For most small business that deal in physical goods, a large part of their net -worth is invested in the stock in hand. +Distrobutors have large part of their net worth is invested in the stock in hand. With ERPNext, you can always keep a birds eye view on your stock availability, replineshment, procurement and sales. + +ERPNext Stock + +Distributors need to be on the top of their game always. From procuring the products to providing after-sales support for the same, they are an important part of the supply-chain. ### Material Flow -There are three main types of entries: +There are three main types of entries * Purchase Receipt: Items received from Suppliers against Purchase Orders. * Stock Entry: Items transferred from one Warehouse to another. * Delivery Note: Items shipped to Customers. -#### How does ERPNext track stock movement / levels? +ERPNext Healthcare -Tracking stock is not just about adding and subtracting quantities. Some -complications arise when: +### A Distributor on ERPNext Implementation - * Back-dated (past) entries are made / edited: This affects future stock levels and may lead to negative stock. - * Stock has to be valued based on First-in-First-out: ERPNext needs to maintain a sequence of all transactions to know the exact value of your Items. - * Stock reports are required at any point in time in the past: You have to lookup what was the quantity / value your stock of Item X on date Y. +When Tarun Gupta's security services startup Neural Integrated Services started growing, his ERP could not keep pace and was full of bugs in spite of spending a lot of money. Thats when Tarun decided he wanted to move to something better and discovered ERPNext. -To manage this, ERPNext collects all inventory transactions in a table called -the Stock Ledger Entry. All Purchase Receipts, Stock Entries and Delivery -Notes update this table. +
    +
    + +
    +
    -### Topics +### User Manual + +A distributor needs lots more than sales and purchase module to operate efficiently. ERPNext has all of it available built-in. + +- You track your books of accounts using [Accounts module](/docs/user/manual/en/accounts.html). +- Manage payroll, leaves and claims of your support staff in the [HR module](/docs/user/manual/en/human-resources.html). +- Attend customer's support queries better with [Support](/docs/user/manual/en/support.html) module of ERPNext. + +Here is the stepwise guide on the functionalities of ERPNext Stock / inventory module. {index} diff --git a/foundation/www/docs/user/manual/en/stock/item/_sidebar.json b/foundation/www/docs/user/manual/en/stock/item/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/stock/item/_sidebar.json +++ b/foundation/www/docs/user/manual/en/stock/item/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/item/index.md b/foundation/www/docs/user/manual/en/stock/item/index.md index a231e7f0..788e88bc 100644 --- a/foundation/www/docs/user/manual/en/stock/item/index.md +++ b/foundation/www/docs/user/manual/en/stock/item/index.md @@ -5,6 +5,13 @@ An Item is your companys' product or a service. The term Item is applicable to t 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. +
    +
    + +
    +
    + ## Item Properties * **Item Name:** Item name is the actual name of your product or service. @@ -84,16 +91,10 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi * **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. -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 - ### Manufacturing And Website Manufaturing details 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 f7e861ed..a49085eb 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 @@ -5,11 +5,11 @@ 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. -> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price +> Selling/Buying/Stock > Setup > Item Price > New Item Price Or -> Item >> Add/Edit Prices >> Click on "+" >> New Item Price +> Item > Add/Edit Prices > Click on "+" > New Item Price Following are the steps to create new Item Price. @@ -17,7 +17,7 @@ Step 1: Select Price List You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it. -![Item Price list](/docs/assets/old_images/erpnext/item-price-list.png) +![Item Price list](/assets/img/stock/item-price-1.png) On selection of Price List, its currency and for selling or buying property will be fetched as well. @@ -27,20 +27,27 @@ 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/assets/old_images/erpnext/item-price-item.png) +![Item Price Item](/assets/img/stock/item-price-2.png) Step 3: Enter Rate Enter selling/buying rate of an item in Price List currency. -![Item Price Rate](/docs/assets/old_images/erpnext/item-price-rate.png) +![Item Price Rate](/assets/img/stock/item-price-3.png) Step 4: Save Item Price To check all Item Price together, go to: -Stock >> Main Report >> Itemwise Price List Rate +> Stock > Main Report > Itemwise Price List Rate You will find option to create new Item Price record (+) in this report as well. +
    +
    + +
    +
    + {next} 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 0e857b50..d6740619 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 @@ -57,3 +57,15 @@ To update the value in the variants items from the template item, select the res To set the fields Goto Stock > Item Variant Settings Item Variant Settings + +
    + +
    + +
    + +
    + +{next} 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..4e0ada4e 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,6 @@ 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 + +{next} \ 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..c710e5d0 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,6 @@ 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 + +{next} \ 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 a980c398..595dac61 100644 --- a/foundation/www/docs/user/manual/en/stock/material-request.md +++ b/foundation/www/docs/user/manual/en/stock/material-request.md @@ -33,4 +33,10 @@ The User can also raise a [Request For Quotation](/docs/user/manual/en/buying/re > Info: Material Request is not mandatory. It is ideal if you have centralized buying so that you can collect this information from various departments. + +
    + +
    + {next} 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 0ada9bab..46e3cbb9 100644 --- a/foundation/www/docs/user/manual/en/stock/opening-stock.md +++ b/foundation/www/docs/user/manual/en/stock/opening-stock.md @@ -13,4 +13,12 @@ If you are not making opening Stock Entry, you can select "Stock Adjustment" acc 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 15c2520b..24dd3f67 100644 --- a/foundation/www/docs/user/manual/en/stock/projected-quantity.md +++ b/foundation/www/docs/user/manual/en/stock/projected-quantity.md @@ -21,7 +21,7 @@ shortages and to calculate the right order quantity. Reserved Qty * Actual Qty: Quantity available in the warehouse. - * Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured. + * Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured. * Requested Qty: Quantity requested for purchase, but not ordered. * Ordered Qty: Quantity ordered for purchase, but not received. * Reserved Qty: Quantity ordered for sale, but not delivered. 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 a93cf22a..d8f82134 100644 --- a/foundation/www/docs/user/manual/en/stock/serial-no.md +++ b/foundation/www/docs/user/manual/en/stock/serial-no.md @@ -16,6 +16,11 @@ If your Item is _serialized_ you will have to enter the Serial Nos in the related column with each Serial No in a new line. You can maintain single units of serialized items using Serial Number. +
    + +
    + ### Serial Nos and Inventory Inventory of an Item can only be affected if the Serial No is transacted via a diff --git a/foundation/www/docs/user/manual/en/stock/setup/_sidebar.json b/foundation/www/docs/user/manual/en/stock/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/stock/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/stock/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/stock-entry.md b/foundation/www/docs/user/manual/en/stock/stock-entry.md index cd5adf79..ba527fc1 100644 --- a/foundation/www/docs/user/manual/en/stock/stock-entry.md +++ b/foundation/www/docs/user/manual/en/stock/stock-entry.md @@ -24,6 +24,11 @@ In the Stock Entry you have to update the Items table with all your transactions. For each row, you must enter a “Source Warehouse” or a “Target Warehouse” or both (if you are recording a movement). +
    + +
    + **Additional Costs:** If the stock entry is an incoming entry i.e any item is receiving at a target warehouse, you can add related additional costs (like Shipping Charges, Customs Duty, Operating Costs etc) associated with the process. The additional costs will be considered to calculate valuation rate of the items. @@ -40,6 +45,7 @@ If perpetual inventory system is enabled, additional costs will be booked in "Ex Additional Costs General Ledger + > **Note:** To update Stock from a spreadsheet, see [Stock Reconciliation]({{doc_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html). {next} diff --git a/foundation/www/docs/user/manual/en/stock/tools/_sidebar.json b/foundation/www/docs/user/manual/en/stock/tools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/stock/tools/_sidebar.json +++ b/foundation/www/docs/user/manual/en/stock/tools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md b/foundation/www/docs/user/manual/en/stock/tools/landed-cost-voucher.md index a245c874..3cf167a3 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 @@ -25,7 +25,7 @@ In the document, you can select multiple Purchase Receipts and fetch all items f Landed Cost Vouher -### What happend on submission? +### What happens on submission? 1. On submission of Landed Cost Voucher, the applicable landed cost charges are updated in Purchase Receipt Item table. 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 3ef9c9aa..aa8b63f8 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 @@ -8,4 +8,10 @@ Inspection. To enable ERPNext to perform this function, go to : Quality Inspection + +
    + +
    + {next} \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/subscription/__init__.py b/foundation/www/docs/user/manual/en/subscription/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/en/support/_sidebar.json b/foundation/www/docs/user/manual/en/support/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/support/_sidebar.json +++ b/foundation/www/docs/user/manual/en/support/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/_sidebar.json b/foundation/www/docs/user/manual/en/using-erpnext/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/_sidebar.json +++ b/foundation/www/docs/user/manual/en/using-erpnext/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/_sidebar.json b/foundation/www/docs/user/manual/en/using-erpnext/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/index.txt b/foundation/www/docs/user/manual/en/using-erpnext/articles/index.txt index 9dc7df3f..67e98952 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/index.txt +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/index.txt @@ -8,5 +8,4 @@ bulk-rename renaming-documents search-filter tree-master-renaming -pos-view -letter-head-in-the-report \ No newline at end of file +letter-head-in-the-report 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 deleted file mode 100644 index 162bf2d6..00000000 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md +++ /dev/null @@ -1,12 +0,0 @@ - -#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 - -For creating POS Invoice, check following help video. - - \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/website/_sidebar.json b/foundation/www/docs/user/manual/en/website/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/website/_sidebar.json +++ b/foundation/www/docs/user/manual/en/website/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/website/add-products-to-website.md b/foundation/www/docs/user/manual/en/website/add-products-to-website.md index ed0525c9..9801f7d4 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 @@ -6,6 +6,11 @@ ERPNext will populate your website with products out of your Item Master. The html code will be generated automatically. +
    + +
    + #### Step 1: Edit Item For this example we will add a rocking chair to our catalog to sell on our website. diff --git a/foundation/www/docs/user/manual/en/website/articles/_sidebar.json b/foundation/www/docs/user/manual/en/website/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/website/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/en/website/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/website/index.md b/foundation/www/docs/user/manual/en/website/index.md index a51e6eb7..09e44510 100644 --- a/foundation/www/docs/user/manual/en/website/index.md +++ b/foundation/www/docs/user/manual/en/website/index.md @@ -28,6 +28,10 @@ HTML / CSS or hire the services of a professional. The good part is that once this is setup, you can add and edit content, blogs and products directly from your ERP. +
    + +
    + ### Topics {index} diff --git a/foundation/www/docs/user/manual/en/website/setup/_sidebar.json b/foundation/www/docs/user/manual/en/website/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/en/website/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/en/website/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/website/setup/social-login-keys.md b/foundation/www/docs/user/manual/en/website/setup/social-login-keys.md index a793bc33..8141a318 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 @@ -7,9 +7,26 @@ Social Login enables users to login to ERPNext via their Google, Facebook or Git Checkout the following Video Tutorials to understand how to enable social logins on ERPNext -* for FaceBook - https://www.youtube.com/watch?v=zC6Q6gIfiw8 -* for Google - https://www.youtube.com/watch?v=w_EAttrE9sw -* for GitHub - https://www.youtube.com/watch?v=bG71DxxkVjQ +* for FaceBook: + +
    + +
    + +* for Google: + +
    + +
    + +* for GitHub: + +
    + +
    For Google the *Authorized redirect URI* is [yoursite]/api/method/frappe.www.login.login_via_google 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 f07b2b63..cf79b1f8 100644 --- a/foundation/www/docs/user/manual/en/website/shopping-cart.md +++ b/foundation/www/docs/user/manual/en/website/shopping-cart.md @@ -9,6 +9,11 @@ the items you intend to buy. This software displays the price of the product . It also displays shipping and handling charges, along with taxes, if applicable. +
    + +
    + ### Shopping Cart Setup To set up a shopping cart, go to the website module. @@ -54,4 +59,10 @@ on "Place Order" to place the order. Website Specifications + +
    + +
    + {next} diff --git a/foundation/www/docs/user/manual/es/_sidebar.json b/foundation/www/docs/user/manual/es/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/_sidebar.json +++ b/foundation/www/docs/user/manual/es/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/accounts/_sidebar.json b/foundation/www/docs/user/manual/es/accounts/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/accounts/_sidebar.json +++ b/foundation/www/docs/user/manual/es/accounts/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/Assessment/_sidebar.json b/foundation/www/docs/user/manual/es/education/Assessment/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/education/Assessment/_sidebar.json +++ b/foundation/www/docs/user/manual/es/education/Assessment/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/_sidebar.json b/foundation/www/docs/user/manual/es/education/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/education/_sidebar.json +++ b/foundation/www/docs/user/manual/es/education/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/admission/_sidebar.json b/foundation/www/docs/user/manual/es/education/admission/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/education/admission/_sidebar.json +++ b/foundation/www/docs/user/manual/es/education/admission/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/fees/_sidebar.json b/foundation/www/docs/user/manual/es/education/fees/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/education/fees/_sidebar.json +++ b/foundation/www/docs/user/manual/es/education/fees/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/schedule/_sidebar.json b/foundation/www/docs/user/manual/es/education/schedule/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/education/schedule/_sidebar.json +++ b/foundation/www/docs/user/manual/es/education/schedule/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/setup/_sidebar.json b/foundation/www/docs/user/manual/es/education/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/education/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/es/education/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/education/student/_sidebar.json b/foundation/www/docs/user/manual/es/education/student/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/education/student/_sidebar.json +++ b/foundation/www/docs/user/manual/es/education/student/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/introduction/_sidebar.json b/foundation/www/docs/user/manual/es/introduction/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/introduction/_sidebar.json +++ b/foundation/www/docs/user/manual/es/introduction/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/_sidebar.json b/foundation/www/docs/user/manual/es/projects/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/projects/_sidebar.json +++ b/foundation/www/docs/user/manual/es/projects/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/projects/articles/_sidebar.json b/foundation/www/docs/user/manual/es/projects/articles/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/projects/articles/_sidebar.json +++ b/foundation/www/docs/user/manual/es/projects/articles/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/__init__.py b/foundation/www/docs/user/manual/es/schools/Assessment/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/Assessment/_sidebar.json b/foundation/www/docs/user/manual/es/schools/Assessment/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/schools/Assessment/_sidebar.json +++ b/foundation/www/docs/user/manual/es/schools/Assessment/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/__init__.py b/foundation/www/docs/user/manual/es/schools/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/_sidebar.json b/foundation/www/docs/user/manual/es/schools/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/schools/_sidebar.json +++ b/foundation/www/docs/user/manual/es/schools/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/admission/__init__.py b/foundation/www/docs/user/manual/es/schools/admission/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/admission/_sidebar.json b/foundation/www/docs/user/manual/es/schools/admission/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/schools/admission/_sidebar.json +++ b/foundation/www/docs/user/manual/es/schools/admission/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/fees/__init__.py b/foundation/www/docs/user/manual/es/schools/fees/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/fees/_sidebar.json b/foundation/www/docs/user/manual/es/schools/fees/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/schools/fees/_sidebar.json +++ b/foundation/www/docs/user/manual/es/schools/fees/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/schedule/__init__.py b/foundation/www/docs/user/manual/es/schools/schedule/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/schedule/_sidebar.json b/foundation/www/docs/user/manual/es/schools/schedule/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/schools/schedule/_sidebar.json +++ b/foundation/www/docs/user/manual/es/schools/schedule/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/setup/__init__.py b/foundation/www/docs/user/manual/es/schools/setup/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/setup/_sidebar.json b/foundation/www/docs/user/manual/es/schools/setup/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/schools/setup/_sidebar.json +++ b/foundation/www/docs/user/manual/es/schools/setup/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/manual/es/schools/student/__init__.py b/foundation/www/docs/user/manual/es/schools/student/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/foundation/www/docs/user/manual/es/schools/student/_sidebar.json b/foundation/www/docs/user/manual/es/schools/student/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/manual/es/schools/student/_sidebar.json +++ b/foundation/www/docs/user/manual/es/schools/student/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/videos/_sidebar.json b/foundation/www/docs/user/videos/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/videos/_sidebar.json +++ b/foundation/www/docs/user/videos/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/videos/learn/_sidebar.json b/foundation/www/docs/user/videos/learn/_sidebar.json index 88f5aab5..906a7228 100644 --- a/foundation/www/docs/user/videos/learn/_sidebar.json +++ b/foundation/www/docs/user/videos/learn/_sidebar.json @@ -1,22 +1,22 @@ [ { - "route": "/docs", + "route": "/docs", "title": "Docs Home" - }, + }, { - "route": "/docs/user", + "route": "/docs/user", "title": "User Guide" - }, + }, { - "route": "/docs/current/api", + "route": "/docs/current/api", "title": "Server API" - }, + }, { - "route": "/docs/current/models", + "route": "/docs/current/models", "title": "Models (Reference)" - }, + }, { - "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", + "route": "https://github.com/frappe/erpnext/tree/develop/erpnext/docs", "title": "Improve Docs" } ] \ No newline at end of file diff --git a/foundation/www/docs/user/videos/learn/index.md b/foundation/www/docs/user/videos/learn/index.md index 9a915999..ccc43e0d 100644 --- a/foundation/www/docs/user/videos/learn/index.md +++ b/foundation/www/docs/user/videos/learn/index.md @@ -216,12 +216,8 @@ Bill of Materials 3:27 -
  • - Production Planning Tool - 1:41 -
    • -
  • - Production Order +
  • + Work Order 2:24
  • diff --git a/foundation/www/docs/user/videos/learn/index.txt b/foundation/www/docs/user/videos/learn/index.txt index e0d8003d..956703b9 100644 --- a/foundation/www/docs/user/videos/learn/index.txt +++ b/foundation/www/docs/user/videos/learn/index.txt @@ -20,7 +20,7 @@ opening-stock point-of-sale printing-and-branding product-bundle -production-order +work-order production-planning project-and-task purchase-cycle diff --git a/foundation/www/docs/user/videos/learn/payment-terms.md b/foundation/www/docs/user/videos/learn/payment-terms.md new file mode 100644 index 00000000..ea05cbee --- /dev/null +++ b/foundation/www/docs/user/videos/learn/payment-terms.md @@ -0,0 +1,15 @@ + +#Payment Terms + +
    + +
    + +**Duration: 2:55** + +This tutorial shows you how to set payment terms in ERPNext. Payment Terms help in defining the multiple payment slabs during sales or purchase transactions. + +In Payment Terms you can define the breakup of the payment to be received (or made) in terms of different payment modes and the period after the due date. You can also create templates to quickly load the payment terms in a transaction. + + diff --git a/foundation/www/docs/user/videos/learn/production-order.md b/foundation/www/docs/user/videos/learn/production-order.md deleted file mode 100644 index 9f941984..00000000 --- a/foundation/www/docs/user/videos/learn/production-order.md +++ /dev/null @@ -1,10 +0,0 @@ - -# Production Order - - - -**Duration: 2:24** - -Production Order (also called as 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. - -This video walks you through creating Production Order in ERPNext. There will be several entries made against Production Order (like Material Transfer, Manufacture entry, Time Log) to track progress against Production Order. diff --git a/foundation/www/docs/user/videos/learn/production-planning.md b/foundation/www/docs/user/videos/learn/production-planning.md deleted file mode 100644 index d0e7e775..00000000 --- a/foundation/www/docs/user/videos/learn/production-planning.md +++ /dev/null @@ -1,10 +0,0 @@ - -# Production Planning Tool - - - -**Duration: 1:41** - -Production Planning Tool helps you plan production and purchase of Items for a period. - -This video walks you through production planning for Sales Order item. Material Planning allows you to check required quantity of raw materials for manufacturing. You can create Material Request for the raw-material items for which sufficient stock is not available. From Production Planning Tool, you can also create Production Order for the finished items. diff --git a/foundation/www/docs/user/videos/learn/work-order.md b/foundation/www/docs/user/videos/learn/work-order.md new file mode 100644 index 00000000..c55a8470 --- /dev/null +++ b/foundation/www/docs/user/videos/learn/work-order.md @@ -0,0 +1,10 @@ + +# Work Order + + + +**Duration: 2:24** + +Work Order (also called as 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. + +This video walks you through creating Work Order in ERPNext. There will be several entries made against Work Order (like Material Transfer, Manufacture entry, Time Log) to track progress against Work Order.