diff --git a/erpnext/docs/assets/img/human-resources/employee-loan-application.png b/erpnext/docs/assets/img/human-resources/employee-loan-application.png deleted file mode 100644 index 317de4f0937..00000000000 Binary files a/erpnext/docs/assets/img/human-resources/employee-loan-application.png and /dev/null differ diff --git a/erpnext/docs/assets/img/human-resources/employee-loan.png b/erpnext/docs/assets/img/human-resources/employee-loan.png deleted file mode 100644 index 19f3181ec22..00000000000 Binary files a/erpnext/docs/assets/img/human-resources/employee-loan.png and /dev/null differ diff --git a/erpnext/docs/assets/img/human-resources/loan-application.png b/erpnext/docs/assets/img/human-resources/loan-application.png new file mode 100644 index 00000000000..3c6cfd28896 Binary files /dev/null and b/erpnext/docs/assets/img/human-resources/loan-application.png differ diff --git a/erpnext/docs/assets/img/human-resources/loan.png b/erpnext/docs/assets/img/human-resources/loan.png new file mode 100644 index 00000000000..f2f71d48e9c Binary files /dev/null and b/erpnext/docs/assets/img/human-resources/loan.png differ diff --git a/erpnext/docs/assets/img/human-resources/repayment-schedule.png b/erpnext/docs/assets/img/human-resources/repayment-schedule.png index f2ddf02fab3..31085c1a20a 100644 Binary files a/erpnext/docs/assets/img/human-resources/repayment-schedule.png and b/erpnext/docs/assets/img/human-resources/repayment-schedule.png differ diff --git a/erpnext/docs/user/manual/de/human-resources/offer-letter.md b/erpnext/docs/user/manual/de/human-resources/job-offer.md similarity index 100% rename from erpnext/docs/user/manual/de/human-resources/offer-letter.md rename to erpnext/docs/user/manual/de/human-resources/job-offer.md diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/index.txt b/erpnext/docs/user/manual/de/manufacturing/tools/index.txt index 1f798d06379..bdd357cd3db 100644 --- a/erpnext/docs/user/manual/de/manufacturing/tools/index.txt +++ b/erpnext/docs/user/manual/de/manufacturing/tools/index.txt @@ -1,2 +1 @@ -production-planning-tool -bom-replace-tool +bom-update-tool \ No newline at end of file diff --git a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md deleted file mode 100644 index 63e51f8c48a..00000000000 --- a/erpnext/docs/user/manual/de/manufacturing/tools/production-planning-tool.md +++ /dev/null @@ -1,51 +0,0 @@ -# Werkzeug zur Fertigungsplanung -Beigetragen von CWT Connector & Wire Technology GmbH - -Das Werkzeug zur Fertigungsplanung unterstützt Sie dabei die Fertigung zu planen und Artikel für eine Periode einzukaufen (normalerweise eine Woche oder ein Monat). - -Die Liste der Artikel kann über die offenen Kundenaufträge im System erstellt werden. Folgendes wird angelegt: - -* Fertigungsaufträge für jeden Artikel. -* Materialanforderung für Artikel deren vorhergesagte Menge wahrscheinlich unter 0 fällt. - -Um das Werkzeug zur Fertigungsplanung zu nutzen, gehen Sie zu: - -> Fertigung > Werkzeuge > Werkzeug zur Fertigungsplanung - -Werkzeug zur Fertigungsplanung - -### Schritt 1: Auswahl und Kundenauftrag - -* Wählen Sie einen Kundenauftrag für die Materialanforderung über die Filterfunktion (Zeit, Artikel und Kunde) aus. -* Klicken Sie auf "Kundenaufträge aufrufen" um eine Übersicht zu erhalten. - -Werkzeug zur Fertigungsplanung - -### Schritt 2: Artikel aus Kundenaufträgen abrufen - -Sie können Artikel hinzufügen, entfernen oder die Menge dieser Artikel verändern. - -Werkzeug zur Fertigungsplanung - -### Schritt 3: Fertigungsaufträge erstellen - -Werkzeug zur Fertigungsplanung - -### Schritt 4: Materialanfragen erstellen - -Erstellen Sie für Artikel mit prognostiziertem Engpass Materialanfragen. - -Werkzeug zur Fertigungsplanung - -Das Werkzeug zur Fertigungsplanung wird auf zwei Ebenend verwendet: - -* Auswahl von offenen Kundenaufträge einer Periode auf Basis des erwarteten Lieferdatums. -* Auswahl von Artikeln aus diesen Kundenaufträgen. - -Das Werkzeug erstellt eine Aktualisierung, wenn Sie bereits einen Kundenauftrag für einen bestimmten Artikel zu einem Kundenauftrag erstellt haben ("geplante Menge"). - -Sie könnenjederzeit die Artikelliste bearbeiten und die zur Fertigung geplante Menge erhöhen bzw. vermindern. - -> Anmerkung: Wie ändern Sie einen Fertigungsplan? Des Ergebnis des Werkzeuges zur Produktionsplanung ist der Fertigungsauftrag. Sobald Ihre Aufträge erstellt wurden, können Sie sie ändern, indem Sie die Fertigungsaufträge ändern. - -{next} diff --git a/erpnext/docs/user/manual/en/human-resources/loan-management.md b/erpnext/docs/user/manual/en/human-resources/loan-management.md index d8a548b5df8..9457e1a7651 100644 --- a/erpnext/docs/user/manual/en/human-resources/loan-management.md +++ b/erpnext/docs/user/manual/en/human-resources/loan-management.md @@ -18,7 +18,7 @@ Employee can apply for loan by going to: > Human Resources > Loan Management > Loan Application > New Loan Application -Loan Application +Loan Application #### In the Loan Application, @@ -35,7 +35,7 @@ Once the Loan is approved, Manager can create Loan record for the Employee. > Human Resources > Loan Management > Loan > New Loan -Loan Application +Loan Application #### In the Loan, diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/index.txt b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt index a3851545897..bdd357cd3db 100644 --- a/erpnext/docs/user/manual/en/manufacturing/tools/index.txt +++ b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt @@ -1,2 +1 @@ -production-planning-tool bom-update-tool \ No newline at end of file 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 deleted file mode 100644 index 4b7ee7afc6c..00000000000 --- a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md +++ /dev/null @@ -1,75 +0,0 @@ -# Production Planning Tool - -Production Planning Tool helps you plan production and purchase of Items for a -period (usually a week or a month). - -
- -
- -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: - - * 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: - -> Manufacturing > Tools > Production Planning Tool - -Production Planing Tool - -#### Step 1: Specify source to get Production Items - -* You can select Sales Order or Material Request according to where you want to source the items from -* If you plan to add items manually, keep the "Get items from" field empty - - - -#### Step 2: Select and get Sales Order / Material Request - -* Use filters to get the Sales Order / Material Request -* Click on Get Sales Order / Get Material Requests to generate a list. - -Production Planing Tool - - - -#### Step 3: Get Items - -* Get the items for the Sales Order / Material request list -* You can add/remove or change quantity of these Items. - -Production Planing Tool - -#### Step 4: Create Work Orders - -Production Planing Tool - - - -#### Step 5: Create Material Request - -Create Material Request for Items with projected shortfall. - -Production Planing Tool - - - -The Production Planning Tool is used in two stages: - - * Selection of open Sales Orders / pending Material Request for the period based on “Expected Delivery Date”. - * Selection of Items from those Sales Orders / Material Requests - -The tool will update if you have already created Production Orde rs for a -particular Item against its Sales Order (“Planned Quantity”) or Material Request. - -You can always edit the Item list and increase / reduce quantities to plan -your production. - -> Note: How do you change a Production Plan? The output of the Production -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/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md index 4457de04084..f10061c5cc2 100644 --- a/erpnext/docs/user/videos/learn/index.md +++ b/erpnext/docs/user/videos/learn/index.md @@ -215,10 +215,6 @@ Bill of Materials 3:27 -
  • - Production Planning Tool - 1:41 -
  • Work Order 2:24 diff --git a/erpnext/docs/user/videos/learn/production-planning.md b/erpnext/docs/user/videos/learn/production-planning.md deleted file mode 100644 index 2af4c91d1ab..00000000000 --- a/erpnext/docs/user/videos/learn/production-planning.md +++ /dev/null @@ -1,9 +0,0 @@ -# Production Planning Tool - - - -**Duration: 1:41** - -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 Work Order for the finished items. diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py index 1025bc7daea..e5311f11397 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py @@ -183,7 +183,7 @@ class PayrollEntry(Document): Get loan details from submitted salary slip based on selected criteria """ cond = self.get_filter_condition() - return frappe.db.sql(""" select eld.loan_account, + return frappe.db.sql(""" select eld.loan_account, eld.loan eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment from `tabSalary Slip` t1, `tabSalary Slip Loan` eld @@ -293,7 +293,7 @@ class PayrollEntry(Document): }) if data.interest_amount and not data.interest_income_account: - frappe.throw(_("Select interest income account in employee loan {0}").format(data.employee_loan)) + frappe.throw(_("Select interest income account in loan {0}").format(data.loan)) if data.interest_income_account and data.interest_amount: accounts.append({ diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js index e812f19ced1..fa843bc984d 100644 --- a/erpnext/public/js/help_links.js +++ b/erpnext/public/js/help_links.js @@ -504,10 +504,6 @@ frappe.help.help_links['Form/Operation'] = [ { label: 'Operation', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/operation' }, ] -frappe.help.help_links['Form/Production Planning Tool'] = [ - { label: 'Production Planning Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/production-planning-tool' }, -] - frappe.help.help_links['Form/BOM Update Tool'] = [ { label: 'BOM Update Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/bom-update-tool' }, ]