Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: translations and UX in alternative item mapping #34433

Merged
merged 5 commits into from
Mar 21, 2023
Merged

fix: translations and UX in alternative item mapping #34433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
787f8a7
fix: disable deletion in alternative item mapping
barredterra Mar 13, 2023
b7dbcc5
feat: german translations
barredterra Mar 13, 2023
37f1253
fix: make string translatable
barredterra Mar 13, 2023
db2cc68
Merge branch 'develop' into alternative-item-fixes
anandbaburajan Mar 16, 2023
19c8fae
Merge branch 'develop' into alternative-item-fixes
deepeshgarg007 Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion erpnext/selling/doctype/quotation/quotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -330,7 +331,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
dialog.fields_dict.info.$wrapper.html(
`<p class="small text-muted">
<span class="indicator yellow"></span>
Alternative Items
${__("Alternative Items")}
</p>`
)
dialog.show();
Expand Down
6 changes: 5 additions & 1 deletion erpnext/translations/de.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5067,7 +5067,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),
Expand Down Expand Up @@ -9918,3 +9918,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,