Merge branch 'master' into property

0a672838-541a-4694-af7a-250ceb851720/0a672838-541a-4694-af7a-250ceb851720.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>0a672838-541a-4694-af7a-250ceb851720</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/0a672838-541a-4694-af7a-250ceb851720/inbox/mainHelp_en_us.adoc</reference>
+  <path>Inbox/mainHelp</path>
+  <locale>en_us</locale>
+</userhelp>

0a672838-541a-4694-af7a-250ceb851720/inbox/mainHelp_en_us.adoc

+:icons: font
+
+== Inboxes
+
+A inbox represents a *logical data pot* from which *emails are fetched and processed*.
+
+Additionally, *each inbox represents a mailbridge*.
+
+[WARNING]
+The mailbridge to a inbox must be created *manually*.
+
+=== Settings
+Settings for the *automatic reopening of a ticket* can be stored in a inbox.
+
+=== Assignments
+==== E-mail
+A inbox can be assigned *several e-mail addresses*. For this purpose, *reply templates and signatures* are also stored.
+
+==== Employee groups
+For better organization, all *associated employee groups* can be stored.
+
+==== Rule editor
+For each inbox *several inbox filter groups can be assigned*. These are managed in a separate context.

0a84e6bc-012c-42fc-801f-7a81eb33fd83/0a84e6bc-012c-42fc-801f-7a81eb33fd83.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>0a84e6bc-012c-42fc-801f-7a81eb33fd83</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/0a84e6bc-012c-42fc-801f-7a81eb33fd83/offer/offermain_view/f94b5b0d-e1a2-4fd3-a9fa-c61a1bdf6ecd/userHelp_en_us.adoc</reference>
+  <path>Offer/OfferMain_view/f94b5b0d-e1a2-4fd3-a9fa-c61a1bdf6ecd/userHelp</path>
+  <locale>en_us</locale>
+</userhelp>

0a84e6bc-012c-42fc-801f-7a81eb33fd83/offer/offermain_view/f94b5b0d-e1a2-4fd3-a9fa-c61a1bdf6ecd/userHelp_en_us.adoc

+All products created in the system are displayed in the *Products* tab. All functions of the filter view of the Context "Product" are available.
+
+As soon as you open the preview of a product, the button *"Add to offer "* is available. This allows you to add the selected product as an item to the offer.

0b67ea0d-dd73-4e43-9280-ca94bcbd9811/0b67ea0d-dd73-4e43-9280-ca94bcbd9811.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>0b67ea0d-dd73-4e43-9280-ca94bcbd9811</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/0b67ea0d-dd73-4e43-9280-ca94bcbd9811/_____system_application_neon/service/userHelp_en_us.adoc</reference>
+  <path>_____SYSTEM_APPLICATION_NEON/Service/userHelp</path>
+  <locale>en_us</locale>
+</userhelp>

0b67ea0d-dd73-4e43-9280-ca94bcbd9811/_____system_application_neon/service/userHelp_en_us.adoc

+== Service
+
+Handle service cases via service tickets quickly, efficiently and to the full satisfaction of your customers.
\ No newline at end of file

0c3e20e2-13cb-4852-9d5b-b18d3dece1fd/0c3e20e2-13cb-4852-9d5b-b18d3dece1fd.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>0c3e20e2-13cb-4852-9d5b-b18d3dece1fd</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/0c3e20e2-13cb-4852-9d5b-b18d3dece1fd/inbox/inboxmain_view/664346bb-ed06-4f6e-aa5f-b60542eadb46/userHelp_en_us.adoc</reference>
+  <path>Inbox/InboxMain_view/664346bb-ed06-4f6e-aa5f-b60542eadb46/userHelp</path>
+  <locale>en_us</locale>
+</userhelp>

0c3e20e2-13cb-4852-9d5b-b18d3dece1fd/inbox/inboxmain_view/664346bb-ed06-4f6e-aa5f-b60542eadb46/userHelp_en_us.adoc

+:icons: font
+
+=== Assignment e-mail
+In the upper table you can manage and create all e-mail addresses of the opened mailbox.
+Each entry includes:
+
+* *Mail address* +
+  The receiving address to which the received e-mail was sent.
+* *Signature* +
+  If a signature is deposited by you, it will be automatically attached to new manual and automatic e-mails.
+* *Reply Template* +
+  As soon as an employee writes a reply mail from a service ticket, the automatic template can be stored here. +
+  In addition, this template is required if the "Send reply mail" indicator is active; this is an automated mail.
+* *Send answer* +
+  As already described under "Reply template", an automatic reply mail can be activated with this indicator.
+* *Answer address* +
+  If the reply email address is different from the incoming email address, you can enter it here.
+* *Default ticket template* +
+  If no template is defined in the rule editor, you can define the fallback here.
+* *Workflow* +
+  If you want to start a workflow with a new ticket automatically, you can select it here accordingly.
+
+[NOTE]
+The *Signature* and *Reply template* fields are *document templates* that can be created and edited in the context of the same name.
+
+=== Assignment of employee groups
+For a *better organization and clarity* of the mailboxes you have the possibility to assign one or more employee groups in the lower table.
+These groups represent the employees who are to process this inbox.
+
+[NOTE]
+Assigning employee groups has *no further impact* on code or other processes.

2b063b04-1b49-431d-bfa9-bb7d0d4383ce/2b063b04-1b49-431d-bfa9-bb7d0d4383ce.aod → 0d833aa4-d3d3-4bdd-be11-2a1ca09b0976/0d833aa4-d3d3-4bdd-be11-2a1ca09b0976.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
-  <name>2b063b04-1b49-431d-bfa9-bb7d0d4383ce</name>
+  <name>0d833aa4-d3d3-4bdd-be11-2a1ca09b0976</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <reference>%aditoprj%/userhelp/2b063b04-1b49-431d-bfa9-bb7d0d4383ce/_____system_application_neon/administration/userHelp_de_de.adoc</reference>
-  <path>_____SYSTEM_APPLICATION_NEON/Administration/userHelp</path>
+  <reference>%aditoprj%/userhelp/0d833aa4-d3d3-4bdd-be11-2a1ca09b0976/mosaicotemplate/mainHelp_de_de.adoc</reference>
+  <path>MosaicoTemplate/mainHelp</path>
   <locale>de_de</locale>
 </userhelp>

0d833aa4-d3d3-4bdd-be11-2a1ca09b0976/mosaicotemplate/mainHelp_de_de.adoc

+:icons: font
+
+== Mosaico
+
+Im Context "Mosaico" ist der HTML-Editor Mosiaco in ADITO integriert. Somit ist es möglich, HTML-Datein als Mosaicovorlage für Serienmails oder Landingpages direkt in ADITO zu speichern und zu bearbeiten.
+
+
+=== Mosaicovorlagen anlegen
+==== Ursprungsvorlagen
+Mosaicovorlagen basieren auf einer Ursprungsvorlage, in der die grundlegenden Bausteine definiert sind, die z.B. für einen Newsletter mit den Designvorgaben (z.B. Bilder, Textblöcke, Schriften, Farben) benötigt werden.
+
+[NOTE]
+Die Urspungsvorlagen können kundenindiduell angepasst werden.
+
+==== Mosaicovorlagen klassifizieren
+Bei der Neuanlage einer Mosaicovorlage können Sie eine Klassifizierung vornehmen. Nutzen Sie diese, um in der Filteransicht entsprechend danach zu gruppieren. Somit sehen Sie direkt, ob eine Mosaicovorlage für Newsletter, Einladungsmailings etc. verwendet wird.
+
+=== Mosaicovorlage HTML bearbeiten
+Sobald Sie die Mosaicovorlage in ADITO angelegt haben, können Sie das HTML erstellen und bearbeiten. Dazu öffnen Sie den HTML-Editor Mosaico mit der Aktion "In Mosaico öffnen", die Sie in der Vorschau finden.
+
+Wurde das HTML initial erstellt, wird dies in der Vorschau im Bereich "Hauptdokumente" angezeigt und kann heruntergeladen werden. Wenn Sie die Vorschau des HTML öffnen, können Sie eine Beschreibung ergänzen oder das HTML löschen. 
+
+=== Mosaicovorlage in Serienmail verwenden
+Um eine Mosaicovorlage in einer Serienmail zu verwenden, führen Sie die Aktion "Serienmail schreiben" aus. Somit wird eine neue Serienmail angelegt, die mit der Mosaicovorlage verknüpft ist. 
+
+[IMPORTANT]
+Sie können das HTML sowohl hier in der Mosaicovorlage bearbeiten, als auch später direkt aus der Serienmail. 
+
+[NOTE] 
+Sie können eine neue Mosaicovorlage auch aus einer Serienmail heraus anlegen.
+
+=== Mosaicovorlage kopieren
+Um z.B. die Mosaicovorlage, die für den monatlichen Newsletter benötigt wird, einfach zu kopieren, verwenden Sie die Aktion "Vorlage kopieren". Es wird eine neue Mosaicovorlage erstellt, die das HTML mit den bisherigen Inhalten enthält, das nun angepasst werden kann.
+
+=== Mosaicovorlage in Dokumentvorlage verwenden
+Wenn Sie ein HTML mit Mosaico erstellt haben, können Sie dies als Dokumentvorlage abspeichern. Somit erstellen Sie z.B. Landingpages oder E-Mail-Dokumentvorlagen, die selten angepasst werden.
+

0d924ec0-1ca9-4148-b0f4-0f131efcdd5b/0d924ec0-1ca9-4148-b0f4-0f131efcdd5b.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>0d924ec0-1ca9-4148-b0f4-0f131efcdd5b</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/0d924ec0-1ca9-4148-b0f4-0f131efcdd5b/inbox/inboxmain_view/683b7ddd-5144-415c-8430-d27dbeba1500/userHelp_en_us.adoc</reference>
+  <path>Inbox/InboxMain_view/683b7ddd-5144-415c-8430-d27dbeba1500/userHelp</path>
+  <locale>en_us</locale>
+</userhelp>

0d924ec0-1ca9-4148-b0f4-0f131efcdd5b/inbox/inboxmain_view/683b7ddd-5144-415c-8430-d27dbeba1500/userHelp_en_us.adoc

+:icons: font
+
+Under the tab *Statistic* you will find a graphical overview of the data from the opened mailbox.
+
+[NOTE]
+All data in the following charts are calculated live, so they are always up to date.
+
+=== Number of tickets (status)
+Here you can find a diagram which evaluates the tickets according to their status.
+For example, you can see how many tickets from the current inbox have already been completed.
+
+=== Number of tickets (mail)
+To see which tickets have the most mail traffic, you can use this chart to help.
+
+=== Number of tickets (medium)
+An evaluation of how many tickets were received via which medium can be viewed here.

1221a81c-1146-498d-885f-77f3144b583c/1221a81c-1146-498d-885f-77f3144b583c.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>1221a81c-1146-498d-885f-77f3144b583c</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/1221a81c-1146-498d-885f-77f3144b583c/order/editHelp_en_us.adoc</reference>
+  <path>Order/editHelp</path>
+  <locale>en_us</locale>
+</userhelp>

1221a81c-1146-498d-885f-77f3144b583c/order/editHelp_en_us.adoc

+:icons: font
+
+=== Order Type
+If you create a receipt from another, you have already preset the correct type here, e.g. if you create the invoice from a delivery note.
+
+=== Sales project and offer
+Each receipt must be assigned to a sales project and optionally to a offer. The assignment takes place automatically and is preset if
+
+* a receipt was created from a offer, or
+* only *one* sales project is associated with a company.
+
+=== Sent
+[WARNING]
+As soon as the indicator "Sent" is active, the document can no longer be processed.
+
+=== Currency, language, delivery specification and payment term
+These fields are taken over for you *automatically from* the linked *offer* and the linked *company*.
+You can *adjust* these fields for this document *individually*.
+
+=== Header text and footer text
+Under *Choose Header* or *Choose Footer* you have the possibility to choose from all *document templates* stored in the system.
+After you have selected a template, the text appears in the field "Header text" or "Footer text", there you can make adjustments for this offer.
+
+[NOTE]
+Document templates can be created and edited in the context of the same name under the Marketing menu group, with the appropriate authorization.
+
+=== Pay date and paid
+These fields are not displayed for the document type "Order confirmation".
+As soon as you receive a payment for this receipt, you can enter the *date* in the "Pay date" field and the *amount* in the "Paid" field.
+
+[TIP]
+The incoming payment can also be entered for an existing document via an action in the preview.
+
+=== Dunning level and dunning text
+These fields are only displayed for the document type "Invoice".
+These fields allow you to specify the level and text of the *dunning* to be printed.
+
+=== Cancelled
+If the "cancelled" indicator is set to active, you *cannot process this document further*.
+This means, for example, that you can no longer create an invoice from a cancelled delivery note.
+
+=== Payment address and delivery address
+In the field "Choose payment address" and "Choose delivery address" you have the possibility to take a *different address* of the contact or the company, if you don't want to use the default.
+You can *individually adjust* the addresses after the selection in the field placed below.

1364df27-2be4-4c27-ae94-8c77e88348d2/1364df27-2be4-4c27-ae94-8c77e88348d2.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>1364df27-2be4-4c27-ae94-8c77e88348d2</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/1364df27-2be4-4c27-ae94-8c77e88348d2/turnover/mainHelp_en_us.adoc</reference>
+  <path>Turnover/mainHelp</path>
+  <locale>en_us</locale>
+</userhelp>

1364df27-2be4-4c27-ae94-8c77e88348d2/turnover/mainHelp_en_us.adoc

+:icons: font
+== Sales forecast
+
+The sales forecast graphically displays figures from "Planning", "Forecast", "Forecast weighted" and "Turnover".
+
+[TIP]
+You can change the type of diagram by switching views.
+
+The following figures are used for the graphs:
+
+* the *planning* at customer level.
+* the *forecast* recorded in the respective sales projects.
+* the *forecast weighted*. Here the forecast is considered with the probability specified in the sales project.
+* the *sales figures* from the invoices (gross amount).
+
+[NOTE]
+With the drill-down function you can display the values on a monthly level. To do this, click directly in the bar or on the line of the value you want to drill down. The value of the planning, differentiated by company, is divided evenly over the 12 months.

143eb139-b8c2-499f-9a14-9cc1b9c643ab/143eb139-b8c2-499f-9a14-9cc1b9c643ab.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>143eb139-b8c2-499f-9a14-9cc1b9c643ab</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/143eb139-b8c2-499f-9a14-9cc1b9c643ab/person/personmain_view/e7b8c90f-dc8d-40f1-b4db-1493f845026f/userHelp_en_us.adoc</reference>
+  <path>Person/PersonMain_view/e7b8c90f-dc8d-40f1-b4db-1493f845026f/userHelp</path>
+  <locale>en_us</locale>
+</userhelp>

143eb139-b8c2-499f-9a14-9cc1b9c643ab/person/personmain_view/e7b8c90f-dc8d-40f1-b4db-1493f845026f/userHelp_en_us.adoc

+In the tab *360 degree* you can see all important links of the contact.
+
+Use the *Timeline view* to display the chronological history of the linked data and thus, for example, view the most recent receipt.
+
+=== Create New 
+
+Create new records *directly with a link* to the contact via the "New module" menu.
+
+=== Search for keywords
+
+You can search for specific keywords using the "Filter content" input field.
\ No newline at end of file

15a3570b-e3b3-434a-84f6-124762724ab7/weblink/mainHelp_de_de.adoc

 == Weblink
-Im Context Weblinks finden Sie die zentrale Verwaltung von Weblinks und können sowohl für Mailings, als auch bei aktiver Webseitenerkennung (Leadforensics) Links nach Tags kategorisieren und mit einem Punktscore belegen.
+Im Context Weblinks finden Sie die zentrale Verwaltung von Weblinks, die Sie tracken möchten. Diese Links können Sie sowohl für Mailings, als auch bei aktiver Webseitenerkennung (Leadforensics) nach Tags kategorisieren und mit einem Punktscore belegen.
 
 Die so angelegten Links können mit einem Platzhalter in HTML-Templates integriert werden. Zudem ist es möglich den Redirect zu aktivieren und dies für die Abbildung von Ab- bzw. Anmelde-Prozessen zu verwenden.
+
+

15d4d360-4ad9-4fa8-a9df-6162eca6ed70/15d4d360-4ad9-4fa8-a9df-6162eca6ed70.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<userhelp xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/userhelp/1.1.0">
+  <name>15d4d360-4ad9-4fa8-a9df-6162eca6ed70</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <reference>%aditoprj%/userhelp/15d4d360-4ad9-4fa8-a9df-6162eca6ed70/salesproject/salesprojectmain_view/3da4532a-716f-4ff2-a8bc-c29d4f7cb9fb/userHelp_en_us.adoc</reference>
+  <path>Salesproject/SalesprojectMain_view/3da4532a-716f-4ff2-a8bc-c29d4f7cb9fb/userHelp</path>
+  <locale>en_us</locale>
+</userhelp>