Merge pull request #604 from SchrodingersGat/add-quantity-field

Add quantity field
This commit is contained in:
Oliver 2020-01-06 09:02:08 +11:00 committed by GitHub
commit 3098f6045f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 46 deletions

View File

@ -7,41 +7,41 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-12-09 11:16+0000\n"
"POT-Creation-Date: 2020-01-05 21:52+0000\n"
"PO-Revision-Date: 2019-12-19 17:48+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Last-Translator: \n"
"Language-Team: \n"
"X-Generator: Poedit 2.2.4\n"
#: InvenTree/helpers.py:175 order/models.py:159 order/models.py:210
#: InvenTree/helpers.py:186 order/models.py:159 order/models.py:210
msgid "Invalid quantity provided"
msgstr "Keine gültige Menge"
#: InvenTree/helpers.py:178
#: InvenTree/helpers.py:189
msgid "Empty serial number string"
msgstr "Keine Seriennummer angegeben"
#: InvenTree/helpers.py:199 InvenTree/helpers.py:216
#: InvenTree/helpers.py:210 InvenTree/helpers.py:227
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr "Doppelte Seriennummer: {n}"
#: InvenTree/helpers.py:203 InvenTree/helpers.py:206 InvenTree/helpers.py:209
#: InvenTree/helpers.py:220
#: InvenTree/helpers.py:214 InvenTree/helpers.py:217 InvenTree/helpers.py:220
#: InvenTree/helpers.py:231
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Ungültige Gruppe: {g}"
#: InvenTree/helpers.py:226
#: InvenTree/helpers.py:237
msgid "No serial numbers found"
msgstr "Keine Seriennummern gefunden"
#: InvenTree/helpers.py:230
#: InvenTree/helpers.py:241
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@ -188,8 +188,7 @@ msgstr "Ausgewähltes Lagerobjekt nicht in BOM für Teil '{p}' gefunden"
#, python-brace-format
msgid "Allocated quantity ({n}) must not exceed available quantity ({q})"
msgstr ""
"zugewiesene Anzahl ({n}) darf nicht die verfügbare ({q}) Anzahl "
"überschreiten"
"zugewiesene Anzahl ({n}) darf nicht die verfügbare ({q}) Anzahl überschreiten"
#: build/models.py:401
msgid "Build to allocate parts"
@ -263,8 +262,8 @@ msgstr "Die folgende Seriennummer existiert bereits: ({sn})"
#: common/models.py:65
msgid "Settings key (must be unique - case insensitive"
msgstr ""
"Einstellungs-Schlüssel (muss einzigartig sein, Groß-/ Kleinschreibung "
"wird nicht beachtet)"
"Einstellungs-Schlüssel (muss einzigartig sein, Groß-/ Kleinschreibung wird "
"nicht beachtet)"
#: common/models.py:67
msgid "Settings value"
@ -417,7 +416,7 @@ msgstr "Referenz"
#: order/templates/order/purchase_order_detail.html:111
#: stock/templates/stock/item.html:89
#: stock/templates/stock/stock_adjust.html:20
#: stock/templates/stock/stock_adjust.html:18
msgid "Quantity"
msgstr "Anzahl"
@ -479,8 +478,8 @@ msgstr "Teilekategorie wählen"
#: part/forms.py:81
msgid "Perform 'deep copy' which will duplicate all BOM data for this part"
msgstr ""
"Tiefe Kopie ausführen. Dies wird alle Daten der Stückliste für dieses "
"Teil duplizieren"
"Tiefe Kopie ausführen. Dies wird alle Daten der Stückliste für dieses Teil "
"duplizieren"
#: part/forms.py:86
msgid "Confirm part creation"
@ -1073,8 +1072,8 @@ msgid ""
"This stock item is serialized - it has a unique serial number and the "
"quantity cannot be adjusted."
msgstr ""
"Dieses Lagerobjekt ist serialisiert. Es hat eine eindeutige Seriennummer "
"und die Anzahl kann nicht angepasst werden."
"Dieses Lagerobjekt ist serialisiert. Es hat eine eindeutige Seriennummer und "
"die Anzahl kann nicht angepasst werden."
#: stock/templates/stock/item.html:56
msgid ""
@ -1088,7 +1087,7 @@ msgid "Belongs To"
msgstr "Gehört zu"
#: stock/templates/stock/item.html:78
#: stock/templates/stock/stock_adjust.html:16
#: stock/templates/stock/stock_adjust.html:17
msgid "Location"
msgstr "Standort"
@ -1153,7 +1152,7 @@ msgstr "Objekt-Details"
msgid "Stock Locations"
msgstr "Lagerobjekt-Standorte"
#: stock/templates/stock/stock_adjust.html:15
#: stock/templates/stock/stock_adjust.html:16
msgid "Stock Item"
msgstr "Lagerobjekt"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-12-09 11:16+0000\n"
"POT-Creation-Date: 2020-01-05 21:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,30 +18,30 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: InvenTree/helpers.py:175 order/models.py:159 order/models.py:210
#: InvenTree/helpers.py:186 order/models.py:159 order/models.py:210
msgid "Invalid quantity provided"
msgstr ""
#: InvenTree/helpers.py:178
#: InvenTree/helpers.py:189
msgid "Empty serial number string"
msgstr ""
#: InvenTree/helpers.py:199 InvenTree/helpers.py:216
#: InvenTree/helpers.py:210 InvenTree/helpers.py:227
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
#: InvenTree/helpers.py:203 InvenTree/helpers.py:206 InvenTree/helpers.py:209
#: InvenTree/helpers.py:220
#: InvenTree/helpers.py:214 InvenTree/helpers.py:217 InvenTree/helpers.py:220
#: InvenTree/helpers.py:231
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
#: InvenTree/helpers.py:226
#: InvenTree/helpers.py:237
msgid "No serial numbers found"
msgstr ""
#: InvenTree/helpers.py:230
#: InvenTree/helpers.py:241
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@ -407,7 +407,7 @@ msgstr ""
#: order/templates/order/purchase_order_detail.html:111
#: stock/templates/stock/item.html:89
#: stock/templates/stock/stock_adjust.html:20
#: stock/templates/stock/stock_adjust.html:18
msgid "Quantity"
msgstr ""
@ -1065,7 +1065,7 @@ msgid "Belongs To"
msgstr ""
#: stock/templates/stock/item.html:78
#: stock/templates/stock/stock_adjust.html:16
#: stock/templates/stock/stock_adjust.html:17
msgid "Location"
msgstr ""
@ -1130,7 +1130,7 @@ msgstr ""
msgid "Stock Locations"
msgstr ""
#: stock/templates/stock/stock_adjust.html:15
#: stock/templates/stock/stock_adjust.html:16
msgid "Stock Item"
msgstr ""

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-12-09 11:16+0000\n"
"POT-Creation-Date: 2020-01-05 21:52+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,30 +18,30 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: InvenTree/helpers.py:175 order/models.py:159 order/models.py:210
#: InvenTree/helpers.py:186 order/models.py:159 order/models.py:210
msgid "Invalid quantity provided"
msgstr ""
#: InvenTree/helpers.py:178
#: InvenTree/helpers.py:189
msgid "Empty serial number string"
msgstr ""
#: InvenTree/helpers.py:199 InvenTree/helpers.py:216
#: InvenTree/helpers.py:210 InvenTree/helpers.py:227
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
#: InvenTree/helpers.py:203 InvenTree/helpers.py:206 InvenTree/helpers.py:209
#: InvenTree/helpers.py:220
#: InvenTree/helpers.py:214 InvenTree/helpers.py:217 InvenTree/helpers.py:220
#: InvenTree/helpers.py:231
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
#: InvenTree/helpers.py:226
#: InvenTree/helpers.py:237
msgid "No serial numbers found"
msgstr ""
#: InvenTree/helpers.py:230
#: InvenTree/helpers.py:241
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@ -407,7 +407,7 @@ msgstr ""
#: order/templates/order/purchase_order_detail.html:111
#: stock/templates/stock/item.html:89
#: stock/templates/stock/stock_adjust.html:20
#: stock/templates/stock/stock_adjust.html:18
msgid "Quantity"
msgstr ""
@ -1065,7 +1065,7 @@ msgid "Belongs To"
msgstr ""
#: stock/templates/stock/item.html:78
#: stock/templates/stock/stock_adjust.html:16
#: stock/templates/stock/stock_adjust.html:17
msgid "Location"
msgstr ""
@ -1130,7 +1130,7 @@ msgstr ""
msgid "Stock Locations"
msgstr ""
#: stock/templates/stock/stock_adjust.html:15
#: stock/templates/stock/stock_adjust.html:16
msgid "Stock Item"
msgstr ""

View File

@ -1,4 +1,5 @@
{% load i18n %}
{% load inventree_extras %}
{% block pre_form_content %}
@ -14,10 +15,9 @@
<tr>
<th>{% trans "Stock Item" %}</th>
<th>{% trans "Location" %}</th>
<th>{% trans "Quantity" %}</th>
{% if edit_quantity %}
<th>{{ stock_action_title }}</th>
{% else %}
<th>{% trans "Quantity" %}</th>
{% endif %}
<th></th>
</tr>
@ -26,6 +26,7 @@
<td>{% include "hover_image.html" with image=item.part.image hover=True %}
{{ item.part.full_name }} <small><i>{{ item.part.description }}</i></small></td>
<td>{{ item.location.pathstring }}</td>
<td>{% decimal item.quantity %}</td>
<td>
{% if edit_quantity %}
<input class='numberinput'
@ -36,7 +37,6 @@
<br><span class='help-inline'>{{ item.error }}</span>
{% endif %}
{% else %}
{{ item.new_quantity }}
<input type='hidden' name='stock-id-{{ item.id }}' value='{{ item.new_quantity }}'/>
{% endif %}
</td>