Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: translations and UX in alternative item mapping (#34433)

Browse Source 
* fix: disable deletion in alternative item mapping

* feat: german translations

* fix: make string translatable

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
This commit is contained in:
Raffael Meyer 2023-03-21 11:50:11 +01:00 committed by GitHub
parent 0df3a1a3af
commit 79911734e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/selling/doctype/quotation/quotation.js
View File

@ -304,6 +304,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
fieldname: "alternative_items", fieldname: "alternative_items",
fieldtype: "Table", fieldtype: "Table",
cannot_add_rows: true, cannot_add_rows: true,
cannot_delete_rows: true,
in_place_edit: true, in_place_edit: true,
reqd: 1, reqd: 1,
data: this.data, data: this.data,
@ -330,7 +331,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
dialog.fields_dict.info.$wrapper.html( dialog.fields_dict.info.$wrapper.html(
`<p class="small text-muted"> `<p class="small text-muted">
<span class="indicator yellow"></span> <span class="indicator yellow"></span>
Alternative Items ${__("Alternative Items")}
</p>` </p>`
) )
dialog.show(); dialog.show();

6
erpnext/translations/de.csv
View File

@ -5063,7 +5063,7 @@ Price List Rate (Company Currency),Preisliste (Unternehmenswährung),
Rate ,Preis, Rate ,Preis,
Rate (Company Currency),Preis (Unternehmenswährung), Rate (Company Currency),Preis (Unternehmenswährung),
Amount (Company Currency),Betrag (Unternehmenswährung), Amount (Company Currency),Betrag (Unternehmenswährung),
Is Free Item,Ist freies Einzelteil, Is Free Item,Ist kostenlos,
Net Rate,Nettopreis, Net Rate,Nettopreis,
Net Rate (Company Currency),Nettopreis (Unternehmenswährung), Net Rate (Company Currency),Nettopreis (Unternehmenswährung),
Net Amount (Company Currency),Nettobetrag (Unternehmenswährung), Net Amount (Company Currency),Nettobetrag (Unternehmenswährung),
@ -9914,3 +9914,7 @@ Delivered at Place Unloaded,Geliefert benannter Ort entladen,
Delivered Duty Paid,Geliefert verzollt, Delivered Duty Paid,Geliefert verzollt,
Discount Validity,Frist für den Rabatt, Discount Validity,Frist für den Rabatt,
Discount Validity Based On,Frist für den Rabatt berechnet sich nach, 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,

Can't render this file because it is too large.