From a951e56f9c400c4d25cf69e1d2fc89060daa3f09 Mon Sep 17 00:00:00 2001 From: Frappe Date: Thu, 22 Jun 2017 23:44:53 +0530 Subject: [PATCH] Modified help pages --- erpnext/docs/user/manual/de/CRM/setup/customer-group.md | 2 +- erpnext/docs/user/manual/de/buying/purchase-order.md | 2 +- erpnext/docs/user/manual/de/buying/supplier-quotation.md | 2 +- erpnext/docs/user/manual/de/customer-portal/issues.md | 8 ++++---- erpnext/docs/user/manual/de/selling/sales-order.md | 2 +- .../docs/user/manual/de/selling/setup/sales-partner.md | 2 +- erpnext/docs/user/manual/de/setting-up/sms-setting.md | 5 +++-- erpnext/docs/user/manual/de/stock/material-request.md | 2 +- erpnext/docs/user/manual/de/stock/projected-quantity.md | 2 +- erpnext/docs/user/manual/en/CRM/setup/customer-group.md | 2 +- erpnext/docs/user/manual/en/buying/purchase-taxes.md | 2 +- erpnext/docs/user/manual/en/customer-portal/issues.md | 8 ++++---- erpnext/docs/user/manual/en/selling/sales-order.md | 2 +- .../docs/user/manual/en/selling/setup/sales-partner.md | 2 +- .../en/selling/setup/sales-person-target-allocation.md | 2 +- erpnext/docs/user/manual/en/setting-up/sms-setting.md | 2 +- erpnext/docs/user/manual/en/stock/item/index.md | 4 ++++ erpnext/docs/user/manual/en/stock/material-request.md | 2 +- erpnext/docs/user/manual/en/stock/projected-quantity.md | 2 +- 19 files changed, 30 insertions(+), 25 deletions(-) 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 28110fa6a9e..35250415809 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. -Customer Group report +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 55a1cdb8cfb..7c72d1e1085 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 +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 1ec3ba7674b..93db6a7d6cb 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 +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 bd3af179ebe..aec334af818 100644 --- a/erpnext/docs/user/manual/de/customer-portal/issues.md +++ b/erpnext/docs/user/manual/de/customer-portal/issues.md @@ -5,17 +5,17 @@ Kunden können über das Kundenportal sehr einfach Fälle eröffnen. Eine einfac ### Ticketliste leeren -Issue List +Issue List ### Neuer Fall -New Issue +New Issue ### Fall öffnen -Issue Raised +Issue Raised ### Fall beantworten -Issue reply +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 6e478af12e6..187aeab37e6 100644 --- a/erpnext/docs/user/manual/de/selling/sales-order.md +++ b/erpnext/docs/user/manual/de/selling/sales-order.md @@ -9,7 +9,7 @@ Wenn Ihr Kunde das Angebot annimmt, können Sie das Angebot in einen Kundenauftr ### Flußdiagramm des Kundenauftrags -Kundenauftrag aus Angebot erstellen +Kundenauftrag aus Angebot erstellen Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag 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 d017d1af535..c7883cf18ee 100644 --- a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md +++ b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md @@ -27,7 +27,7 @@ Um eine Übersicht Ihrer Partner zu erhalten, gehen Sie zu: https://example.erpnext.com/Partners -Sales Partner +Sales Partner {next} diff --git a/erpnext/docs/user/manual/de/setting-up/sms-setting.md b/erpnext/docs/user/manual/de/setting-up/sms-setting.md index 327e8e8b822..1bcc058ae75 100644 --- a/erpnext/docs/user/manual/de/setting-up/sms-setting.md +++ b/erpnext/docs/user/manual/de/setting-up/sms-setting.md @@ -10,8 +10,8 @@ Beispiel-URL: http://instant.smses.com/web2sms.php?username=&password;=&to;=&sender;=&message;= +SMS-Einstellungen -![SMS-Einstellungen]({{docs_base_url}}/assets/old_images/erpnext/sms-setting2.jpg) > Anmerkung: Die Zeichenfolge bis zum "?" ist die URL des SMS-Gateways. @@ -23,6 +23,7 @@ Die oben angegebene URL verschickt SMS über das Konto "abcd" an Mobilnummern "9 Beachten Sie, dass einige Parameter in der URL statisch sind. Sie bekommen von Ihrem SMS-Anbieter statische Werte wie Benutzername, Passwort usw. Diese statischen Werte sollten in die Tabelle der statischen Parameter eingetragen werden. -![SMS-Einstellungen]({{docs_base_url}}/assets/old_images/erpnext/sms-settings1.png) +SMS-Einstellungen + {next} diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md index 4e18d5babc9..5a47b13e4e2 100644 --- a/erpnext/docs/user/manual/de/stock/material-request.md +++ b/erpnext/docs/user/manual/de/stock/material-request.md @@ -3,7 +3,7 @@ Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst. -Materialanfrage +Materialanfrage Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md index cc75b5527f5..b9ee64c2ab6 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. -Projected Quantity +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 c65a833c9a9..505c4fbf7ae 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: -Customer Group report +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 2a611aaee94..f3be64dddbd 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 +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/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md index a441a45e3b3..0088de6b076 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 -Issue List +Issue List #### New Issue -New Issue +New Issue #### Open Issue -Issue Raised +Issue Raised #### Reply on Issue -Issue reply +Issue reply {next} diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md index aaf558db367..99b9a85c252 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 flow +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 bd462d31779..728218fc908 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 +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 4f12ee124d1..08bbd782364 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 @@ -12,7 +12,7 @@ To allocate target, you should open specific Sales Person master. In the Sales Person master, you will find table called Sales Person Target. -![Sales Person Target Item Group]({{docs_base_url}}/assets/img/selling/sales-person-target-item-group.png) +Sales person target In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. 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 5d44cb553b3..7c666924cdd 100644 --- a/erpnext/docs/user/manual/en/setting-up/sms-setting.md +++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md @@ -36,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 +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 9bb26046ae6..58636dd94b4 100644 --- a/erpnext/docs/user/manual/en/stock/item/index.md +++ b/erpnext/docs/user/manual/en/stock/item/index.md @@ -82,8 +82,12 @@ Inspection Criteria: If a Quality Inspection is prepared for this Item, then thi * **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item. ======= +<<<<<<< HEAD Sales details >>>>>>> Edited help page +======= +Sales details +>>>>>>> Modified help pages * **Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item. diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md index d707dd70106..8e4caea23ef 100644 --- a/erpnext/docs/user/manual/en/stock/material-request.md +++ b/erpnext/docs/user/manual/en/stock/material-request.md @@ -1,7 +1,7 @@ A Material Request is a simple document identifying a requirement of a set of Items (products or services) for a particular reason. -![Workflow]({{docs_base_url}}/assets/img/buying/material-request-flowchart.png) +Material Request To generate a Material Request manually go to: diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md index d38bfc9fffe..0e7b7427688 100644 --- a/erpnext/docs/user/manual/en/stock/projected-quantity.md +++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md @@ -11,7 +11,7 @@ maintained to serve unexpected demands. Having a tight control of the projected inventory is crucial to determine shortages and to calculate the right order quantity. -![Projected Quantity Stock Report]({{docs_base_url}}/assets/img/stock/projected_quantity.png) +Projected Quantity > Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -