diff --git a/erpnext/docs/assets/img/manufacturing/production-order.png b/erpnext/docs/assets/img/manufacturing/production-order.png
deleted file mode 100644
index fc71943..0000000
--- a/erpnext/docs/assets/img/manufacturing/production-order.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/work-order.png b/erpnext/docs/assets/img/manufacturing/work-order.png
new file mode 100644
index 0000000..f88d859
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/work-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-1.png b/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-1.png
deleted file mode 100644
index db871b8..0000000
--- a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-2.png b/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-2.png
deleted file mode 100644
index bcae5e3..0000000
--- a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-3.gif b/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-3.gif
deleted file mode 100644
index 07092c4..0000000
--- a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-3.gif
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-4.png b/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-4.png
deleted file mode 100644
index 5d214ef..0000000
--- a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-4.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-5.png b/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-5.png
deleted file mode 100644
index ac97a31..0000000
--- a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-5.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-6.png b/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-6.png
deleted file mode 100644
index 05b0958..0000000
--- a/erpnext/docs/assets/img/project/timesheet/timesheet-production-order-6.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-1.png b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-1.png
new file mode 100644
index 0000000..81e2cce
--- /dev/null
+++ b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-2.png b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-2.png
new file mode 100644
index 0000000..8f442f1
--- /dev/null
+++ b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-3.gif b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-3.gif
new file mode 100644
index 0000000..bb988c7
--- /dev/null
+++ b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-3.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-4.png b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-4.png
new file mode 100644
index 0000000..0b4fc5c
--- /dev/null
+++ b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-5.png b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-5.png
new file mode 100644
index 0000000..7f07731
--- /dev/null
+++ b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-5.png
Binary files differ
diff --git a/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-6.png b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-6.png
new file mode 100644
index 0000000..c2814a0
--- /dev/null
+++ b/erpnext/docs/assets/img/project/timesheet/timesheet-work-order-6.png
Binary files differ
diff --git a/erpnext/docs/user/manual/de/manufacturing/index.txt b/erpnext/docs/user/manual/de/manufacturing/index.txt
index 3b932a5..13f0701 100644
--- a/erpnext/docs/user/manual/de/manufacturing/index.txt
+++ b/erpnext/docs/user/manual/de/manufacturing/index.txt
@@ -1,6 +1,6 @@
 introduction
 bill-of-materials
-production-order
+work-order
 workstation
 operation
 subcontracting
diff --git a/erpnext/docs/user/manual/de/manufacturing/production-order.md b/erpnext/docs/user/manual/de/manufacturing/production-order.md
deleted file mode 100644
index e6ddd7b..0000000
--- a/erpnext/docs/user/manual/de/manufacturing/production-order.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Fertigungsauftrag
-<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
-
-Der Fertigungsauftrag (auch als Arbeitsauftrag bezeichnet) ist ein Dokument welches vom Produktionsplaner als Startsignal in die Fertigung gegeben wird, um eine bestimmte Anzahl eines bestimmten Artikels zu produzieren. Der Fertigungsauftrag unterstützt Sie auch dabei den Materialbedarf (Lagerbuchung) für diesen Artikel aus der **Stückliste** zu generieren.
-
-Der **Fertigungsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generiert, basierend auf den Kundenaufträgen. Sie können weiterhin direkt einen Fertigungsauftrag erstellen über:
-
-> Fertigung > Dokumente > Fertigungsauftrag > Neu
-
-<img class="screenshot" alt="Fertigungsauftrag" src="{{docs_base_url}}/assets/img/manufacturing/production-order.png">
-
-### Einen Fertigungsauftrag erstellen
-
-* Wählen Sie den Artikel aus, der gefertigt werden soll.
-* Die Standard-Stückliste für diesen Artikel wird aus dem System gezogen. Sie können die Stückliste auch ändern.
-* Wenn die ausgewählte Stückliste auch Arbeitsgänge mit berücksichtigt, sollte das System alle Arbeitsgänge aus der Stückliste übernehmen.
-* Geben Sie das geplante Startdatum an (ein geschätztes Datum zu dem die Produktion beginnen soll).
-* Wählen Sie das Lager aus. Das Fertigungslager ist der Ort zu dem die Artikel gelangen, wenn Sie mit der Herstellung beginnen, und das Eingangslager ist der Ort, wo fertige Erzeugnisse lagern, bevor sie versandt werden.
-
-> Anmerkung: Sie können einen Fertigungsauftrag abspeichern ohne ein Lager auszuwählen. Lager sind jedoch zwingend erforderlich um einen Fertigungsauftrag zu übertragen.
-
-### Arbeitsplätze neu zuordnen/Dauer von Arbeitsgängen
-
-* Als Voreinstellung zieht das System Arbeitsplätze und die Dauer von Arbeitsgängen aus der gewählten Stückliste.
-
-<img class="screenshot" alt="Fertigungsauftrag - Arbeitsgänge" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations.png">
-
-* Wenn Sie den Arbeitsplatz für einen bestimmten Arbeitsgang im Fertigungsauftrag neu zuordnen möchten, können Sie das tun, bevor Sie den Fertigungsauftrag übertragen.
-
-<img class="screenshot" alt="Fertigungsauftrag - Arbeitsgänge neu zuordnen" src="{{docs_base_url}}/assets/img/manufacturing/PO-reassigning-operations.png">
-
-* Wählen Sie den betreffenden Arbeitsgang aus und ändern Sie seinen Arbeitsplatz.
-* Sie können auch die Dauer des Arbeitsgangs ändern.
-
-### Kapazitätsplanung im Fertigungsauftrag
-
-* Wenn ein Fertigungsauftrag basierend auf dem geplanten Startdatum und der Verfügbarkeit des Arbeitsplatzes übertragen wird, plant das System alle Arbeitsgänge für den Fertigungsauftrag ein (wenn der Fertigungsauftrag selbst Arbeitsgänge enthält).
-
-### Material der Fertigung übergeben
-
-* Wenn Sie Ihren Fertigungsauftrags übertragen haben, müssen Sie das Rohmaterial übertragen um den Fertigungsprozess zu starten.
-* Das erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um diesen Fertigungsauftrag abzuschliessen. Die Artikel werden an das Fertigungslager übertragen (dieser Prozess fügt basierend auf Ihren Einstellungen Unterbaugruppen mit Stückliste als EINEN Artikel hinzu oder löst die Unterpunkte auf).
-* Klicken Sie auf "Material der Fertigung übergeben".
-
-<img class="screenshot" alt="Materialübertrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
-
-* Geben Sie die Menge des Materials an, das übertragen werden soll.
-
-<img class="screenshot" alt="Materialübertrag - Menge" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-qty.png">
-
-* Übertragen Sie die Lagerbuchung.
-
-<img class="screenshot" alt="Lagerbuchung zum Kundenauftrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-SE-for-material-transfer.png">
-
-* Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Fertigungsauftrag aktualisiert.
-
-<img class="screenshot" alt="Lagerbuchung zum Fertigungsauftrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-updated.png">
-
-### Zeitprotokoll erstellen
-
-* Der Fortschritt des Fertigungsauftrages kann über ein [Zeitprotokoll]<img class="screenshot" alt="Make TL against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png"> mitprotokolliert werden.
-* Zeitprotokolle werden zu den Arbeitsgängen des Fertigungsauftrages erstellt.
-* Vorlagen für Zeitprotokolle werden für die eingeplanten Arbeitsgänge zum Zeitpunkt des Übertragens des Fertigungsauftrages erstellt.
-* Um weitere Zeitprotokolle zu einem Arbeitsgang zu erstellen, wählen Sie "Zeitprotokoll erstellen" im betreffenden Arbeitsgang aus.
-
-<img class="screenshot" alt="Zeitprotokoll zum Fertigungsauftrag erstellen" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png">
-
-### Fertige Erzeugnisse aktualisieren
-
-* Wenn Sie den Fertigungsauftrag fertiggestellt haben, müssen Sie die Fertigen Erzeugnisse aktualisieren.
-* Das erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager "Fertige Erzeugnisse" gutschreibt.
-* Klicken Sie auf "Fertige Erzeugnisse aktualisieren".
-
-<img class="screenshot" alt="Fertigerzeugnisse aktualiseren" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
-
-* Geben Sie die Menge des übertragenen Materials an.
-
-<img class="screenshot" alt="Menge der Fertigerzeugnisse aktualisieren" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update-qty.png">
-
->Tipp: Sie können einen Fertigungsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren.
-
-### Einen Fertigungsauftrag anhalten
-
-* Wenn Sie einen Fertigungsauftrag anhalten, wird sein Status auf "Angehalten" gesetzt, mit der Folge, dass alle Herstellungsprozesse für diesen Fertigungsauftrag eingestellt werden.
-* Um den Fertigungsauftrag anzuhalten klicken Sie auf die Schaltfläche "Anhalten".
-
-1. Wenn Sie den Fertigungsauftrag übertragen, reserviert das System für jeden Arbeitsgang des Fertigungsauftrags in Serie gemäß dem geplanten Startdatum basierend auf der Verfügbarkeit des Arbeitsplatzes ein Zeitfenster. Die Verfügbarkeit des Arbeitsplatzes hängt von den Arbeitszeiten des Arbeitsplatzes und der Urlaubsliste ab und davon, ob ein anderer Arbeitsgang des Fertigungsauftrages in diesem Zeitfenster eingeplant wurde. Sie können in den Fertigungseinstellungen die Anzahl der Tage angeben, in denen das System versucht den Arbeitsgang einzuplanen. Standardmäßig ist dieser Wert auf 30 Tage eingestellt. Wenn der Arbeitsgang über das verfügbare Zeitfenster hinaus Zeit benötigt, fragt Sie das System, ob der Arbeitsgang pausieren soll. Wenn das System die Terminplanung erstellen konnte, legt es Zeitprotokolle an und speichert sie. Sie können diese verändern und später übertragen.
-2. Sie können außerdem zusätzliche Zeitprotokolle für einen Arbeitsgang erstellen. Hierzu wählen Sie den betreffenden Arbeitsgang aus und klicken Sie auf "Zeitprotokoll erstellen".
-3. Rohmaterial übertragen: Dieser Schritt erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um dem Fertigungsauftrag abzuschliessen, und dem Fertigungslager hinzugefügt werden müssen (Unterartikel werden entweder als EIN Artikel mit Stücklister ODER in aufgelöster Form gemäß Ihren Einstellungen hinzugefügt).
-4. Fertigerzeugnisse aktualisieren: Dieser Schritt erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager Fertige Erzeugnisse hinzufügt.
-5. Um die zum Fertigungsauftrag erstellten Zeitprotokolle anzusehen, klicken Sie auf "Zeitprotokolle anzeigen".
-
-<img class="screenshot" alt="Fertigungsauftrag anhalten" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
-
-* Sie können auch einen angehaltenen Fertigungsauftrag wieder weiter laufen lassen.
-
-> Anmerkung: Um einen Fertigungsauftrag zu einem Artikel zu erstellen müssen Sie auf dem Artikelformular das Feld "Fertigungsauftrag zulassen" ankreuzen.
-
-{next}
diff --git a/erpnext/docs/user/manual/de/manufacturing/work-order.md b/erpnext/docs/user/manual/de/manufacturing/work-order.md
new file mode 100644
index 0000000..bc56fe2
--- /dev/null
+++ b/erpnext/docs/user/manual/de/manufacturing/work-order.md
@@ -0,0 +1,99 @@
+# Arbeitsauftrag
+<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
+
+Der Arbeitsauftrag (auch als Arbeitsauftrag bezeichnet) ist ein Dokument welches vom Produktionsplaner als Startsignal in die Fertigung gegeben wird, um eine bestimmte Anzahl eines bestimmten Artikels zu produzieren. Der Arbeitsauftrag unterstützt Sie auch dabei den Materialbedarf (Lagerbuchung) für diesen Artikel aus der **Stückliste** zu generieren.
+
+Der **Arbeitsauftrag** wird aus dem **Werkzeug zur Fertigungsplanung** generiert, basierend auf den Kundenaufträgen. Sie können weiterhin direkt einen Arbeitsauftrag erstellen über:
+
+> Fertigung > Dokumente > Arbeitsauftrag > Neu
+
+<img class="screenshot" alt="Arbeitsauftrag" src="{{docs_base_url}}/assets/img/manufacturing/work-order.png">
+
+### Einen Arbeitsauftrag erstellen
+
+* Wählen Sie den Artikel aus, der gefertigt werden soll.
+* Die Standard-Stückliste für diesen Artikel wird aus dem System gezogen. Sie können die Stückliste auch ändern.
+* Wenn die ausgewählte Stückliste auch Arbeitsgänge mit berücksichtigt, sollte das System alle Arbeitsgänge aus der Stückliste übernehmen.
+* Geben Sie das geplante Startdatum an (ein geschätztes Datum zu dem die Produktion beginnen soll).
+* Wählen Sie das Lager aus. Das Fertigungslager ist der Ort zu dem die Artikel gelangen, wenn Sie mit der Herstellung beginnen, und das Eingangslager ist der Ort, wo fertige Erzeugnisse lagern, bevor sie versandt werden.
+
+> Anmerkung: Sie können einen Arbeitsauftrag abspeichern ohne ein Lager auszuwählen. Lager sind jedoch zwingend erforderlich um einen Arbeitsauftrag zu übertragen.
+
+### Arbeitsplätze neu zuordnen/Dauer von Arbeitsgängen
+
+* Als Voreinstellung zieht das System Arbeitsplätze und die Dauer von Arbeitsgängen aus der gewählten Stückliste.
+
+<img class="screenshot" alt="Arbeitsauftrag - Arbeitsgänge" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations.png">
+
+* Wenn Sie den Arbeitsplatz für einen bestimmten Arbeitsgang im Arbeitsauftrag neu zuordnen möchten, können Sie das tun, bevor Sie den Arbeitsauftrag übertragen.
+
+<img class="screenshot" alt="Arbeitsauftrag - Arbeitsgänge neu zuordnen" src="{{docs_base_url}}/assets/img/manufacturing/PO-reassigning-operations.png">
+
+* Wählen Sie den betreffenden Arbeitsgang aus und ändern Sie seinen Arbeitsplatz.
+* Sie können auch die Dauer des Arbeitsgangs ändern.
+
+### Kapazitätsplanung im Arbeitsauftrag
+
+* Wenn ein Arbeitsauftrag basierend auf dem geplanten Startdatum und der Verfügbarkeit des Arbeitsplatzes übertragen wird, plant das System alle Arbeitsgänge für den Arbeitsauftrag ein (wenn der Arbeitsauftrag selbst Arbeitsgänge enthält).
+
+### Material der Fertigung übergeben
+
+* Wenn Sie Ihren Arbeitsauftrags übertragen haben, müssen Sie das Rohmaterial übertragen um den Fertigungsprozess zu starten.
+* Das erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um diesen Arbeitsauftrag abzuschliessen. Die Artikel werden an das Fertigungslager übertragen (dieser Prozess fügt basierend auf Ihren Einstellungen Unterbaugruppen mit Stückliste als EINEN Artikel hinzu oder löst die Unterpunkte auf).
+* Klicken Sie auf "Material der Fertigung übergeben".
+
+<img class="screenshot" alt="Materialübertrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
+
+* Geben Sie die Menge des Materials an, das übertragen werden soll.
+
+<img class="screenshot" alt="Materialübertrag - Menge" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-qty.png">
+
+* Übertragen Sie die Lagerbuchung.
+
+<img class="screenshot" alt="Lagerbuchung zum Kundenauftrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-SE-for-material-transfer.png">
+
+* Das an die Fertigung übertragene Material wird basierend auf der Lagerbuchung im Arbeitsauftrag aktualisiert.
+
+<img class="screenshot" alt="Lagerbuchung zum Arbeitsauftrag" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-updated.png">
+
+### Zeitprotokoll erstellen
+
+* Der Fortschritt des Arbeitsauftrages kann über ein [Zeitprotokoll]<img class="screenshot" alt="Make TL against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png"> mitprotokolliert werden.
+* Zeitprotokolle werden zu den Arbeitsgängen des Arbeitsauftrages erstellt.
+* Vorlagen für Zeitprotokolle werden für die eingeplanten Arbeitsgänge zum Zeitpunkt des Übertragens des Arbeitsauftrages erstellt.
+* Um weitere Zeitprotokolle zu einem Arbeitsgang zu erstellen, wählen Sie "Zeitprotokoll erstellen" im betreffenden Arbeitsgang aus.
+
+<img class="screenshot" alt="Zeitprotokoll zum Arbeitsauftrag erstellen" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png">
+
+### Fertige Erzeugnisse aktualisieren
+
+* Wenn Sie den Arbeitsauftrag fertiggestellt haben, müssen Sie die Fertigen Erzeugnisse aktualisieren.
+* Das erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager "Fertige Erzeugnisse" gutschreibt.
+* Klicken Sie auf "Fertige Erzeugnisse aktualisieren".
+
+<img class="screenshot" alt="Fertigerzeugnisse aktualiseren" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
+
+* Geben Sie die Menge des übertragenen Materials an.
+
+<img class="screenshot" alt="Menge der Fertigerzeugnisse aktualisieren" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update-qty.png">
+
+>Tipp: Sie können einen Arbeitsauftrag auch teilweise fertig stellen, indem Sie über eine Lagerbuchung das Lager Fertige Erzeugnisse aktualisieren.
+
+### Einen Arbeitsauftrag anhalten
+
+* Wenn Sie einen Arbeitsauftrag anhalten, wird sein Status auf "Angehalten" gesetzt, mit der Folge, dass alle Herstellungsprozesse für diesen Arbeitsauftrag eingestellt werden.
+* Um den Arbeitsauftrag anzuhalten klicken Sie auf die Schaltfläche "Anhalten".
+
+1. Wenn Sie den Arbeitsauftrag übertragen, reserviert das System für jeden Arbeitsgang des Arbeitsauftrags in Serie gemäß dem geplanten Startdatum basierend auf der Verfügbarkeit des Arbeitsplatzes ein Zeitfenster. Die Verfügbarkeit des Arbeitsplatzes hängt von den Arbeitszeiten des Arbeitsplatzes und der Urlaubsliste ab und davon, ob ein anderer Arbeitsgang des Arbeitsauftrages in diesem Zeitfenster eingeplant wurde. Sie können in den Fertigungseinstellungen die Anzahl der Tage angeben, in denen das System versucht den Arbeitsgang einzuplanen. Standardmäßig ist dieser Wert auf 30 Tage eingestellt. Wenn der Arbeitsgang über das verfügbare Zeitfenster hinaus Zeit benötigt, fragt Sie das System, ob der Arbeitsgang pausieren soll. Wenn das System die Terminplanung erstellen konnte, legt es Zeitprotokolle an und speichert sie. Sie können diese verändern und später übertragen.
+2. Sie können außerdem zusätzliche Zeitprotokolle für einen Arbeitsgang erstellen. Hierzu wählen Sie den betreffenden Arbeitsgang aus und klicken Sie auf "Zeitprotokoll erstellen".
+3. Rohmaterial übertragen: Dieser Schritt erstellt eine Lagerbuchung mit allen Artikeln, die benötigt werden, um dem Arbeitsauftrag abzuschliessen, und dem Fertigungslager hinzugefügt werden müssen (Unterartikel werden entweder als EIN Artikel mit Stücklister ODER in aufgelöster Form gemäß Ihren Einstellungen hinzugefügt).
+4. Fertigerzeugnisse aktualisieren: Dieser Schritt erstellt eine Lagerbuchung, welche alle Unterartikel vom Fertigungslager abzieht und dem Lager Fertige Erzeugnisse hinzufügt.
+5. Um die zum Arbeitsauftrag erstellten Zeitprotokolle anzusehen, klicken Sie auf "Zeitprotokolle anzeigen".
+
+<img class="screenshot" alt="Arbeitsauftrag anhalten" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
+
+* Sie können auch einen angehaltenen Arbeitsauftrag wieder weiter laufen lassen.
+
+> Anmerkung: Um einen Arbeitsauftrag zu einem Artikel zu erstellen müssen Sie auf dem Artikelformular das Feld "Arbeitsauftrag zulassen" ankreuzen.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
index c72004d..3950df1 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
@@ -22,7 +22,7 @@
 ---- Quotation<br>
 ---- Sales Invoice<br>
 ---- Employee<br>
----- Production Order<br>
+---- Work Order<br>
 .. and so on.
 
 So linking this field with parent Doctype will list all the Doctype records.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
index d6d1e3f..4fc8fa3 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
@@ -1,7 +1,7 @@
 # Custom Doctype
 
 DocType or a Document Type is a tool to insert form in ERPNext. The forms like Sales Order,
-Sales Invoices, Production Order are added as Doctype in the backend. Let's assume we are
+Sales Invoices, Work Order are added as Doctype in the backend. Let's assume we are
 creating a Custom Doctype for a Book.
 
 Custom Doctype allows you to insert custom forms in ERPNext as per your requirement.
diff --git a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
index dc3db10..2c1ede7 100644
--- a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
@@ -164,7 +164,7 @@
 #### Sales Order
 
 A note confirming the terms of delivery and price of an Item (product or
-service) by the Customer. Deliveries, Production Orders and Invoices are made
+service) by the Customer. Deliveries, Work Orders and Invoices are made
 on basis of Sales Orders.
 
 > Selling > Sales Order
@@ -360,16 +360,16 @@
 
 > Manufacturing > Workstation
 
-#### Production Order
+#### Work Order
 
 A document signaling production (manufacture) of a particular Item with
 specified quantities.
 
-> Manufacturing > Production Order
+> Manufacturing > Work Order
 
 #### Production Planning Tool
 
-A tool for automatic creation of Production Orders and Purchase Requests based
+A tool for automatic creation of Work Orders and Purchase Requests based
 on Open Sales Orders in a given period.
 
 > Manufacturing > Production Planning Tool
diff --git a/erpnext/docs/user/manual/en/introduction/implementation-strategy.md b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
index bf0a2b9..6aca55c 100644
--- a/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
+++ b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
@@ -14,7 +14,7 @@
   * Create Customer Groups, Item Groups, Warehouses, Supplier Groups, so that you can classify your Items.
   * Complete a standard sales cycle - Lead > Opportunity > Quotation > Sales Order > Delivery Note > Sales Invoice > Payment (Journal Entry)
   * Complete a standard purchase cycle - Material Request > Purchase Order > Purchase Receipt > Payment (Journal Entry).
-  * Complete a manufacturing cycle (if applicable) - BOM > Production Planning Tool > Production Order > Material Issue
+  * Complete a manufacturing cycle (if applicable) - BOM > Production Planning Tool > Work Order > Material Issue
   * Replicate a real life scenario into the system.
   * Create custom fields, print formats etc as required.
 
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md b/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md
index e1c1c42..45e37fe 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/capacity-planning.md
@@ -1,4 +1,4 @@
-# Capacity Planning based on Production Order
+# Capacity Planning based on Work Order
 
 Capacity Planning functionality helps you in tracking production jobs allocated on each Workstation.
 
@@ -24,19 +24,19 @@
 
     In a BOM, with the list of raw material needed, for manufacturing, you can also list operation and workstations through which those raw materials will be processed.  
 
-4.  Production Order:  
+4.  Work Order:  
 
-    On submission of Production Order, Timesheet for Operations. This helps you allocate production jobs on each Workstation, as well as you can update actual time taken for each Operation.  
+    On submission of Work Order, Timesheet for Operations. This helps you allocate production jobs on each Workstation, as well as you can update actual time taken for each Operation.  
 
 ### Error due to Capacity Planning
 
-**Question:** On Submission of Production Order, we are getting following error message.
+**Question:** On Submission of Work Order, we are getting following error message.
 
 <img alt="Role Desk Permission" class="screenshot" src="{{docs_base_url}}/assets/img/articles/capacity-2.png">
 
-**Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Production Order.
+**Answer: **Please check if you have updated Working Hours in the Workstation master? If not, then please update it and then try to submit Work Order.
 
-On submission of Production Order, Operations (as added in the BOM) are allocated on the workstation. Each operation should start and end on the same day. If a system is not able to schedule that operation in a day, then system request you to divide that Project, so that system can allocate smaller operations in a day.
+On submission of Work Order, Operations (as added in the BOM) are allocated on the workstation. Each operation should start and end on the same day. If a system is not able to schedule that operation in a day, then system request you to divide that Project, so that system can allocate smaller operations in a day.
 
 If you have update working hours in the Workstation, but still getting this issue, that because one of your operation is taking too long, and cannot be completed in a day. Please divide that operation into smaller operations, so that it can be allocated on Workstation and completed on the same day.
 
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md
index c17b923..7146920 100644
--- a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.md
@@ -6,4 +6,4 @@
 
 <img src="{{docs_base_path}}/assets/img/articles/$SGrab_203.png">
 
-`Use Multi-Level BOM` field is also there in the Production Order and Stock Entry. If checked, raw-materials of sub-assembly item will be consumed in the manufacturing process, and not the sub-assembly item itself.
+`Use Multi-Level BOM` field is also there in the Work Order and Stock Entry. If checked, raw-materials of sub-assembly item will be consumed in the manufacturing process, and not the sub-assembly item itself.
diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
index 0557d2c..5c306e0 100644
--- a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -24,7 +24,7 @@
 
   * Select the Item for which you want to make the BOM.
   * Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary.
-  * Workstations are defined only for product costing and Production Order Operations scheduling purposes not inventory. 
+  * Workstations are defined only for product costing and Work Order Operations scheduling purposes not inventory. 
   * Inventory is tracked in Warehouses not Workstations.
 
 ###Costing of a BOM
diff --git a/erpnext/docs/user/manual/en/manufacturing/index.md b/erpnext/docs/user/manual/en/manufacturing/index.md
index 3fcccf4..cd397e8 100644
--- a/erpnext/docs/user/manual/en/manufacturing/index.md
+++ b/erpnext/docs/user/manual/en/manufacturing/index.md
@@ -2,7 +2,7 @@
 
 The Manufacturing module in ERPNext helps you to maintain multi-level Bill of
 Materials (BOMs) for your Items. 
-It helps in product costing, production planning, creating production orders for your manufacturing shop floors and 
+It helps in product costing, production planning, creating work orders for your manufacturing shop floors and 
 planning inventory by getting your material requirement via BOMs (also called Material Requirements Planning MRP).
 
 ### Topics
diff --git a/erpnext/docs/user/manual/en/manufacturing/index.txt b/erpnext/docs/user/manual/en/manufacturing/index.txt
index 3b932a5..13f0701 100644
--- a/erpnext/docs/user/manual/en/manufacturing/index.txt
+++ b/erpnext/docs/user/manual/en/manufacturing/index.txt
@@ -1,6 +1,6 @@
 introduction
 bill-of-materials
-production-order
+work-order
 workstation
 operation
 subcontracting
diff --git a/erpnext/docs/user/manual/en/manufacturing/introduction.md b/erpnext/docs/user/manual/en/manufacturing/introduction.md
index 2a947b2..18b8b34 100644
--- a/erpnext/docs/user/manual/en/manufacturing/introduction.md
+++ b/erpnext/docs/user/manual/en/manufacturing/introduction.md
@@ -21,6 +21,6 @@
 You can track work-in-progress by creating work-in-progress Warehouses.
 
 ERPNext will help you track material movement by automatically creating Stock
-Entries from your Production Orders by building from Bill of Materials.
+Entries from your Work Orders by building from Bill of Materials.
 
 {next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
deleted file mode 100644
index 4e2c129..0000000
--- a/erpnext/docs/user/manual/en/manufacturing/production-order.md
+++ /dev/null
@@ -1,125 +0,0 @@
-# Production Order
-
-<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-flow.png">
-A Production Order (also known as a Work Order) is a document that is given to
-the manufacturing shop floor by the Production Planner as a signal to produce
-a certain quantity of a certain Item. The Production Order also helps to generate
-the material requirements (Stock Entry) for the Item to be produced from its
-**Bill of Materials**.
-
-The **Production Order** is generated from the **Production Planning
-Tool** based on Sales Orders. You can also create a direct Production Order
-by:
-
-> Manufacturing > Documents > Production Order > New
-
-<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/production-order.png">
-
-<div class-"embed-container">
-  <iframe src="https://www.youtube.com/embed/yv_KAIlHrO4?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
-  </iframe>
-</div>
-
-### Creating Production Orders
-
-  * Select the Item to be produced.
-  * The default BOM for that item will be fetched by the system. You can also change BOM.
-  * Enter the Qty to manufacture.
-  * If the selected BOM has operartion mentioned in it, the system shall fetch all operations from BOM.
-  * Mention the Planned Start Date (an Estimated Date at which you want the Production to begin.)
-  * Select Warehouses:
-    * Source Warehouses: The warehouse where you store your raw materials. Each required item can have separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of Production Order, the raw mateirals will be reserved in these warehouses for production usage.
-    * Work-in-Progress Warehouse: The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as Work-in-Progress warehouse.
-    * Target Warehouse: The warehouse where you store finished Items before they are shipped.
-	* Scrap Warehouse: Scrap Items will be stored in this warehouse.
-  * Required Items: All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the default source warehouse for any item. And during the production, you can track transferred raw materials from this table.
-
-> Note : You can save a Production Order without selecting the warehouses, but warehouses are mandatory for submitting a Production Order
-
-###Reassigning Workstation/Duration for Operations
-
-* By default the system fetchs workstation and duration for Production Order Operations from the selected BOM.
-
-<img class="screenshot" alt="PO Opeartions" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations.png">
-
-* If you wish to reassign the workstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order.
-
-<img class="screenshot" alt="PO reassigning Operations" src="{{docs_base_url}}/assets/img/manufacturing/PO-reassigning-operations.png">
-
-* Select the respective operation, and change its workstation.
-* You can also change the Operating Time for that operation
-
-### Capacity Planning in Production Order
-
-* When a Production Order is submitted, based on the Planned Start Date and the availability of the workstations, system schedules all operations for the Production Order (if Production Order has operations specified).
-* Drafts of Time Logs are also created based on the scheduled operations.
-
-### Transfering Materials for Manufacturing
-
-* Once you have submitted your Production Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process.
-* This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
-
-* Click on 'Start'.
-
-<img class="screenshot" alt="Transfer Materials" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
-
-* Mention the quantity of materials to be transfered.
-
-<img class="screenshot" alt="Material Transfer Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-qty.png">
-
-* Submit the Stock Entry
-
-<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-SE-for-material-transfer.png">
-
-* Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry.
-
-<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-updated.png">
-
-#### Material Transfer through Stock Entry
-Use cases for this option are:
-* If material transfer is done in bulk and/or is not required to be tracked against a particular Production Order
-* If the responsibility for Material Transfer and Production Entry lies with two separate users
-
-If this is the case, you can select the Skip Material Transfer check box, which will allow you to make the “Manufacture” Stock Entry directly by clicking on the ‘Finish’ button.
-
-### Making Time Logs
-
-* Progress in the Production Order can be tracked using [Timesheet](/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.html)
-* Timesheet's time slots are created against Production Order Operations.
-* Drafts of Timesheet are created based on the scheduled operations when an Production Order is Submitted.
-* To create more Timesheets against an operation click 'Make Timesheet' button.
-
-<img class="screenshot" alt="Make timesheet against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-ts.png">
-
-###Updating Finished Goods
-
-* Once you are done with the Production Order you need to update the Finished Goods.
-* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
-* Click on 'Finish'.
-
-<img class="screenshot" alt="Update Finished Goods" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
-
-* Mention the quantity of materials to be transfered.
-
-<img class="screenshot" alt="Update Finished Goods Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update-qty.png">
-
- > Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry.
- 
-### Stopping a Production Order
-
-* When you stop a Production Order its status is changed to Stop indicating that all production process against that Production Order is to be ceased.
-* To stop the Production Order click on the 'Stop' Button
-
-  1. On Submitting the Production Order, the system will reserve a slot for each of the Production Order Operations serially after the planned start date based on the workstation availability. The Workstation availability depends on the Workstation timings, holiday list and if some other Production Order Operation was scheduled in that slot. You can mention the number of days for the system to try scheduling the operations in the Manufacturing Settings. This is set to 30 Days by default. If the operation requires time exceeding the available slot, system shall ask you to break the operations. Once the scheduling is done system shall create Time Logs and save them. You can Modify them and submit them later.
-  2. You can also create additional time logs against an Operation. For doing so select the respective operation and click on 'Make Time Log'
-  3. Transfer Raw Material: This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
-  4. Update Finished Goods: This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
-  5. To check all Time Logs made against the Production Order click on 'Show Time Logs'
-
-<img class="screenshot" alt="PO - stop" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
-
-* You can also re-start a stopped Production Order.
-
-> Note : In order to make a Production Order against an Item you must specify 'Yes' to "Allow Production Order" on the Item form.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-plan.md b/erpnext/docs/user/manual/en/manufacturing/production-plan.md
index e0daf0a..8f3e9d6 100644
--- a/erpnext/docs/user/manual/en/manufacturing/production-plan.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-plan.md
@@ -20,7 +20,7 @@
 
 <img class="screenshot" alt="Sales Orders" src="/docs/assets/img/manufacturing/sales_orders.png">
 
-* Click on Get Items for Production Order to fetch the items from the above sales orders.
+* Click on Get Items for Work Order to fetch the items from the above sales orders.
 
 <img class="screenshot" alt="Sales Order Item" src="/docs/assets/img/manufacturing/sales_order_items.png">
 	* Include Exploded Items :- To include subassembly items of raw materials in the production.
@@ -35,7 +35,7 @@
 
 <img class="screenshot" alt="Material Requests" src="/docs/assets/img/manufacturing/material_requests.png">
 
-* Click on Get Items for Production Order to fetch the items from the above material requests.
+* Click on Get Items for Work Order to fetch the items from the above material requests.
 
 <img class="screenshot" alt="Material Request Item" src="/docs/assets/img/manufacturing/material_request_items.png">
 
@@ -48,6 +48,6 @@
   * Include Subcontracted Items :- To add subcontracted item's raw materials if include exploded items is disabled
   * Ignore Existing Ordered Quantity :- If enabled then system will not check the projected quantity to make material request.
 
-# Options To Make Production Order and Material Request
+# Options To Make Work Order and Material Request
 
 <img class="screenshot" alt="Make PO or MR" src="/docs/assets/img/manufacturing/make_po_mr.png">
diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
index 0908c37..2a48fae 100644
--- a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
@@ -8,7 +8,7 @@
 
 ####Disable Capacity Planning and Time Tracking
 
-As per Capacity Planning feature, when Production Order is created for an item, for each Operation, Time Log is created. Based on actual Operation Time, Time Logs is updated. This also provides total Operations Cost against Production Order.
+As per Capacity Planning feature, when Work Order is created for an item, for each Operation, Time Log is created. Based on actual Operation Time, Time Logs is updated. This also provides total Operations Cost against Work Order.
 
 If you don't track actual operations time, and want to disable creation of Time Log based on Operations, you should check "Disable Capacity Planning and Time Tracking" in the Manufacturing Settings.
 
@@ -28,11 +28,11 @@
 
 ####Over Production Allowance Percentage
 
-While making Production Orders against a Sales Order, the system will only allow production item quantity to be lesser than or equal to the quantity in the Sales Order. In case you wish to allow Production Orders to be raised with greater quantity, you can mention the Over Production Allowance Percentage here.
+While making Work Orders against a Sales Order, the system will only allow production item quantity to be lesser than or equal to the quantity in the Sales Order. In case you wish to allow Work Orders to be raised with greater quantity, you can mention the Over Production Allowance Percentage here.
 
 ####Back-flush Raw Materials Based On
 
-When creating Manufacture Entry, raw-material items are back-flush based on BOM of production item. If you want raw-material items to be back-flushed based on Material Transfer entry made against that Production Order instead, then you should set Back-flush Raw Materials Based On "Material Transferred for Manufacture".
+When creating Manufacture Entry, raw-material items are back-flush based on BOM of production item. If you want raw-material items to be back-flushed based on Material Transfer entry made against that Work Order instead, then you should set Back-flush Raw Materials Based On "Material Transferred for Manufacture".
 
 <img class="screenshot" alt="Manufacturing Settings" src="{{docs_base_url}}/assets/img/articles/manufacturing-settings-4.png">
 
@@ -46,8 +46,8 @@
 
 ####Default Work In Progress Warehouse
 
-This Warehouse will be auto-updated in the Work In Progress Warehouse field of Production Order.
+This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Order.
 
 ####Default Finished Goods Warehouse
 
-This Warehouse will be auto-updated in the Work In Progress Warehouse field of Production Order.
+This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Order.
diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
index 0887a8f..4b7ee7a 100644
--- a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
@@ -11,7 +11,7 @@
 This list of Items can be generated from the open Sales Orders or pending Material Requests that can be Manufactured in the system
 and will generate:
 
-  * Production Orders for each Item.
+  * Work Orders for each Item.
   * Purchase Requests for Items whose Projected Quantity is likely to fall below zero.
 
 To use the Production Planning Tool, go to:
@@ -43,7 +43,7 @@
 
 <img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-item.png">
 
-#### Step 4: Create Production Orders
+#### Step 4: Create Work Orders
 
 <img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-production-order.png">
 
@@ -69,7 +69,7 @@
 your production.
 
 > Note: How do you change a Production Plan? The output of the Production
-Planning Tool is the Production Order. Once your orders are created, you can
-change them by amending the Production Orders.
+Planning Tool is the Work Order. Once your orders are created, you can
+change them by amending the Work Orders.
 
 {next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/work-order.md b/erpnext/docs/user/manual/en/manufacturing/work-order.md
new file mode 100644
index 0000000..577ff4c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/work-order.md
@@ -0,0 +1,125 @@
+# Work Order
+
+<img class="screenshot" alt="Work Order" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-flow.png">
+A Work Order is a document that is given to
+the manufacturing shop floor by the Production Planner as a signal to produce
+a certain quantity of a certain Item. The Work Order also helps to generate
+the material requirements (Stock Entry) for the Item to be produced from its
+**Bill of Materials**.
+
+The **Work Order** is generated from the **Production Planning
+Tool** based on Sales Orders. You can also create a direct Work Order
+by:
+
+> Manufacturing > Documents > Work Order > New
+
+<img class="screenshot" alt="Work Order" src="{{docs_base_url}}/assets/img/manufacturing/work-order.png">
+
+<div class-"embed-container">
+  <iframe src="https://www.youtube.com/embed/yv_KAIlHrO4?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>
+  </iframe>
+</div>
+
+### Creating Work Orders
+
+  * Select the Item to be produced.
+  * The default BOM for that item will be fetched by the system. You can also change BOM.
+  * Enter the Qty to manufacture.
+  * If the selected BOM has operartion mentioned in it, the system shall fetch all operations from BOM.
+  * Mention the Planned Start Date (an Estimated Date at which you want the Production to begin.)
+  * Select Warehouses:
+    * Source Warehouses: The warehouse where you store your raw materials. Each required item can have separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of Work Order, the raw mateirals will be reserved in these warehouses for production usage.
+    * Work-in-Progress Warehouse: The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as Work-in-Progress warehouse.
+    * Target Warehouse: The warehouse where you store finished Items before they are shipped.
+	* Scrap Warehouse: Scrap Items will be stored in this warehouse.
+  * Required Items: All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the default source warehouse for any item. And during the production, you can track transferred raw materials from this table.
+
+> Note : You can save a Work Order without selecting the warehouses, but warehouses are mandatory for submitting a Work Order
+
+###Reassigning Workstation/Duration for Operations
+
+* By default the system fetchs workstation and duration for Work Order Operations from the selected BOM.
+
+<img class="screenshot" alt="PO Opeartions" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations.png">
+
+* If you wish to reassign the workstation for a particular opeeration in the Work Order, you can do so before submitting the Work Order.
+
+<img class="screenshot" alt="PO reassigning Operations" src="{{docs_base_url}}/assets/img/manufacturing/PO-reassigning-operations.png">
+
+* Select the respective operation, and change its workstation.
+* You can also change the Operating Time for that operation
+
+### Capacity Planning in Work Order
+
+* When a Work Order is submitted, based on the Planned Start Date and the availability of the workstations, system schedules all operations for the Work Order (if Work Order has operations specified).
+* Drafts of Time Logs are also created based on the scheduled operations.
+
+### Transfering Materials for Manufacturing
+
+* Once you have submitted your Work Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process.
+* This will create a Stock Entry with all the Items required to complete this Work Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
+
+* Click on 'Start'.
+
+<img class="screenshot" alt="Transfer Materials" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
+
+* Mention the quantity of materials to be transfered.
+
+<img class="screenshot" alt="Material Transfer Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-qty.png">
+
+* Submit the Stock Entry
+
+<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-SE-for-material-transfer.png">
+
+* Material Transfered for Manufacturing will be updated in the Work Order based on the Stock Entry.
+
+<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-updated.png">
+
+#### Material Transfer through Stock Entry
+Use cases for this option are:
+* If material transfer is done in bulk and/or is not required to be tracked against a particular Work Order
+* If the responsibility for Material Transfer and Production Entry lies with two separate users
+
+If this is the case, you can select the Skip Material Transfer check box, which will allow you to make the “Manufacture” Stock Entry directly by clicking on the ‘Finish’ button.
+
+### Making Time Logs
+
+* Progress in the Work Order can be tracked using [Timesheet](/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.html)
+* Timesheet's time slots are created against Work Order Operations.
+* Drafts of Timesheet are created based on the scheduled operations when an Work Order is Submitted.
+* To create more Timesheets against an operation click 'Make Timesheet' button.
+
+<img class="screenshot" alt="Make timesheet against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-ts.png">
+
+###Updating Finished Goods
+
+* Once you are done with the Work Order you need to update the Finished Goods.
+* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
+* Click on 'Finish'.
+
+<img class="screenshot" alt="Update Finished Goods" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
+
+* Mention the quantity of materials to be transfered.
+
+<img class="screenshot" alt="Update Finished Goods Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update-qty.png">
+
+ > Tip : You can also partially complete a Work Order by updating the Finished Goods stock creating a Stock Entry.
+ 
+### Stopping a Work Order
+
+* When you stop a Work Order its status is changed to Stop indicating that all production process against that Work Order is to be ceased.
+* To stop the Work Order click on the 'Stop' Button
+
+  1. On Submitting the Work Order, the system will reserve a slot for each of the Work Order Operations serially after the planned start date based on the workstation availability. The Workstation availability depends on the Workstation timings, holiday list and if some other Work Order Operation was scheduled in that slot. You can mention the number of days for the system to try scheduling the operations in the Manufacturing Settings. This is set to 30 Days by default. If the operation requires time exceeding the available slot, system shall ask you to break the operations. Once the scheduling is done system shall create Time Logs and save them. You can Modify them and submit them later.
+  2. You can also create additional time logs against an Operation. For doing so select the respective operation and click on 'Make Time Log'
+  3. Transfer Raw Material: This will create a Stock Entry with all the Items required to complete this Work Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
+  4. Update Finished Goods: This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
+  5. To check all Time Logs made against the Work Order click on 'Show Time Logs'
+
+<img class="screenshot" alt="PO - stop" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
+
+* You can also re-start a stopped Work Order.
+
+> Note : In order to make a Work Order against an Item you must specify 'Yes' to "Allow Work Order" on the Item form.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md
index 7388e16..19b6af6 100644
--- a/erpnext/docs/user/manual/en/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md
@@ -14,7 +14,7 @@
 
 In workstation specify the workstation working hours under the 'working hour' section. 
 You can also specify the working hours based on shifts.
-While scheduling Production Order, system will check for the availability of the workstation based on the working hours specified.	
+While scheduling Work Order, system will check for the availability of the workstation based on the working hours specified.	
 
 > Note : You can enable overtime for your workstation in [Manufacturing Settings](/docs/user/manual/en/manufacturing/setup/manufacturing-settings.html)
 
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/index.md b/erpnext/docs/user/manual/en/projects/timesheet/index.md
index 8fd30c4..3e3dd9f 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/index.md
+++ b/erpnext/docs/user/manual/en/projects/timesheet/index.md
@@ -3,7 +3,7 @@
 Timesheet can be used for track actual hours worked. It can be used for multiple purposes like:
 
 * Billable work to Customers
-* Production Order Operations
+* Work Order Operations
 * Creating Salary Slip based on hours worked.
 * Tasks
 * Project
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/index.txt b/erpnext/docs/user/manual/en/projects/timesheet/index.txt
index 9cd8cee..287d526 100644
--- a/erpnext/docs/user/manual/en/projects/timesheet/index.txt
+++ b/erpnext/docs/user/manual/en/projects/timesheet/index.txt
@@ -1,4 +1,4 @@
 salary-slip-from-timesheet
 sales-invoice-from-timesheet
-timesheet-against-production-order
-timer-in-timesheet
\ No newline at end of file
+timesheet-against-work-order
+timer-in-timesheet
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
deleted file mode 100644
index 6e108b3..0000000
--- a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-production-order.md
+++ /dev/null
@@ -1,39 +0,0 @@
-#Timesheet based on Production Order
-
-Creating Timesheet for Production Order helps in capacity planning for the Workstations. Also it helps in tracking actual time consumed the Workstation for completing specific operation.
-
-When a Production Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet.
-
-<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-capacity-planning.png">
-
-Let's assume we are manufacturing a mobile phone. As per the Bill of Material, time required for the assembly of components could be one hour. However the actual time taken for it's completion could be more than planned. The actual time tracking provides actual operation cost, hence helps in determining accurate valuation of the manufacturing item.
-
-####Production Order
-
-As per the Bill of Materials of manufacturing item, following are the Operations and Workstation through which raw-material items are processed.
-
-<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-1.png">
-
-On submission on Production Order, Timesheet will be created automatically.
-
-<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-2.png">
-
-####Time Sheet created from Production Order
-
-In the Timesheet, unique row will be added for each Operation - Workstation. This allows operator/supervisor at the workstation to enter actual From Time and To Time taken for each Operation.
-
-<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-3.gif">
-
-After enter From Time and To Time for all the Operations, Total Hours will be calculated.
-
-<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-6.png">
-
-With updating actual time, you can also enter "Completed Qty". If all the items are not processed in the same Timesheet, you can create another Timesheet from the Production Order.
-
-<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-4.png">
-
-####Save and Submit Timesheet
-
-On the submission of Timesheet, Total Hours is calculated. Also, in the Production Order, for each Operation, actual Start and End Time is updated.
-
-<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-production-order-5.png">
diff --git a/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.md b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.md
new file mode 100644
index 0000000..9b5dfd2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/timesheet/timesheet-against-work-order.md
@@ -0,0 +1,39 @@
+#Timesheet based on Work Order
+
+Creating Timesheet for Work Order helps in capacity planning for the Workstations. Also it helps in tracking actual time consumed the Workstation for completing specific operation.
+
+When a Work Order is submitted, based on the Planned Start Date and the availability of the Workstations, system schedules all operations by creating Timesheet.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-capacity-planning.png">
+
+Let's assume we are manufacturing a mobile phone. As per the Bill of Material, time required for the assembly of components could be one hour. However the actual time taken for it's completion could be more than planned. The actual time tracking provides actual operation cost, hence helps in determining accurate valuation of the manufacturing item.
+
+####Work Order
+
+As per the Bill of Materials of manufacturing item, following are the Operations and Workstation through which raw-material items are processed.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-1.png">
+
+On submission on Work Order, Timesheet will be created automatically.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-2.png">
+
+####Time Sheet created from Work Order
+
+In the Timesheet, unique row will be added for each Operation - Workstation. This allows operator/supervisor at the workstation to enter actual From Time and To Time taken for each Operation.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-3.gif">
+
+After enter From Time and To Time for all the Operations, Total Hours will be calculated.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-6.png">
+
+With updating actual time, you can also enter "Completed Qty". If all the items are not processed in the same Timesheet, you can create another Timesheet from the Work Order.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-4.png">
+
+####Save and Submit Timesheet
+
+On the submission of Timesheet, Total Hours is calculated. Also, in the Work Order, for each Operation, actual Start and End Time is updated.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/project/timesheet/timesheet-work-order-5.png">
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
index ce22d8e..1662d00 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
@@ -26,13 +26,13 @@
  
 #### 4.Purpose: Material Transfer for Manufacture 
 
-In the manufacturing process, raw-materials are issued from the stores to the production department (generally WIP warehouse). This Material Transfer entry is created from Production Order. Items in this entry are fetched from the BOM of production Item, as selected in Production Order.
+In the manufacturing process, raw-materials are issued from the stores to the production department (generally WIP warehouse). This Material Transfer entry is created from Work Order. Items in this entry are fetched from the BOM of production Item, as selected in Work Order.
 
 <img alt="Transfer for Manufacture" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-manufacture-transfer.gif">
 
 #### 4.Purpose: Manufacture
 
-Manufacture is created from Production Order. In this entry, both raw-material item as well as production item are fetched from the BOM, selected in the Production Order. For the raw-material items, only Source Warehouse (generally WIP warehouse) is mentioned. For the production item, only target warehouse as mentioned in the Production Order is updated. On submission, stock of raw-material items are deducted from Source Warehouse, which indicates that raw-material items were consumed in the manufacturing process. Production Item is added to the Target Warehouse marking the completion of production cycle.
+Manufacture is created from Work Order. In this entry, both raw-material item as well as production item are fetched from the BOM, selected in the Work Order. For the raw-material items, only Source Warehouse (generally WIP warehouse) is mentioned. For the production item, only target warehouse as mentioned in the Work Order is updated. On submission, stock of raw-material items are deducted from Source Warehouse, which indicates that raw-material items were consumed in the manufacturing process. Production Item is added to the Target Warehouse marking the completion of production cycle.
 
 <img alt="Manufacture" class="screenshot" src="{{docs_base_url}}/assets/img/articles/stock-entry-manufacture.gif">
 
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
index b674470..74c82c6 100644
--- a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
@@ -11,7 +11,7 @@
 This report list item wise - warehouse wise stock level of an item considering all the stock transactions. With Actual Quantity of an item, it also provide other details like:
 
 1. Actual Qty: Quantity available in the warehouse.
-2. Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.
+2. Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured.
 3. Requested Qty: Quantity requested for purchase, but not ordered.
 4. Ordered Qty: Quantity ordered for purchase, but not received.
 5. Reserved Qty: Quantity ordered for sale, but not delivered.
diff --git a/erpnext/docs/user/manual/en/stock/batch.md b/erpnext/docs/user/manual/en/stock/batch.md
index 8283af3..0a15bc0 100644
--- a/erpnext/docs/user/manual/en/stock/batch.md
+++ b/erpnext/docs/user/manual/en/stock/batch.md
@@ -34,7 +34,7 @@
 ### Transacting Items with Batches
 
 Batch master is created before creation of Purchase Receipt.
-Hence eveytime there is Purchase Receipt or Production Order being made for a batch item,
+Hence eveytime there is Purchase Receipt or Work Order being made for a batch item,
 you will first create its Batch No, and then select it in Purchase order or Production Entry.
 
 On every stock transaction (Purchase Receipt, Delivery Note, POS Invoice) made for batch item,
diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
index 2f432fc..784b4b1 100644
--- a/erpnext/docs/user/manual/en/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md
@@ -20,7 +20,7 @@
 Reserved Qty
 
   * Actual Qty: Quantity available in the warehouse.
-  * Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.
+  * Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured.
   * Requested Qty: Quantity requested for purchase, but not ordered.
   * Ordered Qty: Quantity ordered for purchase, but not received.
   * Reserved Qty: Quantity ordered for sale, but not delivered.
diff --git a/erpnext/docs/user/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md
index 0dee100..4457de0 100644
--- a/erpnext/docs/user/videos/learn/index.md
+++ b/erpnext/docs/user/videos/learn/index.md
@@ -219,8 +219,8 @@
             Production Planning Tool</a>
               <span class="text-muted pull-right">1:41</span>
         </li>
-        <li><a href="/docs/user/videos/learn/production-order.html">
-            Production Order</a>
+        <li><a href="/docs/user/videos/learn/work-order.html">
+            Work Order</a>
             <span class="text-muted pull-right">2:24</span>
         </li>
         <li>
diff --git a/erpnext/docs/user/videos/learn/index.txt b/erpnext/docs/user/videos/learn/index.txt
index e0d8003..956703b 100644
--- a/erpnext/docs/user/videos/learn/index.txt
+++ b/erpnext/docs/user/videos/learn/index.txt
@@ -20,7 +20,7 @@
 point-of-sale
 printing-and-branding
 product-bundle
-production-order
+work-order
 production-planning
 project-and-task
 purchase-cycle
diff --git a/erpnext/docs/user/videos/learn/production-order.md b/erpnext/docs/user/videos/learn/production-order.md
deleted file mode 100644
index dd2e30f..0000000
--- a/erpnext/docs/user/videos/learn/production-order.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Production Order
-
-<iframe width="660" height="371" src="https://www.youtube.com/embed/ZotgLyp2YFY" frameborder="0" allowfullscreen></iframe>
-
-**Duration: 2:24**
-
-Production Order (also called as Work Order) is a document that is given to the manufacturing shop floor by the Production Planner as a signal to produce a certain quantity of a certain Item.
-
-This video walks you through creating Production Order in ERPNext. There will be several entries made against Production Order (like Material Transfer, Manufacture entry, Time Log) to track progress against Production Order.
diff --git a/erpnext/docs/user/videos/learn/production-planning.md b/erpnext/docs/user/videos/learn/production-planning.md
index 6ed409b..2af4c91 100644
--- a/erpnext/docs/user/videos/learn/production-planning.md
+++ b/erpnext/docs/user/videos/learn/production-planning.md
@@ -6,4 +6,4 @@
 
 Production Planning Tool helps you plan production and purchase of Items for a period.
 
-This video walks you through production planning for Sales Order item. Material Planning allows you to check required quantity of raw materials for manufacturing. You can create Material Request for the raw-material items for which sufficient stock is not available. From Production Planning Tool, you can also create Production Order for the finished items.
+This video walks you through production planning for Sales Order item. Material Planning allows you to check required quantity of raw materials for manufacturing. You can create Material Request for the raw-material items for which sufficient stock is not available. From Production Planning Tool, you can also create Work Order for the finished items.
diff --git a/erpnext/docs/user/videos/learn/work-order.md b/erpnext/docs/user/videos/learn/work-order.md
new file mode 100644
index 0000000..cea67f0
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/work-order.md
@@ -0,0 +1,9 @@
+# Work Order
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/ZotgLyp2YFY" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:24**
+
+Work Order (also called as Work Order) is a document that is given to the manufacturing shop floor by the Production Planner as a signal to produce a certain quantity of a certain Item.
+
+This video walks you through creating Work Order in ERPNext. There will be several entries made against Work Order (like Material Transfer, Manufacture entry, Time Log) to track progress against Work Order.
diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js
index 21d02db..e812f19 100644
--- a/erpnext/public/js/help_links.js
+++ b/erpnext/public/js/help_links.js
@@ -493,7 +493,7 @@
 ]
 
 frappe.help.help_links['Form/Work Order'] = [
-	{ label: 'Work Order', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/production-order' },
+	{ label: 'Work Order', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/work-order' },
 ]
 
 frappe.help.help_links['Form/Workstation'] = [