From 6d4b311b35055e0a2243344dd77b2e60f87aba1e Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 21 Mar 2023 11:50:11 +0100 Subject: [PATCH] fix: translations and UX in alternative item mapping (#34433) * fix: disable deletion in alternative item mapping * feat: german translations * fix: make string translatable --------- Co-authored-by: Anand Baburajan Co-authored-by: Deepesh Garg (cherry picked from commit 79911734e914b61c9dd8a4af721d462d3dff20c0) --- erpnext/selling/doctype/quotation/quotation.js | 3 ++- erpnext/translations/de.csv | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js index 81ef44d53ed9..83fa472d68ba 100644 --- a/erpnext/selling/doctype/quotation/quotation.js +++ b/erpnext/selling/doctype/quotation/quotation.js @@ -304,6 +304,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext. fieldname: "alternative_items", fieldtype: "Table", cannot_add_rows: true, + cannot_delete_rows: true, in_place_edit: true, reqd: 1, data: this.data, @@ -330,7 +331,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext. dialog.fields_dict.info.$wrapper.html( `

- Alternative Items + ${__("Alternative Items")}

` ) dialog.show(); diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv index 2aa6dbc0d1c4..3fb637b842f0 100644 --- a/erpnext/translations/de.csv +++ b/erpnext/translations/de.csv @@ -5064,7 +5064,7 @@ Price List Rate (Company Currency),Preisliste (Unternehmenswährung), Rate ,Preis, Rate (Company Currency),Preis (Unternehmenswährung), Amount (Company Currency),Betrag (Unternehmenswährung), -Is Free Item,Ist freies Einzelteil, +Is Free Item,Ist kostenlos, Net Rate,Nettopreis, Net Rate (Company Currency),Nettopreis (Unternehmenswährung), Net Amount (Company Currency),Nettobetrag (Unternehmenswährung), @@ -9915,3 +9915,7 @@ Delivered at Place Unloaded,Geliefert benannter Ort entladen, Delivered Duty Paid,Geliefert verzollt, Discount Validity,Frist für den Rabatt, Discount Validity Based On,Frist für den Rabatt berechnet sich nach, +Select Alternative Items for Sales Order,Alternativpositionen für Auftragsbestätigung auswählen, +Select an item from each set to be used in the Sales Order.,"Wählen Sie aus den Alternativen jeweils einen Artikel aus, der in die Auftragsbestätigung übernommen werden soll.", +Is Alternative,Ist Alternative, +Alternative Items,Alternativpositionen,