diff --git a/foundation/www/docs/assets/img/articles/twofactor/_sidebar.json b/foundation/www/docs/assets/img/articles/twofactor/_sidebar.json new file mode 100644 index 00000000..88f5aab5 --- /dev/null +++ b/foundation/www/docs/assets/img/articles/twofactor/_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/articles/twofactor/twofactor-1.png b/foundation/www/docs/assets/img/articles/twofactor/twofactor-1.png new file mode 100644 index 00000000..6dd17f0e Binary files /dev/null and b/foundation/www/docs/assets/img/articles/twofactor/twofactor-1.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/twofactor-2.png b/foundation/www/docs/assets/img/articles/twofactor/twofactor-2.png new file mode 100644 index 00000000..c8842139 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/twofactor/twofactor-2.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/twofactor-3.png b/foundation/www/docs/assets/img/articles/twofactor/twofactor-3.png new file mode 100644 index 00000000..56eee8cf Binary files /dev/null and b/foundation/www/docs/assets/img/articles/twofactor/twofactor-3.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/twofactor-4.png b/foundation/www/docs/assets/img/articles/twofactor/twofactor-4.png new file mode 100644 index 00000000..6d8ecabc Binary files /dev/null and b/foundation/www/docs/assets/img/articles/twofactor/twofactor-4.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/twofactor-5.png b/foundation/www/docs/assets/img/articles/twofactor/twofactor-5.png new file mode 100644 index 00000000..1c39e948 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/twofactor/twofactor-5.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/twofactor-6.png b/foundation/www/docs/assets/img/articles/twofactor/twofactor-6.png new file mode 100644 index 00000000..d62ba532 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/twofactor/twofactor-6.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/twofactor-8.png b/foundation/www/docs/assets/img/articles/twofactor/twofactor-8.png new file mode 100644 index 00000000..84cf5fa5 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/twofactor/twofactor-8.png differ diff --git a/foundation/www/docs/assets/img/articles/twofactor/twofactor_app.jpeg b/foundation/www/docs/assets/img/articles/twofactor/twofactor_app.jpeg new file mode 100644 index 00000000..ae5e9308 Binary files /dev/null and b/foundation/www/docs/assets/img/articles/twofactor/twofactor_app.jpeg differ diff --git a/foundation/www/docs/assets/img/setup-wizard/twofactor.png b/foundation/www/docs/assets/img/setup-wizard/twofactor.png new file mode 100644 index 00000000..ada4f5b9 Binary files /dev/null and b/foundation/www/docs/assets/img/setup-wizard/twofactor.png differ diff --git a/foundation/www/docs/assets/img/setup/settings/twofactor-settings.png b/foundation/www/docs/assets/img/setup/settings/twofactor-settings.png new file mode 100644 index 00000000..c56f304a Binary files /dev/null and b/foundation/www/docs/assets/img/setup/settings/twofactor-settings.png differ diff --git a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html index 68af6df0..1b7405dc 100644 --- a/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html +++ b/foundation/www/docs/current/api/accounts/erpnext.accounts.general_ledger.html @@ -3,7 +3,7 @@
- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 + + + get_tax_amount_if_for_valuation_or_deduction + (self, tax_amount, tax) +

+

No docs

+
+
+ + + + +

@@ -394,6 +408,20 @@ +

+ + + set_cumulative_total + (self, row_idx, tax) +

+

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 abb526c5..0512bc76 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 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 + + + erpnext.controllers.website_list_for_contact.get_list_for_transactions + (doctype, txt, filters, limit_start, limit_page_length=20, ignore_permissions=False, fields=None, order_by=None) +

+

No docs

+
+
+ + + + + + +

diff --git a/foundation/www/docs/current/api/controllers/index.html b/foundation/www/docs/current/api/controllers/index.html index 899a2d78..df1743e1 100644 --- a/foundation/www/docs/current/api/controllers/index.html +++ b/foundation/www/docs/current/api/controllers/index.html @@ -7,7 +7,7 @@

- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - 8.6.5 + 8.8.0 diff --git a/foundation/www/docs/current/models/accounts/account.html b/foundation/www/docs/current/models/accounts/account.html index 0056f7c2..98c5cc12 100644 --- a/foundation/www/docs/current/models/accounts/account.html +++ b/foundation/www/docs/current/models/accounts/account.html @@ -9,7 +9,7 @@
- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 +

+ + + update_expense_claim + (self) +

+

No docs

+
+
+ + + + +

diff --git a/foundation/www/docs/current/models/accounts/payment_entry_deduction.html b/foundation/www/docs/current/models/accounts/payment_entry_deduction.html index d8080eb5..57ad6932 100644 --- a/foundation/www/docs/current/models/accounts/payment_entry_deduction.html +++ b/foundation/www/docs/current/models/accounts/payment_entry_deduction.html @@ -9,7 +9,7 @@

- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 24 - tc_name - - Link - - Terms and Conditions - - - - - - - -Terms and Conditions - - - - - - - - 25 column_break0 Column Break @@ -462,28 +441,7 @@ - 26 - territory - - Link - - Territory - - - - - - - -Territory - - - - - - - - 27 + 25 selling_price_list Link @@ -504,7 +462,28 @@ - 28 + 26 + tc_name + + Link + + Terms and Conditions + + + + + + + +Terms and Conditions + + + + + + + + 27 apply_discount Check @@ -516,7 +495,7 @@ - 29 + 28 apply_discount_on Select @@ -531,7 +510,73 @@ Net Total + 29 + customer_details + + Section Break + + New Customer Details + + + + + + 30 + territory + + Link + + Territory + + + + + + + +Territory + + + + + + + + 31 + column_break_31 + + Column Break + + + + + + + + + 32 + customer_group + + Link + + Customer Group + + + + + + + +Customer Group + + + + + + + + 33 section_break_19 Section Break @@ -543,7 +588,7 @@ Net Total - 31 + 34 write_off_account Link @@ -564,7 +609,7 @@ Net Total - 32 + 35 write_off_cost_center Link @@ -585,7 +630,7 @@ Net Total - 33 + 36 account_for_change_amount Link @@ -606,7 +651,7 @@ Net Total - 34 + 37 taxes_and_charges Link @@ -627,7 +672,7 @@ Net Total - 35 + 38 column_break_23 Column Break @@ -639,7 +684,7 @@ Net Total - 36 + 39 income_account Link @@ -660,7 +705,7 @@ Net Total - 37 + 40 expense_account Link @@ -681,7 +726,7 @@ Net Total - 38 + 41 cost_center Link diff --git a/foundation/www/docs/current/models/accounts/pricing_rule.html b/foundation/www/docs/current/models/accounts/pricing_rule.html index 518493d8..d2482448 100644 --- a/foundation/www/docs/current/models/accounts/pricing_rule.html +++ b/foundation/www/docs/current/models/accounts/pricing_rule.html @@ -9,7 +9,7 @@
- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 1 + default + + Check + + Default + + + + + + + 2 mode_of_payment Link @@ -62,7 +74,7 @@ - 2 + 3 amount Currency @@ -76,7 +88,7 @@ - 3 + 4 column_break_3 Column Break @@ -88,7 +100,7 @@ - 4 + 5 account Link @@ -109,7 +121,7 @@ - 5 + 6 type Read Only @@ -123,7 +135,7 @@ - 6 + 7 base_amount Currency 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 e7ed689f..faac22b4 100644 --- a/foundation/www/docs/current/models/accounts/sales_invoice_timesheet.html +++ b/foundation/www/docs/current/models/accounts/sales_invoice_timesheet.html @@ -9,7 +9,7 @@
- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 +

+ + + onload + (self) +

+

No docs

+
+
+ + + + +

@@ -833,7 +847,7 @@ Cancelled erpnext.hr.doctype.expense_claim.expense_claim.make_bank_entry - (docname) + (dt, dn)

No docs

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 c40cc032..d7dcf134 100644 --- a/foundation/www/docs/current/models/hr/expense_claim_account.html +++ b/foundation/www/docs/current/models/hr/expense_claim_account.html @@ -9,7 +9,7 @@
- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 12 - final_delivery_date + delivery_date Date - - Final Delivery Date + + Delivery Date 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 4586b11d..bb0c7b60 100644 --- a/foundation/www/docs/current/models/selling/sales_order_item.html +++ b/foundation/www/docs/current/models/selling/sales_order_item.html @@ -9,7 +9,7 @@
- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 51 + series_for_depreciation_entry + + Data + + Series for Asset Depreciation Entry (Journal Entry) + + + + + + + 52 column_break_40 Column Break @@ -890,7 +902,7 @@ Last Day of the Next Month - 52 + 53 disposal_account Link @@ -911,7 +923,7 @@ Last Day of the Next Month - 53 + 54 depreciation_cost_center Link @@ -932,7 +944,7 @@ Last Day of the Next Month - 54 + 55 company_info Section Break @@ -945,7 +957,7 @@ Last Day of the Next Month - 55 + 56 address_html HTML @@ -957,7 +969,7 @@ Last Day of the Next Month - 56 + 57 column_break1 Column Break @@ -969,7 +981,7 @@ Last Day of the Next Month - 57 + 58 phone_no Data @@ -983,7 +995,7 @@ Last Day of the Next Month - 58 + 59 fax Data @@ -997,7 +1009,7 @@ Last Day of the Next Month - 59 + 60 email Data @@ -1011,7 +1023,7 @@ Last Day of the Next Month - 60 + 61 website Data @@ -1023,7 +1035,7 @@ Last Day of the Next Month - 61 + 62 registration_info Section Break @@ -1035,7 +1047,7 @@ Last Day of the Next Month - 62 + 63 registration_details Code @@ -1048,7 +1060,7 @@ Last Day of the Next Month - 63 + 64 delete_company_transactions Button diff --git a/foundation/www/docs/current/models/setup/currency_exchange.html b/foundation/www/docs/current/models/setup/currency_exchange.html index 433d1851..808c4358 100644 --- a/foundation/www/docs/current/models/setup/currency_exchange.html +++ b/foundation/www/docs/current/models/setup/currency_exchange.html @@ -9,7 +9,7 @@
- Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 +
  • + + +POS Profile + +
  • + + +
  • diff --git a/foundation/www/docs/current/models/setup/email_digest.html b/foundation/www/docs/current/models/setup/email_digest.html index 6a96f6f8..f790a7c7 100644 --- a/foundation/www/docs/current/models/setup/email_digest.html +++ b/foundation/www/docs/current/models/setup/email_digest.html @@ -9,7 +9,7 @@
    - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - - - - - - -

    SMS Parameter

    -
    - - -Child Table - - -

    Table Name: tabSMS Parameter

    - - - - -

    Fields

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    SrFieldnameTypeLabelOptions
    1parameter - Data - Parameter - -
    2value - Data - Value - -
    - - - - -

    Child Table Of

    - - - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/models/setup/sms_settings.html b/foundation/www/docs/current/models/setup/sms_settings.html deleted file mode 100644 index 6fce961f..00000000 --- a/foundation/www/docs/current/models/setup/sms_settings.html +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - -

    SMS Settings

    - - -Single - - - - - - -

    Fields

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    SrFieldnameTypeLabelOptions
    1column_break0 - Column Break - - -
    2sms_gateway_url - Data - SMS Gateway URL -

    - Eg. smsgateway.com/api/send_sms.cgi

    -
    3message_parameter - Data - Message Parameter -

    - Enter url parameter for message

    -
    4receiver_parameter - Data - Receiver Parameter -

    - Enter url parameter for receiver nos

    -
    5sms_sender_name - Data - SMS Sender Name - -
    6static_parameters_section - Column Break - - -
    7parameters - Table - Static Parameters -

    - Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)

    -
    - - - - -SMS Parameter - - - -
    - - -
    -

    Controller

    -

    erpnext.setup.doctype.sms_settings.sms_settings

    - - - - - - - -

    Class SMSSettings

    - -

    Inherits from frappe.model.document.Document - -

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

    - - - erpnext.setup.doctype.sms_settings.sms_settings.create_sms_log - (args, sent_to) -

    -

    No docs

    -
    -
    - - - - - - -

    Public API -
    /api/method/erpnext.setup.doctype.sms_settings.sms_settings.get_contact_number -

    -

    - - - erpnext.setup.doctype.sms_settings.sms_settings.get_contact_number - (contact_name, ref_doctype, ref_name) -

    -

    returns mobile number of the contact

    -
    -
    - - - - - - - -

    - - - erpnext.setup.doctype.sms_settings.sms_settings.get_sender_name - () -

    -

    returns name as SMS sender

    -
    -
    - - - - - - - -

    - - - erpnext.setup.doctype.sms_settings.sms_settings.send_request - (gateway_url, params) -

    -

    No docs

    -
    -
    - - - - - - -

    Public API -
    /api/method/erpnext.setup.doctype.sms_settings.sms_settings.send_sms -

    -

    - - - erpnext.setup.doctype.sms_settings.sms_settings.send_sms - (receiver_list, msg, sender_name=, success_msg=True) -

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.setup.doctype.sms_settings.sms_settings.send_via_gateway - (arg) -

    -

    No docs

    -
    -
    - - - - - - - -

    - - - erpnext.setup.doctype.sms_settings.sms_settings.validate_receiver_nos - (receiver_list) -

    -

    No docs

    -
    -
    - - - - - - - - - - - \ No newline at end of file diff --git a/foundation/www/docs/current/models/setup/supplier_type.html b/foundation/www/docs/current/models/setup/supplier_type.html index 12ffb640..956a73e9 100644 --- a/foundation/www/docs/current/models/setup/supplier_type.html +++ b/foundation/www/docs/current/models/setup/supplier_type.html @@ -9,7 +9,7 @@
    - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 4 - data_6 + country Link diff --git a/foundation/www/docs/current/models/stock/material_request.html b/foundation/www/docs/current/models/stock/material_request.html index e6f9e653..8504ee57 100644 --- a/foundation/www/docs/current/models/stock/material_request.html +++ b/foundation/www/docs/current/models/stock/material_request.html @@ -9,7 +9,7 @@
    - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 7 + supplier_delivery_note + + Data + + Supplier Delivery Note + + + + + + + 8 column_break1 Column Break @@ -139,7 +151,7 @@ PREC-RET- - 8 + 9 posting_date Date @@ -151,7 +163,7 @@ PREC-RET- - 9 + 10 posting_time Time @@ -164,7 +176,7 @@ PREC-RET- - 10 + 11 set_posting_time Check @@ -176,7 +188,7 @@ PREC-RET- - 11 + 12 company Link @@ -197,7 +209,7 @@ PREC-RET- - 12 + 13 is_return Check @@ -209,7 +221,7 @@ PREC-RET- - 13 + 14 return_against Link @@ -230,7 +242,7 @@ PREC-RET- - 14 + 15 section_addresses Section Break @@ -242,7 +254,7 @@ PREC-RET- - 15 + 16 supplier_address Link @@ -263,7 +275,7 @@ PREC-RET- - 16 + 17 contact_person Link @@ -284,7 +296,7 @@ PREC-RET- - 17 + 18 address_display Small Text @@ -296,7 +308,7 @@ PREC-RET- - 18 + 19 contact_display Small Text @@ -308,7 +320,7 @@ PREC-RET- - 19 + 20 contact_mobile Small Text @@ -320,7 +332,7 @@ PREC-RET- - 20 + 21 contact_email Small Text @@ -332,7 +344,7 @@ PREC-RET- - 21 + 22 col_break_address Column Break @@ -344,7 +356,7 @@ PREC-RET- - 22 + 23 shipping_address Link @@ -365,7 +377,7 @@ PREC-RET- - 23 + 24 shipping_address_display Small Text @@ -377,7 +389,7 @@ PREC-RET- - 24 + 25 currency_and_price_list Section Break @@ -391,7 +403,7 @@ PREC-RET- - 25 + 26 currency Link @@ -412,7 +424,7 @@ PREC-RET- - 26 + 27 conversion_rate Float @@ -425,7 +437,7 @@ PREC-RET- - 27 + 28 column_break2 Column Break @@ -437,7 +449,7 @@ PREC-RET- - 28 + 29 buying_price_list Link @@ -458,7 +470,7 @@ PREC-RET- - 29 + 30 price_list_currency Link @@ -479,7 +491,7 @@ PREC-RET- - 30 + 31 plc_conversion_rate Float @@ -491,7 +503,7 @@ PREC-RET- - 31 + 32 ignore_pricing_rule Check @@ -503,7 +515,7 @@ PREC-RET- - 32 + 33 items_section Section Break @@ -517,7 +529,7 @@ PREC-RET- - 33 + 34 items Table @@ -538,7 +550,7 @@ PREC-RET- - 34 + 35 get_current_stock Button @@ -552,7 +564,7 @@ PREC-RET- - 35 + 36 section_break0 Section Break @@ -564,7 +576,7 @@ PREC-RET- - 36 + 37 base_total Currency @@ -578,7 +590,7 @@ PREC-RET- - 37 + 38 base_net_total Currency @@ -592,7 +604,7 @@ PREC-RET- - 38 + 39 column_break_27 Column Break @@ -604,7 +616,7 @@ PREC-RET- - 39 + 40 total Currency @@ -618,7 +630,7 @@ PREC-RET- - 40 + 41 net_total Currency @@ -632,7 +644,7 @@ PREC-RET- - 41 + 42 taxes_section Section Break @@ -647,7 +659,7 @@ PREC-RET- - 42 + 43 taxes_and_charges Link @@ -668,7 +680,7 @@ PREC-RET- - 43 + 44 taxes Table @@ -689,7 +701,7 @@ PREC-RET- - 44 + 45 sec_tax_breakup Section Break @@ -701,7 +713,7 @@ PREC-RET- - 45 + 46 other_charges_calculation Text @@ -713,7 +725,7 @@ PREC-RET- - 46 + 47 totals Section Break @@ -727,7 +739,7 @@ PREC-RET- - 47 + 48 base_taxes_and_charges_added Currency @@ -741,7 +753,7 @@ PREC-RET- - 48 + 49 base_taxes_and_charges_deducted Currency @@ -755,7 +767,7 @@ PREC-RET- - 49 + 50 base_total_taxes_and_charges Currency @@ -769,7 +781,7 @@ PREC-RET- - 50 + 51 column_break3 Column Break @@ -781,7 +793,7 @@ PREC-RET- - 51 + 52 taxes_and_charges_added Currency @@ -795,7 +807,7 @@ PREC-RET- - 52 + 53 taxes_and_charges_deducted Currency @@ -809,7 +821,7 @@ PREC-RET- - 53 + 54 total_taxes_and_charges Currency @@ -823,7 +835,7 @@ PREC-RET- - 54 + 55 section_break_42 Section Break @@ -835,7 +847,7 @@ PREC-RET- - 55 + 56 apply_discount_on Select @@ -851,7 +863,7 @@ Net Total - 56 + 57 base_discount_amount Currency @@ -865,7 +877,7 @@ Net Total - 57 + 58 column_break_44 Column Break @@ -877,7 +889,7 @@ Net Total - 58 + 59 additional_discount_percentage Float @@ -889,7 +901,7 @@ Net Total - 59 + 60 discount_amount Currency @@ -903,7 +915,7 @@ Net Total - 60 + 61 section_break_46 Section Break @@ -915,7 +927,7 @@ Net Total - 61 + 62 base_grand_total Currency @@ -929,7 +941,7 @@ Net Total - 62 + 63 base_in_words Data @@ -941,7 +953,7 @@ Net Total - 63 + 64 base_rounded_total Currency @@ -955,7 +967,7 @@ Net Total - 64 + 65 column_break_50 Column Break @@ -967,7 +979,7 @@ Net Total - 65 + 66 grand_total Currency @@ -981,7 +993,7 @@ Net Total - 66 + 67 in_words Data @@ -993,7 +1005,7 @@ Net Total - 67 + 68 terms_section_break Section Break @@ -1007,7 +1019,7 @@ Net Total - 68 + 69 tc_name Link @@ -1028,7 +1040,7 @@ Net Total - 69 + 70 terms Text Editor @@ -1040,7 +1052,7 @@ Net Total - 70 + 71 raw_material_details Section Break @@ -1054,7 +1066,7 @@ Net Total - 71 + 72 is_subcontracted Select @@ -1069,7 +1081,7 @@ Yes - 72 + 73 supplier_warehouse Link @@ -1090,7 +1102,7 @@ Yes - 73 + 74 supplied_items Table @@ -1111,7 +1123,7 @@ Yes - 74 + 75 bill_no Data @@ -1123,7 +1135,7 @@ Yes - 75 + 76 bill_date Date @@ -1135,7 +1147,7 @@ Yes - 76 + 77 more_info Section Break @@ -1149,7 +1161,7 @@ Yes - 77 + 78 status Select @@ -1168,7 +1180,7 @@ Closed - 78 + 79 rejected_warehouse Link @@ -1190,7 +1202,7 @@ Closed - 79 + 80 amended_from Link @@ -1211,7 +1223,7 @@ Closed - 80 + 81 range Data @@ -1223,7 +1235,7 @@ Closed - 81 + 82 column_break4 Column Break @@ -1235,7 +1247,7 @@ Closed - 82 + 83 per_billed Percent @@ -1247,7 +1259,7 @@ Closed - 83 + 84 printing_settings Section Break @@ -1259,7 +1271,7 @@ Closed - 84 + 85 letter_head Link @@ -1280,7 +1292,7 @@ Closed - 85 + 86 select_print_heading Link @@ -1301,7 +1313,7 @@ Closed - 86 + 87 language Data @@ -1313,7 +1325,7 @@ Closed - 87 + 88 other_details HTML @@ -1325,7 +1337,7 @@ Closed - 88 + 89 instructions Small Text @@ -1337,7 +1349,7 @@ Closed - 89 + 90 remarks Small Text @@ -1349,7 +1361,7 @@ Closed - 90 + 91 transporter_info Section Break @@ -1363,7 +1375,7 @@ Closed - 91 + 92 transporter_name Data @@ -1375,7 +1387,7 @@ Closed - 92 + 93 column_break5 Column Break @@ -1387,7 +1399,7 @@ Closed - 93 + 94 lr_no Data @@ -1399,7 +1411,7 @@ Closed - 94 + 95 lr_date Date 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 4e6b44fe..61dded84 100644 --- a/foundation/www/docs/current/models/stock/purchase_receipt_item.html +++ b/foundation/www/docs/current/models/stock/purchase_receipt_item.html @@ -9,7 +9,7 @@
    - Version 8.6.5 + Version 8.8.0 4 + supplier_part_no + + Data + + Supplier Part Number + + + + + + + 5 column_break_2 Column Break @@ -98,7 +110,7 @@ - 5 + 6 item_name Data @@ -110,7 +122,7 @@ - 6 + 7 section_break_4 Section Break @@ -122,7 +134,7 @@ - 7 + 8 description Text Editor @@ -134,7 +146,7 @@ - 8 + 9 col_break1 Column Break @@ -146,7 +158,7 @@ - 9 + 10 image Attach @@ -158,7 +170,7 @@ - 10 + 11 image_view Image @@ -172,7 +184,7 @@ - 11 + 12 received_and_accepted Section Break @@ -184,7 +196,7 @@ - 12 + 13 received_qty Float @@ -196,7 +208,7 @@ - 13 + 14 qty Float @@ -208,7 +220,7 @@ - 14 + 15 rejected_qty Float @@ -220,7 +232,7 @@ - 15 + 16 col_break2 Column Break @@ -232,7 +244,7 @@ - 16 + 17 uom Link @@ -253,7 +265,7 @@ - 17 + 18 stock_uom Link @@ -274,7 +286,7 @@ - 18 + 19 conversion_factor Float @@ -286,7 +298,7 @@ - 19 + 20 rate_and_amount Section Break @@ -298,7 +310,7 @@ - 20 + 21 price_list_rate Currency @@ -312,7 +324,7 @@ - 21 + 22 discount_percentage Percent @@ -324,7 +336,7 @@ - 22 + 23 col_break3 Column Break @@ -336,7 +348,7 @@ - 23 + 24 base_price_list_rate Currency @@ -350,7 +362,7 @@ - 24 + 25 sec_break1 Section Break @@ -362,7 +374,7 @@ - 25 + 26 rate Currency @@ -376,7 +388,7 @@ - 26 + 27 amount Currency @@ -390,7 +402,7 @@ - 27 + 28 col_break4 Column Break @@ -402,7 +414,7 @@ - 28 + 29 base_rate Currency @@ -416,7 +428,7 @@ - 29 + 30 base_amount Currency @@ -430,7 +442,7 @@ - 30 + 31 pricing_rule Link @@ -451,7 +463,7 @@ - 31 + 32 section_break_29 Section Break @@ -463,7 +475,7 @@ - 32 + 33 net_rate Currency @@ -477,7 +489,7 @@ - 33 + 34 net_amount Currency @@ -491,7 +503,7 @@ - 34 + 35 column_break_32 Column Break @@ -503,7 +515,7 @@ - 35 + 36 base_net_rate Currency @@ -517,7 +529,7 @@ - 36 + 37 base_net_amount Currency @@ -531,7 +543,7 @@ - 37 + 38 warehouse_and_reference Section Break @@ -543,7 +555,7 @@ - 38 + 39 warehouse Link @@ -564,7 +576,7 @@ - 39 + 40 rejected_warehouse Link @@ -585,7 +597,7 @@ - 40 + 41 quality_inspection Link @@ -606,7 +618,7 @@ - 41 + 42 column_break_40 Column Break @@ -618,7 +630,7 @@ - 42 + 43 purchase_order Link @@ -639,7 +651,7 @@ - 43 + 44 schedule_date Date @@ -651,7 +663,7 @@ - 44 + 45 stock_qty Float @@ -663,7 +675,7 @@ - 45 + 46 section_break_45 Section Break @@ -675,7 +687,7 @@ - 46 + 47 serial_no Small Text @@ -687,7 +699,7 @@ - 47 + 48 batch_no Link @@ -708,7 +720,7 @@ - 48 + 49 column_break_48 Column Break @@ -720,7 +732,7 @@ - 49 + 50 rejected_serial_no Small Text @@ -732,7 +744,7 @@ - 50 + 51 section_break_50 Section Break @@ -744,7 +756,7 @@ - 51 + 52 project Link @@ -765,7 +777,7 @@ - 52 + 53 cost_center Link @@ -786,7 +798,7 @@ - 53 + 54 purchase_order_item Data @@ -798,7 +810,7 @@ - 54 + 55 col_break5 Column Break @@ -810,7 +822,7 @@ - 55 + 56 allow_zero_valuation_rate Check @@ -822,7 +834,7 @@ - 56 + 57 bom Link @@ -843,7 +855,7 @@ - 57 + 58 billed_amt Currency @@ -855,7 +867,7 @@ - 58 + 59 landed_cost_voucher_amount Currency @@ -867,7 +879,7 @@ - 59 + 60 brand Link @@ -888,7 +900,7 @@ - 60 + 61 item_group Link @@ -909,7 +921,7 @@ - 61 + 62 rm_supp_cost Currency @@ -923,7 +935,7 @@ - 62 + 63 item_tax_amount Currency @@ -937,7 +949,7 @@ - 63 + 64 valuation_rate Currency @@ -951,7 +963,7 @@ - 64 + 65 item_tax_rate Code @@ -965,7 +977,7 @@ Used for Taxes and Charges

    - 65 + 66 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 16864048..0892861d 100644 --- a/foundation/www/docs/current/models/stock/quality_inspection.html +++ b/foundation/www/docs/current/models/stock/quality_inspection.html @@ -9,7 +9,7 @@
    - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - + +
    Company:company:default_currency
    + 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 5c9aa634..c44b2aa9 100644 --- a/foundation/www/docs/current/models/stock/stock_reconciliation_item.html +++ b/foundation/www/docs/current/models/stock/stock_reconciliation_item.html @@ -9,7 +9,7 @@
    - Version 8.6.5 + Version 8.8.0 - + +
    Company:company:default_currency
    + @@ -151,7 +153,9 @@ Amount - + +
    Company:company:default_currency
    + @@ -199,7 +203,9 @@ Current Valuation Rate - + +
    Company:company:default_currency
    + @@ -211,7 +217,9 @@ Current Amount - + +
    Company:company:default_currency
    + @@ -259,7 +267,9 @@ Amount Difference - + +
    Company:company:default_currency
    + diff --git a/foundation/www/docs/current/models/stock/stock_settings.html b/foundation/www/docs/current/models/stock/stock_settings.html index bd6616ef..84ed6d77 100644 --- a/foundation/www/docs/current/models/stock/stock_settings.html +++ b/foundation/www/docs/current/models/stock/stock_settings.html @@ -9,7 +9,7 @@
    - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 - Version 8.6.5 + Version 8.8.0 -# Adjust Withhold Amount Payment Entry - #Adjust Withhold Amount in the Payment Entry ###Question diff --git a/foundation/www/docs/user/manual/en/accounts/articles/c-form.md b/foundation/www/docs/user/manual/en/accounts/articles/c-form.md index 8d54e3ee..e8290c5f 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/c-form.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/c-form.md @@ -1,6 +1,4 @@ -# C Form - #C-Form C-Form functionality is only applicable for Indian customers. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md b/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md index 35770203..82af8df9 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/changing-parent-account.md @@ -1,6 +1,4 @@ -# Changing Parent Account - #Changing Parent Account Chart of Account has hierarchical structure. Each account has a parent it is listed under. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md index a9009038..f290c8b2 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/difference-entry-button.md @@ -1,6 +1,4 @@ -# Difference Entry Button - #Difference Entry As per accounting standards, debit in a accounting entry must be equal to credit. If not, system does allow submission of accounting transaction, thereby stops ledger posting. In ERPNext, on saving accounting entry, system validates if debit and credit is tallying. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md b/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md index a869c814..405de6e5 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md @@ -1,6 +1,4 @@ -# Freeze Accounting Entries - #Freeze Accounting Entries To freeze accounting entries upto a certain date, follow below given steps. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md index f6f968ae..075e969c 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md @@ -1,6 +1,4 @@ -# How To Freeze Accounting Ledger - #How To Freeze Accounting Ledger? If you want to discontinue using specific Account, you can freeze it. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md b/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md index 795e7918..d01da800 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md @@ -1,6 +1,4 @@ -# Managing Transactions In Multiple Currency - #Managing Transactions In Multiple Currency In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. If transaction is created in the parties currency, their currency symbol is updated in the print format as well. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md index fdd66f1a..bf08a4a3 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md @@ -1,6 +1,4 @@ -# Post Dated Cheque Entry - #Post Dated Cheque Entry Post Dated Cheque is a cheque dated on future date. Party generally give post dated cheque, as advance payment. This cheque would be cleared only when cheque date arrives. 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 dbd71f7c..23a0911d 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,6 +1,4 @@ -# Tracking Project Profitability Using Cost Center - #Tracking Project Profibitability using Cost Center To track expenses and profibility for a project, you can use Cost Centers. You should create separate Cost Center for each Project. This will allow you to. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md b/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md index 67c11c55..e42eb1d7 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.md @@ -1,6 +1,4 @@ -# Update Stock Option In Sales Invoice - #Delivery from Sales Invoice If you have items delivery and invoicing happening at the same time, you can create delivery from with Sales Invoice itself. Sales Invoice has field called **Update Stock**, just before Item table. If this field is checked, on submission of Sales Invoice, stock of Item will be deducted from selected Warehouse. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md b/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md index 80b4edfe..79de7fb2 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.md @@ -1,6 +1,4 @@ -# What Is The Differences Of Total And Valuation In Tax And Charges - #Purchase Tax or Charges Categories Consider Tax or Charge field in Purchase Taxes and Charges master has three values. diff --git a/foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md b/foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md index 281a0eac..60bf536b 100644 --- a/foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md +++ b/foundation/www/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md @@ -1,6 +1,4 @@ -# Withdrawing Salary From Owners Equity Account - #Withdrawing Salary from Owner's Equity Account ### Question 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 5ca58bc5..3418566c 100644 --- a/foundation/www/docs/user/manual/en/accounts/opening-accounts.md +++ b/foundation/www/docs/user/manual/en/accounts/opening-accounts.md @@ -1,6 +1,4 @@ -# Opening Accounts - #Updating Opening Balance in Accounts If you are a new company you can start using ERPNext accounting module by going to chart of accounts. However, if you are migrating from a legacy accounting system like Tally or a Fox Pro based software diff --git a/foundation/www/docs/user/manual/en/accounts/payment-entry.md b/foundation/www/docs/user/manual/en/accounts/payment-entry.md index 839ba6b0..498ec215 100644 --- a/foundation/www/docs/user/manual/en/accounts/payment-entry.md +++ b/foundation/www/docs/user/manual/en/accounts/payment-entry.md @@ -7,6 +7,7 @@ Payment Entry can be made against following transactions. 2. Purchase Invoice. 3. Sales Order (Advance Payment) 4. Purchase Order (Advance Payment) + 5. Expense Claim ####Step 1: Make Payment @@ -22,7 +23,7 @@ In the Payment Entry, select Mode of Payment (eg: Bank, Cash, Wire Transfer). In ####Step 3: Payment Amount -Enter actual payment amount received from the Customer or paid to the Supplier. +Enter actual payment amount received from the Customer or paid to the Supplier or Employee. Making Payment @@ -91,7 +92,7 @@ Following internal transfers can be managed from the Payment Entry. - Updating opening balance in an Accounts. - Fixed Asset Depreciation entry. - For adjusting Credit Note against Sales Invoice and Debit Note against Purchase Invoice, incase there is no payment happening at all. - + 4. Payment Entries are used if a cheque is printed. * * * ## Managing Outstanding Payments diff --git a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md index dd5c3662..0aa5ec79 100644 --- a/foundation/www/docs/user/manual/en/accounts/pricing-rule.md +++ b/foundation/www/docs/user/manual/en/accounts/pricing-rule.md @@ -1,6 +1,4 @@ -# Pricing Rule - #Pricing Rule Pricing Rule is a master where you can define rules based on which discount is applied to specific Customer or Supplier. diff --git a/foundation/www/docs/user/manual/en/accounts/recurring-orders-and-invoices.md b/foundation/www/docs/user/manual/en/accounts/recurring-orders-and-invoices.md index 3ae59a32..af70b8a8 100644 --- a/foundation/www/docs/user/manual/en/accounts/recurring-orders-and-invoices.md +++ b/foundation/www/docs/user/manual/en/accounts/recurring-orders-and-invoices.md @@ -1,6 +1,4 @@ -# Recurring Orders And Invoices - #Recurring Orders and Invoices If you have a contract with a **Customer** where you bill the Customer on a monthly, quarterly, half-yearly or annual basis, you should use recurring feature in orders and invoices. diff --git a/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md index c9edfe16..cad5e1c7 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md +++ b/foundation/www/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md @@ -1,6 +1,4 @@ -# Maintaining Suppliers Part No In Item - #Maintaining Supplier's Item Code in the Item master For each item, code assigned might differ from the code your supplier has given to that same item. ERPNext allows you to track Supplier's Item Code in the item master. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code. diff --git a/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md b/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md index 25ca5872..851f94c3 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md +++ b/foundation/www/docs/user/manual/en/buying/articles/pull-items-in-purchase-order-based-on-supplier.md @@ -1,6 +1,4 @@ -# Pull Items In Purchase Order Based On Supplier - #Pull Items in Purchase Order based on Supplier **Question:** diff --git a/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md b/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md index 36792a97..d5ea1162 100644 --- a/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md +++ b/foundation/www/docs/user/manual/en/buying/articles/purchasing-in-different-unit.md @@ -1,6 +1,4 @@ -# Purchasing In Different Unit - #Purchasing in Different Unit (UoM) Each item has stock unit of measument (UoM) associated to it. For example UoM of pen could be numbers (Nos) and sand could be stocked kgs. However, when we place an order with Supplier, UoM for an item could change. Like we can order 1 set/box of Pen, or one truck of sand to our Supplier. When creating purchase transacton, you can change Purchase UoM for an item. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md index 6c11cd63..016c05a9 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md @@ -1,6 +1,4 @@ -# Allow Fields To Be Changed After Submit - #Editing Value in Submitted Document Once document is submitted, fields are frozen, and no editing is allowd. Still there are certain standard fields like Letter Head, Print Heading which can still be edited. For the custom field, if **Allow on Submit** property is checked, it will be editable even after document is submitted. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md index f0e34b86..9a237b8d 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.md @@ -1,6 +1,4 @@ -# Creating Custom Link Field - #Creating Custom Link Fields Links field are the ones linked to another document type. For example, customer field is a link field in Sales Order. This field is linked to the Customer master. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md index 77da4738..718228ca 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md @@ -1,6 +1,4 @@ -# Customizing Sorting Order In The List View - #Customizing Sorting Order in the List View **Question:** I want records in my Item List sorted based on Desc Order of Item Code. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md index adbbee33..a20d6bcc 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md @@ -1,6 +1,4 @@ -# Deleting Custom Reports - #Deleting Custom Reports ERPNext has several [types of reports](/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md index d60af5e8..71dbf353 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md @@ -1,6 +1,4 @@ -# Disable Rounded Total - #Disable Rounded Total All the sales transactions like Sales Order, Sales Invoice has Rounded Total in it. It calculated based on the value of Grand Total. Also Rounded Total is also visible in the Standard Print Formats. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md index 11a1ad36..4c44cec0 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/field-types.md @@ -1,6 +1,4 @@ -# Field Types - #Field Types Following are the types of fields you can define while creating new ones, or while amend standard ones. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md index ba91d35b..16c9c5c0 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.md @@ -1,6 +1,4 @@ -# Increase Max Attachments - #Increase Max Attachments In ERPNext, you can limit how many files can be attached to specific Document. Using Custmize Form, you can set **Max(imum) Attachments** which can be added to a particular documents. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md index d842ddbc..dfe6cbcc 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.md @@ -1,6 +1,4 @@ -# Make Field Visible In Print Format - #Make Fields Visible In Print Format Each transaction has Standard Print Format. In the Standard format, only certain fields are displayed by default. If user needs field in the Standard format to be visible, it can be customized by using Customize Form tool. 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 375e0ee7..e309341c 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md @@ -1,6 +1,4 @@ -# Making Custom Reports In Erpnext - #Reports in ERPNext There are three kind of reports in ERPNext. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md index bf74cef4..89a5c407 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md @@ -1,6 +1,4 @@ -# Managing Dynamic Link Fields - #Managing Dynamic Link Fields Dynamic Link field is one which can search and hold value of any document/doctype. Let's consider an example to learn how Dynamic Link field works. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/module-visibility.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/module-visibility.md index b98c336b..b1f00672 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/module-visibility.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/module-visibility.md @@ -1,6 +1,4 @@ -# Module Visibility - #Module Visibility If you have permission on specific module, but it is still not visible, following are the possibilities of issues you should look at. Let's consider a scenario that user is permission of Website module, but not able to access it. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md index 11e95b8a..c485f2c0 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md @@ -1,6 +1,4 @@ -# Perm Level Error In Permission Manager - #Perm Level Error in Permission Manager While customizing rules in the [Permission Manager](/docs/user/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions), you might receive an error message saying: diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md index 15543d9d..8cb9e68a 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md @@ -1,6 +1,4 @@ -# Search Record By Specific Field - #Search Record by Specific Field While creating any document (say Sales Invoice), you have to select other document id in it (say Serial No). For ease in selection, you can also make value of other field of that visible in the search result. Search By functionality enables to define field whos value will be visible in the search result. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md index b16aa20e..638959f3 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-language.md @@ -1,6 +1,4 @@ -# Set Language - #Change the Language ERPNext is an multi-lingual application. It allows each user to select preferred lannguage. Following is how User can customize language in one's account. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md index 607f6e1f..deba31b9 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/articles/set-precision.md @@ -1,6 +1,4 @@ -# Set Precision - #Set Precision In ERPNext, default precision for `Float`, `Currency` and `Percent` field is three. It allows you to enter value having value upto three decimal places. diff --git a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md index d2db7151..32fa5e68 100644 --- a/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md +++ b/foundation/www/docs/user/manual/en/customize-erpnext/kanban-board.md @@ -1,6 +1,4 @@ -# Kanban Board - #Kanban Board Kanban is a Japanese manufacturing system in which the supply of components is regulated through the use of an instruction card sent along the production line. 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 e9abf0b7..91dd3dfb 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 @@ -40,11 +40,18 @@ To make payment against the expense claim, user has to click on Make > Bank Entr Expense Claim #### Payment Entry -Expense Claim - +Expense Claim Note: This amount should not be clubbed with Salary because the amount will then be taxable to the Employee. +Alternatively, a Payment Entry can be made for an employee and all outstanding Expense Claims will be pulled in. + +> Accounts > Payment Entry > New Payment Entry + +Set the Payment Type to "Pay", the Party Type to Employee, the Party to the employee being paid and the account being paid +from. All outstanding expense claims will be pulled in and payments amounts can be allocated to each expense. +Expense Claim + ### Linking with Task & Project * To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim diff --git a/foundation/www/docs/user/manual/en/human-resources/holiday-list.md b/foundation/www/docs/user/manual/en/human-resources/holiday-list.md index 8fec005e..bb03c188 100644 --- a/foundation/www/docs/user/manual/en/human-resources/holiday-list.md +++ b/foundation/www/docs/user/manual/en/human-resources/holiday-list.md @@ -1,6 +1,4 @@ -# Holiday List - #Holiday List Holiday List is a list which contains the dates of holidays. diff --git a/foundation/www/docs/user/manual/en/human-resources/leave.md b/foundation/www/docs/user/manual/en/human-resources/leave.md index 439cbeb6..931a46cf 100644 --- a/foundation/www/docs/user/manual/en/human-resources/leave.md +++ b/foundation/www/docs/user/manual/en/human-resources/leave.md @@ -1,6 +1,4 @@ -# Leave - #Overview This section enables you to manage leave schedule of your organization. It also explains the way employees can apply for leaves. Employees create leave request and manager (leave approver) approves or rejects the request. You can select from a number of leave types such as sick leave, casual leave, privilege leave and so on. You can also allocate leaves to your employees and generate reports to track leaves record. diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md index d6f36490..5f7aeba4 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md @@ -1,6 +1,4 @@ -# Nested Bom Structure - #Nested BOM Structure **Question:** Our manufacturing process involves producing sub-assembly items before final product. How should we manage BOM master in this scenario? 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 355d1849..314cf5b2 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md @@ -1,6 +1,4 @@ -# Production Planning Subassembly - #Production Planning & Subassembly if you need Production Planning Tool to consider raw-materials required for the manufacturing of sub-assembly items selected in the BOM, please check following instructions to achieve the same. diff --git a/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md b/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md index a7364691..278beb30 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md +++ b/foundation/www/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.md @@ -1,6 +1,4 @@ -# Valuation Based On Field In Bom - #Valuation Based On in BOM **Question:** What are for various options in `Valuation Based On` in the Bill Of Materials (BOM)? 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 eb1cb380..1ca2c3fd 100644 --- a/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md +++ b/foundation/www/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md @@ -1,6 +1,4 @@ -# Manufacturing Settings - #Manufacturing Settings Manufacturing Settings can be found at: diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md b/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md index 0e0bca34..81c378ca 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/salary-slip-from-timesheet.md @@ -1,6 +1,4 @@ -# Salary Slip From Timesheet - #Salary Slip from Timesheet If salary / wages for your employees are calculated based on number of hours worked, you can use Timesheet to track actual hours worked, and for creating Salary Slip. diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md b/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md index 5cec36bb..2a54d20f 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/sales-invoice-from-timesheet.md @@ -1,6 +1,4 @@ -# Sales Invoice From Timesheet - #Sales Invoice from Timesheet Customer can be invoiced based on total no. of hours your Employees has worked for that Customer. Timesheet can be used to track actual no. of hours Employee has worked. For example, in the IT services domain, clients are billed based on man-hour bases, where per hour billing cost is pre-determined.s diff --git a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md index f84a6a2a..9ac61121 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md @@ -1,6 +1,4 @@ -# Timesheet Against Production Order - #Timesheet based on Production Order Creating Timesheet for Production Order helps in capacity planning for the Workstations. Also it helps in tracking actual time consumed the Workstation for completing specific operation. 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 a79e216d..150803b4 100644 --- a/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md +++ b/foundation/www/docs/user/manual/en/projects/timesheet/timesheet-against-project.md @@ -1,6 +1,4 @@ -# Timesheet Against Project - #Timesheet against Project and Task Timesheets can be tracked against Project and Tasks so that you can get reports on how much time was spent on each Task or Project. diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md index 8c70a7e4..fba3109f 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_criteria.md @@ -1,6 +1,4 @@ -# Assessment Criteria - #Assessment Criteria Assessment Criteria is the parameter based on which you assess the Student. diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md index b94cf081..79ed5dcb 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_group.md @@ -1,6 +1,4 @@ -# Assessment Group - #Assessment Group Assessment Group tree is a master where you can define the hierarchy for examination conducted in your education institute. diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md index 6b557ded..0d15f631 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_plan.md @@ -1,6 +1,4 @@ -# Assessment Plan - #Assessment Plan To schedule an assessment/examination for a Student Group, for specific Course, create Assessment Plan. In the Assessment Plan, you can also capture details like: diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md index f3c0b6d2..cd9ba678 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result.md @@ -1,6 +1,4 @@ -# Assessment Result - #Assessment Result Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool](/docs/user/manual/en/schools/assessment/assessment_result_tool.html). diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md index ce1a36b4..55182267 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/assessment_result_tool.md @@ -1,6 +1,4 @@ -# Assessment Result Tool - #Assessment Result Tool Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student. diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md b/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md index 3385a2ef..0874cf14 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/grading_scale.md @@ -1,6 +1,4 @@ -# Grading Scale - #Grading Scale In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned. diff --git a/foundation/www/docs/user/manual/en/schools/Assessment/index.md b/foundation/www/docs/user/manual/en/schools/Assessment/index.md index 58d97326..317b468f 100644 --- a/foundation/www/docs/user/manual/en/schools/Assessment/index.md +++ b/foundation/www/docs/user/manual/en/schools/Assessment/index.md @@ -1,6 +1,4 @@ -# Assessment - #Assessment Every education institute organizes assessment / examination to evaluates progress of their Students. In ERPNext, you can manage complete assessment processing for your ERPNext account. diff --git a/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md b/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md index 18edacf2..f5df998e 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md +++ b/foundation/www/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md @@ -1,6 +1,4 @@ -# Selling In Different Uom - #Selling in Different Unit (UoM) A sell price unit of measure (UOM) is the UOM with which you price items. You can have multiple sell price UOMs for any inventory item. However, when Customer places, UoM for an item could change. diff --git a/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md b/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md index a0a25ecc..071da4ec 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md +++ b/foundation/www/docs/user/manual/en/selling/articles/adding-margin.md @@ -1,6 +1,4 @@ -# Adding Margin - #Adding Margin User Can apply the margin on Quotation Item and Sales Order Item using following two options. diff --git a/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md b/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md index 914ca294..d3dc325c 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md +++ b/foundation/www/docs/user/manual/en/selling/articles/applying-discount.md @@ -1,6 +1,4 @@ -# Applying Discount - #Applying Discount There are several ways Discount can be applied on an item in the sales transactions. diff --git a/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md b/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md index 65e42c46..bc4be7a6 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md +++ b/foundation/www/docs/user/manual/en/selling/articles/close-sales-order.md @@ -1,6 +1,4 @@ -# Close Sales Order - #Close Sales Order In the submitted Sales Orders, you will find **Stop** option. Stopping Sales Order will restrict user from creating Delivery Note and Sales Invoice against it. 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 be7705f8..bf823234 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md +++ b/foundation/www/docs/user/manual/en/selling/articles/drop-shipping.md @@ -1,6 +1,4 @@ -# Drop Shipping - #Drop Ship **Drop shipping** is a supply chain management technique in which the retailer does not keep goods in stock. Instead they transfer customer orders and shipment details to either the manufacturer, another retailer, or a wholesaler, who then ships the goods directly to the customer 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 27d76756..3540e673 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md +++ b/foundation/www/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md @@ -1,6 +1,4 @@ -# Erpnext For Services Organization - #ERPNext for Service Organization **Question:** ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by companies offering servies? diff --git a/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md index fec0c8ff..fb87b011 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md +++ b/foundation/www/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md @@ -1,6 +1,4 @@ -# Sales Persons In The Sales Transactions - #Sales Persons in the Sales Transactions In ERPNext, Sales Person master is maintained in [tree structure](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.html). Sales Person is selectable in all the sales transactions. diff --git a/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md b/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md index 8fdde614..06a23cf4 100644 --- a/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md +++ b/foundation/www/docs/user/manual/en/selling/articles/shipping-rule.md @@ -1,6 +1,4 @@ -# Shipping Rule - #Shipping Rule Shipping Rule master helps in defining a rule based on which shipping charge is applied on a sales transactions. diff --git a/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md b/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md index fefb9b4c..4711b830 100644 --- a/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md +++ b/foundation/www/docs/user/manual/en/selling/setup/product-bundle.md @@ -1,6 +1,4 @@ -# Product Bundle - #Product Bundle Product Bundle can be seen as something like a "Bill-of-Material" on the Sales side. It's a master where you can list existing items which are bundled together and sold as a set (or bundle). For instance, when you sell a laptop, you need to ensure that charger, mouse and laptop bag are delivered with it and stock levels of these items get affected. diff --git a/foundation/www/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md b/foundation/www/docs/user/manual/en/setting-up/articles/calculate-incentive-for-sales-team.md similarity index 100% rename from foundation/www/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md rename to foundation/www/docs/user/manual/en/setting-up/articles/calculate-incentive-for-sales-team.md diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/change-password.md b/foundation/www/docs/user/manual/en/setting-up/articles/change-password.md index 0a6fbe89..f9b5ddee 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/change-password.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/change-password.md @@ -1,6 +1,4 @@ -# Change Password - #Change User Password Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md index 4648a409..e30d976d 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md @@ -1,6 +1,4 @@ -# Delete A Company And All Related Transactions - #Delete All Related Transactions for a Company Often, users setup all the master data and then create a few dummy records. Then they want to delete the dummy records and the company and start over again, keeping the other master data like Customers, Items, BOMs intact. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md b/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md index 37111046..3e6d90af 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/edit-submitted-document.md @@ -1,6 +1,4 @@ -# Edit Submitted Document - #Edit Submitted Document To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/index.txt b/foundation/www/docs/user/manual/en/setting-up/articles/index.txt index e6a3b85a..acf15318 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/index.txt +++ b/foundation/www/docs/user/manual/en/setting-up/articles/index.txt @@ -1,6 +1,7 @@ change-password delete-a-company-and-all-related-transactions edit-submitted-document +calculate-incentive-for-sales-team integrating-erpnext-with-other-application manage-header-and-footer managing-multiple-companies @@ -9,4 +10,5 @@ managing-tree-structure-masters naming-series-current-value overwriting-data-from-data-import-tool rename-user -using-custom-domain-on-erpnext \ No newline at end of file +using-custom-domain-on-erpnext +setup-two-factor-authentication \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md b/foundation/www/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md index 290267cb..7ad55872 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md @@ -1,6 +1,4 @@ -# Integrating Erpnext With Other Application - #Integrating ERPNext with other Applications For now, ERPNext has out-of-the-box integration available for some applications like Shopify, your SMS gateway and payment gateway. To integrate ERPNext with other application, you can use REST API of Frappé. Check following links to learn more about REST API of Frappé. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md b/foundation/www/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md index c13e333d..bab703b9 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/manage-header-and-footer.md @@ -1,6 +1,4 @@ -# Manage Header And Footer - #Manage Header And Footer Check following to learn how to setup Letter Head in ERPNext. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md index 3761de38..7e8b05db 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md @@ -1,6 +1,4 @@ -# Managing Multiple Companies - #Managing Multiple Companies ERPNext allows you to create multiple companies in a single ERPNext instance. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md index da01a612..552ea718 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-perm-level.md @@ -1,6 +1,4 @@ -# Managing Perm Level - #Managing Perm Level in Permission Manager In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md index a798d33a..0547cd1f 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md @@ -1,6 +1,4 @@ -# Managing Tree Structure Masters - #Managing Tree Structure Masters Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent master, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md index 092ad94d..715a86db 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/naming-series-current-value.md @@ -1,6 +1,4 @@ -# Naming Series Current Value - #Setting the Current Value for Naming Series Naming Series feature allows you to define prefix for naming of a documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO-00001, SO-00002... and so on. Click [here](/docs/user/manual/en/setting-up/settings/naming-series.html) to learn how you can customize Number Series for a transaction/master in ERPNext. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md b/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md index da779d9e..391d37f9 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.md @@ -1,6 +1,4 @@ -# Overwriting Data From Data Import Tool - #Overwriting Data from Data Import Tool Data Import Tool allows importing documents (like customers, Suppliers, Orders, Invoices etc.) from spreadsheet file into ERPNext. The very same tool can also be used for overwrite values in the existing documents. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md b/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md index 80bb4860..fc83df5e 100644 --- a/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md +++ b/foundation/www/docs/user/manual/en/setting-up/articles/rename-user.md @@ -1,6 +1,4 @@ -# Rename User - #Rename User Renaming functionality allows you to edit id of specific record. User is saved with person's Email Address. Only User with System Manager's role will be able to rename User IDs. diff --git a/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md b/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md new file mode 100644 index 00000000..d2940d60 --- /dev/null +++ b/foundation/www/docs/user/manual/en/setting-up/articles/setup-two-factor-authentication.md @@ -0,0 +1,42 @@ + +#Setup Two Factor Authentication + +##Enable Two Factor Authentication (2FA) + +Activate two factor authentication by running the command. + +`bench --site [sitename] enable_two_factor_auth true` + +Specify the following in System Settings + +* The method of OTP validation (OTP App = TOTP using Soft or Hard Token while Email/SMS = HOTP using Email or SMS +* The expiry time for the QR Code on the server if OTP App is specified +* The OTP Issuer Name. + +Enable Two Factor Auth + + +On activation of 2FA from setup, it is also activated for the Role "All". In this way, all users including the Administrator have to perform a 2nd level authentication with a token. By unchecking the "Two Factor Authentication" checkbox in the "All" role and enabling it in other roles, the need to login with a token can be limited to specific roles. 2FA does not apply to login by Web Users and API login + +Role Enable Two Factor Auth + +If using SMS authentication, please make sure that your SMS settings are updated + +SMS Settings + +If using Email, make sure that your outgoing Email account settings are updated + +Email Settings + +When the new user tries to log in for the first time in a system that has two-factor authentication enabled and which has the authentication option as OTP App, an email is sent containing a link to the QR Code. + +Email Notify Two Factor +QR Code Page + +Scanning the QR Code with an authentication app like Google Authenticator registers the access for the user and automatically starts to generate tokens that can be used to login + +Two Factor Scan App + +If either of Email/SMS is used as the authentication method, you get notifications also + +Email and SMS \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/setting-up/index.txt b/foundation/www/docs/user/manual/en/setting-up/index.txt index 92378252..129876eb 100644 --- a/foundation/www/docs/user/manual/en/setting-up/index.txt +++ b/foundation/www/docs/user/manual/en/setting-up/index.txt @@ -15,5 +15,4 @@ third-party-backups workflows bar-code company-setup -calculate-incentive-for-sales-team articles diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md b/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md index a123b4cc..66495178 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/dropbox-backup.md @@ -1,6 +1,4 @@ -# Dropbox Backup - #Setting Up Dropbox Backups We always recommend customers to maintain backup of their data in ERPNext. The database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well. diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md index b41f39a7..2c486e31 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/ldap-integration.md @@ -1,6 +1,4 @@ -# Ldap Integration - #Setting up LDAP Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations. diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md index bed87384..9e78752a 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/paypal-integration.md @@ -1,6 +1,4 @@ -# Paypal Integration - #Setting up PayPal A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar. diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md index de14c56c..07838c5c 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/razorpay-integration.md @@ -1,6 +1,4 @@ -# Razorpay Integration - #Setting up Razorpay A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar. diff --git a/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md b/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md index edec5052..6bd00e20 100644 --- a/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md +++ b/foundation/www/docs/user/manual/en/setting-up/integrations/stripe-integration.md @@ -1,6 +1,4 @@ -# Stripe Integration - #Setting up Stripe To setup Stripe, diff --git a/foundation/www/docs/user/manual/en/setting-up/print/cheque-print-template.md b/foundation/www/docs/user/manual/en/setting-up/print/cheque-print-template.md index e2e58d8f..56504bf2 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/cheque-print-template.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/cheque-print-template.md @@ -1,6 +1,4 @@ -# Cheque Print Template - #Cheque Print Template Business involves making payment to various parties like suppliers and employees. Payment can be made in various modes like cash, NEFT or cheque. If you are making a payment via cheque, you can also create a Print Format for printing Cheque from ERPNext based on the Payment Entry. diff --git a/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md b/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md index 77dd092c..3d73bbe7 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/custom-translations.md @@ -1,6 +1,4 @@ -# Custom Translations - #Custom Translations User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature. 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 2384678e..8ee6c7b5 100644 --- a/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md +++ b/foundation/www/docs/user/manual/en/setting-up/print/letter-head.md @@ -1,6 +1,4 @@ -# Letter Head - #Letter Head Each company has default Letter Head for their company. This Letter Head values are generally set as Header and Footer in the documents. In ERPNext, you can capture the these details in the Letter Head master. diff --git a/foundation/www/docs/user/manual/en/setting-up/settings/system-settings.md b/foundation/www/docs/user/manual/en/setting-up/settings/system-settings.md index eae0f26c..39bdb759 100644 --- a/foundation/www/docs/user/manual/en/setting-up/settings/system-settings.md +++ b/foundation/www/docs/user/manual/en/setting-up/settings/system-settings.md @@ -11,4 +11,14 @@ To open System Settings, go to: System Settings +####Two Factor Authentication. +Settings for Two Factor Authentication can be configured here. + +* Select the authentication method to be used +* Expiry time for QRCode image if "OTP App" is selected in method +* Issuer name of the One Time Password + +Two Factor Auth + + {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt index 74f6a42f..eb765582 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/index.txt @@ -1,10 +1,10 @@ step-1-language step-2-currency-and-timezone step-3-user-details -step-4-company-details -step-5-letterhead-and-logo -step-6-add-users -step-7-tax-details -step-8-customer-names -step-9-suppliers -step-10-item +step-5-company-details +step-6-letterhead-and-logo +step-7-add-users +step-8-tax-details +step-9-customer-names +step-10-suppliers +step-11-item diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md similarity index 92% rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md index 72abf31c..ad1bbf11 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-suppliers.md @@ -1,5 +1,5 @@ -# Step 8: Suppliers +# Step 10: Suppliers Enter a few of your Suppliers' names. diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-item.md similarity index 95% rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-item.md index 6613abd0..a557719e 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-11-item.md @@ -1,5 +1,5 @@ -# Step 9: Item Names +# Step 11: Item Names In this final step, please enter the names of the Items you buy or sell. diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md index 43d449c1..ee660298 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md @@ -3,8 +3,7 @@ Enter Users Profile Details like Name, User ID and preferred password. -User +User --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md new file mode 100644 index 00000000..f6e758c0 --- /dev/null +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-two-factor-authentication.md @@ -0,0 +1,14 @@ + +# Step 4: Two Factor Authentication + +Enable Two Factor Athentication + +TwoFactor + +--- +###Authentication Method +Whenevever each user logs in, based on the role set for that user, +they will be asked for a **One Time Password** after they input +their login details. + +{next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md similarity index 85% rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md index 31d124d3..63246bff 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-company-details.md @@ -1,10 +1,9 @@ -# Step 4: Company Details +# Step 5: Company Details Enter Company Details like Name, Abbreviation and Financial Year Details. -Company Details +Company Details --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-letterhead-and-logo.md similarity index 85% rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-letterhead-and-logo.md index c82784d5..2531fa66 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-letterhead-and-logo.md @@ -1,10 +1,9 @@ -# Step 5: Letterhead and Logo +# Step 6: Letterhead and Logo Attach Company Letterhead and Company Logo. -Company Logo and Letterhead +Company Logo and Letterhead --- diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md similarity index 51% rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md index 907edafb..74bb492f 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-add-users.md @@ -1,9 +1,8 @@ -# Step 6: Add Users +# Step 7: Add Users Add other users and assign them roles based on their job responsibilities. -Users +Users {next} diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md similarity index 91% rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md index 4092bb70..b6dbe0df 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-tax-details.md @@ -1,10 +1,9 @@ -# Step 6: Tax Details +# Step 8: Tax Details Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type. -Tax Details +Tax Details Just set the tax name and the standard percentage levied. diff --git a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md similarity index 84% rename from foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md rename to foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md index 50446ed8..08eb4c29 100644 --- a/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md +++ b/foundation/www/docs/user/manual/en/setting-up/setup-wizard/step-9-customer-names.md @@ -1,11 +1,10 @@ -# Step 7: Customers +# Step 9: Customers Enter your Customer names and the contact person from that organisation. -Customers +Customers --- diff --git a/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md index e9c8a877..bee69488 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md +++ b/foundation/www/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md @@ -1,6 +1,4 @@ -# Allow Over Delivery Billing Against Sales Order Upto Certain Limit - #Allow Over Delivery/Billing While creating Delivery Note, system validates if item's Qty mentined is same as in the Sales Order. If Item Qty has been increased, you will get over-delivery validation. If you want to be able to deliver more items than mentioned in the Sales Order, you should update "Allow over delivery or receipt upto this percent" in the Item master. diff --git a/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md index 72bbe22e..1bd7f159 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md +++ b/foundation/www/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md @@ -1,6 +1,4 @@ -# Auto Creation Of Material Request - #Auto Creation of Material Request To prevent stockouts, you can track item's reorder level. When stock level goes below reorder level, purchase manager is notified and instructed to initiate purchase process for the item. diff --git a/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md b/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md index 2b5a5d3f..e9ee86d6 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md +++ b/foundation/www/docs/user/manual/en/stock/articles/creating-depreciation-for-item.md @@ -1,6 +1,4 @@ -# Creating Depreciation For Item - #Depreciation Entry **Question:** A Fixed Asset Item has been purchased and stored in a warehouse. How to create a depreciation for a Fixed Asset Item? diff --git a/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md b/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md index 1b771803..47b71eaf 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md +++ b/foundation/www/docs/user/manual/en/stock/articles/maintain-stock-field-frozen-in-item-master.md @@ -1,6 +1,4 @@ -# Maintain Stock Field Frozen In Item Master - #Maintain Stock field Frozen in the Item master In the item master, you might witness values in the following fields to be frozen. diff --git a/foundation/www/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md b/foundation/www/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md index 41fe8324..8cd24969 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md +++ b/foundation/www/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md @@ -1,6 +1,4 @@ -# Manage Rejected Finished Goods Items - #Manage Rejected Finished Goods Items There could be manufactured Items which would not pass quality test, hence rejected. diff --git a/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md b/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md index 96a505c3..912aa6eb 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md +++ b/foundation/www/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.md @@ -1,6 +1,4 @@ -# Managing Batch Wise Inventory - #Managing Batch wise Inventory Set of items which has same properties and attributes can be group in a single Batch. For example, pharmaceuticals items are batch, so that it's manufacturing and expiry date can be tracked together. diff --git a/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md index 6ac6d94c..a98c75a7 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md +++ b/foundation/www/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md @@ -1,6 +1,4 @@ -# Managing Fractions In Uom - #Managing Fractions in UoM UoM stands for Unit of Measurement. Few examples of UoM are Numbers (Nos), Kgs, Litre, Meter, Box, Carton etc. diff --git a/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md index d6d68672..f229af31 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md +++ b/foundation/www/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md @@ -1,6 +1,4 @@ -# Opening Stock Balance Entry For The Serialized And Batch Item - #Opening Stock Balance Entry for the Serialized and Batch Item Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them is update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](/docs/user/manual/en/stock/serial-no.html). diff --git a/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md b/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md index f6e20c0b..50620b2a 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md +++ b/foundation/www/docs/user/manual/en/stock/articles/repack-entry.md @@ -1,6 +1,4 @@ -# Repack Entry - #Repack Entry Repack Entry is created for item bought in bulk, which is being packed into smaller packages. For example, item bought in tons can be repacked into Kgs. diff --git a/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md index 886e7f29..c8a2b2d9 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md +++ b/foundation/www/docs/user/manual/en/stock/articles/serial-no-naming.md @@ -1,6 +1,4 @@ -# Serial No Naming - #Serial No. Naming Serial Nos. is unique value assigned on each unit of an item. Serial no. helps in tracking item's warranty and expiry details. Generally high value items like machines, computers, costly equipments are serialized. 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 a85dcc2f..11c12abe 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md +++ b/foundation/www/docs/user/manual/en/stock/articles/stock-entry-purpose.md @@ -1,6 +1,4 @@ -# Stock Entry Purpose - #Stock Entry Purpose Stock Entry is a stock transaction, which can be used for multiple purposes. Let's learn about each Stock Entry Purpose below. 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 6c65395f..583b5b90 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/stock-level-report.md +++ b/foundation/www/docs/user/manual/en/stock/articles/stock-level-report.md @@ -1,6 +1,4 @@ -# Stock Level Report - #Stock Level Report Stock Level report list stock item's quantity available in a particular warehouse. diff --git a/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md index 82e383f1..893ae7bb 100644 --- a/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md +++ b/foundation/www/docs/user/manual/en/stock/articles/track-items-using-barcode.md @@ -1,6 +1,4 @@ -# Track Items Using Barcode - #Track Items Using Barcode A barcode is a value decoded into vertical spaced lines. Barcode scanners are the input medium, like Keyboard. When it scans a barcode, the data appears in the computer screens at the point of a cursor. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md index 6ea3922b..a45080f9 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md @@ -1,6 +1,4 @@ -# Adding Attachments To Outgoing Messages - #Adding Attachments to Outgoing Messages ERPNext has in-built file manager. Click [here](/docs/user/videos/learn/file-manager.html) to learn more on how attachments are managed in ERPNext. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md index aec4e838..034ab449 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md @@ -1,6 +1,4 @@ -# Adding File As A Attachment - #Adding File as a Attachment ERPNext allows to attach files with documents. User with a read permission on particular document will also be able to access files attached with it. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md index 79f4ff07..de46aee2 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/bulk-rename.md @@ -1,6 +1,4 @@ -# Bulk Rename - #Bulk Rename Using renaming tool, you can to rectify/change multiple document ids at once. This tool is only accessible to the User who has System Manager role assigned. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md index ea380959..a5e4e361 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md @@ -1,6 +1,4 @@ -# Check Link Between Documents - #Checking Link Between Documents Links option shows one document is linked to which other documents. Check Menu for the Links options. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md index f6cd67d2..648dcf19 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md @@ -1,6 +1,4 @@ -# Delete Submitted Document - #Delete Submitted Document To be able to delete Submitted document, you should first Cancel. Once canceled, you can delete that document from Menu or from the List View of that Document Type. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md index 683da3f4..b20e894a 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/duplicate-record.md @@ -1,6 +1,4 @@ -# Duplicate Record - #Duplicate a Record Duplicate feature helps you to copy values of existing document into new document. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md index f08e5567..7a7e95c7 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/merging-documents.md @@ -1,6 +1,4 @@ -# Merging Documents - #Merging Documents For a document, if you have two records which are identical, and meant for common purpose, you can merge them into one record. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md index 5861364d..74391b2f 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/pos-view.md @@ -1,6 +1,4 @@ -# Pos View - #POS View POS (point of sale) view renders form in a different layout, optimized for the quick selection of items. This view has primarily been designed for the retail business. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md index d69f7b93..d83692ca 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/renaming-documents.md @@ -1,6 +1,4 @@ -# Renaming Documents - #Renaming a Document Using Renaming feature, you can change ID of a master documents like Item, Warehouse, Accounts etc. Following are the steps to rename Item Code. Following same steps, you can rename other masters as well. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md index f9e0f9b9..18f58279 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/search-filter.md @@ -1,6 +1,4 @@ -# Search Filter - #Search Filter Search Filter option allow user to filter records based on value in the specific field of that document. Search Filters are available on the List View of Document Type and in the Report Builder. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md index def0cad5..5c068f75 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md @@ -1,6 +1,4 @@ -# Tree Master Renaming - #Tree Master Renaming There are various master which are maintained in tree structure. Click [here](/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.html) to learn more about tree structured masters in ERPNext. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md b/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md index a1508f4f..62fdf459 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/document-versioning.md @@ -1,6 +1,4 @@ -# Document Versioning - #Document Versioning The document versioning feature allows you to track all the changes made in the form over the period. It will be very helpful in audit trial to check which user edited what value, and when exactly. diff --git a/foundation/www/docs/user/manual/en/using-erpnext/restore-deleted-docs.md b/foundation/www/docs/user/manual/en/using-erpnext/restore-deleted-docs.md index ae03ce4e..d2ea2021 100644 --- a/foundation/www/docs/user/manual/en/using-erpnext/restore-deleted-docs.md +++ b/foundation/www/docs/user/manual/en/using-erpnext/restore-deleted-docs.md @@ -1,6 +1,4 @@ -# Restore Deleted Docs - #Restore Deleted Documents In ERPNext, you can delete a records if not needed. They can be masters like Items, Customer or transactions like Sales Order, Payment Entries etc. diff --git a/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md index 3cfdec49..c4c92d85 100644 --- a/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md +++ b/foundation/www/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md @@ -1,6 +1,4 @@ -# Managing User Sign Up Via Website - #Customer / Supplier Signup Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page. diff --git a/foundation/www/docs/user/manual/en/website/articles/website-security.md b/foundation/www/docs/user/manual/en/website/articles/website-security.md index c280a84c..cfe6071c 100644 --- a/foundation/www/docs/user/manual/en/website/articles/website-security.md +++ b/foundation/www/docs/user/manual/en/website/articles/website-security.md @@ -1,6 +1,4 @@ -# Website Security - #Website Security One can easily generate a website using ERPNext. We can list our Products on the website and also create blogs. Products are directly fetched from the Item Master records of your ERPNext account. Some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to the public.