Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
InvenTree/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

41
InvenTree/locale/de/LC_MESSAGES/django.po
View File

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

22
InvenTree/locale/en/LC_MESSAGES/django.po
View File

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

22
InvenTree/locale/es/LC_MESSAGES/django.po
View File

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

6
InvenTree/stock/templates/stock/stock_adjust.html
View File

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