diff --git a/erpnext/docs/assets/old_images/erpnext/sms-setting2.jpg b/erpnext/docs/assets/img/setup/sms-setting2.jpg similarity index 100% rename from erpnext/docs/assets/old_images/erpnext/sms-setting2.jpg rename to erpnext/docs/assets/img/setup/sms-setting2.jpg diff --git a/erpnext/docs/assets/img/setup/sms-settings1.png b/erpnext/docs/assets/img/setup/sms-settings1.png new file mode 100644 index 00000000000..8f70eb1a175 Binary files /dev/null and b/erpnext/docs/assets/img/setup/sms-settings1.png differ diff --git a/erpnext/docs/assets/old_images/erpnext/sms-settings1.png b/erpnext/docs/assets/old_images/erpnext/sms-settings1.png deleted file mode 100644 index 64678d077f8..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sms-settings1.png and /dev/null differ diff --git a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md index 1aeb2d17146..28110fa6a9e 100644 --- a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md +++ b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md @@ -7,6 +7,6 @@ Kundengruppen versetzen Sie in die Lage Ihre Kunden zu organisieren. Sie können > Tipp: Wenn Sie der Meinung sind, dass hier zu viel Aufwand getrieben wird, dann können Sie es bei einer Standard-Kundengruppe belassen. Aber der gesamte Aufwand wird sich dann auszahlen, wenn Sie die ersten Berichte erhalten. Ein Beispiel eines Berichts ist unten abgebildet. -![Vertriebsanalyse]({{docs_base_url}}/assets/old_images/erpnext/sales-analytics-customer.png) +Customer Group report {next} diff --git a/erpnext/docs/user/manual/de/buying/purchase-order.md b/erpnext/docs/user/manual/de/buying/purchase-order.md index 705dd8dec3f..55a1cdb8cfb 100644 --- a/erpnext/docs/user/manual/de/buying/purchase-order.md +++ b/erpnext/docs/user/manual/de/buying/purchase-order.md @@ -7,7 +7,7 @@ Ein Lieferantenauftrag kann automatisch aus einer Materialanfrage oder einem Lie ### Flußdiagramm der Lieferantenbestellung -![Lieferantenauftrag]({{docs_base_url}}/assets/img/buying/purchase-order-f.jpg) +Lieferantenauftrag In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über: diff --git a/erpnext/docs/user/manual/de/buying/supplier-quotation.md b/erpnext/docs/user/manual/de/buying/supplier-quotation.md index 3295d38d901..1ec3ba7674b 100644 --- a/erpnext/docs/user/manual/de/buying/supplier-quotation.md +++ b/erpnext/docs/user/manual/de/buying/supplier-quotation.md @@ -7,7 +7,7 @@ Sie können ein Lieferantenangebot aus einer Materialanfrage heraus erstellen. ### Flußdiagramm zum Lieferantenangebot -![Lieferantenangebot]({{docs_base_url}}/assets/img/buying/supplier-quotation-f.jpg) +Lieferantenangebot Sie können ein Lieferantenangebot auch direkt erstellen über: diff --git a/erpnext/docs/user/manual/de/customer-portal/issues.md b/erpnext/docs/user/manual/de/customer-portal/issues.md index 9650ccacc3b..bd3af179ebe 100644 --- a/erpnext/docs/user/manual/de/customer-portal/issues.md +++ b/erpnext/docs/user/manual/de/customer-portal/issues.md @@ -5,18 +5,17 @@ Kunden können über das Kundenportal sehr einfach Fälle eröffnen. Eine einfac ### Ticketliste leeren -![Ticketliste]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-list-empty.png) - +Issue List ### Neuer Fall -![Neues Ticket]({{docs_base_url}}/assets/old_images/erpnext/portal-new-ticket.png) +New Issue ### Fall öffnen -![Fall eröffnen]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-1.png) +Issue Raised ### Fall beantworten -![Fall beantworten]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-reply.png) +Issue reply {next} diff --git a/erpnext/docs/user/manual/de/selling/sales-order.md b/erpnext/docs/user/manual/de/selling/sales-order.md index bd9ddc47ee7..6e478af12e6 100644 --- a/erpnext/docs/user/manual/de/selling/sales-order.md +++ b/erpnext/docs/user/manual/de/selling/sales-order.md @@ -9,11 +9,9 @@ Wenn Ihr Kunde das Angebot annimmt, können Sie das Angebot in einen Kundenauftr ### Flußdiagramm des Kundenauftrags -![Kundenauftrag]({{docs_base_url}}/assets/old_images/erpnext/sales-order-f.jpg) +Kundenauftrag aus Angebot erstellen -Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: - -> Vertrieb > Kundenauftrag > Neuer Kundenauftrag +Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag ### Einen Kundenauftrag aus einem Angebot erstellen diff --git a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md index 7cbf0d8dcab..d017d1af535 100644 --- a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md +++ b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md @@ -27,10 +27,7 @@ Um eine Übersicht Ihrer Partner zu erhalten, gehen Sie zu: https://example.erpnext.com/Partners -![Auflistung der Vertriebspartner]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-listing.png) +Sales Partner -Im Folgenden sehen Sie, wie die vollständigen Daten Ihres Partners auf der Webseite angezeigt werden. - -![Veröffentlichte Vertriebspartner]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-published.png) {next} diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md index f7f441b690b..4e18d5babc9 100644 --- a/erpnext/docs/user/manual/de/stock/material-request.md +++ b/erpnext/docs/user/manual/de/stock/material-request.md @@ -3,13 +3,13 @@ Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst. -![Workflow]({{docs_base_url}}/assets/img/buying/material-request-workflow.jpg) +Materialanfrage Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: > Lagerbestand > Dokumente > Materialanfrage > Neu -### Materialanfrage erstelle +### Materialanfrage erstellen Materialanfrage diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md index 18448be7ce4..cc75b5527f5 100644 --- a/erpnext/docs/user/manual/de/stock/projected-quantity.md +++ b/erpnext/docs/user/manual/de/stock/projected-quantity.md @@ -7,7 +7,7 @@ Der projizierte Lagerbestand wird vom Planungssystem verwendet um den Nachbestel Eine strikte Kontrolle des projizierten Lagerbestandes ist entscheidend um Engpässe vorherzusagen und die richtige Bestellmenge kalkulieren zu können. -![Bericht zur projizierten Menge]({{docs_base_url}}/assets/img/stock/projected-quantity-stock-report.png) +Projected Quantity > Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge diff --git a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md index 68608a79d86..c65a833c9a9 100644 --- a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md +++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md @@ -9,6 +9,6 @@ based on your domain). Customer Group”. But all this effort, will pay off when you start getting reports. An example of a sample report is given below: -![Sales Analytics]({{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif) +Customer Group report {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md index 180ad3e719d..2a611aaee94 100644 --- a/erpnext/docs/user/manual/en/buying/purchase-taxes.md +++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md @@ -8,7 +8,7 @@ Orders and Purchase Invoices. > Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges Master -![Purchase-Taxes]({{docs_base_url}}/assets/img/buying/purchase-taxes.png) +Purchase taxes You can specify if the tax / charge is only for valuation (not a part of diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md index 257370ea3fa..c170d911224 100644 --- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md +++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md @@ -1,10 +1,19 @@ ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web. +<<<<<<< HEAD Customer Portal Order 1 Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance. Customer Portal Order 1 +======= +Once an order is raised, either using the Shopping Cart or from within +ERPNext, your customer can view the order and keep an eye on the billing and +shipment status. When the invoice and payment against these orders are +submitted, the customer can see the updated status on the portal, at a glance. + +Customer Portal>>>>>> Edited help page #### Outstanding Sales Invoice diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md index 31fec08c32a..a441a45e3b3 100644 --- a/erpnext/docs/user/manual/en/customer-portal/issues.md +++ b/erpnext/docs/user/manual/en/customer-portal/issues.md @@ -5,18 +5,18 @@ conversation. #### Empty Issue List -![Ticket List]({{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png) +Issue List #### New Issue -![New Ticket]({{docs_base_url}}/assets/img/website/portal-new-ticket.png) +New Issue #### Open Issue -![Open Issue]({{docs_base_url}}/assets/img/website/portal-ticket-1.gif) +Issue Raised #### Reply on Issue -![Reply Issue]({{docs_base_url}}/assets/img/website/portal-ticket-reply.gif) +Issue reply {next} diff --git a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md index 5f740043d2f..ccfa63a93af 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md @@ -8,35 +8,35 @@ In ERPNext Kanban board can be an alternative for the list views. It helps you i To create a Kanban board in ERPNext click the Kanban dropdown on the sidebar, and select New Kanban Board. -+Add New Kanban Board +Add New Kanban Board ###Add new Card/Document To add Cards on Kanban Board click Add Tasks. You can Edit a card details by click on the card and it will take you to the Task Doctype where you can further add and edit card details. -+Add New Kanban Board +Add card in Kanban Board ###Update Cards/Document Status Based on the Task status you can drag and drop the Cards in the respective column. For example if the task is work in progress you can move the card for the task from the status Open to Working. -+Add New Kanban Board +Move Cards on Kanban Board ###Manage Columns To add more columns in the Kanban board click Add columns. -+Add New Kanban Board +Add New column in Kanban Board To move columns based on the priority drag and drop the columns as per requirement. -+Add New Kanban Board +Move columns in Kanban Board To set Colors to a Card click drop down menu on the card and assign color to it. -+Add New Kanban Board +Add color to cards in Kanban Board You can also Archive and Restore the columns added in a Kanban board. To do so click Archive in drop down menu on the card. Once archived you can restore the column from the list of the archived columns in the Kanban board. -+Add New Kanban Board +Archive and Restore in Kanban Board diff --git a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md index 4fbdf8edd3a..1efed7592fd 100644 --- a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md +++ b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md @@ -7,7 +7,7 @@ For example an Item Pen is stocked in Nos, but sold in Box. Hence we will make S ###Step 1: In the Item master, under Unit of Measure section, you can list all the possible UoM of an item, with its UoM Conversion Factor. Update UoM Conversion Factors In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10. -+Item Unit of Measure +Item Unit of Measure ###Setp 2: In the Sale Order, you will find two UoM fields @@ -17,7 +17,7 @@ In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10. In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Sale UoM (Box in this case). Updating Sales UoM is mainly for the reference of the Customer. In the print format, you will see item quantity in the Sales UoM. -+Sale order Unit of Measure +Sale order Unit of Measure Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you sell just one Box, then Qty as per stock UoM will be set as 10. @@ -26,4 +26,4 @@ Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM Irrespective of the Sales UoM selected in the Sale Order, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while selling item in different UoM. - +Stock report in UOM +Stock report in UOM diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md index 18b84fdc03b..aaf558db367 100644 --- a/erpnext/docs/user/manual/en/selling/sales-order.md +++ b/erpnext/docs/user/manual/en/selling/sales-order.md @@ -11,7 +11,7 @@ a Sales Order. ### Sales Order Flow-Chart -![Sales Order]({{docs_base_url}}/assets/img/buying/sales-order-f.jpg) +Sales Order flow To create a new Sales Order go to: diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md index 0495a1eff71..bd462d31779 100644 --- a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md +++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md @@ -25,7 +25,7 @@ To see listing of partner, you should go to: https://example.erpnext.com/partners -![Sales Partner Listing]({{docs_base_url}}/assets/img/crm/sales-partner-listing.png) +Sales Partner {next} diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md index 258f4c64129..4f12ee124d1 100644 --- a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md +++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md @@ -22,7 +22,8 @@ In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. If you wish to spread allocated target across months, then you should setup Monthly Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation). -![Sales Person Target Distribution]({{docs_base_url}}/assets/im/selling/sales-person-target-distribution.gif) + +Target Distribution ####Report - Sales Person Target Variance Item Groupwise @@ -32,7 +33,8 @@ To check this report, go to: This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report. -![Sales Person Item Group Report]({{docs_base_url}}/assets/img/selling/sales-person-item-group-report.png) + +Target Item Group As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report. @@ -48,7 +50,7 @@ To allocate target to Sales Person based on Territory, you can should select spe In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master. -![Sales Person Territory Manager]({{docs_base_url}}/assets/img/selling/sales-person-territory-manager.png) +Sales Person Territory Manager ####2.2 Allocating Target @@ -62,7 +64,7 @@ Using this Monthly Distribution document, you can divide target Qty or Amount ac This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report. -![Sales Person Territory Report]({{docs_base_url}}/assets/img/selling/sales-person-territory-report.png) +Sales Person Territory Report --- @@ -74,7 +76,7 @@ To create new Monthly Distriibution, go to: `Accounts > Monthly Distributon` -![Target Distribution]({{docs_base_url}}/assets/img.selling/erpnext/target-distribution.png) +Target Distribution You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master. diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md index 28bf0afe094..a5dd9399a2b 100644 --- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md +++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md @@ -38,7 +38,8 @@ file. To export the document in Excel tick the checkbox for Download in Excel Fi Download Template ### Download in Excel -Download Template + +Download Template ### 3\. Upload the File ethier in .xlsx or .csv diff --git a/erpnext/docs/user/manual/en/setting-up/sms-setting.md b/erpnext/docs/user/manual/en/setting-up/sms-setting.md index 4871ed1a957..5d44cb553b3 100644 --- a/erpnext/docs/user/manual/en/setting-up/sms-setting.md +++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md @@ -17,7 +17,8 @@ Example URL: http://instant.smses.com/web2sms.php?username=&password;=&to;=&sender;=&message;= -![SMS Settings]({{docs_base_url}}/assets/old_images/erpnext/sms-setting2.jpg) +SMS Setting 2 + > Note: the string up to the "?" is the SMS Gateway URL @@ -35,6 +36,6 @@ Note that some parameters in the URL are static.You will get static values from your SMS Provider like username, password etc. These static values should be entered in the Static Parameters table. -![SMS Setting]({{docs_base_url}}/assets/old_images/erpnext/sms-settings1.png) +SMS Setting {next} diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md index b3b72790126..9bb26046ae6 100644 --- a/erpnext/docs/user/manual/en/stock/item/index.md +++ b/erpnext/docs/user/manual/en/stock/item/index.md @@ -52,7 +52,11 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Purchase Details +<<<<<<< HEAD Item Purchase Details +======= +Purchase details +>>>>>>> Edited help page * **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse. @@ -72,9 +76,14 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Sales Details +<<<<<<< HEAD Item Sales Details * **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. +======= + +Sales details +>>>>>>> Edited help page * **Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item. @@ -82,7 +91,12 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi ### Manufacturing And Website +<<<<<<< HEAD Item Manfacturing and Website Details +======= + +Manufaturing details +>>>>>>> Edited help page Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.