diff --git a/erpnext/docs/assets/img/accounts/pos-customer.png b/erpnext/docs/assets/img/accounts/pos-customer.png index c3cbb8a6083..20bce38920b 100644 Binary files a/erpnext/docs/assets/img/accounts/pos-customer.png and b/erpnext/docs/assets/img/accounts/pos-customer.png differ diff --git a/erpnext/docs/assets/img/accounts/pos-email.png b/erpnext/docs/assets/img/accounts/pos-email.png new file mode 100644 index 00000000000..31aa086e9f0 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/pos-email.png differ diff --git a/erpnext/docs/assets/img/taxes-and-charges.gif b/erpnext/docs/assets/img/selling/taxes-and-charges.gif similarity index 100% rename from erpnext/docs/assets/img/taxes-and-charges.gif rename to erpnext/docs/assets/img/selling/taxes-and-charges.gif diff --git a/erpnext/docs/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png b/erpnext/docs/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png new file mode 100644 index 00000000000..aec9293dc7d Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/reset-roles-permisison-for-page-report.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/role-permission-for-page-and-report.png b/erpnext/docs/assets/img/users-and-permissions/role-permission-for-page-and-report.png new file mode 100644 index 00000000000..69b31d6ed3a Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/role-permission-for-page-and-report.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/roles-for-page.png b/erpnext/docs/assets/img/users-and-permissions/roles-for-page.png new file mode 100644 index 00000000000..f28c6d7ba0e Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/roles-for-page.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/roles-for-report.png b/erpnext/docs/assets/img/users-and-permissions/roles-for-report.png new file mode 100644 index 00000000000..1f8fd4e6824 Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/roles-for-report.png differ diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md index 64fa22c5b84..0c7e591c33d 100644 --- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md +++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md @@ -27,7 +27,7 @@ In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, S ### Customer -You can select one of the existing Customer from the Customer master. If Customer doesn't exist in the Customer master, enter Customer Name in the POS Invoice view itself. On creation of POS Invoice, Customer will be auto-created in the Customer master. +In POS, user can select the existing customer during making an order or create the new customer. This features works in the offline mode also. User can also add the customer details like contact number, address details etc on the form. The customer which has been created from the POS will be synced when the internet connection is active. POS Customer @@ -105,4 +105,9 @@ Credits: To see entries after “Submit”, click on “View Ledger”. +### Email +User can send email from the POS, after submission of an order, user has to click on menu > email +POS Payment +After sync of an order, email sent to the customer with the print of the bill in the attachment + {next} diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt index b00f32ad320..74243df5209 100644 --- a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt @@ -1,4 +1,5 @@ adding-users role-based-permissions user-permissions +role-permisison-for-page-and-report sharing diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md new file mode 100644 index 00000000000..dff5c0cd1aa --- /dev/null +++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-permisison-for-page-and-report.md @@ -0,0 +1,25 @@ +# Role Permission for Page and Report + +In ERPNext, user can make his custom UI using page and the custom report using report builder or query report. ERPNext has role based permission system where user can assign roles to the user and sames roles can assign to the page and report to access them. + +If user has enbaled the developer mode then, they can add the roles in the table of page and report. With this user can transfer the roles of page and report to the production server from the develop server. + +### For Page +Assign roles to the page + +### For Report +Assign roles to the report + +## Tool for custom roles assignment + +If developer mode is disabled then user can assign the roles to the page, report using tool Role Permission for Page and Report. The changes can be apply only for the respective database, it not make changes in the code base. + +To access, goto Setup > Permissions > Role Permission for Page and Report + +Tools to assign custom roles to the page + +### Reset to defaults + +Using reset to defaults button, user can remove the custom roles applied on the page or report and set the roles which has been alredy available on the respective page or report. + +Reset the default roles