Merge remote-tracking branch 'inventree/master' into rejected-stock

# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
This commit is contained in:
Oliver Walters 2020-05-04 08:10:14 +10:00
commit 5a100962fe
4 changed files with 572 additions and 1218 deletions

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-03 22:06+0000\n"
"POT-Creation-Date: 2020-05-03 09:34+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"
@ -94,68 +94,64 @@ msgstr ""
msgid "Polish"
msgstr ""
#: InvenTree/status_codes.py:94 InvenTree/status_codes.py:135
#: InvenTree/status_codes.py:230
#: InvenTree/status_codes.py:90 InvenTree/status_codes.py:131
#: InvenTree/status_codes.py:213
msgid "Pending"
msgstr ""
#: InvenTree/status_codes.py:95
#: InvenTree/status_codes.py:91
msgid "Placed"
msgstr ""
#: InvenTree/status_codes.py:96 InvenTree/status_codes.py:233
#: InvenTree/status_codes.py:92 InvenTree/status_codes.py:216
msgid "Complete"
msgstr ""
#: InvenTree/status_codes.py:97 InvenTree/status_codes.py:137
#: InvenTree/status_codes.py:232
#: InvenTree/status_codes.py:93 InvenTree/status_codes.py:133
#: InvenTree/status_codes.py:215
msgid "Cancelled"
msgstr ""
#: InvenTree/status_codes.py:98 InvenTree/status_codes.py:138
#: InvenTree/status_codes.py:174
#: InvenTree/status_codes.py:94 InvenTree/status_codes.py:134
#: InvenTree/status_codes.py:169
msgid "Lost"
msgstr ""
#: InvenTree/status_codes.py:99 InvenTree/status_codes.py:139
#: InvenTree/status_codes.py:176
#: InvenTree/status_codes.py:95 InvenTree/status_codes.py:135
#: InvenTree/status_codes.py:170
msgid "Returned"
msgstr ""
#: InvenTree/status_codes.py:136 InvenTree/status_codes.py:177
#: InvenTree/status_codes.py:132 InvenTree/status_codes.py:171
#: order/templates/order/sales_order_base.html:98
msgid "Shipped"
msgstr ""
#: InvenTree/status_codes.py:170
#: InvenTree/status_codes.py:165
msgid "OK"
msgstr ""
#: InvenTree/status_codes.py:171
#: InvenTree/status_codes.py:166
msgid "Attention needed"
msgstr ""
#: InvenTree/status_codes.py:172
#: InvenTree/status_codes.py:167
msgid "Damaged"
msgstr ""
#: InvenTree/status_codes.py:173
#: InvenTree/status_codes.py:168
msgid "Destroyed"
msgstr ""
#: InvenTree/status_codes.py:175
msgid "Rejected"
msgstr ""
#: InvenTree/status_codes.py:178
#: InvenTree/status_codes.py:172
msgid "Used for Build"
msgstr ""
#: InvenTree/status_codes.py:179
#: InvenTree/status_codes.py:173
msgid "Installed in Stock Item"
msgstr ""
#: InvenTree/status_codes.py:231 build/templates/build/allocate.html:349
#: InvenTree/status_codes.py:214 build/templates/build/allocate.html:349
#: order/templates/order/sales_order_detail.html:220
#: part/templates/part/tabs.html:21 templates/js/build.html:120
msgid "Allocated"
@ -221,10 +217,9 @@ msgstr ""
#: build/models.py:74 build/templates/build/allocate.html:320
#: build/templates/build/auto_allocate.html:18
#: build/templates/build/build_base.html:70
#: build/templates/build/detail.html:22 order/models.py:464
#: build/templates/build/detail.html:22 order/models.py:462
#: order/templates/order/order_wizard/select_parts.html:30
#: order/templates/order/purchase_order_detail.html:145
#: order/templates/order/receive_parts.html:19
#: part/templates/part/part_app_base.html:7
#: part/templates/part/set_category.html:13 templates/js/bom.html:135
#: templates/js/build.html:41 templates/js/company.html:109
@ -313,11 +308,11 @@ msgstr ""
msgid "Allocated quantity ({n}) must not exceed available quantity ({q})"
msgstr ""
#: build/models.py:460 order/models.py:548
#: build/models.py:460 order/models.py:546
msgid "StockItem is over-allocated"
msgstr ""
#: build/models.py:463 order/models.py:551
#: build/models.py:463 order/models.py:549
msgid "Allocation quantity must be greater than zero"
msgstr ""
@ -338,7 +333,7 @@ msgid "Stock quantity to allocate to build"
msgstr ""
#: build/templates/build/allocate.html:17
#: company/templates/company/detail_part.html:18 order/views.py:763
#: company/templates/company/detail_part.html:18 order/views.py:743
msgid "Order Parts"
msgstr ""
@ -485,14 +480,13 @@ msgstr ""
#: build/templates/build/build_base.html:80
#: build/templates/build/detail.html:42
#: order/templates/order/receive_parts.html:24
#: stock/templates/stock/item_base.html:221 templates/js/build.html:57
#: templates/js/order.html:162 templates/js/order.html:235
#: templates/js/stock.html:264
msgid "Status"
msgstr ""
#: build/templates/build/build_base.html:93 order/models.py:462
#: build/templates/build/build_base.html:93 order/models.py:460
#: order/templates/order/sales_order_base.html:9
#: order/templates/order/sales_order_base.html:33
#: order/templates/order/sales_order_notes.html:10
@ -904,7 +898,7 @@ msgstr ""
msgid "Supplier"
msgstr ""
#: company/templates/company/detail.html:26 order/models.py:277
#: company/templates/company/detail.html:26 order/models.py:275
#: order/templates/order/sales_order_base.html:73 templates/js/company.html:44
#: templates/js/order.html:217
msgid "Customer"
@ -1123,10 +1117,8 @@ msgstr ""
msgid "Orders"
msgstr ""
#: company/templates/company/tabs.html:9
#: order/templates/order/receive_parts.html:14
#: part/templates/part/category.html:83 templates/navbar.html:10
#: templates/stats.html:8 templates/stats.html:17
#: company/templates/company/tabs.html:9 part/templates/part/category.html:83
#: templates/navbar.html:10 templates/stats.html:8 templates/stats.html:17
msgid "Parts"
msgstr ""
@ -1269,61 +1261,61 @@ msgstr ""
msgid "Lines can only be received against an order marked as 'Placed'"
msgstr ""
#: order/models.py:283
#: order/models.py:281
msgid "Customer order reference code"
msgstr ""
#: order/models.py:322
#: order/models.py:320
msgid "SalesOrder cannot be shipped as it is not currently pending"
msgstr ""
#: order/models.py:399
#: order/models.py:397
msgid "Item quantity"
msgstr ""
#: order/models.py:401
#: order/models.py:399
msgid "Line item reference"
msgstr ""
#: order/models.py:403
#: order/models.py:401
msgid "Line item notes"
msgstr ""
#: order/models.py:429 order/templates/order/order_base.html:9
#: order/models.py:427 order/templates/order/order_base.html:9
#: order/templates/order/order_base.html:23
#: stock/templates/stock/item_base.html:175 templates/js/order.html:136
msgid "Purchase Order"
msgstr ""
#: order/models.py:442
#: order/models.py:440
msgid "Supplier part"
msgstr ""
#: order/models.py:445
#: order/models.py:443
msgid "Number of items received"
msgstr ""
#: order/models.py:539
#: order/models.py:537
msgid "Cannot allocate stock item to a line with a different part"
msgstr ""
#: order/models.py:541
#: order/models.py:539
msgid "Cannot allocate stock to a line without a part"
msgstr ""
#: order/models.py:544
#: order/models.py:542
msgid "Allocation quantity cannot exceed stock quantity"
msgstr ""
#: order/models.py:554
#: order/models.py:552
msgid "Quantity must be 1 for serialized stock item"
msgstr ""
#: order/models.py:571
#: order/models.py:569
msgid "Select stock item to allocate"
msgstr ""
#: order/models.py:574
#: order/models.py:572
msgid "Enter stock allocation quantity"
msgstr ""
@ -1356,7 +1348,6 @@ msgstr ""
#: order/templates/order/order_base.html:106
#: order/templates/order/purchase_order_detail.html:180
#: order/templates/order/receive_parts.html:22
#: order/templates/order/sales_order_base.html:105
msgid "Received"
msgstr ""
@ -1455,8 +1446,8 @@ msgid "Attachments"
msgstr ""
#: order/templates/order/purchase_order_detail.html:16
#: order/templates/order/sales_order_detail.html:17 order/views.py:1071
#: order/views.py:1185
#: order/templates/order/sales_order_detail.html:17 order/views.py:1051
#: order/views.py:1165
msgid "Add Line Item"
msgstr ""
@ -1479,7 +1470,6 @@ msgid "No line items found"
msgstr ""
#: order/templates/order/purchase_order_detail.html:162
#: order/templates/order/receive_parts.html:20
msgid "Order Code"
msgstr ""
@ -1496,27 +1486,6 @@ msgstr ""
msgid "Receive line item"
msgstr ""
#: order/templates/order/receive_parts.html:8
msgid "Receive outstanding parts for"
msgstr ""
#: order/templates/order/receive_parts.html:15
msgid "Select parts to receive against this order"
msgstr ""
#: order/templates/order/receive_parts.html:21
#: part/templates/part/part_base.html:128 templates/js/part.html:210
msgid "On Order"
msgstr ""
#: order/templates/order/receive_parts.html:23
msgid "Receive"
msgstr ""
#: order/templates/order/receive_parts.html:36
msgid "Error: Referenced part has been removed"
msgstr ""
#: order/templates/order/sales_order_base.html:15
msgid "This SalesOrder has not been fully allocated"
msgstr ""
@ -1688,51 +1657,51 @@ msgstr ""
msgid "No destination set"
msgstr ""
#: order/views.py:705
#: order/views.py:691
msgid "Error converting quantity to number"
msgstr ""
#: order/views.py:711
#: order/views.py:697
msgid "Receive quantity less than zero"
msgstr ""
#: order/views.py:717
#: order/views.py:703
msgid "No lines specified"
msgstr ""
#: order/views.py:1091
#: order/views.py:1071
msgid "Invalid Purchase Order"
msgstr ""
#: order/views.py:1099
#: order/views.py:1079
msgid "Supplier must match for Part and Order"
msgstr ""
#: order/views.py:1104
#: order/views.py:1084
msgid "Invalid SupplierPart selection"
msgstr ""
#: order/views.py:1236 order/views.py:1254
#: order/views.py:1216 order/views.py:1234
msgid "Edit Line Item"
msgstr ""
#: order/views.py:1270 order/views.py:1282
#: order/views.py:1250 order/views.py:1262
msgid "Delete Line Item"
msgstr ""
#: order/views.py:1275 order/views.py:1287
#: order/views.py:1255 order/views.py:1267
msgid "Deleted line item"
msgstr ""
#: order/views.py:1296
#: order/views.py:1276
msgid "Allocate Stock to Order"
msgstr ""
#: order/views.py:1365
#: order/views.py:1345
msgid "Edit Allocation Quantity"
msgstr ""
#: order/views.py:1380
#: order/views.py:1360
msgid "Remove allocation"
msgstr ""
@ -2259,6 +2228,10 @@ msgstr ""
msgid "Allocated to Sales Orders"
msgstr ""
#: part/templates/part/part_base.html:128 templates/js/part.html:210
msgid "On Order"
msgstr ""
#: part/templates/part/part_base.html:143
msgid "Can Build"
msgstr ""

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-03 22:06+0000\n"
"POT-Creation-Date: 2020-05-03 09:34+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"
@ -94,68 +94,64 @@ msgstr ""
msgid "Polish"
msgstr ""
#: InvenTree/status_codes.py:94 InvenTree/status_codes.py:135
#: InvenTree/status_codes.py:230
#: InvenTree/status_codes.py:90 InvenTree/status_codes.py:131
#: InvenTree/status_codes.py:213
msgid "Pending"
msgstr ""
#: InvenTree/status_codes.py:95
#: InvenTree/status_codes.py:91
msgid "Placed"
msgstr ""
#: InvenTree/status_codes.py:96 InvenTree/status_codes.py:233
#: InvenTree/status_codes.py:92 InvenTree/status_codes.py:216
msgid "Complete"
msgstr ""
#: InvenTree/status_codes.py:97 InvenTree/status_codes.py:137
#: InvenTree/status_codes.py:232
#: InvenTree/status_codes.py:93 InvenTree/status_codes.py:133
#: InvenTree/status_codes.py:215
msgid "Cancelled"
msgstr ""
#: InvenTree/status_codes.py:98 InvenTree/status_codes.py:138
#: InvenTree/status_codes.py:174
#: InvenTree/status_codes.py:94 InvenTree/status_codes.py:134
#: InvenTree/status_codes.py:169
msgid "Lost"
msgstr ""
#: InvenTree/status_codes.py:99 InvenTree/status_codes.py:139
#: InvenTree/status_codes.py:176
#: InvenTree/status_codes.py:95 InvenTree/status_codes.py:135
#: InvenTree/status_codes.py:170
msgid "Returned"
msgstr ""
#: InvenTree/status_codes.py:136 InvenTree/status_codes.py:177
#: InvenTree/status_codes.py:132 InvenTree/status_codes.py:171
#: order/templates/order/sales_order_base.html:98
msgid "Shipped"
msgstr ""
#: InvenTree/status_codes.py:170
#: InvenTree/status_codes.py:165
msgid "OK"
msgstr ""
#: InvenTree/status_codes.py:171
#: InvenTree/status_codes.py:166
msgid "Attention needed"
msgstr ""
#: InvenTree/status_codes.py:172
#: InvenTree/status_codes.py:167
msgid "Damaged"
msgstr ""
#: InvenTree/status_codes.py:173
#: InvenTree/status_codes.py:168
msgid "Destroyed"
msgstr ""
#: InvenTree/status_codes.py:175
msgid "Rejected"
msgstr ""
#: InvenTree/status_codes.py:178
#: InvenTree/status_codes.py:172
msgid "Used for Build"
msgstr ""
#: InvenTree/status_codes.py:179
#: InvenTree/status_codes.py:173
msgid "Installed in Stock Item"
msgstr ""
#: InvenTree/status_codes.py:231 build/templates/build/allocate.html:349
#: InvenTree/status_codes.py:214 build/templates/build/allocate.html:349
#: order/templates/order/sales_order_detail.html:220
#: part/templates/part/tabs.html:21 templates/js/build.html:120
msgid "Allocated"
@ -221,10 +217,9 @@ msgstr ""
#: build/models.py:74 build/templates/build/allocate.html:320
#: build/templates/build/auto_allocate.html:18
#: build/templates/build/build_base.html:70
#: build/templates/build/detail.html:22 order/models.py:464
#: build/templates/build/detail.html:22 order/models.py:462
#: order/templates/order/order_wizard/select_parts.html:30
#: order/templates/order/purchase_order_detail.html:145
#: order/templates/order/receive_parts.html:19
#: part/templates/part/part_app_base.html:7
#: part/templates/part/set_category.html:13 templates/js/bom.html:135
#: templates/js/build.html:41 templates/js/company.html:109
@ -313,11 +308,11 @@ msgstr ""
msgid "Allocated quantity ({n}) must not exceed available quantity ({q})"
msgstr ""
#: build/models.py:460 order/models.py:548
#: build/models.py:460 order/models.py:546
msgid "StockItem is over-allocated"
msgstr ""
#: build/models.py:463 order/models.py:551
#: build/models.py:463 order/models.py:549
msgid "Allocation quantity must be greater than zero"
msgstr ""
@ -338,7 +333,7 @@ msgid "Stock quantity to allocate to build"
msgstr ""
#: build/templates/build/allocate.html:17
#: company/templates/company/detail_part.html:18 order/views.py:763
#: company/templates/company/detail_part.html:18 order/views.py:743
msgid "Order Parts"
msgstr ""
@ -485,14 +480,13 @@ msgstr ""
#: build/templates/build/build_base.html:80
#: build/templates/build/detail.html:42
#: order/templates/order/receive_parts.html:24
#: stock/templates/stock/item_base.html:221 templates/js/build.html:57
#: templates/js/order.html:162 templates/js/order.html:235
#: templates/js/stock.html:264
msgid "Status"
msgstr ""
#: build/templates/build/build_base.html:93 order/models.py:462
#: build/templates/build/build_base.html:93 order/models.py:460
#: order/templates/order/sales_order_base.html:9
#: order/templates/order/sales_order_base.html:33
#: order/templates/order/sales_order_notes.html:10
@ -904,7 +898,7 @@ msgstr ""
msgid "Supplier"
msgstr ""
#: company/templates/company/detail.html:26 order/models.py:277
#: company/templates/company/detail.html:26 order/models.py:275
#: order/templates/order/sales_order_base.html:73 templates/js/company.html:44
#: templates/js/order.html:217
msgid "Customer"
@ -1123,10 +1117,8 @@ msgstr ""
msgid "Orders"
msgstr ""
#: company/templates/company/tabs.html:9
#: order/templates/order/receive_parts.html:14
#: part/templates/part/category.html:83 templates/navbar.html:10
#: templates/stats.html:8 templates/stats.html:17
#: company/templates/company/tabs.html:9 part/templates/part/category.html:83
#: templates/navbar.html:10 templates/stats.html:8 templates/stats.html:17
msgid "Parts"
msgstr ""
@ -1269,61 +1261,61 @@ msgstr ""
msgid "Lines can only be received against an order marked as 'Placed'"
msgstr ""
#: order/models.py:283
#: order/models.py:281
msgid "Customer order reference code"
msgstr ""
#: order/models.py:322
#: order/models.py:320
msgid "SalesOrder cannot be shipped as it is not currently pending"
msgstr ""
#: order/models.py:399
#: order/models.py:397
msgid "Item quantity"
msgstr ""
#: order/models.py:401
#: order/models.py:399
msgid "Line item reference"
msgstr ""
#: order/models.py:403
#: order/models.py:401
msgid "Line item notes"
msgstr ""
#: order/models.py:429 order/templates/order/order_base.html:9
#: order/models.py:427 order/templates/order/order_base.html:9
#: order/templates/order/order_base.html:23
#: stock/templates/stock/item_base.html:175 templates/js/order.html:136
msgid "Purchase Order"
msgstr ""
#: order/models.py:442
#: order/models.py:440
msgid "Supplier part"
msgstr ""
#: order/models.py:445
#: order/models.py:443
msgid "Number of items received"
msgstr ""
#: order/models.py:539
#: order/models.py:537
msgid "Cannot allocate stock item to a line with a different part"
msgstr ""
#: order/models.py:541
#: order/models.py:539
msgid "Cannot allocate stock to a line without a part"
msgstr ""
#: order/models.py:544
#: order/models.py:542
msgid "Allocation quantity cannot exceed stock quantity"
msgstr ""
#: order/models.py:554
#: order/models.py:552
msgid "Quantity must be 1 for serialized stock item"
msgstr ""
#: order/models.py:571
#: order/models.py:569
msgid "Select stock item to allocate"
msgstr ""
#: order/models.py:574
#: order/models.py:572
msgid "Enter stock allocation quantity"
msgstr ""
@ -1356,7 +1348,6 @@ msgstr ""
#: order/templates/order/order_base.html:106
#: order/templates/order/purchase_order_detail.html:180
#: order/templates/order/receive_parts.html:22
#: order/templates/order/sales_order_base.html:105
msgid "Received"
msgstr ""
@ -1455,8 +1446,8 @@ msgid "Attachments"
msgstr ""
#: order/templates/order/purchase_order_detail.html:16
#: order/templates/order/sales_order_detail.html:17 order/views.py:1071
#: order/views.py:1185
#: order/templates/order/sales_order_detail.html:17 order/views.py:1051
#: order/views.py:1165
msgid "Add Line Item"
msgstr ""
@ -1479,7 +1470,6 @@ msgid "No line items found"
msgstr ""
#: order/templates/order/purchase_order_detail.html:162
#: order/templates/order/receive_parts.html:20
msgid "Order Code"
msgstr ""
@ -1496,27 +1486,6 @@ msgstr ""
msgid "Receive line item"
msgstr ""
#: order/templates/order/receive_parts.html:8
msgid "Receive outstanding parts for"
msgstr ""
#: order/templates/order/receive_parts.html:15
msgid "Select parts to receive against this order"
msgstr ""
#: order/templates/order/receive_parts.html:21
#: part/templates/part/part_base.html:128 templates/js/part.html:210
msgid "On Order"
msgstr ""
#: order/templates/order/receive_parts.html:23
msgid "Receive"
msgstr ""
#: order/templates/order/receive_parts.html:36
msgid "Error: Referenced part has been removed"
msgstr ""
#: order/templates/order/sales_order_base.html:15
msgid "This SalesOrder has not been fully allocated"
msgstr ""
@ -1688,51 +1657,51 @@ msgstr ""
msgid "No destination set"
msgstr ""
#: order/views.py:705
#: order/views.py:691
msgid "Error converting quantity to number"
msgstr ""
#: order/views.py:711
#: order/views.py:697
msgid "Receive quantity less than zero"
msgstr ""
#: order/views.py:717
#: order/views.py:703
msgid "No lines specified"
msgstr ""
#: order/views.py:1091
#: order/views.py:1071
msgid "Invalid Purchase Order"
msgstr ""
#: order/views.py:1099
#: order/views.py:1079
msgid "Supplier must match for Part and Order"
msgstr ""
#: order/views.py:1104
#: order/views.py:1084
msgid "Invalid SupplierPart selection"
msgstr ""
#: order/views.py:1236 order/views.py:1254
#: order/views.py:1216 order/views.py:1234
msgid "Edit Line Item"
msgstr ""
#: order/views.py:1270 order/views.py:1282
#: order/views.py:1250 order/views.py:1262
msgid "Delete Line Item"
msgstr ""
#: order/views.py:1275 order/views.py:1287
#: order/views.py:1255 order/views.py:1267
msgid "Deleted line item"
msgstr ""
#: order/views.py:1296
#: order/views.py:1276
msgid "Allocate Stock to Order"
msgstr ""
#: order/views.py:1365
#: order/views.py:1345
msgid "Edit Allocation Quantity"
msgstr ""
#: order/views.py:1380
#: order/views.py:1360
msgid "Remove allocation"
msgstr ""
@ -2259,6 +2228,10 @@ msgstr ""
msgid "Allocated to Sales Orders"
msgstr ""
#: part/templates/part/part_base.html:128 templates/js/part.html:210
msgid "On Order"
msgstr ""
#: part/templates/part/part_base.html:143
msgid "Can Build"
msgstr ""