updated docs

erpnext/config/docs.py

@@ -12,7 +12,7 @@ You can create Custom Form, Fields, Scripts and can also create your own Apps
 to extend ERPNext functionality.
 
 ERPNext is Open Source under the GNU General Public Licence v3 and has been
-listed as one of the Best Open Source Softwares in the world by my online
+listed as one of the Best Open Source Softwares in the world by many online
 blogs."""
 
 docs_version = "6.x.x"

erpnext/docs/index.html

@@ -38,7 +38,7 @@ You can create Custom Form, Fields, Scripts and can also create your own Apps
 to extend ERPNext functionality.</p>
 
 <p>ERPNext is Open Source under the GNU General Public Licence v3 and has been
-listed as one of the Best Open Source Softwares in the world by my online
+listed as one of the Best Open Source Softwares in the world by many online
 blogs.</p>
 
   </div>

erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md

@@ -6,7 +6,7 @@ For retail operations, the delivery of goods, accrual of sale and payment all ha
 
 ###Offline POS
 
-POS transactions are generally quick, hence should have as less dependency as possible. In ERPNext, you can create POS Invoices even when not connected to the internet.
+In the retails business, invoicing needs to done very quickly, hence should less dependency. In the ERPNext, you can create POS Invoices, even when not connected to the internet.
 
 POS Invoices created in the offline mode will be saved locally in the browser. If internet connection is lost which creating POS Invoice, you will still be able can proceed forward. Once internet connection is available again, offline invoices will be synced, and pushed onto your ERPNext account. To learn more on how POS Invoices can be created when offline, [check here.](https://frappe.io/blog/blog/erpnext-features/offline-pos-in-erpnext-7)
 

erpnext/docs/user/manual/en/setting-up/print/index.txt

@@ -4,4 +4,5 @@ print-headings
 letter-head
 address-template
 terms-and-conditions
-cheque-print-template
+cheque-print-template
+multi-lingual-print-format

erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md

@@ -1,28 +1,26 @@
-####What is Multlingual Print Format?
+#Multi-lngual Print Formats
 
 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.
 
-####How does it work?
-Set print language for customer, supplier on their respective form.
+####Set Language
 
-`Selling -> Customer -> Customer List -> Click on New`
+In the Customer master, select default Language. Say default language for the Customer is <b>deutsch</b>.
 
-Here user has set default language for customer Adalbert as <b>deutsch</b>.
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/set_customer_default_lang.png" class="screenshot">
 
-<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/set_customer_default_lang.png" class="screenshot">
+Same way, you can also set default language in the Supplier master.
 
-`Buying -> Supplier -> Supplier List -> Click on New`
+<img src="{{docs_base_url}}/assets/img/multilingual_print_format/set_supplier_default_lang.png" class="screenshot">
 
-Here user has set default language for supplier Piero as <b>Italiano</b>.
-<img src="{{ docs_base_url }}/assets/img/multilingual_print_format/set_supplier_default_lang.png" class="screenshot">
+####Print Preview in the Party's Language
 
-When user click on print icon on the document, system will load the print preview in their default language.
+In the Print Preview of a transaction, values will be translated into party's language.
 
-Customer quotation standard print preview in customer's default language.
+Customer Quotation print preview in customer's default language.
 
 <img src="{{ docs_base_url }}/assets/img/multilingual_print_format/customer_quotation.png" class="screenshot">
 
-Supplier quotation standard print preview in supplier's default language.
+Supplier Quotation print preview in supplier's default language.
 
 <img src="{{ docs_base_url }}/assets/img/multilingual_print_format/supplier_quotation.png" class="screenshot">
 
@@ -32,16 +30,15 @@ User can have option to select alternate language on print view.
 
 <img src="{{ docs_base_url }}/assets/img/multilingual_print_format/alternate_language.png" class="screenshot">
 
-
 ####Custom Translation
 
 User can set their custom translations using translation form. For example user want to set description of the product in customer's language(Italiano). For that create new translation with language as Italiano, enter source data and Translated information.
 
-`Setup -> Settings -> Translation List -> Click on New`
+`Setup > Settings > Translation List > New`
 
 <img src="{{ docs_base_url }}/assets/img/multilingual_print_format/translation.png" class="screenshot">
 
-The translation is applied when user select language as Italiano on supplier quotation's print prieview.
+The translation is applied when user select language as Italiano on supplier quotation's print preview.
 
 <img src="{{ docs_base_url }}/assets/img/multilingual_print_format/custom_translation.png" class="screenshot">
 

erpnext/docs/user/manual/en/using-erpnext/assignment.md

@@ -2,7 +2,7 @@ Assign To feature in ERPNext allows you to allocate particular document to speci
 
 For example, if Sales Order needs to be approved/submitted by Sales Manager, first draft user can allocate that Sales Order to Sales Manager. On allocating document to Sales Manager, it will be added to that user's ToDo list. Same way, allocation can also be done to Material User and Account user who needs to create Delivery Note and Sales Invoice respectively against this Sales Note.
 
-<div class=well>Permissions restriction cannot be done based on Assigned To</div>
+<div class=well>Permissions restriction cannot be done based on Assigned To.</div>
 
 Following are the steps to assign document to another user.
 
@@ -10,30 +10,28 @@ Following are the steps to assign document to another user.
 
 Assign to option is located at the footer of document. Clicking on Assignment Icon on the tool bar will fast-forward you to footer of same document.
 
-![Assigned To Icon]({{docs_base_url}}/assets/old_images/erpnext/assigned-to-icon.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/assign-1.png">
 
 
-![Assigned To]({{docs_base_url}}/assets/old_images/erpnext/assigned-to.png)
-
 #### 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 User]({{docs_base_url}}/assets/old_images/erpnext/assign-user.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/accounts/assign-2.png">
 
-With assignment, you can also leave a comment for the review of asignee.
+With assignment, you can also leave a comment for the review of assignee.
 
 ####ToDo List of Assignee
 
 This transaction will appear in the To-do list of the ser in “Todo” section.
 
-![Assign Todo]({{docs_base_url}}/assets/old_images/erpnext/assign-todo.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/accounts/assign-3.png">
 
 ####Removing Assignment
 
 User will be able to remove assignment by clicking on "Assignment Completed" button in the document.
 
-![Assign Remove]({{docs_base_url}}/assets/old_images/erpnext/assign-remove.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/accounts/assign-4.png">
 
 Once assignment is set as completed, Status of its ToDo record will be set as Closed.
 

erpnext/docs/user/manual/en/using-erpnext/calendar.md

@@ -1,36 +1,46 @@
-The Calendar is a tool where you can create and share Events and also see
-auto-generated events from the system.
+The Calendar is a tool where you can create and share Events and also see auto-generated events from the system.
 
-You can switch calender view based on Month, Week and Day.
+You can access Calendar from
 
-###Creating Events in Calender
+`Explore > Tools > Calendar`
+
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-1.png">
+
+###Creating new Event
 
 ####Creating Event Manually
 
-To create event manually, you should first determine Calender View. If Event's start and end time will be within one day, then you should first switch to Day view.
+To create event manually, you should first select the Calender View (Day, Month, Year). If Event's start and end time will be within one day, then select Week or Day view.
 
-This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time.
+Select the Time from for the Event via drag and drop.
 
-![Calender Event Manually]({{docs_base_url}}/assets/old_images/erpnext/calender-event-manually.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-2.gif">
 
-Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it.
+Based on the selection of time slot, Start Time and End Time will be updated in the Event master.
 
-####Event Based on Lead
+####Subject
+
+Enter Subject for the Event.
+
+####Event Type
+
+Event Type can be Public or Private. Public Events will be visible to all the Users.
+
+###Event Based on Lead
 
 In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person specified in this field.
 
-![Calender Event Lead]({{docs_base_url}}/assets/old_images/erpnext/calender-event-lead.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-3.png">
 
-####Birthday Event
+###Birthday Events
 
-Birthday Event is created based on Date of Birth specified in the Employee master.
+Birthday Events are auto-created based on Date of Birth of the Employee.
 
 ###Recurring Events
 
-You can set events as recurring in specific interval by Checking the "Repeat This
-Event".
+You can set events as recurring in specific interval by Checking the "Repeat This Event".
 
-![Calender Event Recurring]({{docs_base_url}}/assets/old_images/erpnext/calender-event-recurring.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-4.png">
 
 ###Permission for Event
 
@@ -38,7 +48,7 @@ You can set Event as Private or Public. Private Events will be visible only to y
 
 Public Event, like Birthday will be visible to all.
 
-![Calender Event Permission]({{docs_base_url}}/assets/old_images/erpnext/calender-event-permission.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-5.png">
 
 ###Event Reminders
 
@@ -48,16 +58,12 @@ There are two ways you can receive email reminder for an event.
 
 In the Event master, checking "Send an email reminder in the morning" will trigger notification email to all the participants for this event.
 
-![Calender Event Notification]({{docs_base_url}}/assets/old_images/erpnext/calender-event-notification.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-6.png">
 
-####Create Email Digest
+###Calendar Views
 
-To get email reminders for event, you should set Email Digest for Calender Events.
+Calendar view is available for the documents like Sales Order, Production Order, Holiday List, Leave Application etc. Based on the posting date of the document, it's link will be visible in the Calendar.
 
-Email Digest can be set from:
-
-`Setup > Email > Email Digest`
-
-![Calender Email Digest]({{docs_base_url}}/assets/old_images/erpnext/calender-email-digest.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-7.png">
 
 {next}

erpnext/docs/user/manual/en/using-erpnext/chat.md

@@ -0,0 +1,14 @@
+You can send and receive messages from the system by using the Messages tool. 
+
+`Explore > Tools > Chat`
+
+If you send a message to a user, and the user is logged in, it will appear as a popup message and the unread messages counter in the top toolbar will be
+updated.
+
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/chat-1.png">
+
+You can choose to send message to all the users, or to specific user.
+
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/chat-2.png">
+
+{next}

erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md

@@ -1,19 +1,24 @@
+Following are the tools in each document using which you can collaborate with other Users in your ERPNext account.
+
 ### Assigned to
 
-You can email any transaction from the system by clicking on the “Assigned to”
-button in the right sidebar. A log of all your sent emails will be maintained
-in Communication.
-
-![Forms]({{docs_base_url}}/assets/old_images/erpnext/forms.png)
+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
 
 Comments are a great way to add information about a transaction that is not a
-part of the transactions. Like some background information etc. Comments can
-be added in the right sidebar.
+part of the transactions. Like some background information etc.
+
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/comments-1.png">
+
+###Share
+
+You can share document with the specific User. If Document is shared with the specific User, he/she will be able to access it, even if that User doesn't have permission to access that document or Document Type.
+
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/share-1.gif">
 
 ### Tags
 
-[Read more about Tags]({{docs_base_url}}/user/manual/en/using-erpnext/tags.html)  
+[Read more about Tags]({{docs_base_url}}/user/manual/en/using-erpnext/tags.html)
 
 {next}

erpnext/docs/user/manual/en/using-erpnext/index.txt

@@ -1,10 +1,9 @@
 to-do
 collaborating-around-forms
-messages
+chat
 notes
 calendar
 assignment
 tags
 articles
 pos-view
-multilingual_print_format

erpnext/docs/user/manual/en/using-erpnext/messages.md

@@ -1,12 +0,0 @@
-You can send and receive messages from the system by using the Messages tool.
-If you send a message to a user, and the user is logged in, it will appear as
-a popup message and the unread messages counter in the top toolbar will be
-updated.
-
-![Message List]({{docs_base_url}}/assets/old_images/erpnext/message-list.png)
-
-You can choose to send message to all the users, or to specific user.
-
-![Messsage To]({{docs_base_url}}/assets/old_images/erpnext/message-to.png)
-
-{next}

erpnext/docs/user/manual/en/using-erpnext/notes.md

@@ -1,20 +1,18 @@
 You can store your long notes under this section. It can contain your partner lists, frequently used passwords, terms and conditions, or any other document which needs to be shared. Following are the steps to create new Note.
 
-####Go to Note
-
-`Home > Note > New`
+`Explore > Note > New`
 
 ####Notes Details
 
 Enter Title and Context.
 
-![Note]({{docs_base_url}}/assets/old_images/erpnext/note.png)
+<img class="screenshot" alt="Note New" src="{{docs_base_url}}/assets/img/collaboration-tools/note-1.png">
 
 ####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.
 
-![Note Permission]({{docs_base_url}}/assets/old_images/erpnext/note-permission.png)
+<img class="screenshot" alt="Note Permissions" src="{{docs_base_url}}/assets/img/collaboration-tools/note-2.png">
 
 <div class=well>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.</div>
 

erpnext/docs/user/manual/en/using-erpnext/tags.md

@@ -1,5 +1,9 @@
-Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. ERPNext will also show you all the important tags in the document list.
+Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. 
 
-![Tags]({{docs_base_url}}/assets/old_images/erpnext/tags-in-list.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/tags-1.png">
+
+ERPNext will also show you all the important tags in the document list.
+
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/collaboration-tools/tags-2.png">
 
 {next}

erpnext/docs/user/manual/en/using-erpnext/to-do.md

@@ -1,10 +1,9 @@
-To Do is a simple tool where all the activities [assigned](https://erpnext.com/collaboration-tools/assignment) to you and assigned
-by you are listed. You can also add your own to-do items in the list.
+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.
 
-![Todo List]({{docs_base_url}}/assets/old_images/erpnext/todo-list.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/accounts/assign-3.png">
 
-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 record itself.
+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.
 
-![Todo Close]({{docs_base_url}}/assets/old_images/erpnext/todo-close.png)
+<img class="screenshot" alt="Assign" src="{{docs_base_url}}/assets/img/accounts/assign-4.png">
 
 {next}