From d8ada930c8f0767a4320c89c855026eba4150245 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 28 Oct 2020 22:37:58 +1100 Subject: [PATCH] More template updates - Add icons to more action buttons --- InvenTree/build/templates/build/index.html | 3 +- .../company/supplier_part_orders.html | 3 +- .../company/supplier_part_pricing.html | 4 +- InvenTree/locale/de/LC_MESSAGES/django.po | 130 ++++++++++-------- InvenTree/locale/en/LC_MESSAGES/django.po | 124 +++++++++-------- InvenTree/locale/es/LC_MESSAGES/django.po | 124 +++++++++-------- .../order/purchase_order_detail.html | 3 +- .../templates/order/purchase_orders.html | 3 +- .../templates/order/sales_order_detail.html | 4 +- .../InvenTree/settings/currency.html | 3 +- .../templates/InvenTree/settings/part.html | 4 +- .../templates/InvenTree/settings/user.html | 8 +- 12 files changed, 238 insertions(+), 175 deletions(-) diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html index d72807f9f1..ca21b9abf3 100644 --- a/InvenTree/build/templates/build/index.html +++ b/InvenTree/build/templates/build/index.html @@ -21,7 +21,8 @@ InvenTree | {% trans "Build Orders" %}
- +
diff --git a/InvenTree/company/templates/company/supplier_part_orders.html b/InvenTree/company/templates/company/supplier_part_orders.html index 29eb8ee874..88bc061bee 100644 --- a/InvenTree/company/templates/company/supplier_part_orders.html +++ b/InvenTree/company/templates/company/supplier_part_orders.html @@ -13,7 +13,8 @@ {% if roles.purchase_order.add %}
- +
{% endif %} diff --git a/InvenTree/company/templates/company/supplier_part_pricing.html b/InvenTree/company/templates/company/supplier_part_pricing.html index 97022024f5..6138669bc4 100644 --- a/InvenTree/company/templates/company/supplier_part_pricing.html +++ b/InvenTree/company/templates/company/supplier_part_pricing.html @@ -13,7 +13,9 @@ {% if roles.purchase_order.add %}
- +
{% endif %} diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po index fe4ceea3a7..afd1426fd4 100644 --- a/InvenTree/locale/de/LC_MESSAGES/django.po +++ b/InvenTree/locale/de/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-28 07:30+0000\n" +"POT-Creation-Date: 2020-10-28 11:37+0000\n" "PO-Revision-Date: 2020-05-03 11:32+0200\n" "Last-Translator: Christian Schlüter \n" "Language-Team: C \n" @@ -177,7 +177,7 @@ msgid "Rejected" msgstr "" #: InvenTree/status_codes.py:223 build/templates/build/allocate.html:358 -#: order/templates/order/sales_order_detail.html:223 +#: order/templates/order/sales_order_detail.html:225 #: part/templates/part/tabs.html:23 templates/js/build.js:140 msgid "Allocated" msgstr "Zugeordnet" @@ -315,14 +315,14 @@ msgid "Build Order Reference" msgstr "Bestellreferenz" #: build/models.py:87 build/templates/build/allocate.html:342 -#: order/templates/order/purchase_order_detail.html:172 templates/js/bom.js:154 +#: order/templates/order/purchase_order_detail.html:173 templates/js/bom.js:154 msgid "Reference" msgstr "Referenz" #: build/models.py:94 build/templates/build/allocate.html:337 #: company/templates/company/supplier_part_base.html:61 #: company/templates/company/supplier_part_detail.html:27 -#: order/templates/order/purchase_order_detail.html:159 +#: order/templates/order/purchase_order_detail.html:160 #: part/templates/part/detail.html:51 part/templates/part/set_category.html:14 #: templates/InvenTree/search.html:147 templates/js/bom.js:147 #: templates/js/bom.js:486 templates/js/build.js:56 templates/js/company.js:56 @@ -349,7 +349,7 @@ msgstr "Eltern-Bau, dem dieser Bau zugewiesen ist" #: build/templates/build/build_base.html:78 #: build/templates/build/detail.html:22 order/models.py:501 #: order/templates/order/order_wizard/select_parts.html:30 -#: order/templates/order/purchase_order_detail.html:147 +#: order/templates/order/purchase_order_detail.html:148 #: order/templates/order/receive_parts.html:19 part/models.py:293 #: part/templates/part/part_app_base.html:7 #: part/templates/part/set_category.html:13 templates/InvenTree/search.html:133 @@ -422,7 +422,7 @@ msgstr "Link zu einer externen URL" #: build/models.py:181 build/templates/build/tabs.html:14 company/models.py:314 #: company/templates/company/tabs.html:33 order/templates/order/po_tabs.html:18 -#: order/templates/order/purchase_order_detail.html:202 +#: order/templates/order/purchase_order_detail.html:203 #: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:70 #: stock/forms.py:306 stock/forms.py:338 stock/forms.py:366 stock/models.py:453 #: stock/models.py:1404 stock/templates/stock/tabs.html:26 @@ -497,8 +497,8 @@ msgid "Create new Stock Item" msgstr "Neues Lagerobjekt hinzufügen" #: build/templates/build/allocate.html:170 -#: order/templates/order/sales_order_detail.html:70 -#: order/templates/order/sales_order_detail.html:152 stock/models.py:375 +#: order/templates/order/sales_order_detail.html:72 +#: order/templates/order/sales_order_detail.html:154 stock/models.py:375 #: stock/templates/stock/item_base.html:178 msgid "Serial Number" msgstr "Seriennummer" @@ -507,11 +507,11 @@ msgstr "Seriennummer" #: build/templates/build/auto_allocate.html:20 #: build/templates/build/build_base.html:83 #: build/templates/build/detail.html:27 -#: company/templates/company/supplier_part_pricing.html:73 +#: company/templates/company/supplier_part_pricing.html:75 #: order/templates/order/order_wizard/select_parts.html:32 -#: order/templates/order/purchase_order_detail.html:177 -#: order/templates/order/sales_order_detail.html:72 -#: order/templates/order/sales_order_detail.html:154 +#: order/templates/order/purchase_order_detail.html:178 +#: order/templates/order/sales_order_detail.html:74 +#: order/templates/order/sales_order_detail.html:156 #: part/templates/part/allocation.html:16 #: part/templates/part/allocation.html:49 #: part/templates/part/sale_prices.html:80 stock/forms.py:297 @@ -534,12 +534,12 @@ msgid "Location" msgstr "Standort" #: build/templates/build/allocate.html:210 -#: order/templates/order/sales_order_detail.html:94 templates/js/build.js:144 +#: order/templates/order/sales_order_detail.html:96 templates/js/build.js:144 msgid "Edit stock allocation" msgstr "Lagerobjekt-Standort bearbeiten" #: build/templates/build/allocate.html:211 -#: order/templates/order/sales_order_detail.html:95 templates/js/build.js:145 +#: order/templates/order/sales_order_detail.html:97 templates/js/build.js:145 msgid "Delete stock allocation" msgstr "Zuweisung löschen" @@ -557,12 +557,12 @@ msgid "Assigned" msgstr "Zugewiesen" #: build/templates/build/allocate.html:394 -#: order/templates/order/sales_order_detail.html:273 +#: order/templates/order/sales_order_detail.html:275 msgid "Buy parts" msgstr "Teile kaufen" #: build/templates/build/allocate.html:398 -#: order/templates/order/sales_order_detail.html:277 +#: order/templates/order/sales_order_detail.html:279 msgid "Build parts" msgstr "Bauteile" @@ -762,7 +762,7 @@ msgstr "Nein" msgid "Completed" msgstr "Fertig" -#: build/templates/build/index.html:24 build/views.py:403 +#: build/templates/build/index.html:25 build/views.py:403 msgid "New Build Order" msgstr "Neuer Bauauftrag" @@ -1213,12 +1213,12 @@ msgid "Supplier Parts" msgstr "Zulieferer-Teile" #: company/templates/company/detail_part.html:17 -#: order/templates/order/purchase_order_detail.html:68 +#: order/templates/order/purchase_order_detail.html:69 msgid "Create new supplier part" msgstr "Neues Zuliefererteil anlegen" #: company/templates/company/detail_part.html:18 -#: order/templates/order/purchase_order_detail.html:67 +#: order/templates/order/purchase_order_detail.html:68 #: part/templates/part/supplier.html:14 templates/js/stock.js:798 msgid "New Supplier Part" msgstr "Neues Zulieferer-Teil" @@ -1315,7 +1315,7 @@ msgid "Create new purchase order" msgstr "Neue Bestellung anlegen" #: company/templates/company/purchase_orders.html:16 -#: order/templates/order/purchase_orders.html:18 +#: order/templates/order/purchase_orders.html:19 msgid "New Purchase Order" msgstr "Neue Bestellung" @@ -1388,35 +1388,40 @@ msgstr "Notiz" msgid "Supplier Part Orders" msgstr "Zuliefererbestellungen" +#: company/templates/company/supplier_part_orders.html:17 +#: part/templates/part/orders.html:15 +msgid "Order Part" +msgstr "Teil bestellen" + #: company/templates/company/supplier_part_pricing.html:10 msgid "Pricing Information" msgstr "Preisinformationen ansehen" -#: company/templates/company/supplier_part_pricing.html:16 company/views.py:410 +#: company/templates/company/supplier_part_pricing.html:17 company/views.py:410 #: part/templates/part/sale_prices.html:13 part/views.py:2228 msgid "Add Price Break" msgstr "Preisstaffel hinzufügen" -#: company/templates/company/supplier_part_pricing.html:34 +#: company/templates/company/supplier_part_pricing.html:36 #: part/templates/part/sale_prices.html:41 #, fuzzy #| msgid "No company information found" msgid "No price break information found" msgstr "Keine Firmeninformation gefunden" -#: company/templates/company/supplier_part_pricing.html:78 +#: company/templates/company/supplier_part_pricing.html:80 #: part/templates/part/sale_prices.html:85 templates/js/bom.js:207 msgid "Price" msgstr "Preis" -#: company/templates/company/supplier_part_pricing.html:92 +#: company/templates/company/supplier_part_pricing.html:94 #: part/templates/part/sale_prices.html:99 #, fuzzy #| msgid "Edit Price Break" msgid "Edit price break" msgstr "Preisstaffel bearbeiten" -#: company/templates/company/supplier_part_pricing.html:93 +#: company/templates/company/supplier_part_pricing.html:95 #: part/templates/part/sale_prices.html:100 #, fuzzy #| msgid "Delete Price Break" @@ -1761,7 +1766,7 @@ msgid "Issued" msgstr "Aufgegeben" #: order/templates/order/order_base.html:111 -#: order/templates/order/purchase_order_detail.html:182 +#: order/templates/order/purchase_order_detail.html:183 #: order/templates/order/receive_parts.html:22 #: order/templates/order/sales_order_base.html:113 msgid "Received" @@ -1843,48 +1848,48 @@ msgstr "Position hinzufügen" msgid "Attachments" msgstr "Anhänge" -#: order/templates/order/purchase_order_detail.html:16 -#: order/templates/order/sales_order_detail.html:18 order/views.py:1117 +#: order/templates/order/purchase_order_detail.html:17 +#: order/templates/order/sales_order_detail.html:19 order/views.py:1117 #: order/views.py:1232 msgid "Add Line Item" msgstr "Position hinzufügen" -#: order/templates/order/purchase_order_detail.html:20 +#: order/templates/order/purchase_order_detail.html:21 msgid "Purchase Order Items" msgstr "Bestellpositionen" -#: order/templates/order/purchase_order_detail.html:38 -#: order/templates/order/purchase_order_detail.html:118 +#: order/templates/order/purchase_order_detail.html:39 +#: order/templates/order/purchase_order_detail.html:119 #: part/templates/part/category.html:173 part/templates/part/category.html:215 #: templates/js/stock.js:804 msgid "New Location" msgstr "Neuer Standort" -#: order/templates/order/purchase_order_detail.html:39 -#: order/templates/order/purchase_order_detail.html:119 +#: order/templates/order/purchase_order_detail.html:40 +#: order/templates/order/purchase_order_detail.html:120 #: stock/templates/stock/location.html:22 msgid "Create new stock location" msgstr "Neuen Lagerort anlegen" -#: order/templates/order/purchase_order_detail.html:131 +#: order/templates/order/purchase_order_detail.html:132 msgid "No line items found" msgstr "Keine Positionen gefunden" -#: order/templates/order/purchase_order_detail.html:164 +#: order/templates/order/purchase_order_detail.html:165 #: order/templates/order/receive_parts.html:20 msgid "Order Code" msgstr "Bestellnummer" -#: order/templates/order/purchase_order_detail.html:213 -#: order/templates/order/sales_order_detail.html:283 +#: order/templates/order/purchase_order_detail.html:214 +#: order/templates/order/sales_order_detail.html:285 msgid "Edit line item" msgstr "Position bearbeiten" -#: order/templates/order/purchase_order_detail.html:214 +#: order/templates/order/purchase_order_detail.html:215 msgid "Delete line item" msgstr "Position löschen" -#: order/templates/order/purchase_order_detail.html:219 +#: order/templates/order/purchase_order_detail.html:220 msgid "Receive line item" msgstr "Position empfangen" @@ -1937,15 +1942,15 @@ msgstr "Warnung" msgid "Sales Order Items" msgstr "Auftragspositionen" -#: order/templates/order/sales_order_detail.html:225 +#: order/templates/order/sales_order_detail.html:227 msgid "Fulfilled" msgstr "Erledigt" -#: order/templates/order/sales_order_detail.html:280 +#: order/templates/order/sales_order_detail.html:282 msgid "Allocate parts" msgstr "Teile zuordnen" -#: order/templates/order/sales_order_detail.html:284 +#: order/templates/order/sales_order_detail.html:286 msgid "Delete line item " msgstr "Position löschen" @@ -2586,6 +2591,7 @@ msgid "Edit BOM" msgstr "Stückliste bearbeiten" #: part/templates/part/bom.html:53 part/templates/part/params.html:38 +#: templates/InvenTree/settings/user.html:19 msgid "Edit" msgstr "Bearbeiten" @@ -2979,10 +2985,6 @@ msgstr "Dieses Teil ist nicht aktiv" msgid "Part Notes" msgstr "Teil-Bemerkungen" -#: part/templates/part/orders.html:15 -msgid "Order Part" -msgstr "Teil bestellen" - #: part/templates/part/params.html:8 msgid "Part Parameters" msgstr "Teilparameter" @@ -2991,7 +2993,7 @@ msgstr "Teilparameter" msgid "Add new parameter" msgstr "Parameter hinzufügen" -#: part/templates/part/params.html:15 templates/InvenTree/settings/part.html:27 +#: part/templates/part/params.html:15 templates/InvenTree/settings/part.html:28 msgid "New Parameter" msgstr "Neuer Parameter" @@ -4506,7 +4508,7 @@ msgstr "Einstellungen" msgid "Currencies" msgstr "Währungs-Wert" -#: templates/InvenTree/settings/currency.html:17 +#: templates/InvenTree/settings/currency.html:18 #, fuzzy #| msgid "Delete Currency" msgid "New Currency" @@ -4530,15 +4532,15 @@ msgstr "Einstellungen" msgid "Part Parameter Templates" msgstr "Teilparametervorlage bearbeiten" -#: templates/InvenTree/settings/part.html:43 +#: templates/InvenTree/settings/part.html:45 msgid "No part parameter templates found" msgstr "Keine Teilparametervorlagen gefunden" -#: templates/InvenTree/settings/part.html:63 +#: templates/InvenTree/settings/part.html:65 msgid "Edit Template" msgstr "Vorlage bearbeiten" -#: templates/InvenTree/settings/part.html:64 +#: templates/InvenTree/settings/part.html:66 msgid "Delete Template" msgstr "Vorlage löschen" @@ -4632,25 +4634,43 @@ msgstr "" msgid "User Information" msgstr "Keine Benutzerinformation" -#: templates/InvenTree/settings/user.html:24 +#: templates/InvenTree/settings/user.html:18 +#, fuzzy +#| msgid "No user information" +msgid "Edit User Information" +msgstr "Keine Benutzerinformation" + +#: templates/InvenTree/settings/user.html:21 +#, fuzzy +#| msgid "Create new part" +msgid "Change Password" +msgstr "Neues Teil anlegen" + +#: templates/InvenTree/settings/user.html:22 +#, fuzzy +#| msgid "Select part" +msgid "Set Password" +msgstr "Teil auswählen" + +#: templates/InvenTree/settings/user.html:28 #, fuzzy #| msgid "User" msgid "Username" msgstr "Benutzer" -#: templates/InvenTree/settings/user.html:28 +#: templates/InvenTree/settings/user.html:32 #, fuzzy #| msgid "Instance Name" msgid "First Name" msgstr "Instanzname" -#: templates/InvenTree/settings/user.html:32 +#: templates/InvenTree/settings/user.html:36 #, fuzzy #| msgid "Instance Name" msgid "Last Name" msgstr "Instanzname" -#: templates/InvenTree/settings/user.html:36 +#: templates/InvenTree/settings/user.html:40 #, fuzzy #| msgid "Address" msgid "Email Address" diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po index 485f6d952f..15b1d532f6 100644 --- a/InvenTree/locale/en/LC_MESSAGES/django.po +++ b/InvenTree/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-28 07:30+0000\n" +"POT-Creation-Date: 2020-10-28 11:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -169,7 +169,7 @@ msgid "Rejected" msgstr "" #: InvenTree/status_codes.py:223 build/templates/build/allocate.html:358 -#: order/templates/order/sales_order_detail.html:223 +#: order/templates/order/sales_order_detail.html:225 #: part/templates/part/tabs.html:23 templates/js/build.js:140 msgid "Allocated" msgstr "" @@ -291,14 +291,14 @@ msgid "Build Order Reference" msgstr "" #: build/models.py:87 build/templates/build/allocate.html:342 -#: order/templates/order/purchase_order_detail.html:172 templates/js/bom.js:154 +#: order/templates/order/purchase_order_detail.html:173 templates/js/bom.js:154 msgid "Reference" msgstr "" #: build/models.py:94 build/templates/build/allocate.html:337 #: company/templates/company/supplier_part_base.html:61 #: company/templates/company/supplier_part_detail.html:27 -#: order/templates/order/purchase_order_detail.html:159 +#: order/templates/order/purchase_order_detail.html:160 #: part/templates/part/detail.html:51 part/templates/part/set_category.html:14 #: templates/InvenTree/search.html:147 templates/js/bom.js:147 #: templates/js/bom.js:486 templates/js/build.js:56 templates/js/company.js:56 @@ -325,7 +325,7 @@ msgstr "" #: build/templates/build/build_base.html:78 #: build/templates/build/detail.html:22 order/models.py:501 #: order/templates/order/order_wizard/select_parts.html:30 -#: order/templates/order/purchase_order_detail.html:147 +#: order/templates/order/purchase_order_detail.html:148 #: order/templates/order/receive_parts.html:19 part/models.py:293 #: part/templates/part/part_app_base.html:7 #: part/templates/part/set_category.html:13 templates/InvenTree/search.html:133 @@ -396,7 +396,7 @@ msgstr "" #: build/models.py:181 build/templates/build/tabs.html:14 company/models.py:314 #: company/templates/company/tabs.html:33 order/templates/order/po_tabs.html:18 -#: order/templates/order/purchase_order_detail.html:202 +#: order/templates/order/purchase_order_detail.html:203 #: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:70 #: stock/forms.py:306 stock/forms.py:338 stock/forms.py:366 stock/models.py:453 #: stock/models.py:1404 stock/templates/stock/tabs.html:26 @@ -470,8 +470,8 @@ msgid "Create new Stock Item" msgstr "" #: build/templates/build/allocate.html:170 -#: order/templates/order/sales_order_detail.html:70 -#: order/templates/order/sales_order_detail.html:152 stock/models.py:375 +#: order/templates/order/sales_order_detail.html:72 +#: order/templates/order/sales_order_detail.html:154 stock/models.py:375 #: stock/templates/stock/item_base.html:178 msgid "Serial Number" msgstr "" @@ -480,11 +480,11 @@ msgstr "" #: build/templates/build/auto_allocate.html:20 #: build/templates/build/build_base.html:83 #: build/templates/build/detail.html:27 -#: company/templates/company/supplier_part_pricing.html:73 +#: company/templates/company/supplier_part_pricing.html:75 #: order/templates/order/order_wizard/select_parts.html:32 -#: order/templates/order/purchase_order_detail.html:177 -#: order/templates/order/sales_order_detail.html:72 -#: order/templates/order/sales_order_detail.html:154 +#: order/templates/order/purchase_order_detail.html:178 +#: order/templates/order/sales_order_detail.html:74 +#: order/templates/order/sales_order_detail.html:156 #: part/templates/part/allocation.html:16 #: part/templates/part/allocation.html:49 #: part/templates/part/sale_prices.html:80 stock/forms.py:297 @@ -507,12 +507,12 @@ msgid "Location" msgstr "" #: build/templates/build/allocate.html:210 -#: order/templates/order/sales_order_detail.html:94 templates/js/build.js:144 +#: order/templates/order/sales_order_detail.html:96 templates/js/build.js:144 msgid "Edit stock allocation" msgstr "" #: build/templates/build/allocate.html:211 -#: order/templates/order/sales_order_detail.html:95 templates/js/build.js:145 +#: order/templates/order/sales_order_detail.html:97 templates/js/build.js:145 msgid "Delete stock allocation" msgstr "" @@ -530,12 +530,12 @@ msgid "Assigned" msgstr "" #: build/templates/build/allocate.html:394 -#: order/templates/order/sales_order_detail.html:273 +#: order/templates/order/sales_order_detail.html:275 msgid "Buy parts" msgstr "" #: build/templates/build/allocate.html:398 -#: order/templates/order/sales_order_detail.html:277 +#: order/templates/order/sales_order_detail.html:279 msgid "Build parts" msgstr "" @@ -720,7 +720,7 @@ msgstr "" msgid "Completed" msgstr "" -#: build/templates/build/index.html:24 build/views.py:403 +#: build/templates/build/index.html:25 build/views.py:403 msgid "New Build Order" msgstr "" @@ -1130,12 +1130,12 @@ msgid "Supplier Parts" msgstr "" #: company/templates/company/detail_part.html:17 -#: order/templates/order/purchase_order_detail.html:68 +#: order/templates/order/purchase_order_detail.html:69 msgid "Create new supplier part" msgstr "" #: company/templates/company/detail_part.html:18 -#: order/templates/order/purchase_order_detail.html:67 +#: order/templates/order/purchase_order_detail.html:68 #: part/templates/part/supplier.html:14 templates/js/stock.js:798 msgid "New Supplier Part" msgstr "" @@ -1227,7 +1227,7 @@ msgid "Create new purchase order" msgstr "" #: company/templates/company/purchase_orders.html:16 -#: order/templates/order/purchase_orders.html:18 +#: order/templates/order/purchase_orders.html:19 msgid "New Purchase Order" msgstr "" @@ -1300,31 +1300,36 @@ msgstr "" msgid "Supplier Part Orders" msgstr "" +#: company/templates/company/supplier_part_orders.html:17 +#: part/templates/part/orders.html:15 +msgid "Order Part" +msgstr "" + #: company/templates/company/supplier_part_pricing.html:10 msgid "Pricing Information" msgstr "" -#: company/templates/company/supplier_part_pricing.html:16 company/views.py:410 +#: company/templates/company/supplier_part_pricing.html:17 company/views.py:410 #: part/templates/part/sale_prices.html:13 part/views.py:2228 msgid "Add Price Break" msgstr "" -#: company/templates/company/supplier_part_pricing.html:34 +#: company/templates/company/supplier_part_pricing.html:36 #: part/templates/part/sale_prices.html:41 msgid "No price break information found" msgstr "" -#: company/templates/company/supplier_part_pricing.html:78 +#: company/templates/company/supplier_part_pricing.html:80 #: part/templates/part/sale_prices.html:85 templates/js/bom.js:207 msgid "Price" msgstr "" -#: company/templates/company/supplier_part_pricing.html:92 +#: company/templates/company/supplier_part_pricing.html:94 #: part/templates/part/sale_prices.html:99 msgid "Edit price break" msgstr "" -#: company/templates/company/supplier_part_pricing.html:93 +#: company/templates/company/supplier_part_pricing.html:95 #: part/templates/part/sale_prices.html:100 msgid "Delete price break" msgstr "" @@ -1649,7 +1654,7 @@ msgid "Issued" msgstr "" #: order/templates/order/order_base.html:111 -#: order/templates/order/purchase_order_detail.html:182 +#: order/templates/order/purchase_order_detail.html:183 #: order/templates/order/receive_parts.html:22 #: order/templates/order/sales_order_base.html:113 msgid "Received" @@ -1726,48 +1731,48 @@ msgstr "" msgid "Attachments" msgstr "" -#: order/templates/order/purchase_order_detail.html:16 -#: order/templates/order/sales_order_detail.html:18 order/views.py:1117 +#: order/templates/order/purchase_order_detail.html:17 +#: order/templates/order/sales_order_detail.html:19 order/views.py:1117 #: order/views.py:1232 msgid "Add Line Item" msgstr "" -#: order/templates/order/purchase_order_detail.html:20 +#: order/templates/order/purchase_order_detail.html:21 msgid "Purchase Order Items" msgstr "" -#: order/templates/order/purchase_order_detail.html:38 -#: order/templates/order/purchase_order_detail.html:118 +#: order/templates/order/purchase_order_detail.html:39 +#: order/templates/order/purchase_order_detail.html:119 #: part/templates/part/category.html:173 part/templates/part/category.html:215 #: templates/js/stock.js:804 msgid "New Location" msgstr "" -#: order/templates/order/purchase_order_detail.html:39 -#: order/templates/order/purchase_order_detail.html:119 +#: order/templates/order/purchase_order_detail.html:40 +#: order/templates/order/purchase_order_detail.html:120 #: stock/templates/stock/location.html:22 msgid "Create new stock location" msgstr "" -#: order/templates/order/purchase_order_detail.html:131 +#: order/templates/order/purchase_order_detail.html:132 msgid "No line items found" msgstr "" -#: order/templates/order/purchase_order_detail.html:164 +#: order/templates/order/purchase_order_detail.html:165 #: order/templates/order/receive_parts.html:20 msgid "Order Code" msgstr "" -#: order/templates/order/purchase_order_detail.html:213 -#: order/templates/order/sales_order_detail.html:283 +#: order/templates/order/purchase_order_detail.html:214 +#: order/templates/order/sales_order_detail.html:285 msgid "Edit line item" msgstr "" -#: order/templates/order/purchase_order_detail.html:214 +#: order/templates/order/purchase_order_detail.html:215 msgid "Delete line item" msgstr "" -#: order/templates/order/purchase_order_detail.html:219 +#: order/templates/order/purchase_order_detail.html:220 msgid "Receive line item" msgstr "" @@ -1818,15 +1823,15 @@ msgstr "" msgid "Sales Order Items" msgstr "" -#: order/templates/order/sales_order_detail.html:225 +#: order/templates/order/sales_order_detail.html:227 msgid "Fulfilled" msgstr "" -#: order/templates/order/sales_order_detail.html:280 +#: order/templates/order/sales_order_detail.html:282 msgid "Allocate parts" msgstr "" -#: order/templates/order/sales_order_detail.html:284 +#: order/templates/order/sales_order_detail.html:286 msgid "Delete line item " msgstr "" @@ -2415,6 +2420,7 @@ msgid "Edit BOM" msgstr "" #: part/templates/part/bom.html:53 part/templates/part/params.html:38 +#: templates/InvenTree/settings/user.html:19 msgid "Edit" msgstr "" @@ -2750,10 +2756,6 @@ msgstr "" msgid "Part Notes" msgstr "" -#: part/templates/part/orders.html:15 -msgid "Order Part" -msgstr "" - #: part/templates/part/params.html:8 msgid "Part Parameters" msgstr "" @@ -2762,7 +2764,7 @@ msgstr "" msgid "Add new parameter" msgstr "" -#: part/templates/part/params.html:15 templates/InvenTree/settings/part.html:27 +#: part/templates/part/params.html:15 templates/InvenTree/settings/part.html:28 msgid "New Parameter" msgstr "" @@ -4042,7 +4044,7 @@ msgstr "" msgid "Currencies" msgstr "" -#: templates/InvenTree/settings/currency.html:17 +#: templates/InvenTree/settings/currency.html:18 msgid "New Currency" msgstr "" @@ -4058,15 +4060,15 @@ msgstr "" msgid "Part Parameter Templates" msgstr "" -#: templates/InvenTree/settings/part.html:43 +#: templates/InvenTree/settings/part.html:45 msgid "No part parameter templates found" msgstr "" -#: templates/InvenTree/settings/part.html:63 +#: templates/InvenTree/settings/part.html:65 msgid "Edit Template" msgstr "" -#: templates/InvenTree/settings/part.html:64 +#: templates/InvenTree/settings/part.html:66 msgid "Delete Template" msgstr "" @@ -4142,19 +4144,31 @@ msgstr "" msgid "User Information" msgstr "" -#: templates/InvenTree/settings/user.html:24 -msgid "Username" +#: templates/InvenTree/settings/user.html:18 +msgid "Edit User Information" +msgstr "" + +#: templates/InvenTree/settings/user.html:21 +msgid "Change Password" +msgstr "" + +#: templates/InvenTree/settings/user.html:22 +msgid "Set Password" msgstr "" #: templates/InvenTree/settings/user.html:28 -msgid "First Name" +msgid "Username" msgstr "" #: templates/InvenTree/settings/user.html:32 -msgid "Last Name" +msgid "First Name" msgstr "" #: templates/InvenTree/settings/user.html:36 +msgid "Last Name" +msgstr "" + +#: templates/InvenTree/settings/user.html:40 msgid "Email Address" msgstr "" diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po index 485f6d952f..15b1d532f6 100644 --- a/InvenTree/locale/es/LC_MESSAGES/django.po +++ b/InvenTree/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-28 07:30+0000\n" +"POT-Creation-Date: 2020-10-28 11:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -169,7 +169,7 @@ msgid "Rejected" msgstr "" #: InvenTree/status_codes.py:223 build/templates/build/allocate.html:358 -#: order/templates/order/sales_order_detail.html:223 +#: order/templates/order/sales_order_detail.html:225 #: part/templates/part/tabs.html:23 templates/js/build.js:140 msgid "Allocated" msgstr "" @@ -291,14 +291,14 @@ msgid "Build Order Reference" msgstr "" #: build/models.py:87 build/templates/build/allocate.html:342 -#: order/templates/order/purchase_order_detail.html:172 templates/js/bom.js:154 +#: order/templates/order/purchase_order_detail.html:173 templates/js/bom.js:154 msgid "Reference" msgstr "" #: build/models.py:94 build/templates/build/allocate.html:337 #: company/templates/company/supplier_part_base.html:61 #: company/templates/company/supplier_part_detail.html:27 -#: order/templates/order/purchase_order_detail.html:159 +#: order/templates/order/purchase_order_detail.html:160 #: part/templates/part/detail.html:51 part/templates/part/set_category.html:14 #: templates/InvenTree/search.html:147 templates/js/bom.js:147 #: templates/js/bom.js:486 templates/js/build.js:56 templates/js/company.js:56 @@ -325,7 +325,7 @@ msgstr "" #: build/templates/build/build_base.html:78 #: build/templates/build/detail.html:22 order/models.py:501 #: order/templates/order/order_wizard/select_parts.html:30 -#: order/templates/order/purchase_order_detail.html:147 +#: order/templates/order/purchase_order_detail.html:148 #: order/templates/order/receive_parts.html:19 part/models.py:293 #: part/templates/part/part_app_base.html:7 #: part/templates/part/set_category.html:13 templates/InvenTree/search.html:133 @@ -396,7 +396,7 @@ msgstr "" #: build/models.py:181 build/templates/build/tabs.html:14 company/models.py:314 #: company/templates/company/tabs.html:33 order/templates/order/po_tabs.html:18 -#: order/templates/order/purchase_order_detail.html:202 +#: order/templates/order/purchase_order_detail.html:203 #: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:70 #: stock/forms.py:306 stock/forms.py:338 stock/forms.py:366 stock/models.py:453 #: stock/models.py:1404 stock/templates/stock/tabs.html:26 @@ -470,8 +470,8 @@ msgid "Create new Stock Item" msgstr "" #: build/templates/build/allocate.html:170 -#: order/templates/order/sales_order_detail.html:70 -#: order/templates/order/sales_order_detail.html:152 stock/models.py:375 +#: order/templates/order/sales_order_detail.html:72 +#: order/templates/order/sales_order_detail.html:154 stock/models.py:375 #: stock/templates/stock/item_base.html:178 msgid "Serial Number" msgstr "" @@ -480,11 +480,11 @@ msgstr "" #: build/templates/build/auto_allocate.html:20 #: build/templates/build/build_base.html:83 #: build/templates/build/detail.html:27 -#: company/templates/company/supplier_part_pricing.html:73 +#: company/templates/company/supplier_part_pricing.html:75 #: order/templates/order/order_wizard/select_parts.html:32 -#: order/templates/order/purchase_order_detail.html:177 -#: order/templates/order/sales_order_detail.html:72 -#: order/templates/order/sales_order_detail.html:154 +#: order/templates/order/purchase_order_detail.html:178 +#: order/templates/order/sales_order_detail.html:74 +#: order/templates/order/sales_order_detail.html:156 #: part/templates/part/allocation.html:16 #: part/templates/part/allocation.html:49 #: part/templates/part/sale_prices.html:80 stock/forms.py:297 @@ -507,12 +507,12 @@ msgid "Location" msgstr "" #: build/templates/build/allocate.html:210 -#: order/templates/order/sales_order_detail.html:94 templates/js/build.js:144 +#: order/templates/order/sales_order_detail.html:96 templates/js/build.js:144 msgid "Edit stock allocation" msgstr "" #: build/templates/build/allocate.html:211 -#: order/templates/order/sales_order_detail.html:95 templates/js/build.js:145 +#: order/templates/order/sales_order_detail.html:97 templates/js/build.js:145 msgid "Delete stock allocation" msgstr "" @@ -530,12 +530,12 @@ msgid "Assigned" msgstr "" #: build/templates/build/allocate.html:394 -#: order/templates/order/sales_order_detail.html:273 +#: order/templates/order/sales_order_detail.html:275 msgid "Buy parts" msgstr "" #: build/templates/build/allocate.html:398 -#: order/templates/order/sales_order_detail.html:277 +#: order/templates/order/sales_order_detail.html:279 msgid "Build parts" msgstr "" @@ -720,7 +720,7 @@ msgstr "" msgid "Completed" msgstr "" -#: build/templates/build/index.html:24 build/views.py:403 +#: build/templates/build/index.html:25 build/views.py:403 msgid "New Build Order" msgstr "" @@ -1130,12 +1130,12 @@ msgid "Supplier Parts" msgstr "" #: company/templates/company/detail_part.html:17 -#: order/templates/order/purchase_order_detail.html:68 +#: order/templates/order/purchase_order_detail.html:69 msgid "Create new supplier part" msgstr "" #: company/templates/company/detail_part.html:18 -#: order/templates/order/purchase_order_detail.html:67 +#: order/templates/order/purchase_order_detail.html:68 #: part/templates/part/supplier.html:14 templates/js/stock.js:798 msgid "New Supplier Part" msgstr "" @@ -1227,7 +1227,7 @@ msgid "Create new purchase order" msgstr "" #: company/templates/company/purchase_orders.html:16 -#: order/templates/order/purchase_orders.html:18 +#: order/templates/order/purchase_orders.html:19 msgid "New Purchase Order" msgstr "" @@ -1300,31 +1300,36 @@ msgstr "" msgid "Supplier Part Orders" msgstr "" +#: company/templates/company/supplier_part_orders.html:17 +#: part/templates/part/orders.html:15 +msgid "Order Part" +msgstr "" + #: company/templates/company/supplier_part_pricing.html:10 msgid "Pricing Information" msgstr "" -#: company/templates/company/supplier_part_pricing.html:16 company/views.py:410 +#: company/templates/company/supplier_part_pricing.html:17 company/views.py:410 #: part/templates/part/sale_prices.html:13 part/views.py:2228 msgid "Add Price Break" msgstr "" -#: company/templates/company/supplier_part_pricing.html:34 +#: company/templates/company/supplier_part_pricing.html:36 #: part/templates/part/sale_prices.html:41 msgid "No price break information found" msgstr "" -#: company/templates/company/supplier_part_pricing.html:78 +#: company/templates/company/supplier_part_pricing.html:80 #: part/templates/part/sale_prices.html:85 templates/js/bom.js:207 msgid "Price" msgstr "" -#: company/templates/company/supplier_part_pricing.html:92 +#: company/templates/company/supplier_part_pricing.html:94 #: part/templates/part/sale_prices.html:99 msgid "Edit price break" msgstr "" -#: company/templates/company/supplier_part_pricing.html:93 +#: company/templates/company/supplier_part_pricing.html:95 #: part/templates/part/sale_prices.html:100 msgid "Delete price break" msgstr "" @@ -1649,7 +1654,7 @@ msgid "Issued" msgstr "" #: order/templates/order/order_base.html:111 -#: order/templates/order/purchase_order_detail.html:182 +#: order/templates/order/purchase_order_detail.html:183 #: order/templates/order/receive_parts.html:22 #: order/templates/order/sales_order_base.html:113 msgid "Received" @@ -1726,48 +1731,48 @@ msgstr "" msgid "Attachments" msgstr "" -#: order/templates/order/purchase_order_detail.html:16 -#: order/templates/order/sales_order_detail.html:18 order/views.py:1117 +#: order/templates/order/purchase_order_detail.html:17 +#: order/templates/order/sales_order_detail.html:19 order/views.py:1117 #: order/views.py:1232 msgid "Add Line Item" msgstr "" -#: order/templates/order/purchase_order_detail.html:20 +#: order/templates/order/purchase_order_detail.html:21 msgid "Purchase Order Items" msgstr "" -#: order/templates/order/purchase_order_detail.html:38 -#: order/templates/order/purchase_order_detail.html:118 +#: order/templates/order/purchase_order_detail.html:39 +#: order/templates/order/purchase_order_detail.html:119 #: part/templates/part/category.html:173 part/templates/part/category.html:215 #: templates/js/stock.js:804 msgid "New Location" msgstr "" -#: order/templates/order/purchase_order_detail.html:39 -#: order/templates/order/purchase_order_detail.html:119 +#: order/templates/order/purchase_order_detail.html:40 +#: order/templates/order/purchase_order_detail.html:120 #: stock/templates/stock/location.html:22 msgid "Create new stock location" msgstr "" -#: order/templates/order/purchase_order_detail.html:131 +#: order/templates/order/purchase_order_detail.html:132 msgid "No line items found" msgstr "" -#: order/templates/order/purchase_order_detail.html:164 +#: order/templates/order/purchase_order_detail.html:165 #: order/templates/order/receive_parts.html:20 msgid "Order Code" msgstr "" -#: order/templates/order/purchase_order_detail.html:213 -#: order/templates/order/sales_order_detail.html:283 +#: order/templates/order/purchase_order_detail.html:214 +#: order/templates/order/sales_order_detail.html:285 msgid "Edit line item" msgstr "" -#: order/templates/order/purchase_order_detail.html:214 +#: order/templates/order/purchase_order_detail.html:215 msgid "Delete line item" msgstr "" -#: order/templates/order/purchase_order_detail.html:219 +#: order/templates/order/purchase_order_detail.html:220 msgid "Receive line item" msgstr "" @@ -1818,15 +1823,15 @@ msgstr "" msgid "Sales Order Items" msgstr "" -#: order/templates/order/sales_order_detail.html:225 +#: order/templates/order/sales_order_detail.html:227 msgid "Fulfilled" msgstr "" -#: order/templates/order/sales_order_detail.html:280 +#: order/templates/order/sales_order_detail.html:282 msgid "Allocate parts" msgstr "" -#: order/templates/order/sales_order_detail.html:284 +#: order/templates/order/sales_order_detail.html:286 msgid "Delete line item " msgstr "" @@ -2415,6 +2420,7 @@ msgid "Edit BOM" msgstr "" #: part/templates/part/bom.html:53 part/templates/part/params.html:38 +#: templates/InvenTree/settings/user.html:19 msgid "Edit" msgstr "" @@ -2750,10 +2756,6 @@ msgstr "" msgid "Part Notes" msgstr "" -#: part/templates/part/orders.html:15 -msgid "Order Part" -msgstr "" - #: part/templates/part/params.html:8 msgid "Part Parameters" msgstr "" @@ -2762,7 +2764,7 @@ msgstr "" msgid "Add new parameter" msgstr "" -#: part/templates/part/params.html:15 templates/InvenTree/settings/part.html:27 +#: part/templates/part/params.html:15 templates/InvenTree/settings/part.html:28 msgid "New Parameter" msgstr "" @@ -4042,7 +4044,7 @@ msgstr "" msgid "Currencies" msgstr "" -#: templates/InvenTree/settings/currency.html:17 +#: templates/InvenTree/settings/currency.html:18 msgid "New Currency" msgstr "" @@ -4058,15 +4060,15 @@ msgstr "" msgid "Part Parameter Templates" msgstr "" -#: templates/InvenTree/settings/part.html:43 +#: templates/InvenTree/settings/part.html:45 msgid "No part parameter templates found" msgstr "" -#: templates/InvenTree/settings/part.html:63 +#: templates/InvenTree/settings/part.html:65 msgid "Edit Template" msgstr "" -#: templates/InvenTree/settings/part.html:64 +#: templates/InvenTree/settings/part.html:66 msgid "Delete Template" msgstr "" @@ -4142,19 +4144,31 @@ msgstr "" msgid "User Information" msgstr "" -#: templates/InvenTree/settings/user.html:24 -msgid "Username" +#: templates/InvenTree/settings/user.html:18 +msgid "Edit User Information" +msgstr "" + +#: templates/InvenTree/settings/user.html:21 +msgid "Change Password" +msgstr "" + +#: templates/InvenTree/settings/user.html:22 +msgid "Set Password" msgstr "" #: templates/InvenTree/settings/user.html:28 -msgid "First Name" +msgid "Username" msgstr "" #: templates/InvenTree/settings/user.html:32 -msgid "Last Name" +msgid "First Name" msgstr "" #: templates/InvenTree/settings/user.html:36 +msgid "Last Name" +msgstr "" + +#: templates/InvenTree/settings/user.html:40 msgid "Email Address" msgstr "" diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 0c569bdca8..2f9e57ca99 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -13,7 +13,8 @@
{% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %} - + {% endif %}
diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html index d02af36ff5..347033a888 100644 --- a/InvenTree/order/templates/order/purchase_orders.html +++ b/InvenTree/order/templates/order/purchase_orders.html @@ -15,7 +15,8 @@ InvenTree | {% trans "Purchase Orders" %}
{% if roles.purchase_order.add %} - + {% endif %}
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html index d21a4e950e..8e3128e1f3 100644 --- a/InvenTree/order/templates/order/sales_order_detail.html +++ b/InvenTree/order/templates/order/sales_order_detail.html @@ -15,7 +15,9 @@ {% if roles.sales_order.change %}
- +
{% endif %} diff --git a/InvenTree/templates/InvenTree/settings/currency.html b/InvenTree/templates/InvenTree/settings/currency.html index 99948eeeb1..444dd96c66 100644 --- a/InvenTree/templates/InvenTree/settings/currency.html +++ b/InvenTree/templates/InvenTree/settings/currency.html @@ -14,7 +14,8 @@

{% trans "Currencies" %}

- +
diff --git a/InvenTree/templates/InvenTree/settings/part.html b/InvenTree/templates/InvenTree/settings/part.html index cac04a60ff..19578ba858 100644 --- a/InvenTree/templates/InvenTree/settings/part.html +++ b/InvenTree/templates/InvenTree/settings/part.html @@ -24,7 +24,9 @@

{% trans "Part Parameter Templates" %}

- +
diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 28ab8746cb..1606a05cec 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -15,8 +15,12 @@

{% trans "User Information" %}

-
Edit
-
Set Password
+
+ {% trans "Edit" %} +
+
+ {% trans "Set Password" %} +