From b3ec748123edbf24c7735954debacb9db43cd357 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 6 Jan 2020 08:52:28 +1100
Subject: [PATCH 1/4] Display current stock item quantity in stock-adjust modal
 form

---
 InvenTree/stock/templates/stock/stock_adjust.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/InvenTree/stock/templates/stock/stock_adjust.html b/InvenTree/stock/templates/stock/stock_adjust.html
index 70463d14c1..ac9fbce58d 100644
--- a/InvenTree/stock/templates/stock/stock_adjust.html
+++ b/InvenTree/stock/templates/stock/stock_adjust.html
@@ -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>

From 740d7678d778ddafbc9cf51f06d5cee225f4163a Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 6 Jan 2020 08:57:13 +1100
Subject: [PATCH 2/4] Update translation files

---
 InvenTree/locale/de/LC_MESSAGES/django.mo | Bin 22412 -> 22388 bytes
 InvenTree/locale/de/LC_MESSAGES/django.po |  41 +++++++++++-----------
 InvenTree/locale/en/LC_MESSAGES/django.po |  22 ++++++------
 InvenTree/locale/es/LC_MESSAGES/django.po |  22 ++++++------
 4 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/InvenTree/locale/de/LC_MESSAGES/django.mo b/InvenTree/locale/de/LC_MESSAGES/django.mo
index 198b1d532c41940303f7102f99ec97c2413bb2d8..2467501abb786d475af940bcfb81b5c6e60ae13c 100644
GIT binary patch
delta 2654
zcmX}teN0t#9LMqB0Z|YX6wyGGi;9n7KBRzVAozfSPe3@cxh{I{<tAR-;ermeo6hWE
zX3J}-Yc_3Zg<CrATsduSTDi<sD{O6PjdV4qEt(JchppZp&RH9~uix+7-#NeU_xt;v
z%kC4_-H)u3H&UX5jWIn%#tg;8Vq^Ma4rXHkreZ1PVHJ+Y^_YYEa4Mca-PetYcpJxH
z59VW5iTiyK4rgADTDPXeM0;;+@D^-9ZL}HF@Bk8<Ig0$5YkW+?VY7^R94jyjH)9I!
z@jQS^=v^Fyr%{Q1g-Q4`_Qe~sqHbijxS&k$<48=HP4<|N3TPqvFzC%+My>k*3-KZj
z!F!(lpK#ab;Rvpmq1La#WZZ^1xGTy)ksiU}_=#s14rJbgiuhktfJt-Qj0RyQ^U?Si
z7NG(Oq5^r-vjbJ3bEryO!EyLIPR3~Zlg8vScoJ3e)u@GysFJp0KirAhXg5BBXHgkk
zK_$?Gs#L#HV<zA@)N@y$G7jTt+=M#1w=skL&9@9l&UAZUj4U%|3iDc2COc7?AH;M#
ziVE};DzNjY%3Z=y_!}zll)1*xe<l;vgw?2ug;5pRfn(U;9AKcxK1F5Hjl=K(5~0Z`
zcLT}C`OIgcGTe$I@EA_R&rtXOjd~jfR=Df3Q6;ayQMeve;XRnn{^l?PWqJ}-s?Sl~
z`ZX%zZd9r7d1lOWH=2Y~xn7RCFM`T!8!GS^4#4-k?>kXVeFl3I#i)-94;UzbY|_)2
zO-4Pa3RPM^`f!`~{X3|D&R`P$fI5n+sNT4Ndd@#shdB#)qp%qjsDlb@%L3}JGkt{%
zy73@t-igZKJn9U;$BCG>(ER}_LRIEjR4F5#yHIb<0aOpYkLraVQ9bi3_Q5}qVw$@P
zslPTVu5=?>gzEB@sM5ZKqwzG3#cN1Xrq3c{YH%^qCgu>%z+Z3zW-T`6Q7lCz)PySe
zR#b1ra6BH5GNAgV3-t?^UFBv_izAsgpdP#(C*jAa4X<N97F4@Oun^T;ORzs~#8tQj
zRjDhOf;TZ4?_erMA2LwMl9#w88iqRaG1w2wurF4kx_p`E4pe}rJiAawcnA4yF=<QP
z{{f3pZ%H#MfY(p~>_>ViY7R3f;KCViK{x71Zs9<Dh`J$lnOm|UsQ(FbP^E3fG58`X
zpbiY+m)?BJa<}BmP)88N>G(Wm>;3O!pfkRVrPzZi;gl6_MP?(_HkGJM_MuAOiBqu)
z^|th-A+$j*=HYZy^VVWE?#5^E7!Jb3S}M){CX0bGor?OR3{~<POv6>)_W{(IwW2oM
zj+waM^Em3YJBPaOsyDxhy#ewrs_AlZ7S6}$L<TP~P<J244EzoU;B{0b{=#&8=$ZDE
zdp#GYbA24DXI5hbHz9xKHXll?yxu*+6{vMjV<NWIoBG~gx^^z~HizeaR8Jg1y-pXg
zHxN{24^it=R=N+)#7WF^JuBlM4sIS5>zLt-4V|$!erd+ogu%8GXm-}wPQ*7q6b?F}
zKp>V_97?XS1GZy_+hdX9{G{d1g|mU!q2k(U)y*xYqS5aJ?Qpnt!v@>&1umR*eCtAX
zi|s4-w-(NAZ3+4tY{No#LA;>Ewvt;S%}zLEJMlMWy`GR%?GG|6m@_RQx5^HMZC|bJ
zg#Le`KOD4!c7q*`MM?u!B=%G3tErBU2e+(k<RjKr)@p_0f0UJ5{oK2Q@tNiKEz6D<
z&MUFv;rTgMa)aFxv74GA@wXN{XIU+KD;MQB_WD+*CDb;-)Y+jXyRgb1v4hRpH{MX$
zlwh^Rzghf+m0A}fb6-{S#*iI5T&?~4E~$z6mvmU|@c~OS`dIC;yqY_in?lYyUpTb3
kG2&~m{a{DpIkg>@TdVlxy1iCvnCoq-Z&NUC*N?OQ18fMCGynhq

delta 2649
zcmYk-e@s<n9LMqJUPM4d6h!eCT<`~|A^t*<R1gtSK}8Iwe>g94z^j*wUM_Pw*KM_2
zLubaxe%WfeG;@W_tGW8anm^jISu=CCZ2FIG&8b+KuFUHF;hb6<^YuLEJm);$@Avth
z>w_-O?qi<rn@Q1hW6b@T#tgwe#m4l*5jYITVKSCsHdbRk25}Vb!zma;J$DQH;(g4;
zM>raX&vNe1#SzRGVH{esOtkmGfV&`q+9-<s@m(Y~^C9wQZt~AW%qlTvIxfb+7{w%f
z)%6`zLPu~Aeuimy3FGl5D$v^{Q75vWxu8t{#4JpF+L*DJhYF|$ec0m8_n_8wVF6x5
z1@hQ+;B068SX8AdQR^Eq5nsUJxI4-~k-m>3@U-g>IDq*>RK)RfoB)$i84X1p-FPg-
zIjBHdP=V}s?Zyn|=TXmH!#uo;lQ5bw*O-wEDo`c&qZWoxC4CMPumiPGCuZUqR0h{j
z2|PqqDy5X5umDHlDpbbps9ty$b#w=DAp4uE3`o-a<lY!tX3PxcYfzcIf;yVRn2N_y
zfu2DH_6;h5tEi@XfC_x*JY(oTlY=?9234^gsEX{xG3;*+Gf-q-p)%>gq1d;)H$szz
z3ZxJhU<E3}4pfFGa4LR_dOm)>(^Df+>+(<~uf<&4hN|$}n9Ba9i-9&cjVje;RJZ<!
zins?=>bMHWEYwD`a0)I*J@-5+vt3AO%>hio<L>>>QBD0N_9lu^9~b(PmIBB_m2x&J
zv(>1k+=@Q5-TNm{0bRm)yn{N5Ur@dA2kJfPmBy^Z$>_xwQBD04DzMipslU$j5Et~|
zN!0vnR0h{kXV`-iFn^)*15}5-XNfB1Ue|-D4Nl->Jd5gu2dEzU3;STdDq|?BNv)#(
z+OUobifBC+;uchC58!CLjN|YTlAOs}WXuX|MB2ri!Xo?~$7A7QW1hm*sQ2$gmHahS
zZ+(RMcs|O2V=(tnzi`u*I2p8H7V{mb7w^Z3cnP)P6U@QVYUc?2sOD<Me%OJlaUb^f
z5GFE@t8wg)$;_h}3{<il?2nUi49>v>Y{0&_5!K~eT;D?lconnpA?gT+Eah1&M7^g4
z)k~e2gx#n>K1F&cYR)nk%Z2Oif<DWfvmby1xSoxAU=pfiGg1F1tix1%1GUi+R6rN8
z3GcY`y5&yE!>A+Zz-f2@hw1yj!a!%-gQb{W>y)q#Rgtwwwaq3}CZ|xPzk;gBBh+U%
zfriiqWvGg*LN)JJ9ERP<QgZ<Z;mA6^F7`K*7%0=ls2i(MCEtV!Ane|cqRwm&YQwiM
z9lKr6p+39sQP2J6&b@qtTAz)oU=fz!T8vI$@FoLw?KvEX_b>(jMm1B)Gft^9UGq`b
zi*Xvx$KKxwj4-#6Ka*JRtXqpZ!T@Sr7~^nHy{Yg0rR(H^n&Xh`F;q`{f(q;gYQv;e
zPG*Bq>vK>qo`@51y6d{w2WhRjc1h7*dq`1k>_X8vZ+e3jI{R@X&>ZnCX$?ift-+vW
zdy4~!%Ujz5kw9z6ZY$17{P&jKy)wh@DxRBG7x8blg2tg>eruy;KPk>k{{OsoS!Qg;
ztQt>(zo8*)t=|yaRr0boo)w|SSoWN$-ci+-6}EiyLe2gL%hzayeRWniV1+{MEiG2q
zZYgc@G~3^mb`0{B``ZgDtqnmd><?}CZwT6fvUaa;Y3xQ>xhG+h6$n|rg|YndhaNkw
zA}uz#BHxp+tYM?IDPqM|Eg0b$;BRm8m0N8QD;R7KHOIDBZuHo<7B2FvunVg)V^vi_
zuctnCa`6|Q<lG9&+U%R(x_Mi!y|cQ>zFWN_$>(oqvqFtl$S$op>Md9kyInJ|5897w
le@$$#{OdPFtWeBTchvJ=nPS~5JITAfsVP9RHT8L(e*p1)j&%S4

diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index e41a24b0b6..35589a06d2 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -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"
 
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index 7ed7357117..48bc10ef20 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: 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 ""
 
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 7ed7357117..48bc10ef20 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: 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 ""
 

From 067d2be1f00d629e73b6a126fc7daf480ed19ae6 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 6 Jan 2020 09:23:13 +1100
Subject: [PATCH 3/4] Bug fix - receiving lines against a PO caused issues due
 to integer/Decimal conversion

---
 InvenTree/order/views.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index 8e3f32f907..b4cde63e18 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -12,6 +12,7 @@ from django.views.generic import DetailView, ListView
 from django.forms import HiddenInput
 
 import logging
+from decimal import Decimal, InvalidOperation
 
 from .models import PurchaseOrder, PurchaseOrderLineItem
 from .admin import POLineItemResource
@@ -324,6 +325,8 @@ class PurchaseOrderReceive(AjaxUpdateView):
         self.lines = []
         self.destination = None
 
+        msg = _("Items received")
+
         # Extract the destination for received parts
         if 'location' in request.POST:
             pk = request.POST['location']
@@ -332,7 +335,11 @@ class PurchaseOrderReceive(AjaxUpdateView):
             except (StockLocation.DoesNotExist, ValueError):
                 pass
 
-        errors = self.destination is None
+        errors = False
+
+        if self.destination is None:
+            errors = True
+            msg = _("No destination set")
 
         # Extract information on all submitted line items
         for item in request.POST:
@@ -359,15 +366,17 @@ class PurchaseOrderReceive(AjaxUpdateView):
                 receive = self.request.POST[item]
 
                 try:
-                    receive = int(receive)
-                except ValueError:
+                    receive = Decimal(receive)
+                except InvalidOperation:
                     # In the case on an invalid input, reset to default
                     receive = line.remaining()
+                    msg = _("Error converting quantity to number")
                     errors = True
 
                 if receive < 0:
                     receive = 0
                     errors = True
+                    msg = _("Receive quantity less than zero")
 
                 line.receive_quantity = receive
                 self.lines.append(line)
@@ -378,7 +387,7 @@ class PurchaseOrderReceive(AjaxUpdateView):
 
         data = {
             'form_valid': errors is False,
-            'success': 'Items marked as received',
+            'success': msg,
         }
 
         return self.renderJsonResponse(request, data=data, form=self.get_form())

From 61897cb0fcfe5428082d82edb8855a4991a72c3f Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 6 Jan 2020 09:24:29 +1100
Subject: [PATCH 4/4] Updated translation files

---
 InvenTree/locale/de/LC_MESSAGES/django.po | 30 ++++++++++++++++++-----
 InvenTree/locale/en/LC_MESSAGES/django.po | 28 ++++++++++++++++-----
 InvenTree/locale/es/LC_MESSAGES/django.po | 28 ++++++++++++++++-----
 3 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index 35589a06d2..0bf8f61634 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-05 21:52+0000\n"
+"POT-Creation-Date: 2020-01-05 22:23+0000\n"
 "PO-Revision-Date: 2019-12-19 17:48+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -429,24 +429,42 @@ msgstr "Notiz"
 msgid "Notes"
 msgstr "Notizen"
 
-#: order/views.py:140
+#: order/views.py:141
 msgid "Confirm order cancellation"
 msgstr "Bestell-Stornierung bestätigen"
 
-#: order/views.py:173
+#: order/views.py:174
 msgid "Confirm order placement"
 msgstr "Bestellungstätigung bestätigen"
 
-#: order/views.py:731
+#: order/views.py:328
+#, fuzzy
+#| msgid "Number of items received"
+msgid "Items received"
+msgstr "Empfangene Objekt-Anzahl"
+
+#: order/views.py:342
+msgid "No destination set"
+msgstr ""
+
+#: order/views.py:373
+msgid "Error converting quantity to number"
+msgstr ""
+
+#: order/views.py:379
+msgid "Receive quantity less than zero"
+msgstr ""
+
+#: order/views.py:740
 msgid "Invalid Purchase Order"
 msgstr "Ungültige Bestellung"
 
-#: order/views.py:739
+#: order/views.py:748
 #, fuzzy
 msgid "Supplier must match for Part and Order"
 msgstr "Zulieferer muss zum Teil und zur Bestellung passen"
 
-#: order/views.py:744
+#: order/views.py:753
 msgid "Invalid SupplierPart selection"
 msgstr "Ungültige Wahl des Zulieferer-Teils"
 
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index 48bc10ef20..5266643986 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-01-05 21:52+0000\n"
+"POT-Creation-Date: 2020-01-05 22:23+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"
@@ -420,23 +420,39 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: order/views.py:140
+#: order/views.py:141
 msgid "Confirm order cancellation"
 msgstr ""
 
-#: order/views.py:173
+#: order/views.py:174
 msgid "Confirm order placement"
 msgstr ""
 
-#: order/views.py:731
+#: order/views.py:328
+msgid "Items received"
+msgstr ""
+
+#: order/views.py:342
+msgid "No destination set"
+msgstr ""
+
+#: order/views.py:373
+msgid "Error converting quantity to number"
+msgstr ""
+
+#: order/views.py:379
+msgid "Receive quantity less than zero"
+msgstr ""
+
+#: order/views.py:740
 msgid "Invalid Purchase Order"
 msgstr ""
 
-#: order/views.py:739
+#: order/views.py:748
 msgid "Supplier must match for Part and Order"
 msgstr ""
 
-#: order/views.py:744
+#: order/views.py:753
 msgid "Invalid SupplierPart selection"
 msgstr ""
 
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 48bc10ef20..5266643986 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-01-05 21:52+0000\n"
+"POT-Creation-Date: 2020-01-05 22:23+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"
@@ -420,23 +420,39 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: order/views.py:140
+#: order/views.py:141
 msgid "Confirm order cancellation"
 msgstr ""
 
-#: order/views.py:173
+#: order/views.py:174
 msgid "Confirm order placement"
 msgstr ""
 
-#: order/views.py:731
+#: order/views.py:328
+msgid "Items received"
+msgstr ""
+
+#: order/views.py:342
+msgid "No destination set"
+msgstr ""
+
+#: order/views.py:373
+msgid "Error converting quantity to number"
+msgstr ""
+
+#: order/views.py:379
+msgid "Receive quantity less than zero"
+msgstr ""
+
+#: order/views.py:740
 msgid "Invalid Purchase Order"
 msgstr ""
 
-#: order/views.py:739
+#: order/views.py:748
 msgid "Supplier must match for Part and Order"
 msgstr ""
 
-#: order/views.py:744
+#: order/views.py:753
 msgid "Invalid SupplierPart selection"
 msgstr ""