diff --git a/erpnext/docs/assets/img/collaboration-tools/__init__.py b/erpnext/docs/assets/img/collaboration-tools/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/docs/assets/img/collaboration-tools/note-1.png b/erpnext/docs/assets/img/collaboration-tools/note-1.png new file mode 100644 index 00000000000..ab61672d83b Binary files /dev/null and b/erpnext/docs/assets/img/collaboration-tools/note-1.png differ diff --git a/erpnext/docs/user/manual/en/using-erpnext/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md index 9e78b92d3c2..72b03b72776 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/assignment.md +++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md @@ -12,12 +12,11 @@ Assign to option is located at the footer of document. Clicking on Assignment Ic Assign - #### Step 2: Assign to User In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time. -Assign +Assign With assignment, you can also leave a comment for the review of assignee. @@ -25,13 +24,13 @@ With assignment, you can also leave a comment for the review of assignee. This transaction will appear in the To-do list of the ser in “Todo” section. -Assign +Assign ####Removing Assignment User will be able to remove assignment by clicking on "Assignment Completed" button in the document. -Assign +Assign Once assignment is set as completed, Status of its ToDo record will be set as Closed. diff --git a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md index 2ebd914dbf9..7ffec7677f3 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md +++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md @@ -2,7 +2,7 @@ Following are the tools in each document using which you can collaborate with ot ### Assigned to -If some document requires an action from User, you can Assign that document to that User. On assignment, User to whom document is assigned is intimated via email. To learn about Assign To feature, [click here.]({{docs_base_url}}//user/manual/en/using-erpnext/assignment.html) +If some document requires an action from User, you can Assign that document to that User. On assignment, User to whom document is assigned is intimated via email. To learn about Assign To feature, [click here.]({{docs_base_url}}/user/manual/en/using-erpnext/assignment.html) ### Comments diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.txt b/erpnext/docs/user/manual/en/using-erpnext/index.txt index c38c5f9510f..c3a6aa45ee8 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/index.txt +++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt @@ -6,4 +6,4 @@ calendar assignment tags articles -pos-view +pos-view \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/using-erpnext/notes.md b/erpnext/docs/user/manual/en/using-erpnext/notes.md index dc3972f7bbd..64e7acbe4f9 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/notes.md +++ b/erpnext/docs/user/manual/en/using-erpnext/notes.md @@ -10,10 +10,8 @@ Enter Title and Context. ####Set Permissions to select Users -To make Note accessible for all, check "Public" under links section. If specific Note is to be made accessible to specific user, they shall be selected in the Share With table. +To make Note accessible for all, check "Public" under links section. Else you can share it with the specific User by using Share feature. -Note Permissions - -
Notes can also be used as a knowledge base internally. You can also attach file in the Notes, and make it accessible to specific set of users only.
+Note New {next} diff --git a/erpnext/docs/user/manual/en/using-erpnext/to-do.md b/erpnext/docs/user/manual/en/using-erpnext/to-do.md index 013ba540073..295e79ac840 100644 --- a/erpnext/docs/user/manual/en/using-erpnext/to-do.md +++ b/erpnext/docs/user/manual/en/using-erpnext/to-do.md @@ -1,9 +1,9 @@ To Do is a simple tool where all the activities [assigned]({{docs_base_url}}/user/manual/en/using-erpnext/assignments.html) to you and assigned by you are listed. You can also add your own to-do items in the list. -Assign +Assign When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo master itself. -Assign +Assign {next}