Merge pull request #9401 from sagarvora/so-calendar
[fix] get status in calendar view and show green background
diff --git a/erpnext/docs/assets/img/accounts/chart-of-cost-center.png b/erpnext/docs/assets/img/accounts/chart-of-cost-center.png
new file mode 100644
index 0000000..7e36be2
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/chart-of-cost-center.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/customer-portal-order.png b/erpnext/docs/assets/img/website/customer-portal-order.png
new file mode 100644
index 0000000..83fd57e
--- /dev/null
+++ b/erpnext/docs/assets/img/website/customer-portal-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/invoice-paid.png b/erpnext/docs/assets/img/website/invoice-paid.png
new file mode 100644
index 0000000..ce242c2
--- /dev/null
+++ b/erpnext/docs/assets/img/website/invoice-paid.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/invoice-unpaid.png b/erpnext/docs/assets/img/website/invoice-unpaid.png
new file mode 100644
index 0000000..16c3325
--- /dev/null
+++ b/erpnext/docs/assets/img/website/invoice-unpaid.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/portal-menu.png b/erpnext/docs/assets/img/website/portal-menu.png
new file mode 100644
index 0000000..6b7ee0a
--- /dev/null
+++ b/erpnext/docs/assets/img/website/portal-menu.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/website-login.png b/erpnext/docs/assets/img/website/website-login.png
index 6943098..ba57937 100644
--- a/erpnext/docs/assets/img/website/website-login.png
+++ b/erpnext/docs/assets/img/website/website-login.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/website-signup-details.png b/erpnext/docs/assets/img/website/website-signup-details.png
new file mode 100644
index 0000000..aa96d7f
--- /dev/null
+++ b/erpnext/docs/assets/img/website/website-signup-details.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png b/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png
deleted file mode 100644
index ff14072..0000000
--- a/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-document.png b/erpnext/docs/assets/old_images/erpnext/custom-field-document.png
deleted file mode 100644
index 6791d32..0000000
--- a/erpnext/docs/assets/old_images/erpnext/custom-field-document.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png b/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png
deleted file mode 100644
index 6eacdf1..0000000
--- a/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png
deleted file mode 100644
index 459d503..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png
deleted file mode 100644
index f7ff81b..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png
deleted file mode 100644
index 7693877..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png
deleted file mode 100644
index 771de78..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png b/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png
deleted file mode 100644
index d3e1143..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png b/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png
deleted file mode 100644
index 0993cb5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-menu.png b/erpnext/docs/assets/old_images/erpnext/portal-menu.png
deleted file mode 100644
index 0f9ea82..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-menu.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png b/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png
deleted file mode 100644
index e92e8dc..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html
index 1d50b78..4740c5c 100644
--- a/erpnext/docs/license.html
+++ b/erpnext/docs/license.html
@@ -640,8 +640,8 @@
the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.</p>
-<pre><code> <one line="" to="" give="" the="" program's="" name="" and="" a="" brief="" idea="" of="" what="" it="" does.="">
- Copyright (C) <year> <name of="" author="">
+<pre><code> <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
index 6b8459e..c74029b 100644
--- a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
+++ b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
@@ -4,18 +4,18 @@
Das Webportal von ERPNext gibt Ihren Kunden einen schnellen Zugriff auf Ihre Aufträge, Rechnungen und Sendungen.
Kunden können den Status Ihrer Bestellungen, Rechnungen und des Versandes nachprüfen, indem sie sich auf der Webseite einloggen.
-
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
Sobald eine Bestellung aufgegeben wurde, entweder über den Einkaufswagen oder aus ERPNext heraus, kann Ihr Kunde die Bestellung ansehen und den Abrechnungs- und Versandstatus nachverfolgen. Wenn die Rechnung und die Zahlung zu einer Bestellung übertragen wurden, kann der Kunde auch hier den aktuellen Stand auf einen Blick nachvollziehen.
-
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
### Rechnung mit Status "gezahlt"
-
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-unpaid.png">
### Rechnung mit Status "abgerechnet"
-
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-paid.png">
{next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/portal-login.md b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
index d5cc22e..455dfac 100644
--- a/erpnext/docs/user/manual/de/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
@@ -3,6 +3,6 @@
Um sich in ein Kundenkonto einzuloggen, muss der Kunde seine Email-ID und das Passwort angeben, welche ihm von ERPNext während des Registrierungsprozesses zugesendet wurden.
-
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
{next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/sign-up.md b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
index 5ffc307..0a91145 100644
--- a/erpnext/docs/user/manual/de/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
@@ -1,20 +1,17 @@
# Registrieren
+
<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
Kunden müssen sich über die Webseite als Kunden registrieren.
-### Schritt 1: Klicken Sie auf das Login-Symbol
+### Schritt 1: Klicken Sie auf das Registrieren-Symbol
-
-
-### Schritt 2: Klicken Sie auf das Registrieren-Symbol
-
-
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
### Schritt 3: Geben Sie Ihren Kundennamen und Ihre ID ein
-
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-signup-details.png">
Wenn der Registrierungsprozess abgeschlossen ist, wird dem Kunden eine E-Mail mit dem Passwort zugeschickt.
-{next}
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
index 25c40e1..feeb7d9 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -28,31 +28,31 @@
Wählen Sie die Transaktion oder die Vorlage, in die sie ein benutzerdefiniertes Feld einfügen wollen. Nehmen wir an, dass Sie ein benutzerdefiniertes Verknüpfungsfeld in ein Angebotsformular einfügen wollen; das Dokument soll "Angebot" heißen.
-
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-1.gif">
### Feldbezeichnung einstellen
Die Bezeichnung des benutzerdefinierten Feldes wird basierend auf seinem Namen eingestellt. Wenn Sie ein benutzerdefiniertes Feld mit einem bestimmten Namen erstellen wollen, aber mit einer sich davon unterscheidenden Bezeichnung, dann sollten Sie erst die Bezeichnung angeben, da Sie den Feldnamen noch einstellen wollen. Nach dem Speichern des benutzerdefinierten Feldes können Sie die Feldbezeichnung wieder ändern.
-
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-2.gif">
### Einstellen, nach welchem Element eingefügt werden soll ("Einfügen nach")
Diese Auswahl enthält alle bereits existierenden Felder des ausgewählten Formulars/des DocTypes. Ihr benutzerdefiniertes Feld wird nach dem Feld eingefügt, das Sie unter "Einfügen nach" auswählen.
-
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-3.png">
### Feldtyp auswählen
Klicken Sie hier um weitere Informationen über Feldtypen, die Sie bei einem benutzerdefinierten Feld auswählen können, zu erhalten.
-
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-4.png">
### Optionen einstellen
Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
-
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-5.png">
Wenn der Feldtyp als Auswahlfeld (Drop Down-Feld) angegeben ist, dann sollten alle möglichen Ergebnisse für dieses Feld im Optionen-Feld aufgelistet werden. Die möglichen Ergebnisse sollten alle in einer eigenen Zeile stehen.
@@ -71,7 +71,7 @@
5. Schreibgeschützt: Wenn diese Option aktiviert ist, kann das benutzerdefinierte Feld nicht geändert werden.
6. Beim Übertragen zulassen: Wenn diese Option ausgewählt wird, ist es erlaubt den Wert des Feldes zu ändern, wenn er in einer Transaktion übertragen wird.
-
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-6.png">
### Benutzerdefiniertes Feld löschen
diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
index 16b5431..5ed3802 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -32,6 +32,6 @@
> Accounts > Setup > Chart of Cost Centers
-
+<img class="screenshot" alt="Cost Center" src="{{docs_base_url}}/assets/img/chart-of-cost-center.png">
{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index 83d7bf6..257370e 100644
--- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -1,22 +1,17 @@
-ERPNext Web Portal gives your customers quick access to their Orders, Invoices
-and Shipments Customers can check the status of their orders, invoices, and
-shipping status by logging on to the web.
+ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web.
-
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
-Once an order is raised, either using the Shopping Cart or from within
-ERPNext, your customer can view the order and keep an eye on the billing and
-shipment status. When the invoice and payment against these orders are
-submitted, the customer can see the updated status on the portal, at a glance.
+Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance.
-
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
-#### Invoice with paid status.
+#### Outstanding Sales Invoice
-
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-unpaid.png">
-#### Invoice with billed status.
+#### Paid Sales Invoice
-
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-paid.png">
{next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
index 43c2f08..554285c 100644
--- a/erpnext/docs/user/manual/en/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -1,22 +1,15 @@
-Customers have to log-in to the Company Website, and sign-up as a customer.
+Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
-#### Step 1: Click on Login Icon
+#### Step 1: Signup
-
+On the Login Page, you will find option to Signup.
-
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
-#### Step 2: Click on Sign Up Icon
+#### Step 2: Enter Customer Name and ID
-
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-signup-details.png">
-
-
-#### Step 3: Enter Customer Name and ID
-
-
-
-After the sign up process, a mail will be sent to the customers Email Address with
-the password details.
+After the sign up process, an email will be sent to the customers Email Address with the password details.
{next}
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
index c4f0b77..b2250e0 100644
--- a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
@@ -1,8 +1,8 @@
-#Managing User Sign Up via Website
+#Customer / Supplier Signup
-Users can sign up for ERPNext account via the ERPNext Website.
+Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
-<img src="{{docs_base_url}}/assets/img/website/website-login.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
index 3cadea6..a2eecef 100644
--- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
+++ b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
@@ -6,6 +6,7 @@
frappe.ui.form.on('Assessment Result Tool', {
refresh: function(frm) {
+ frm.trigger("assessment_plan");
if (frappe.route_options) {
frm.set_value("student_group", frappe.route_options.student_group);
frm.set_value("assessment_plan", frappe.route_options.assessment_plan);
diff --git a/erpnext/templates/print_formats/includes/taxes.html b/erpnext/templates/print_formats/includes/taxes.html
index 55e0443..b0bd1d4 100644
--- a/erpnext/templates/print_formats/includes/taxes.html
+++ b/erpnext/templates/print_formats/includes/taxes.html
@@ -1,7 +1,7 @@
{%- macro render_discount_amount(doc) -%}
{%- if doc.discount_amount -%}
<div class="row">
- <div class="col-xs-5 text-right">
+ <div class="col-xs-5 {%- if not doc._align_labels_left %} text-right{%- endif -%}">
<label>{{ _("Discount Amount") }}</label></div>
<div class="col-xs-7 text-right">
- {{ doc.get_formatted("discount_amount", doc) }}
@@ -19,7 +19,7 @@
{%- for charge in data -%}
{%- if not charge.included_in_print_rate -%}
<div class="row">
- <div class="col-xs-5 text-right">
+ <div class="col-xs-5 {%- if not doc._align_labels_left %} text-right{%- endif -%}">
<label>{{ charge.get_formatted("description") }}</label></div>
<div class="col-xs-7 text-right">
{{ frappe.format_value(frappe.utils.flt(charge.tax_amount),
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index a28948b..37b43ae 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -47,7 +47,7 @@
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural إدخال دفتر اليومية ارسل
DocType: Pricing Rule,Apply On,تنطبق على
DocType: Item Price,Multiple Item prices.,أسعار الإغلاق متعددة .
-,Purchase Order Items To Be Received,أمر شراء الأصناف التي سترد
+,Purchase Order Items To Be Received,تم استلام اصناف امر الشراء
DocType: SMS Center,All Supplier Contact,بيانات اتصال جميع الموردين
DocType: Support Settings,Support Settings,إعدادات الدعم
DocType: SMS Parameter,Parameter,المعلمة
@@ -250,7 +250,7 @@
apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,القيمة خارج
DocType: Production Planning Tool,Sales Orders,أوامر البيع
DocType: Purchase Taxes and Charges,Valuation,تقييم
-,Purchase Order Trends,شراء اتجاهات ترتيب
+,Purchase Order Trends,اتجهات امر الشراء
apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,طلب للحصول على الاقتباس يمكن الوصول إليها من خلال النقر على الرابط التالي
apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,تخصيص الاجازات لهذا العام.
DocType: SG Creation Tool Course,SG Creation Tool Course,سان جرمان إنشاء ملعب أداة
@@ -684,7 +684,7 @@
DocType: Supplier,Fixed Days,يوم الثابتة
DocType: Quotation Item,Item Balance,البند الميزان
DocType: Sales Invoice,Packing List,قائمة التعبئة
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,أوامر الشراء نظرا للموردين.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,تحديد موردين لأمر الشراء.
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,النشر
DocType: Activity Cost,Projects User,مشاريع العضو
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,مستهلك
@@ -899,7 +899,7 @@
apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} الوضع هو {2}
DocType: Employee,Provide Email Address registered in company,تقديم عنوان البريد الإلكتروني المسجل في شركة
DocType: Shopping Cart Settings,Enable Checkout,تمكين الخروج
-apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,أمر الشراء إلى الدفع
+apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,مدفوعات امر الشراء
apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,الكمية المتوقعة
DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
@@ -1085,7 +1085,7 @@
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ERPNext اذهب إلى سطح المكتب والبدء في استخدام
DocType: Item,Manufacturer,الصانع
-DocType: Landed Cost Item,Purchase Receipt Item,شراء السلعة استلام
+DocType: Landed Cost Item,Purchase Receipt Item,اصناف استلام الشراء
DocType: Purchase Receipt,PREC-RET-,PREC-RET-
DocType: POS Profile,Sales Invoice Payment,فاتورة مبيعات الدفع
DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,مستودع محجوزة في ترتيب المبيعات / السلع تامة الصنع في معرض النماذج
@@ -1201,7 +1201,7 @@
DocType: Course,Course Intro,مقدمة الدورة
apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,الأسهم الدخول {0} خلق
apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
-,Purchase Order Items To Be Billed,أمر الشراء البنود لتكون وصفت
+,Purchase Order Items To Be Billed,تم اصدار فاتورة لأصناف امر الشراء
DocType: Purchase Invoice Item,Net Rate,صافي معدل
DocType: Purchase Invoice Item,Purchase Invoice Item,اصناف فاتورة المشتريات
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ويرسل الأوراق المالية ليدجر مقالات وGL مقالات لشراء شهادات مختارة
@@ -1620,7 +1620,7 @@
apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{0} {1} is cancelled or stopped,{0} {1} ملغى أو موقف
DocType: Accounts Settings,Credit Controller,المراقب الائتمان
DocType: Delivery Note,Vehicle Dispatch Date,سيارة الإرسال التسجيل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,استلام المشتريات {0} غير مرحل
DocType: Company,Default Payable Account,حساب Paybal الافتراضي
apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0} فوترت٪
@@ -2132,7 +2132,7 @@
DocType: Stock Entry,Total Incoming Value,إجمالي القيمة الواردة
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,مطلوب الخصم ل
apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,شراء قائمة الأسعار
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قائمة اسعار المشتريات
DocType: Offer Letter Term,Offer Term,عرض عمل
DocType: Quality Inspection,Quality Manager,مدير الجودة
DocType: Job Applicant,Job Opening,وظيفة شاغرة
@@ -2515,7 +2515,7 @@
apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,المرجع
DocType: Budget,Cost Center,مركز التكلفة
apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,سند #
-DocType: Notification Control,Purchase Order Message,رسالة طلب شراء
+DocType: Notification Control,Purchase Order Message,رسالة امر الشراء
DocType: Tax Rule,Shipping Country,دولة الشحن
DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,إخفاء المعرف الضريبي العملاء من المعاملات المبيعات
DocType: Upload Attendance,Upload HTML,رفع HTML
@@ -2919,7 +2919,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","حساب الفروقات سجب ان يكون نوع حساب الأصول / الخصوم, بحيث مطابقة المخزون بأدخال الأفتتاحي"
apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},المبلغ صرف لا يمكن أن يكون أكبر من مبلغ القرض {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},مطلوب رقم امر الشراء للصنف {0}
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,إنتاج النظام لم يخلق
apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},لا يمكن تغيير الوضع كما طالب {0} يرتبط مع تطبيق طالب {1}
@@ -3125,7 +3125,7 @@
DocType: Cheque Print Template,Starting position from top edge,بدءا من موقف من أعلى الحافة
apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,تم إدخال المورد نفسه عدة مرات
apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,الربح الإجمالي / الخسارة
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,شراء السلعة ترتيب الموردة
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,الأصناف المزوده بامر الشراء
apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,اسم الشركة لا يمكن تكون شركة
apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,عنوان الرسالة لطباعة النماذج
apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوين نماذج الطباعة مثل الفاتورة الأولية.
@@ -3142,7 +3142,7 @@
apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,يرجى ذكر جولة معطلة مركز التكلفة في الشركة
DocType: Purchase Invoice,Terms,الأحكام
DocType: Academic Term,Term Name,اسم المدى
-DocType: Buying Settings,Purchase Order Required,أمر الشراء المطلوبة
+DocType: Buying Settings,Purchase Order Required,مطلوب امر الشراء
,Item-wise Sales History,الحركة التاريخيه وفقا للصنف
DocType: Expense Claim,Total Sanctioned Amount,الإجمالي الكمية الموافق عليه
,Purchase Analytics,تحليلات المشتريات
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 48c5f2f..932a437 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -18,7 +18,7 @@
DocType: Purchase Order,PO-,IO-
DocType: POS Profile,Applicable for User,Gældende for bruger
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produktionsordre kan ikke annulleres, Unstop det første til at annullere"
-DocType: Vehicle Service,Mileage,Kilometertal
+DocType: Vehicle Service,Mileage,Kilometerpenge
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vil du virkelig kassere dette anlægsaktiv?
apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vælg Standard Leverandør
apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
@@ -593,7 +593,7 @@
DocType: C-Form,IV,IV
apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Leveret: {0}
DocType: Expense Claim,Payable Account,Betales konto
-DocType: Payment Entry,Type of Payment,Type af betaling
+DocType: Payment Entry,Type of Payment,Betalingsmåde
DocType: Sales Order,Billing and Delivery Status,Fakturering og leveringsstatus
DocType: Job Applicant,Resume Attachment,Vedhæft CV
apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gamle kunder
@@ -930,7 +930,7 @@
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Købskvittering
,Received Items To Be Billed,Modtagne varer skal faktureres
apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Godkendte lønsedler
-DocType: Employee,Ms,Ms
+DocType: Employee,Ms,Fru
apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Valutakursen mester.
apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Henvisning Doctype skal være en af {0}
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
@@ -1002,7 +1002,7 @@
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle hjælpevideoerne
DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere prislistesatsen i transaktioner
-DocType: Pricing Rule,Max Qty,Maksimalt antal
+DocType: Pricing Rule,Max Qty,Maksimal mængde
apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
Please enter a valid Invoice","Række {0}: Faktura {1} er ugyldig, kan det blive annulleret / findes ikke. \ Indtast en gyldig faktura"
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
@@ -2300,7 +2300,7 @@
DocType: BOM,Show Operations,Vis Operations
,Minutes to First Response for Opportunity,Minutter til første reaktion for salgsmulighed
apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Ialt fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Vare eller lager for række {0} matcher ikke materiale Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Vare eller lager for række {0} matcher ikke materialeanmodningen
apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Måleenhed
DocType: Fiscal Year,Year End Date,Sidste dag i året
DocType: Task Depends On,Task Depends On,Opgave afhænger af
@@ -2534,7 +2534,7 @@
DocType: C-Form Invoice Detail,Territory,Område
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
-DocType: Vehicle Log,Fuel Qty,Antal Fuel
+DocType: Vehicle Log,Fuel Qty,Brændstofmængde
DocType: Production Order Operation,Planned Start Time,Planlagt starttime
DocType: Course,Assessment,Vurdering
DocType: Payment Entry Reference,Allocated,Allokeret
@@ -2822,8 +2822,8 @@
apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +108,Asset {0} must be submitted,Aktiv {0} skal godkendes
apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +58,Attendance Record {0} exists against Student {1},Tilstedeværelse {0} eksisterer for studerende {1}
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Henvisning # {0} dateret {1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Afskrivninger Slået grund afhændelse af aktiver
-apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrer Adresser
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Bortfaldne afskrivninger grundet afhændelse af aktiver
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrér adresser
DocType: Asset,Item Code,Varenr.
DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
@@ -4152,7 +4152,7 @@
DocType: Buying Settings,Naming Series,Navngivningsnummerserie
DocType: Leave Block List,Leave Block List Name,Blokering af fraværsansøgninger
apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdato skal være mindre end Forsikring Slutdato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Lageraktiver
DocType: Timesheet,Production Detail,Produktion Detail
DocType: Target Detail,Target Qty,Target Antal
DocType: Shopping Cart Settings,Checkout Settings,Kassen Indstillinger
@@ -4384,7 +4384,7 @@
DocType: Company,Company Info,Firmainformation
apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Vælg eller tilføj ny kunde
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Omkostningssted er forpligtet til at bestille et udlæg
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Aktiver)
apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er baseret på deltagelse af denne Medarbejder
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Debetkonto
DocType: Fiscal Year,Year Start Date,År Startdato
@@ -4398,7 +4398,7 @@
apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Slutår kan ikke være før startår
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Personalegoder
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for vare {0} i række {1}
-DocType: Production Order,Manufactured Qty,Fremstillet antal
+DocType: Production Order,Manufactured Qty,Fremstillet mængde
DocType: Purchase Receipt Item,Accepted Quantity,Mængde
apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Angiv en standard helligdagskalender for medarbejder {0} eller firma {1}
apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} eksisterer ikke
@@ -4439,7 +4439,7 @@
DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver sag
DocType: Sales Invoice Item,Discount and Margin,Rabat og Margin
DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-DocType: Pricing Rule,Min Qty,Min Antal
+DocType: Pricing Rule,Min Qty,Minimum mængde
DocType: Asset Movement,Transaction Date,Transaktionsdato
DocType: Production Plan Item,Planned Qty,Planlagt mængde
apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Moms i alt
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 9c985eb..76b2d75 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -161,7 +161,7 @@
DocType: Journal Entry,Opening Entry,Eröffnungsbuchung
apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto Pay Nur
DocType: Employee Loan,Repay Over Number of Periods,Repay über Anzahl der Perioden
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0} - {1} ist nicht in der angegebenen {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0} - {1} ist nicht für den angegebenen {2} eingeschrieben
DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
DocType: Lead,Product Enquiry,Produktanfrage
@@ -582,7 +582,7 @@
apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Kumulierte Werte
apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Kundenauftrag erstellen
-DocType: Project Task,Project Task,Projekt-Teilaufgabe
+DocType: Project Task,Project Task,Projektvorgang
,Lead Id,Lead-ID
DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
DocType: Training Event,Course,Kurs
@@ -867,7 +867,7 @@
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} darf keine Gruppe sein
apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Artikel Row {idx}: {} {Doctype docname} existiert nicht in der oben '{Doctype}' Tisch
apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
-apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Keine Aufgaben
+apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,keine Vorgänge
DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Der Tag des Monats, an welchem eine automatische Rechnung erstellt wird, z. B. 05, 28 usw."
DocType: Asset,Opening Accumulated Depreciation,Öffnungs Kumulierte Abschreibungen
apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punktzahl muß kleiner oder gleich 5 sein
@@ -1466,7 +1466,7 @@
DocType: BOM,Scrap Material Cost(Company Currency),Schrottmaterialkosten (Gesellschaft Währung)
apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Unterbaugruppen
DocType: Asset,Asset Name,Asset-Name
-DocType: Project,Task Weight,Aufgabengewichtung
+DocType: Project,Task Weight,Vorgangsgewichtung
DocType: Shipping Rule Condition,To Value,Bis-Wert
DocType: Asset Movement,Stock Manager,Lagerleiter
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Ausgangslager ist für Zeile {0} zwingend erforderlich
@@ -1586,10 +1586,10 @@
DocType: Student Group,Set 0 for no limit,Stellen Sie 0 für keine Grenze
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag/die Tage, für den/die Sie Urlaub beantragen, sind Ferien. Deshalb müssen Sie keinen Urlaub beantragen."
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Erneut senden Zahlung per E-Mail
-apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Neue Aufgabe
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Neuer Vorgang
apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Angebot erstellen
apps/erpnext/erpnext/config/selling.py +216,Other Reports,Weitere Berichte
-DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
+DocType: Dependent Task,Dependent Task,Abhängiger Vorgang
apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
@@ -2136,7 +2136,7 @@
DocType: Payment Reconciliation,Payment Reconciliation,Zahlungsabgleich
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Bitte den Namen der verantwortlichen Person auswählen
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Noch nicht ausgezahlten: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Noch nicht bezahlt: {0}
DocType: BOM Website Operation,BOM Website Operation,BOM Webseite Tätigkeits
apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Angebotsschreiben
apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Materialanfragen (MAF) und Fertigungsaufträge generieren
@@ -2322,7 +2322,7 @@
apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Zeile {0} stimmen nicht mit Materialanfrage überein
apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Maßeinheit
DocType: Fiscal Year,Year End Date,Enddatum des Geschäftsjahres
-DocType: Task Depends On,Task Depends On,Aufgabe hängt ab von
+DocType: Task Depends On,Task Depends On,Vorgang hängt ab von
DocType: Supplier Quotation,Opportunity,Chance
,Completed Production Orders,Abgeschlossene Fertigungsaufträge
DocType: Operation,Default Workstation,Standard-Arbeitsplatz
@@ -2534,7 +2534,7 @@
DocType: Task,% Progress,% Fortschritt
apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gewinn / Verlust aus der Veräußerung von Vermögenswerten
DocType: Training Event,Will send an email about the event to employees with status 'Open',Wird eine E-Mail über das Ereignis senden an Mitarbeiter mit dem Status 'Offen'
-DocType: Task,Depends on Tasks,Hängt von Aufgaben
+DocType: Task,Depends on Tasks,Abhängig von Vorgang
apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten
DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Anhänge können ohne Erlaubnis des Einkaufswagens angezeigt werden
DocType: Supplier Quotation,SQTN-,SQTN-
@@ -3242,7 +3242,7 @@
apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Benutzer hinzufügen
DocType: POS Item Group,Item Group,Artikelgruppe
DocType: Item,Safety Stock,Sicherheitsbestand
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fortschritt% für eine Aufgabe kann nicht mehr als 100 sein.
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fortschritt-% eines Vorgangs darf nicht größer 100 sein.
DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},An {0}
DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugerechnet (Firmenwährung)
@@ -3642,7 +3642,7 @@
DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
,Sales Funnel,Verkaufstrichter
apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
-DocType: Project,Task Progress,Aufgabenfortschritt
+DocType: Project,Task Progress,Vorgangsentwicklung
apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Einkaufswagen
,Qty to Transfer,Zu versendende Menge
apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Angebote an Leads oder Kunden
@@ -4217,7 +4217,7 @@
DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,Stückliste enthält keine Lagerware
apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Ab-Zeitraum und Bis-Zeitraum sind zwingend erforderlich für wiederkehrende {0}
-apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektaktivität/Aufgabe
+apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektaktivität/-vorgang.
DocType: Vehicle Log,Refuelling Details,Betankungs Einzelheiten
apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gehaltsabrechnungen generieren
apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss ausgewählt sein, wenn ""Anwenden auf"" auf {0} gesetzt wurde"
@@ -4291,7 +4291,7 @@
apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fehler: Keine gültige ID?
DocType: Naming Series,Update Series Number,Nummernkreis-Wert aktualisieren
DocType: Account,Equity,Eigenkapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: "Gewinn und Verlust" Typ Konto {2} nicht in Öffnungs Eintrag erlaubt
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,"{0} {1}: ""Gewinn und Verlust"" Art Konto {2} nicht in Eröffnungs-Buchung erlaubt"
DocType: Sales Order,Printing Details,Druckdetails
DocType: Task,Closing Date,Abschlussdatum
DocType: Sales Order Item,Produced Quantity,Produzierte Menge
@@ -4302,7 +4302,7 @@
DocType: Sales Partner,Partner Type,Partnertyp
DocType: Purchase Taxes and Charges,Actual,Tatsächlich
DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
-apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Zeiterfassung für Aufgaben.
+apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Zeitraport für Vorgänge.
DocType: Purchase Invoice,Against Expense Account,Zu Aufwandskonto
DocType: Production Order,Production Order,Fertigungsauftrag
apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +270,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits übertragen
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 4f0268a..bfbba6d 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -2183,7 +2183,7 @@
apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Créer un Étudiant
apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Vous avez été invité à collaborer sur le projet : {0}
DocType: Leave Block List Date,Block Date,Bloquer la Date
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Appliquer Maintenant
+apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Postuler
apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qté Réelle {0} / Quantité en Attente {1}
DocType: Sales Order,Not Delivered,Non Livré
,Bank Clearance Summary,Bilan des Compensations Bancaires
@@ -3938,7 +3938,7 @@
DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rôle qui est autorisé à soumettre des transactions qui dépassent les limites de crédit fixées.
apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Données de base en cours de synchronisation, cela peut prendre un certain temps"
-DocType: Item,Material Issue,Problème Matériel
+DocType: Item,Material Issue,Sortie de Matériel
DocType: Hub Settings,Seller Description,Description du Vendeur
DocType: Employee Education,Qualification,Qualification
DocType: Item Price,Item Price,Prix de l'Article
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index 96b4636..a234d1a 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -64,6 +64,7 @@
DocType: Payment Request,Payment Request,Pedido de Pagamento
DocType: Asset,Value After Depreciation,Valor após Depreciação
apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relacionados
+DocType: Grading Scale,Grading Scale Name,Nome escala de avaliação
apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Esta é uma conta de root e não pode ser editada.
apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Não é possível definir a autorização com base em desconto para {0}
DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexar arquivo .csv com duas colunas, uma para o nome antigo e um para o novo nome"
@@ -608,7 +609,7 @@
DocType: HR Settings,Enter retirement age in years,Insira a idade da aposentadoria em anos
apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Armazén de Destino
DocType: Item,Allow over delivery or receipt upto this percent,Permitir entrega ou recebimento adicional até este percentual
-DocType: Upload Attendance,Import Attendance,Importação de Atendimento
+DocType: Upload Attendance,Import Attendance,Importação de Ponto
apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos os grupos de itens
DocType: Process Payroll,Activity Log,Log de Atividade
apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compor automaticamente mensagem no envio de transações.
@@ -1087,6 +1088,7 @@
DocType: SMS Center,Receiver List,Lista de recebedores
apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade Consumida
apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variação Líquida em Dinheiro
+DocType: Assessment Plan,Grading Scale,Escala de avaliação
apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Já concluído
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Pedido de Pagamento já existe {0}
@@ -1298,6 +1300,7 @@
apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gráfico de Gantt de todas as tarefas.
DocType: Opportunity,Mins to First Response,Minutos para Primeira Resposta
DocType: Pricing Rule,Margin Type,Tipo da Margem
+DocType: Course,Default Grading Scale,Escala de avaliação padrão
DocType: Appraisal,For Employee Name,Para Nome do Colaborador
DocType: C-Form Invoice Detail,Invoice No,Nota nº
apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +342,Make Payment,Fazer Pagamento
@@ -1394,6 +1397,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Nº de Série {0} está na garantia até {1}
apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
apps/erpnext/erpnext/hooks.py +87,Shipments,Entregas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,O saldo da conta {1} ({0}) e o valor do estoque ({2}) para o armazém {3} devem ser os mesmos
DocType: Payment Entry,Total Allocated Amount (Company Currency),Total alocado (moeda da empresa)
DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
DocType: BOM,Scrap Material Cost,Custo do Material Sucateado
@@ -1424,6 +1428,7 @@
apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em ""Gerar Agenda"" para obter cronograma"
DocType: Bin,Ordered Quantity,Quantidade Encomendada
apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","ex: ""Desenvolve ferramentas para construtores """
+DocType: Grading Scale,Grading Scale Intervals,Intervalos da escala de avaliação
apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entradas contabeis para {2} só pode ser feito em moeda: {3}
DocType: Production Order,In Process,Em Processo
DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item
@@ -2038,6 +2043,7 @@
DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Encargos sobre Compras
,Qty to Receive,Qtde para Receber
DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
+DocType: Grading Scale Interval,Grading Scale Interval,Intervalo da escala de avaliação
apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Reembolso de Despesa para o Log do Veículo {0}
DocType: Sales Partner,Retailer,Varejista
apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
@@ -3186,7 +3192,7 @@
DocType: Employee,Reason for Leaving,Motivo da saída
DocType: BOM Operation,Operating Cost(Company Currency),Custo operacional (moeda da empresa)
DocType: Employee Loan Application,Rate of Interest,Taxa de Juros
-DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
+DocType: Expense Claim Detail,Sanctioned Amount,Valor Sancionado
DocType: GL Entry,Is Opening,É Abertura
apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Lançamento de débito não pode ser relacionado a uma {1}
apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,A Conta {0} não existe
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 5a0a0de..e7c6690 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -57,7 +57,7 @@
DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
,Purchase Order Items To Be Received,AlınacakSatınalma Siparişi Kalemleri
-DocType: SMS Center,All Supplier Contact,Bütün Tedarikçi Kişiler
+DocType: SMS Center,All Supplier Contact,Bütün Tedarikçiler
DocType: Support Settings,Support Settings,Destek Ayarları
DocType: SMS Parameter,Parameter,Parametre
DocType: SMS Parameter,Parameter,Parametre
@@ -868,7 +868,7 @@
apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Hesap {0} birden çok kez girilmiş
DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
DocType: Hub Settings,Seller City,Satıcı Şehri
-,Absent Student Report,Yok Öğrenci Raporu
+,Absent Student Report,Olmayan Öğrenci Raporu
DocType: Email Digest,Next email will be sent on:,Sonraki e-posta gönderilecek:
DocType: Offer Letter Term,Offer Letter Term,Mektubu Dönem Teklif
apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Öğe varyantları vardır.
@@ -2445,7 +2445,7 @@
apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Çocuk Ürün Ürün Paketi olmamalıdır. öğeyi kaldırmak `{0}` ve saklayın
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
-apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets ekle
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Zaman Çizelgesi ekle
DocType: Vehicle Service,Service Item,servis Öğe
DocType: Bank Guarantee,Bank Guarantee,Banka garantisi
DocType: Bank Guarantee,Bank Guarantee,Banka garantisi
@@ -3206,7 +3206,7 @@
apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Mevcut işlem ile depolar grubuna dönüştürülemez.
DocType: Assessment Result Tool,Result HTML,Sonuç HTML
apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Tarihinde sona eriyor
-apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Öğrenciler ekle
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Öğrenci ekle
apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Lütfen {0} seçiniz
DocType: C-Form,C-Form No,C-Form No
DocType: C-Form,C-Form No,C-Form No
@@ -3677,8 +3677,8 @@
apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Formu doldurun ve kaydedin
DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,En son stok durumu ile bütün ham maddeleri içeren bir rapor indir
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Gerçek adet
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Gerçek adet
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Stokdaki gerçek adet
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Stoktaki Gerçek adet
DocType: Homepage,"URL for ""All Products""","Tüm Ürünler" URL
DocType: Leave Application,Leave Balance Before Application,Uygulamadan Önce Kalan İzin
DocType: SMS Center,Send SMS,SMS Gönder
@@ -3806,7 +3806,7 @@
DocType: Purchase Invoice Item,Rate,Birim Fiyat
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stajyer
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stajyer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adres adı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adres Adı
DocType: Stock Entry,From BOM,BOM Gönderen
DocType: Assessment Code,Assessment Code,Değerlendirme Kodu
apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Temel
