diff --git a/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg b/erpnext/docs/assets/img/buying/material-request-workflow.jpg similarity index 100% rename from erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg rename to erpnext/docs/assets/img/buying/material-request-workflow.jpg diff --git a/erpnext/docs/assets/old_images/erpnext/purchase-order-f.jpg b/erpnext/docs/assets/img/buying/purchase-order-f.jpg similarity index 100% rename from erpnext/docs/assets/old_images/erpnext/purchase-order-f.jpg rename to erpnext/docs/assets/img/buying/purchase-order-f.jpg diff --git a/erpnext/docs/assets/img/buying/purchase-taxes.png b/erpnext/docs/assets/img/buying/purchase-taxes.png new file mode 100644 index 00000000000..f372b0a6a61 Binary files /dev/null and b/erpnext/docs/assets/img/buying/purchase-taxes.png differ diff --git a/erpnext/docs/assets/img/buying/supplier-quotation-f.jpg b/erpnext/docs/assets/img/buying/supplier-quotation-f.jpg new file mode 100644 index 00000000000..03c50deeb77 Binary files /dev/null and b/erpnext/docs/assets/img/buying/supplier-quotation-f.jpg differ diff --git a/erpnext/docs/assets/img/crm/sales-analytics-customer.gif b/erpnext/docs/assets/img/crm/sales-analytics-customer.gif new file mode 100644 index 00000000000..f61cea040dc Binary files /dev/null and b/erpnext/docs/assets/img/crm/sales-analytics-customer.gif differ diff --git a/erpnext/docs/assets/img/crm/sales-partner-listing.png b/erpnext/docs/assets/img/crm/sales-partner-listing.png new file mode 100644 index 00000000000..d9825b323df Binary files /dev/null and b/erpnext/docs/assets/img/crm/sales-partner-listing.png differ diff --git a/erpnext/docs/assets/img/manufacturing/subcontract.png b/erpnext/docs/assets/img/manufacturing/subcontract.png new file mode 100644 index 00000000000..84f59b50f3a Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/subcontract.png differ diff --git a/erpnext/docs/assets/img/manufacturing/subcontract2.png b/erpnext/docs/assets/img/manufacturing/subcontract2.png new file mode 100644 index 00000000000..53aac1521dd Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/subcontract2.png differ diff --git a/erpnext/docs/assets/img/manufacturing/subcontract3.png b/erpnext/docs/assets/img/manufacturing/subcontract3.png new file mode 100644 index 00000000000..9a74824e261 Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/subcontract3.png differ diff --git a/erpnext/docs/assets/img/manufacturing/subcontract4.png b/erpnext/docs/assets/img/manufacturing/subcontract4.png new file mode 100644 index 00000000000..20c367cac19 Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/subcontract4.png differ diff --git a/erpnext/docs/assets/img/manufacturing/subcontract5.png b/erpnext/docs/assets/img/manufacturing/subcontract5.png new file mode 100644 index 00000000000..6e8a5f4b206 Binary files /dev/null and b/erpnext/docs/assets/img/manufacturing/subcontract5.png differ diff --git a/erpnext/docs/assets/img/selling/Item-UOM.png b/erpnext/docs/assets/img/selling/Item-UOM.png new file mode 100644 index 00000000000..b3ffff4877d Binary files /dev/null and b/erpnext/docs/assets/img/selling/Item-UOM.png differ diff --git a/erpnext/docs/assets/img/selling/Sale-Order-UOM.png b/erpnext/docs/assets/img/selling/Sale-Order-UOM.png new file mode 100644 index 00000000000..9983bad9a7f Binary files /dev/null and b/erpnext/docs/assets/img/selling/Sale-Order-UOM.png differ diff --git a/erpnext/docs/assets/img/selling/portal-new-ticket.png b/erpnext/docs/assets/img/selling/portal-new-ticket.png new file mode 100644 index 00000000000..ae998b1b307 Binary files /dev/null and b/erpnext/docs/assets/img/selling/portal-new-ticket.png differ diff --git a/erpnext/docs/assets/img/selling/portal-ticket-1.gif b/erpnext/docs/assets/img/selling/portal-ticket-1.gif new file mode 100644 index 00000000000..2024364d104 Binary files /dev/null and b/erpnext/docs/assets/img/selling/portal-ticket-1.gif differ diff --git a/erpnext/docs/assets/img/selling/portal-ticket-list-empty.png b/erpnext/docs/assets/img/selling/portal-ticket-list-empty.png new file mode 100644 index 00000000000..07582f47a44 Binary files /dev/null and b/erpnext/docs/assets/img/selling/portal-ticket-list-empty.png differ diff --git a/erpnext/docs/assets/img/selling/portal-ticket-reply.gif b/erpnext/docs/assets/img/selling/portal-ticket-reply.gif new file mode 100644 index 00000000000..87b208dca2b Binary files /dev/null and b/erpnext/docs/assets/img/selling/portal-ticket-reply.gif differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-order-f.jpg b/erpnext/docs/assets/img/selling/sales-order-f.jpg similarity index 100% rename from erpnext/docs/assets/old_images/erpnext/sales-order-f.jpg rename to erpnext/docs/assets/img/selling/sales-order-f.jpg diff --git a/erpnext/docs/assets/img/selling/sales-person-item-group-report.png b/erpnext/docs/assets/img/selling/sales-person-item-group-report.png new file mode 100644 index 00000000000..d77f3ef130a Binary files /dev/null and b/erpnext/docs/assets/img/selling/sales-person-item-group-report.png differ diff --git a/erpnext/docs/assets/img/selling/sales-person-target-distribution.gif b/erpnext/docs/assets/img/selling/sales-person-target-distribution.gif new file mode 100644 index 00000000000..f482adac983 Binary files /dev/null and b/erpnext/docs/assets/img/selling/sales-person-target-distribution.gif differ diff --git a/erpnext/docs/assets/img/selling/sales-person-target-item-group.png b/erpnext/docs/assets/img/selling/sales-person-target-item-group.png new file mode 100644 index 00000000000..b2090bdbfac Binary files /dev/null and b/erpnext/docs/assets/img/selling/sales-person-target-item-group.png differ diff --git a/erpnext/docs/assets/img/selling/sales-person-territory-manager.png b/erpnext/docs/assets/img/selling/sales-person-territory-manager.png new file mode 100644 index 00000000000..d5ad4c5603e Binary files /dev/null and b/erpnext/docs/assets/img/selling/sales-person-territory-manager.png differ diff --git a/erpnext/docs/assets/img/selling/sales-person-territory-report.png b/erpnext/docs/assets/img/selling/sales-person-territory-report.png new file mode 100644 index 00000000000..d2bef770932 Binary files /dev/null and b/erpnext/docs/assets/img/selling/sales-person-territory-report.png differ diff --git a/erpnext/docs/assets/img/selling/stock ledger for as STOCK-UOM.png b/erpnext/docs/assets/img/selling/stock ledger for as STOCK-UOM.png new file mode 100644 index 00000000000..2ef6f44c4dc Binary files /dev/null and b/erpnext/docs/assets/img/selling/stock ledger for as STOCK-UOM.png differ diff --git a/erpnext/docs/assets/img/selling/target-distribution.png b/erpnext/docs/assets/img/selling/target-distribution.png new file mode 100644 index 00000000000..cc06ec2ca3a Binary files /dev/null and b/erpnext/docs/assets/img/selling/target-distribution.png differ diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-4.png b/erpnext/docs/assets/img/setup/data-import/data-import-4.png new file mode 100644 index 00000000000..24e7ba08dbf Binary files /dev/null and b/erpnext/docs/assets/img/setup/data-import/data-import-4.png differ diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-excel.png b/erpnext/docs/assets/img/setup/data-import/data-import-excel.png new file mode 100644 index 00000000000..f012f0ece12 Binary files /dev/null and b/erpnext/docs/assets/img/setup/data-import/data-import-excel.png differ diff --git a/erpnext/docs/assets/img/stock/item-manufacturing-website.png b/erpnext/docs/assets/img/stock/item-manufacturing-website.png new file mode 100644 index 00000000000..54e9746b521 Binary files /dev/null and b/erpnext/docs/assets/img/stock/item-manufacturing-website.png differ diff --git a/erpnext/docs/assets/img/stock/projected-quantity-stock-report.png b/erpnext/docs/assets/img/stock/projected-quantity-stock-report.png new file mode 100644 index 00000000000..ec372b3e3b3 Binary files /dev/null and b/erpnext/docs/assets/img/stock/projected-quantity-stock-report.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png new file mode 100644 index 00000000000..0d9d8f66c66 Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-user-permissions.png differ diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-level-1.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-level-1.png new file mode 100644 index 00000000000..61a1baf70a6 Binary files /dev/null and b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-level-1.png differ diff --git a/erpnext/docs/assets/img/website/portal-new-ticket.png b/erpnext/docs/assets/img/website/portal-new-ticket.png new file mode 100644 index 00000000000..ae998b1b307 Binary files /dev/null and b/erpnext/docs/assets/img/website/portal-new-ticket.png differ diff --git a/erpnext/docs/assets/img/website/portal-ticket-1.gif b/erpnext/docs/assets/img/website/portal-ticket-1.gif new file mode 100644 index 00000000000..2024364d104 Binary files /dev/null and b/erpnext/docs/assets/img/website/portal-ticket-1.gif differ diff --git a/erpnext/docs/assets/img/website/portal-ticket-list-empty.png b/erpnext/docs/assets/img/website/portal-ticket-list-empty.png new file mode 100644 index 00000000000..07582f47a44 Binary files /dev/null and b/erpnext/docs/assets/img/website/portal-ticket-list-empty.png differ diff --git a/erpnext/docs/assets/img/website/portal-ticket-reply.gif b/erpnext/docs/assets/img/website/portal-ticket-reply.gif new file mode 100644 index 00000000000..87b208dca2b Binary files /dev/null and b/erpnext/docs/assets/img/website/portal-ticket-reply.gif differ diff --git a/erpnext/docs/assets/img/website/shopping-cart-1.png b/erpnext/docs/assets/img/website/shopping-cart-1.png new file mode 100644 index 00000000000..ddf1950eed6 Binary files /dev/null and b/erpnext/docs/assets/img/website/shopping-cart-1.png differ diff --git a/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png b/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png deleted file mode 100644 index 6130ded59c7..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png deleted file mode 100644 index 175eca72018..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png deleted file mode 100644 index fd5875c8c2a..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png deleted file mode 100644 index f03f673a8a2..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png b/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png deleted file mode 100644 index b7d0a90d3f7..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png b/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png deleted file mode 100644 index 508bf4ef8dd..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png b/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png deleted file mode 100644 index bb51d60882f..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png b/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png deleted file mode 100644 index 944a7dafd79..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png b/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png deleted file mode 100644 index 631ca31df29..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png b/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png deleted file mode 100644 index de1c6b8c5d4..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png b/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png deleted file mode 100644 index d10da047135..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png b/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png deleted file mode 100644 index e1a2eb5f878..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png b/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png deleted file mode 100644 index 51f470b3c72..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png b/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png deleted file mode 100644 index 154a73d7d8f..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png b/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png deleted file mode 100644 index 80ce1e13b62..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png b/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png deleted file mode 100644 index ffa0d07579e..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png deleted file mode 100644 index 2611ce4b098..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png deleted file mode 100644 index 868c1701f78..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png deleted file mode 100644 index d9ab164f4c9..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png deleted file mode 100644 index 6fd5f000e9c..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/subcontract.png b/erpnext/docs/assets/old_images/erpnext/subcontract.png deleted file mode 100644 index a1993149e0a..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/subcontract.png and /dev/null differ diff --git a/erpnext/docs/assets/old_images/erpnext/target-distribution.png b/erpnext/docs/assets/old_images/erpnext/target-distribution.png deleted file mode 100644 index 7e451cdb495..00000000000 Binary files a/erpnext/docs/assets/old_images/erpnext/target-distribution.png and /dev/null differ diff --git a/erpnext/docs/user/manual/de/buying/purchase-order.md b/erpnext/docs/user/manual/de/buying/purchase-order.md index 11b414c6a2e..705dd8dec3f 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/old_images/erpnext/purchase-order-f.jpg) +![Lieferantenauftrag]({{docs_base_url}}/assets/img/buying/purchase-order-f.jpg) 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 1aec1035608..3295d38d901 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/old_images/erpnext/supplier-quotation-f.jpg) +![Lieferantenangebot]({{docs_base_url}}/assets/img/buying/supplier-quotation-f.jpg) Sie können ein Lieferantenangebot auch direkt erstellen über: diff --git a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md index 6d101bcc60b..6d8108a87c1 100644 --- a/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md +++ b/erpnext/docs/user/manual/de/setting-up/users-and-permissions/role-based-permissions.md @@ -51,7 +51,7 @@ Der Urlaubsantrag ist ein gutes **Beispiel**, welches alle Bereiche des Berechti 2\. **Ein Mitarbeiter sollte nur auf seine/Ihre eigenen Urlaubsanträge zugreifen können.** Daher sollte der Punkt "Benutzerberechtigungen anwenden" für die Rolle "Mitarbeiter" aktiviert sein und es sollte ein Datensatz "Benutzerberechtigung" für jede Kombination von Benutzer und Mitarbeiter erstellt werden. (Dieser Aufwand reduziert sich für den Dokumententyp, indem über das Programm Datensätze für Benutzerberechtigungen erstellt werden.) -Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken. +Den Zugriff für einen Benutzer mit der Rolle Mitarbeiter auf Urlaubsanträge über den Benutzerberechtigungen-Manager einschränken. 3\. **Der Personalmanager sollte alle Urlaubsanträge sehen können.** Erstellen Sie für den Personalmanager eine Berechtigungsregel auf der Ebene 0 mit Lese-Rechten. Die Option "Benutzerberechtigungen anwenden" sollte deaktiviert sein. diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md index 0f55b1ec4df..f7f441b690b 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/old_images/erpnext/material-request-workflow.jpg) +![Workflow]({{docs_base_url}}/assets/img/buying/material-request-workflow.jpg) Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: > Lagerbestand > Dokumente > Materialanfrage > Neu -### Materialanfrage erstellen +### Materialanfrage erstelle Materialanfrage diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md index 8cea6cfb0f6..18448be7ce4 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/old_images/erpnext/projected-quantity-stock-report.png) +![Bericht zur projizierten Menge]({{docs_base_url}}/assets/img/stock/projected-quantity-stock-report.png) > 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 007f44514b9..68608a79d86 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/old_images/erpnext/sales-analytics-customer.png) +![Sales Analytics]({{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif) {next} \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/accounts/test.md b/erpnext/docs/user/manual/en/accounts/test.md deleted file mode 100644 index e677bde1757..00000000000 --- a/erpnext/docs/user/manual/en/accounts/test.md +++ /dev/null @@ -1 +0,0 @@ -This is test documentaion \ 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 871ff960812..180ad3e719d 100644 --- a/erpnext/docs/user/manual/en/buying/purchase-taxes.md +++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md @@ -8,9 +8,8 @@ Orders and Purchase Invoices. > Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges Master -![Purchase-Taxes]({{docs_base_url}}/assets/old_images/erpnext/purchase-taxes.png) +![Purchase-Taxes]({{docs_base_url}}/assets/img/buying/purchase-taxes.png) - You can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both. diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md index 79ac676f9b2..31fec08c32a 100644 --- a/erpnext/docs/user/manual/en/customer-portal/issues.md +++ b/erpnext/docs/user/manual/en/customer-portal/issues.md @@ -3,20 +3,20 @@ simple and intuitive interface facilitates your customer to report their concerns as Issues. They can view the complete thread of their conversation. -#### Empty Ticket List +#### Empty Issue List -![Ticket List]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-list-empty.png) +![Ticket List]({{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png) #### New Issue -![New Ticket]({{docs_base_url}}/assets/old_images/erpnext/portal-new-ticket.png) +![New Ticket]({{docs_base_url}}/assets/img/website/portal-new-ticket.png) #### Open Issue -![Open Issue]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-1.png) +![Open Issue]({{docs_base_url}}/assets/img/website/portal-ticket-1.gif) #### Reply on Issue -![Reply Issue]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-reply.png) +![Reply Issue]({{docs_base_url}}/assets/img/website/portal-ticket-reply.gif) {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 2a6cd7fcd9f..5f740043d2f 100644 --- a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md +++ b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md @@ -2,7 +2,7 @@ Kanban is a Japanese manufacturing system in which the supply of components is regulated through the use of an instruction card sent along the production line. -In ERPNext Kanban board can be an laternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotatio etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team. +In ERPNext Kanban board can be an alternative for the list views. It helps you in visualizing various documents (like Task, Projects, Quotatio etc.) based on some status on a virtual board. Also, you can easily update card status by dragging and dropping to required status column. Kanban Board helps to visualize, control and optimize workflow and collaborate in real-time with the entire team. ###Create new Kanban Board diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md index 9252171a243..1589d1b7f07 100644 --- a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md +++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md @@ -15,8 +15,7 @@ sub-contracting feature of ERPNext. 2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go). 3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”. -![Subcontract]({{docs_base_url}}/assets/old_images/erpnext/subcontract.png) - +Sub-Contracting __Step 1:__ Make a Bill of Materials for the processed Item, with the unprocessed @@ -24,13 +23,21 @@ Items as sub-items. For example, If you are manufacturing a pen, the processed pen will be named under Bill of Materials(BOM), whereas, the refill, knob, and other items which go into the making of pen, will be categorized as sub-items. +Sub-Contracting + __Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials. +Sub-Contracting + __Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier. +Sub-Contracting + __Step 4:__ Receive the Items from your Supplier via Purchase Receipt. Make sure to check the “Consumed Quantity” in the “Raw Materials” table so that the correct stock is maintained at the Supplier’s end. +Sub-Contracting + > Note 1: Make sure that the “Rate” of processed Item is the processing rate (excluding the raw material rate). diff --git a/erpnext/docs/user/manual/en/selling/articles/Selling in different UOM b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md similarity index 63% rename from erpnext/docs/user/manual/en/selling/articles/Selling in different UOM rename to erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md index b435e958742..4fbdf8edd3a 100644 --- a/erpnext/docs/user/manual/en/selling/articles/Selling in different UOM +++ b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md @@ -4,22 +4,26 @@ A sell price unit of measure (UOM) is the UOM with which you price items. You ca For example an Item Pen is stocked in Nos, but sold in Box. Hence we will make Sales Order for Pen in Box. -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 +###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. - - -Setp 2: In the Sale Order, you will find two UoM field. -UoM -Stock UoM ++Item Unit of Measure + + +###Setp 2: In the Sale Order, you will find two UoM fields + +-UoM +-Stock UoM + 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 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. -Stock Ledger Posting +###Stock Ledger Posting 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 diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md index bcd9c935711..18b84fdc03b 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/old_images/erpnext/sales-order-f.jpg) +![Sales Order]({{docs_base_url}}/assets/img/buying/sales-order-f.jpg) 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 b8762056fb7..0495a1eff71 100644 --- a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md +++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md @@ -25,10 +25,7 @@ To see listing of partner, you should go to: https://example.erpnext.com/partners -![Sales Partner Listing]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-listing.png) +![Sales Partner Listing]({{docs_base_url}}/assets/img/crm/sales-partner-listing.png) -Following is the complete partners details published on the website. - -![Sales Partner Published]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-published.png) {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 75b7561a6e2..258f4c64129 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/old_images/erpnext/sales-person-target-item-group.png) +![Sales Person Target Item Group]({{docs_base_url}}/assets/img/selling/sales-person-target-item-group.png) In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. @@ -22,7 +22,7 @@ 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/old_images/erpnext/sales-person-target-distribution.png) +![Sales Person Target Distribution]({{docs_base_url}}/assets/im/selling/sales-person-target-distribution.gif) ####Report - Sales Person Target Variance Item Groupwise @@ -32,7 +32,7 @@ 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/old_images/erpnext/sales-person-item-group-report.png) +![Sales Person Item Group Report]({{docs_base_url}}/assets/img/selling/sales-person-item-group-report.png) 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 +48,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/old_images/erpnext/sales-person-territory-manager.png) +![Sales Person Territory Manager]({{docs_base_url}}/assets/img/selling/sales-person-territory-manager.png) ####2.2 Allocating Target @@ -62,7 +62,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/old_images/erpnext/sales-person-territory-report.png) +![Sales Person Territory Report]({{docs_base_url}}/assets/img/selling/sales-person-territory-report.png) --- @@ -74,7 +74,7 @@ To create new Monthly Distriibution, go to: `Accounts > Monthly Distributon` -![Target Distribution]({{docs_base_url}}/assets/old_images/erpnext/target-distribution.png) +![Target Distribution]({{docs_base_url}}/assets/img.selling/erpnext/target-distribution.png) 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 70aa0f55305..28bf0afe094 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 @@ -32,18 +32,24 @@ in the data below the column headings. Download Template -Then export your template or save it as a **Excel** or **Comma Separated Values** (CSV) -file. To export te document in Excel check the box for Download in Excel File Format +Then export your template or save it as a Excel or Comma Separated Values (CSV) +file. To export the document in Excel tick the checkbox for Download in Excel File Format Download Template -### 3\. Upload the File ethier in .xls or .csv +### Download in Excel +Download Template -Finally attach the .csv file in the section. Click on the "Upload and Import" +### 3\. Upload the File ethier in .xlsx or .csv + +Finally attach the file in the section. Click on the "Upload". Once the upload is successfull click Import" button. Upload + +Upload + #### Notes: 1. Make sure that if your application allows, use encoding as UTF-8. diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md index 7b10037dc86..6103e3c70f2 100644 --- a/erpnext/docs/user/manual/en/website/shopping-cart.md +++ b/erpnext/docs/user/manual/en/website/shopping-cart.md @@ -39,7 +39,7 @@ Click on "Add to Cart" to add item to shopping cart. #### Goto Checkout -Click on "Goto Cart" to checkout or on "Cart" which is on upper right side +Click on "Go to Cart" to checkout or on "Cart" which is on upper right side of the screen. Website Specifications