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
3,574 Commits 6 Branches 99 Tags 484 MiB
56660d52f2
Commit Graph

2792 Commits

Author SHA1 Message Date
Oliver Walters
3aecb110a5 Add qrcode icon as prefix to barcode input 2020-06-11 19:05:55 +10:00
Oliver Walters
503d5a41b1 Add global 'barcode-scan' button 2020-06-11 18:09:43 +10:00
Oliver Walters
e943681baa Add translations for error messages 2020-06-11 18:09:06 +10:00
Oliver Walters
0559946791 Add unit testing framework for barcodes 2020-06-11 14:44:56 +10:00
Oliver Walters
22a8e82108 Add endpoint for assigning a particular barcode to a StockItem 2020-06-11 12:21:33 +10:00
Oliver Walters
a72ed11cb0 Skeleton for DigiKey barcode 2020-06-11 11:16:55 +10:00
Oliver Walters
1a15b46d65 Remove some debug statements 2020-06-11 11:14:02 +10:00
Oliver Walters
0068cd9825 Refactor barcode endoint 
- Moved code into 'barcode' directory
 2020-06-11 11:09:07 +10:00
Oliver Walters
290c0eb225 Add barcode javascript file 2020-06-11 09:56:59 +10:00
Oliver Walters
bc31cc550e Consolidate buttons for stock item 2020-06-10 15:27:30 +10:00
Oliver Walters
f40a9d1dad Merge remote-tracking branch 'inventree/master' 2020-06-09 16:28:59 +10:00
Oliver Walters
38dcdcad54 Update translation hooks 2020-06-09 16:18:38 +10:00
Oliver
aeba189c1a
Merge pull request #863 from SchrodingersGat/decimalfix 
Decimalize display of variant stock
 2020-06-09 13:44:47 +10:00
Oliver Walters
09400fd66b Decimalize display of variant stock 
(cherry picked from commit 6e45360c4b7a6bc91f584f498fb6e1988593db95)
 2020-06-09 13:31:16 +10:00
Oliver Walters
c7586b83e9 Fix display of buttons for stock item 
(cherry picked from commit b23017b6bf)
 2020-06-09 13:15:12 +10:00
Oliver Walters
b23017b6bf Fix display of buttons for stock item 2020-06-09 13:14:29 +10:00
Oliver Walters
a6a58b299b Merge remote-tracking branch 'inventree/master' 2020-06-06 08:59:28 +10:00
Oliver Walters
126e42a022 Add "IPN" column to stock list table 2020-06-06 08:47:06 +10:00
Oliver Walters
7be158722f Merge remote-tracking branch 'inventree/master' 2020-06-05 20:04:41 +10:00
Oliver Walters
16d261d956 Make description fields optional 2020-06-05 19:33:32 +10:00
Oliver Walters
15817ce61a Add "IPN" column to part table 2020-06-05 19:26:41 +10:00
Oliver Walters
fcd588cb01 Filter SalesOrder by status 2020-06-05 12:08:47 +10:00
Oliver Walters
6ebce2b2fd Add ability to filter purchase orders by "outstanding" status 2020-06-05 12:06:28 +10:00
Oliver Walters
544e217347 Add page to show stock which is assigned to a customer 2020-06-05 11:52:07 +10:00
Oliver Walters
9f599546de Use stock status for determining "in stock" 2020-06-05 09:08:46 +10:00
Oliver Walters
408c6a4040 Filter stock list by "customer" 2020-06-05 09:05:57 +10:00
Oliver Walters
2c7e0bd321 Merge remote-tracking branch 'inventree/master' 2020-06-04 20:07:59 +10:00
Oliver Walters
ca1526405b PEP fixes 2020-06-04 19:51:43 +10:00
Oliver Walters
80019a3ed8 Add forms/views for manually assigning a stock item to a customer 2020-06-04 19:45:41 +10:00
Oliver Walters
d907136264 Display customer in stock item 2020-06-04 19:13:37 +10:00
Oliver Walters
fbd21827fb Add 'customer' field to StockItem 2020-06-04 19:08:33 +10:00
Oliver Walters
4ddabb82ef Add a button to assign stock item to customer 2020-06-04 11:50:55 +10:00
Oliver Walters
a3c0d35b20 Fix for case where BOM item quantity is zero 2020-06-04 11:37:55 +10:00
Oliver Walters
dd9584f487 Follow link when a new stock item is created 2020-05-30 20:58:52 +10:00
Oliver Walters
8459de7be2 Display a message if no stock location is set 2020-05-30 20:58:05 +10:00
Oliver Walters
b73044cd44 Merge remote-tracking branch 'inventree/master' 2020-05-29 13:47:19 +10:00
Oliver Walters
5f3816212f template parts are now allowed to be variants 
- Do not throw an error here!
 2020-05-29 12:40:40 +10:00
Oliver Walters
59d9e430b4 Remove unique-together requirement 
- This is handled manually via the validate_unique function
 2020-05-28 20:38:24 +10:00
Oliver Walters
774e26eb19 Mark some fields as not-required via the API 2020-05-28 20:33:33 +10:00
Oliver Walters
9b7b65374d Use rounding decimal field in BomItem form 2020-05-27 10:33:47 +10:00
Oliver Walters
7bcf9bf5be Allow template parts to be specified for the BOM item 2020-05-27 10:06:18 +10:00
Oliver Walters
d0b3e0bd7c Merge remote-tracking branch 'inventree/master' 2020-05-27 09:31:15 +10:00
Oliver Walters
78990a99e5 Fix serializer for stock item 2020-05-26 23:01:30 +10:00
Oliver Walters
fe69a8e7bb Merge remote-tracking branch 'inventree/master' 2020-05-26 21:53:20 +10:00
Oliver Walters
e128410d54 Update 'required' status for new serializers 
(cherry picked from commit 2306e29743eb25266c78bec5357d1194e0778c58)
 2020-05-26 20:29:09 +10:00
Oliver Walters
81e38eeb14 Add some more custom FileField serializers 
(cherry picked from commit 7b9ff27baefacc977fef7852e99d8a9bb46a062a)
 2020-05-26 20:29:04 +10:00
Oliver Walters
861e30e8d6 Add a special serializer class for FileField which has a custom to_representation function 
- This was solving a very subtle bug which will probably only ever apply to a single installation instance
- Future me will most likely not remember what this was for or how it works
- In any case, there we go
- Ref: http://www.cdrf.co/3.9/rest_framework.fields/Field.html

(cherry picked from commit 7305094854)
 2020-05-26 20:29:00 +10:00
Oliver Walters
03cc6892ea Merge remote-tracking branch 'inventree/master' 2020-05-26 12:52:17 +10:00
Oliver Walters
c0f1966a2c Decimal filter on StockItem adjustment form 2020-05-26 12:08:00 +10:00
Oliver Walters
c92bb78ae8 Stock table display fixes 2020-05-26 12:06:38 +10:00
Oliver Walters
e63622341f Add description field to table filters 2020-05-26 11:57:35 +10:00
Oliver Walters
669a76c921 Add serial number range filtering options for the stock table 2020-05-26 11:54:23 +10:00
Oliver Walters
4cbf2099fa Add stock item filtering by serial number range 2020-05-26 11:49:48 +10:00
Oliver Walters
046a00026c remove debug print 2020-05-26 11:42:30 +10:00
Oliver Walters
47a4ab2ed8 Template changes 2020-05-26 11:38:17 +10:00
Oliver Walters
27ca84fd2a Part view shows next available serial number 2020-05-26 11:34:11 +10:00
Oliver Walters
ae4bfd07da StockItemCreate form now has better logic for auto-detecting the part 2020-05-26 11:31:08 +10:00
Oliver Walters
1bf696a052 Allow API upload of file attachments against StockItemTestResult objects 2020-05-25 22:19:28 +10:00
Oliver Walters
75cdc7eb59 Catch some errors related to missing system packages 2020-05-25 14:57:15 +10:00
Oliver Walters
d2c1e9e2b0 Type fixes 2020-05-25 14:24:29 +10:00
Oliver Walters
0d052334e2 Allow stock items to be created for template parts 2020-05-25 14:20:35 +10:00
Oliver Walters
fdf57891fc Form / view / etc for performing StockItem conversion 2020-05-25 14:16:38 +10:00
Oliver Walters
009adaf528 Code to get and test for variants of a part 2020-05-25 13:13:28 +10:00
Oliver Walters
22220493bd Add unit tests 2020-05-24 21:10:00 +10:00
Oliver Walters
95cc3d2a7a Copy test results when a stock item is split or serialized 2020-05-24 21:09:43 +10:00
Oliver Walters
68b9a690f2 Integer value required for trackable bom item 2020-05-24 20:22:15 +10:00
Oliver Walters
c44205273c Simplify javascript 2020-05-24 20:05:34 +10:00
Oliver Walters
e4d10279fa Include 'key' field in StockItemTestResult serializer 2020-05-24 20:04:34 +10:00
Oliver Walters
01481ef5c9 Add function to get the number of required tests for a part 2020-05-23 14:28:25 +10:00
Oliver Walters
e63342418f Improve / simplify logic for file attachments against test result object 2020-05-23 11:30:42 +10:00
Oliver Walters
50987f47b0 Add a buttony thing 2020-05-22 23:37:26 +10:00
Oliver Walters
4bd0872b2c Expose some more stock item data over API 2020-05-22 23:33:27 +10:00
Oliver Walters
34b40d205e Expose 'part' to the TestReport interface 2020-05-22 23:08:15 +10:00
Oliver Walters
5245442b11 Fixes 2020-05-22 22:27:52 +10:00
Oliver Walters
e6f56cb056 where one or more test report templates exist for a part, 
provide a button for all stock-items of that part,
allowing the user to generate and download a test repotr
 2020-05-22 22:25:05 +10:00
Oliver Walters
71681bfda1 Add a button if a stock item test report is available 2020-05-22 21:38:05 +10:00
Oliver Walters
1ad7e699a9 PEP 2020-05-22 21:31:21 +10:00
Oliver Walters
0ec880290b Functionality for retrieving test templates associated with a given part 2020-05-22 21:29:58 +10:00
Oliver Walters
7215a563b1 Add PartFilterMixin 2020-05-22 21:22:43 +10:00
Oliver Walters
616f17d08a Reset the report app migrations 2020-05-22 21:01:08 +10:00
Oliver Walters
d6cad372db Add migration 2020-05-22 13:05:30 +10:00
Oliver Walters
865a6db828 Fix subdirectory lookup 2020-05-22 13:05:12 +10:00
Oliver Walters
174c4cc591 Add subclass models for report types 2020-05-22 13:01:21 +10:00
Oliver Walters
251a23d127 Cleanup 2020-05-22 00:09:51 +10:00
Oliver Walters
cab87a6860 Update admin 2020-05-22 00:01:36 +10:00
Oliver Walters
b93ba6339a Option for rendering HTML template 2020-05-21 23:41:47 +10:00
Oliver Walters
c3dcabcaad Render an uploaded template to LaTeX 2020-05-21 23:03:01 +10:00
Oliver Walters
05be4da25c remove test code 2020-05-21 14:06:29 +10:00
Oliver Walters
70c5b27d22 Add ReportAsset model 
- Files which can be embedded into a report
 2020-05-21 14:05:25 +10:00
Oliver Walters
b78fe88c26 PEP fixes 2020-05-21 13:53:17 +10:00
Oliver Walters
3d8c059a43 Add "report" app 
- Define ReportTemplate model which contains a report file template
 2020-05-21 13:51:13 +10:00
Oliver Walters
b121262af1 pep FIX 2020-05-19 17:37:00 +10:00
Oliver Walters
9cb039f685 Remove a test (for now) which is causing issues... 2020-05-19 17:08:19 +10:00
Oliver Walters
1cfe445897 PEP fix 2020-05-19 16:59:21 +10:00
Oliver Walters
bf296057b3 Enable attachments to be uploaded via the API 2020-05-19 16:56:41 +10:00
Oliver Walters
2f6d03388d Add serializer / table display 2020-05-18 19:15:40 +10:00
Oliver Walters
fc6cad475a Add validation for StockItemTestResult based on the matching PartTestTemplate 2020-05-18 19:11:43 +10:00
Oliver Walters
e8c402ecd9 Add some more fields to the PartTestTemplate model 2020-05-18 19:00:45 +10:00
Oliver Walters
0bdb62f263 Fix pep 2020-05-18 14:32:30 +10:00
Oliver Walters
fce8e3fe05 add button to delete all test data for a given stock item 2020-05-18 14:29:35 +10:00
Oliver Walters
18b7baa5b9 Allow stock item filtering by IPN 
(cherry picked from commit bd9aad935594e4022299567667faeb149f6d2375)
 2020-05-18 13:33:41 +10:00
Oliver Walters
59dfac2c9b Merge branch 'warning-mesages' 2020-05-17 22:58:21 +10:00
Oliver Walters
1cc0977816 Display testing status for a stock item 2020-05-17 22:33:41 +10:00
Oliver Walters
02b0c0831d Removed test that caused a bug 2020-05-17 22:29:07 +10:00
Oliver Walters
6cb017bbfd Add functions to test if a stock item has passed all tests 2020-05-17 22:03:55 +10:00
Oliver Walters
5f318799c1 Logic fix for table row grouping 2020-05-17 21:51:46 +10:00
Oliver Walters
8ace71ef56 Complete refactor of the test-result table for stock item 2020-05-17 21:09:49 +10:00
Oliver Walters
b9799e1824 Add some more part slidies 2020-05-17 17:05:04 +10:00
Oliver Walters
e30f6ec374 Add forms / views for creating / editing / deleting test templates 2020-05-17 16:50:34 +10:00
Oliver Walters
cd0e66e3c6 Add ability to edit / assign attatched files to test result data 2020-05-17 16:17:05 +10:00
Oliver Walters
e9ed50fc4b Add table displaying part test templates 2020-05-17 16:07:55 +10:00
Oliver Walters
66f2c01d5d Add (empty) page for displaying part test templates 2020-05-17 14:26:53 +10:00
Oliver Walters
bc8b3a68f0 Fixes for unit testing 2020-05-17 14:17:55 +10:00
Oliver Walters
69c748d018 PEP fix 2020-05-17 14:15:13 +10:00
Oliver Walters
95d07cd02b Add unit testing for new API features 2020-05-17 14:14:54 +10:00
Oliver Walters
4d992ea528 Expose test templates to the API 2020-05-17 13:56:49 +10:00
Oliver Walters
f791ac9f57 Register test template in the admin interface 2020-05-17 13:50:06 +10:00
Oliver Walters
badf9230a9 Add fixtures / unit testing for the stock item testing framework 2020-05-17 13:46:19 +10:00
Oliver Walters
8c8b704e38 Add PartTestTemplate model 2020-05-17 13:26:51 +10:00
Oliver Walters
17f241774f Add function to generate "keys" for test results. 
- As the keys are to be used for dict-based lookup (in a template) then they cannot contains spaces.
- May as well enforce lower-case encoding!
 2020-05-17 12:59:03 +10:00
Oliver Walters
1e94a597c9 Merge remote-tracking branch 'inventree/master' 2020-05-17 00:42:03 +10:00
Oliver Walters
b3ca6a6ca7 PEP fixes 2020-05-17 00:26:44 +10:00
Oliver Walters
327682b719 Add forms / views / etc to create / edit / delete test results manually 2020-05-17 00:26:10 +10:00
Oliver Walters
82fe497787 Add buttons to edit / delete a Test result 
- Don't do nuthin yet!
 2020-05-17 00:04:45 +10:00
Oliver Walters
05856a72cf UI cleanup 2020-05-16 23:56:50 +10:00
Oliver Walters
e23a9c1269 Load testresult table for stock item 
- Uses the API / bootstrap table
- Is pretty!
- Provides link to the attachment (if one exists)
 2020-05-16 23:54:07 +10:00
Oliver Walters
3b53437f46 Add 'attachment_detail' to the TestResult serializer 2020-05-16 23:53:28 +10:00
Oliver Walters
608057da69 Add option for user_detail in stockitemtestresult serializer 2020-05-16 23:36:03 +10:00
Oliver Walters
e02b692ab2 Improve API filtering for StockItem 2020-05-16 23:19:16 +10:00
Oliver Walters
197a3e6731 Fixes for Stock API 2020-05-16 23:12:43 +10:00
Oliver Walters
fd11317409 Whoops 2020-05-16 23:04:37 +10:00
Oliver Walters
45556058d2 Allow files to be uploaded alongside a test report 
- Attach the file to the stock item
- Link the uploaded attachment to the test report
 2020-05-16 22:53:23 +10:00
Oliver Walters
247cfcc514 Add API unit tests 2020-05-16 21:57:41 +10:00
Oliver Walters
d6a56da441 PEP fixes 2020-05-16 21:15:14 +10:00
Oliver Walters
a17ab9bfbd Add an (empty) page for dispalying test results 2020-05-16 21:10:27 +10:00
Oliver Walters
fe99e92bfc Refactor table_filters javascript file to prevent loading on every single page 2020-05-16 21:02:25 +10:00
Oliver Walters
f3c71bd96f API interface for StockItemTestResult 2020-05-16 20:56:36 +10:00
Oliver Walters
880a0a4af8 Add StockItemTestResult to the admin interface 2020-05-16 20:55:30 +10:00
Oliver Walters
df91b8cf4d Add function to get all test results as a map 
- This will be required for pushing out to a test report
 2020-05-16 20:45:10 +10:00
Oliver Walters
2bb9fd9955 Add some unit testing for the new model 2020-05-16 20:27:01 +10:00
Oliver Walters
f39f5e5825 Add StockItemTestResult model 2020-05-16 19:56:18 +10:00
Oliver Walters
8a99062704 PEP fixes 2020-05-16 17:52:25 +10:00
Oliver Walters
a6ad263ee7 Fix clean functions so unit tests pass 2020-05-16 17:43:32 +10:00
Oliver Walters
40735d66a1 Translation tweaks 2020-05-16 17:32:20 +10:00
Oliver Walters
7190a8ef69 Serial number placeholder text for BuildComplete form 2020-05-16 17:29:41 +10:00
Oliver Walters
6552d011a4 Better calculatation of placeholder text for serial number 2020-05-16 16:42:34 +10:00
Oliver Walters
3df8f33080 Logic fixes for CreateStockItem form 
- Improved data validation
- Fix bug where form was not checked for validity
 2020-05-16 12:04:53 +10:00
Oliver Walters
3d0bea15ae Refactor function naming 2020-05-16 12:03:18 +10:00
Oliver Walters
4cb97b1340 Add some more form candy 2020-05-16 11:55:10 +10:00
Oliver Walters
498ad4162c Bugfix: Turns out 'prefix' and 'suffix' were protected fields! 2020-05-16 11:05:45 +10:00
Oliver Walters
08d177e55f Update refactor for editing PO and SO forms 2020-05-16 09:36:43 +10:00
Oliver Walters
8fae32e3c7 Refactor HelperForm to easily allow setting prepended text / placeholder / etc 2020-05-16 09:33:34 +10:00
Oliver Walters
0ccac09962 Auto-fill serial numbers for the SerializeStock form 2020-05-16 09:06:39 +10:00
Oliver Walters
10762fc1cf Refactor tractor 2020-05-16 08:55:19 +10:00
Oliver Walters
ea88a03b5a More serial number validation and unit testing 
-
 2020-05-16 08:43:57 +10:00
Oliver Walters
2d6c531fda Unit testing for part variant MPTT 2020-05-15 22:01:21 +10:00
Oliver Walters
0652579312 Update fixture for part model to match MPTT requirements 2020-05-15 21:44:25 +10:00
Oliver Walters
0a78432a0f Convert 'part" to MPTT model - based on the 'variant_of' field 
- Now recursive variants can be implemented properly
 2020-05-15 21:35:53 +10:00
Oliver Walters
72cfaccac5 Pass StockItem object through to the SerializeStock form 2020-05-15 21:16:00 +10:00
Oliver Walters
0f00205256 PEP fix 2020-05-14 21:52:39 +10:00
Oliver Walters
007d2d4054 Add prepended text to order references for forms 2020-05-14 21:51:44 +10:00
Oliver Walters
16aa18429a Use bootstrap3 styling for django crispy forms 2020-05-14 16:55:33 +10:00
Oliver Walters
5167f54268 Fix unit tests 2020-05-14 15:20:40 +10:00
Oliver Walters
6175c5408c Javascript indent cleanup 2020-05-14 15:10:48 +10:00
Oliver Walters
d3758981b4 Fix "New Sales Order" button in Customer detail view 2020-05-14 15:09:31 +10:00
Oliver Walters
b619f26074 Auto-increment sales order reference number 2020-05-14 15:05:55 +10:00
Oliver Walters
08903f357e Auto-increment the purchase-order number when creating a new one 2020-05-14 15:02:46 +10:00
Oliver Walters
cebfe9a30f Function to predict the next purchase order number 2020-05-14 15:00:00 +10:00
Oliver Walters
41eff97c7c Add function to "increment" a number or a number-like string 
- Observe string width
- Keep prefix if one exists
 2020-05-14 14:59:49 +10:00
Oliver Walters
30b5f7d507 Drag and drop for order attachments 2020-05-13 11:28:45 +10:00
Oliver Walters
7143c32fc9 Drag-and-drop attachments for stock item 2020-05-13 11:22:57 +10:00
Oliver Walters
db01f3646a Enable drag-and-drop attachment upload for Part 2020-05-13 11:13:26 +10:00
Oliver Walters
cedf9a9108 Attachment comment field is optional 2020-05-13 10:16:26 +10:00
Oliver Walters
dcf00d816d Merge remote-tracking branch 'inventree/master' 2020-05-12 22:14:20 +10:00
Oliver Walters
f5b97da5d2 Refactor "attachment" table into template 2020-05-12 22:05:38 +10:00
Oliver Walters
366d4b2143 Add new attechment functionality to new models 
- Giving the ol' refactor tractor a fresh coat of paint
 2020-05-12 21:40:42 +10:00
Oliver Walters
2369b40bbf Ensure user gets saved when uploading attachment via API 2020-05-12 21:11:38 +10:00
Oliver Walters
5d716d0cdd Add "upload date" field to fileattachment base class 2020-05-12 20:57:41 +10:00
Oliver Walters
d4fa7d936e Add 'user' field to attachment 2020-05-12 20:50:03 +10:00
Oliver Walters
0851a925fb Add ability to filter by whether the part is serialized or not 2020-05-12 20:18:28 +10:00
Oliver Walters
4615fbc0d8 Abillty to filter stock list by serial number 2020-05-12 20:15:37 +10:00
Oliver Walters
e4872d9f67 Merge remote-tracking branch 'inventree/master' 2020-05-12 09:16:04 +10:00
Oliver Walters
b9d0c60189 Pepper 2020-05-12 08:12:42 +10:00
Oliver Walters
c6cff1fb2e Fixes for StockItem tracking API 
- Make the tracking API consistent with other API endpoints
 2020-05-12 08:12:12 +10:00
Oliver Walters
ac5e26ca0e Typo fix 2020-05-12 07:07:29 +10:00
Oliver Walters
a86513e15d Merge remote-tracking branch 'inventree/master' 2020-05-12 00:29:33 +10:00
Oliver
d2a7961895
Merge pull request #795 from SchrodingersGat/attachment-api 
Attachment api
 2020-05-12 00:10:13 +10:00
Oliver Walters
3151612962 PEP fix 2020-05-12 00:07:08 +10:00
Oliver Walters
4b1d96faad Icon tweaks 2020-05-12 00:01:56 +10:00
Oliver Walters
99af98c5a7 Update iconset 2020-05-11 23:58:27 +10:00
Oliver Walters
cfc0145180 Add some unit tests 2020-05-11 23:44:22 +10:00
Oliver Walters
a7e5a79f4c Expose salesorder and purchaseorder attachments to the API 2020-05-11 23:41:57 +10:00
Oliver Walters
17d0a015f2 Add API endpoint for StockItem attachment items 2020-05-11 23:32:40 +10:00
Oliver Walters
f36c5137dd Add ability to add part file attachments via the API 2020-05-11 23:25:55 +10:00
Oliver Walters
c5999f7186 Merge remote-tracking branch 'inventree/master' 2020-05-11 23:10:29 +10:00
Oliver
f71bfb5700
Update version.py 2020-05-07 10:08:37 +10:00
Oliver
00ccfdf11b
Update version.py 2020-05-07 10:08:20 +10:00
Oliver Walters
003b384abd Slight adjustment to page tabs for StockItem view 2020-05-07 10:04:16 +10:00
Oliver Walters
ea0d32fd3d PEP fixes 2020-05-07 09:58:29 +10:00
Oliver Walters
14132a6efa Add views / models / etc etc to support StockItem attachment 2020-05-07 09:57:54 +10:00
Oliver Walters
64f6238351 Add StockItemAttachment model 2020-05-07 09:39:28 +10:00
Oliver Walters
6318b0bddf Hide a silly button which does nothing 2020-05-04 19:51:06 +10:00
Oliver Walters
0933cf859c Add "new manufacturer" button 2020-05-04 19:48:09 +10:00
Oliver Walters
bbf6f6f93d Merge remote-tracking branch 'inventree/master' 2020-05-04 12:04:02 +10:00
Oliver Walters
ec3e02af94 Table colspan fix 2020-05-04 09:52:50 +10:00
Oliver Walters
15011b7b20 Merge remote-tracking branch 'inventree/master' 2020-05-04 09:46:43 +10:00
Oliver Walters
ce610490b6 Update icon 
- Simple test to see if the travis integration is working correctly now
 2020-05-04 09:43:09 +10:00
Oliver Walters
1c3878829d Merge remote-tracking branch 'inventree/master' 2020-05-04 09:39:19 +10:00
Oliver Walters
436fb3bf30 PEP fixes 2020-05-04 08:54:16 +10:00
Oliver Walters
2c44104c9c Small tweak for login redirect 2020-05-04 08:53:47 +10:00
Oliver
461d694cf8
Merge pull request #782 from andyseracuse/redirect-after-login 
after a login redirect and a successful login, the user is now redirected to the originally desired url
 2020-05-04 08:49:13 +10:00
Oliver Walters
5a100962fe 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
 2020-05-04 08:10:14 +10:00
Oliver Walters
53149ab4dc 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
 2020-05-04 08:06:50 +10:00
Andy Seracuse
85c948ef67 made changed middleware and made necessary changes to settings and urls fles so that the user is redirected to their desired page after a login redirect unless the desired page was logout, in which case the user will be redirect 2020-05-03 14:11:57 -06:00
Christian Schlüter
0a5a1ec5fd
Update de translation 2020-05-03 11:37:51 +02:00
Oliver Walters
54c903f637 translation updates 2020-05-03 09:51:59 +10:00
Oliver Walters
7430abc237 Add ability to set stock status when receiving goods 2020-05-03 09:50:00 +10:00
Oliver Walters
fe87bba577 Link fix for purchase order table 2020-05-03 09:46:42 +10:00
Oliver
ca1b9e6403
Merge pull request #778 from SchrodingersGat/dynamic-js 
Update translations
 2020-05-03 09:29:34 +10:00
Oliver Walters
29335fa665 Add "rejected" status code for StockItem 2020-05-03 09:09:17 +10:00
Oliver Walters
275cd063e1 PEP fixes 2020-05-03 08:59:44 +10:00
Oliver Walters
88e28edba9 Script now manually adjusts the translation file 2020-05-02 23:10:18 +10:00
Oliver Walters
979cf10c66 First pass at a translation helper script 2020-05-02 22:52:32 +10:00
Oliver Walters
034f70c491 Update translations 2020-05-02 22:39:56 +10:00
Oliver Walters
d59f22febb Fix stock thing 2020-05-02 22:18:08 +10:00
Oliver Walters
af6dd83f05 Rename .js files to .html 
This is required so they are parsed by the translation engine
 2020-05-02 22:13:14 +10:00
Oliver Walters
314b8fdbff regenerate translation files 2020-05-02 22:08:25 +10:00
Oliver Walters
853ba825c0 Translation layer for bom.js 2020-05-02 22:07:24 +10:00
Oliver Walters
6c3dc2a25d Translation layer for company.js 2020-05-02 22:01:40 +10:00
Oliver Walters
2c9b76575e Add translation layer for order.js 2020-05-02 21:55:09 +10:00
Oliver Walters
23bd9afaf8 Add translation layer for build.js 2020-05-02 21:48:28 +10:00
Oliver Walters
24a816e9a2 More translations for part.js and stock.js 2020-05-02 21:43:07 +10:00
Oliver Walters
b1a642918c Add translation layer for stock.js 2020-05-02 21:36:18 +10:00
Oliver Walters
9b1e387a8b Translations for part.js 2020-05-02 21:27:45 +10:00
Oliver Walters
5160165669 Add endpoint for dynamic javascript files 2020-05-02 21:19:34 +10:00
Oliver Walters
fb0ebbb1e4 Merge remote-tracking branch 'inventree/master' 2020-05-02 21:05:00 +10:00
Oliver Walters
b1d33ef3bc Add option for sentry.io integration 2020-05-02 20:58:29 +10:00
Oliver Walters
b39283a18f Separate allocation counters 2020-05-02 20:29:20 +10:00
Oliver Walters
26f0338f1d Auto-select a purchase order when ordering parts 2020-05-02 20:25:47 +10:00
Oliver Walters
0199760e1c Bug fix 2020-05-02 20:10:12 +10:00
Oliver Walters
b89002a450 Add button to order a supplier part 2020-05-02 20:10:00 +10:00
Oliver Walters
937211288e Merge remote-tracking branch 'inventree/master' 2020-05-02 17:30:08 +10:00
Oliver
0b2c6cfd70
Merge pull request #773 from SchrodingersGat/moar-speed-fix-plz 
Reduce company list from 100 queries to 4 queries
 2020-05-02 15:41:39 +10:00
Oliver Walters
6912899f41 Merge remote-tracking branch 'inventree/master' 2020-05-02 15:37:24 +10:00
Oliver Walters
b0f4475a83 Fixes 2020-05-02 15:36:48 +10:00
Oliver Walters
094ef38e27 Merge remote-tracking branch 'inventree/master' 2020-05-02 15:29:47 +10:00
Oliver Walters
a8e3a3f1ac Reduce company list from 100 queries to 4 queries 2020-05-02 15:23:28 +10:00
Oliver Walters
6aa6e3b924 Adjust icon size in nav bar 2020-05-02 15:03:49 +10:00
Oliver Walters
24a9a1127b Update favicon 
https://www.favicon-generator.org/
 2020-05-02 14:58:07 +10:00
Oliver Walters
a51aab6dd0 Update translations 
(cherry picked from commit 032f3337cddf684839586728e47864d22a890024)
 2020-05-02 14:55:31 +10:00
Oliver Walters
b44dbba150 New logo design 
(cherry picked from commit b59e26b4629ea97e0ac8b3503cc50c59049d81c1)
 2020-05-02 14:55:27 +10:00
Oliver Walters
9b2045025b StockItem page tweaks 2020-05-02 14:05:52 +10:00
Oliver Walters
cc11df917e Part list API adjustments 2020-05-02 14:03:17 +10:00
Oliver Walters
7fca496de8 Bug fix for StockItem list API 
- The wrong detail data was being set
 2020-05-02 13:51:29 +10:00
Oliver Walters
4197e29fce Major major major (improvements for StockItem list API) 
OK LISTEN UP - Lots of work went into making this speedier:

- For related detail fields (e.g. part_detail), we pre-fetch and cache the model data
- This eliminates duplicate database hits for the same model instances
- Perform all field filtering manually, rather than using the DRF 'filter_fields' concept (this seems to add a lot of overhead)
- Use query annotations to getch calculated fields rather than fetching one-at-a-time
- And finally, if the request is AJAX then return a JsonResponse which is SO FREAKING MUCH FASTER
 2020-05-02 13:46:19 +10:00
Oliver Walters
44319d24e4 Custom list serializer for 'location_detail' 2020-05-02 10:05:35 +10:00
Oliver Walters
a537b6df6e PEP fixes 2020-05-02 09:50:18 +10:00
Oliver Walters
4a60da67fd Significant increase in query speed for Part list 
- Custom list method
- Cache PartCategory objects in memory
 2020-05-02 09:49:05 +10:00
Oliver Walters
7fff0a7427 Catch an error if git cannot be found 2020-05-01 17:02:11 +10:00
Oliver Walters
af00d88555 Bug fix for custom migration 
Ref: https://stackoverflow.com/questions/13410982/attributeerror-long-object-has-no-attribute-fetchall#13411358
 2020-05-01 15:57:10 +10:00
Oliver Walters
a345e0e8da Removed unused serializer field 2020-04-28 23:26:27 +10:00
Oliver Walters
753fab2498 Fix url links in BOM table 2020-04-28 23:23:59 +10:00
Oliver Walters
3b42b5e27e Typo fix for part api 2020-04-28 23:17:59 +10:00
Oliver Walters
087001f29d Fix BOM table rendering 
- Price was not being sent in the PartBriefSerializer!
 2020-04-28 23:17:15 +10:00
Oliver Walters
df218a5193 Fix rendering of "used in" page 2020-04-28 22:57:18 +10:00
Oliver Walters
36ad69091b Merge remote-tracking branch 'inventree/master' 2020-04-28 12:34:47 +10:00
Oliver Walters
f84636fc20 DO NOT DRINK BLEACH 2020-04-28 12:29:28 +10:00
Oliver Walters
351e825ba8 Merge remote-tracking branch 'inventree/master' 2020-04-28 10:51:55 +10:00
Oliver Walters
ee906fc6e6 Unit test fixes 2020-04-28 10:46:02 +10:00
Oliver Walters
9add3d4409 Much better rendering and calculation of part allocations 2020-04-28 10:43:46 +10:00
Oliver Walters
fb70da0331 Cleanup part allocation calculation functions 2020-04-28 10:35:19 +10:00
Oliver Walters
6bdf371490 Moar UI and translation string fixes 2020-04-28 09:41:47 +10:00
Oliver Walters
bbecc8c900 Reverse URL bug fix 2020-04-28 09:35:24 +10:00
Oliver Walters
b913971008 Add more translatable strings 2020-04-28 09:32:33 +10:00
Oliver Walters
440fe155ff Change glyphicons for fontawesome 
I think I gottem all
 2020-04-28 09:31:51 +10:00
Oliver Walters
abbd0bb16a Bug fix in supplier-part table rendering 2020-04-28 09:05:06 +10:00
Oliver Walters
5727e27ae6 Filter by 'in stock' items when auto-allocating to build 2020-04-28 08:44:10 +10:00
Oliver Walters
4fd7b24e3c Update buttons for part BOM view 2020-04-28 08:36:13 +10:00
Oliver Walters
b338834146 Merge remote-tracking branch 'inventree/master' 2020-04-27 22:18:45 +10:00
Oliver Walters
394a9208a1 Merge remote-tracking branch 'inventree/master' into sales-order 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2020-04-27 22:04:05 +10:00
Oliver Walters
79836c77ef Bumped version thing 2020-04-27 22:03:15 +10:00
Oliver Walters
db9970e5df Add some further unit tests for the Build model 2020-04-27 21:44:59 +10:00
Oliver Walters
cb3fe0fc35 Add some more unit testing for the builds 2020-04-27 21:28:44 +10:00
Oliver Walters
35f48ed899 Delete BuildItem objects once a Build has been completed 
- Much more complicated template for build allocation page!
- This will require some refactoring at some point ...
 2020-04-27 20:46:34 +10:00
Oliver Walters
489dfa1823 Bug fix for a code path which resulted in a form failing validation but not showing any errors! 
This one has been here for a while!
 2020-04-27 20:45:01 +10:00
Oliver Walters
2b99cf353a Fix for build complete form 2020-04-27 20:16:41 +10:00
Oliver Walters
646dd65d27 Re-enable auto-allocation for build 2020-04-27 20:05:02 +10:00
Oliver Walters
3685ca4b95 Add some unit testing for the SalesOrder model 2020-04-27 11:32:20 +10:00
Oliver Walters
5e309a62f7 Display "Fulfilled" items 
- Once a salesorder has been marked as "shipped" then the table is displayed differently
- The sub rows show stock items which have been fulfilled against the sales order
 2020-04-27 10:31:38 +10:00
Oliver Walters
5167117067 Calculate 'fulfilled' quantity once a sales order is marked as shipped 
- This allows us to delete the SalesOrderAllocation objects from the database
 2020-04-27 08:58:18 +10:00
Oliver Walters
3c5ba75d27 PEP fixes 2020-04-26 16:44:35 +10:00
Oliver Walters
e768ada83b More work 
- Consolidated "in_stock" filter to single code location
- Improve 'limit_choices_to' for BuildItem and SalesOrderAllocation
- Various template improvements etc
 2020-04-26 16:38:29 +10:00
Oliver Walters
4147163418 Improve status code label rendering 2020-04-26 15:29:21 +10:00
Oliver Walters
1f4bd95d75 Remove the problematic migration entirely 
- The thumbnail check code is run every time the server is started anyway!
 2020-04-26 08:50:37 +10:00
Oliver Walters
0892b160c6 "Fixes" for completing a build 
- This will require a lot of unit testing to get right
 2020-04-26 00:32:09 +10:00
Oliver Walters
72c43d0c2d Bug fix for build completion form 2020-04-25 23:59:28 +10:00
Oliver Walters
50dbebdf59 Improve rendering of BuildComplete template 2020-04-25 23:44:03 +10:00
Oliver Walters
81f789d857 Add link to parent build 2020-04-25 23:26:56 +10:00
Oliver Walters
4f0efec39f PEP and unit testing fixes 2020-04-25 23:24:00 +10:00
Oliver Walters
77361bd0a2 Update templates 2020-04-25 23:20:55 +10:00
Oliver Walters
01a68270ea Add verbose names for multiple Build model fields 
- Improve methods for different models
 2020-04-25 23:17:07 +10:00
Oliver Walters
181d1d6b91 Factor out function to calculate total allocations 2020-04-25 21:31:58 +10:00
Oliver Walters
912a3c4b99 Update progress bar based on sum of allocated quantities 2020-04-25 21:21:52 +10:00
Oliver Walters
b0891c921c Working towards better build allocation: 
- Improve data serialization in API
- Javascript bug fixes
- Load the build allocation table using jQuery
 2020-04-25 21:13:38 +10:00
Oliver Walters
c11b433d94 Make Build object into a MPTT tree model 
- Builds can have child builds
 2020-04-25 15:25:17 +10:00
Oliver Walters
2f0bbecc3d Refactored status code label generation 
- Larger style available
 2020-04-25 15:13:55 +10:00
Oliver Walters
4e40d92db7 PEP fix 2020-04-25 13:31:42 +10:00
Oliver Walters
66b6036827 Add two new "build orders" tab to the "sales order" view 2020-04-25 13:29:18 +10:00
Oliver Walters
d5f3498238 Add a "sales_order" reference to the Build model 
- If a build order is made to fulfil a sales order
- Add sales_order filtering to the Build API
- Pass initial information through to the BuildCreate view
 2020-04-25 13:15:45 +10:00
Oliver Walters
b351976ae9 Mark a SalesOrder as "shipped" 
- Option to hide non-stock items from stock list
- Update models with new feature
 2020-04-25 08:46:28 +10:00
Oliver Walters
41a4033427 Selective display of sales order ilne buttons 2020-04-24 17:18:18 +10:00
Oliver Walters
429bb688d0 Template fixes 2020-04-24 13:03:38 +10:00
Oliver Walters
9d25ed335c Rebuild the "PurchaseOrder" detail 
- Use AJAX and bootstrap-table
- Display progress bar
 2020-04-24 12:52:08 +10:00
Oliver Walters
ba1d2063af Remove some debug messages and fix PIP 2020-04-24 10:22:33 +10:00
Oliver Walters
77471cb89c Form for shipping a SalesOrder 
- Returns "False" for now
 2020-04-24 10:20:56 +10:00
Oliver Walters
b45fec221c Expose more status code data to the templates 
- Status codes are now exposed globally to every page
- Much simplified so wow
- https://stackoverflow.com/questions/3221592/how-to-pass-common-dictionary-data-to-every-page-in-django
 2020-04-24 09:27:42 +10:00
Oliver Walters
2c9b112562 PEP fixes 2020-04-23 21:48:39 +10:00
Oliver Walters
e5fa94b4f8 Add functionality to cancel a sales order 2020-04-23 21:38:40 +10:00
Oliver Walters
e384f9e94c Order date adjustment 
Sales order now has a "shipment date"
 2020-04-23 20:42:59 +10:00
Oliver Walters
435c13cf7c Separate concept of "OrderStatus" into "SalesOrderStatus" and "PurchaseOrderStatus" 2020-04-23 20:38:09 +10:00
Oliver Walters
7f020cbbf6 Enbiggen a whole lotta buttons 2020-04-23 19:41:14 +10:00
Oliver Walters
426aa9258c URL cleanup 2020-04-23 17:37:53 +10:00
Oliver Walters
5d71cf85cc Add separate 'quantity' and 'allocated' columns in sales order view 2020-04-23 16:00:09 +10:00
Oliver Walters
c9ea33e22e Fix order of javascript table events 2020-04-23 10:58:26 +10:00
Oliver Walters
d59c6711bb Update translations 2020-04-23 09:20:25 +10:00
Oliver Walters
1a0f091e0c Improve progress bar rendering 2020-04-23 09:20:18 +10:00
Oliver Walters
a803f21e0c Add buttons to create new builds or orders for sales order parts 
- Need to pre-fill the forms a bit better
 2020-04-22 23:34:27 +10:00
Oliver Walters
6112be2df0 Add forms for editing and deleting a SalesOrderAllocation item 2020-04-22 23:21:54 +10:00
Oliver Walters
2a4e903785 Add button to delete a SalesOrderLineItem 2020-04-22 22:36:55 +10:00
Oliver Walters
26d1a25f31 PEP style fixes 2020-04-22 22:24:06 +10:00
Oliver Walters
fd42149f67 More stuff 2020-04-22 22:22:22 +10:00
Oliver Walters
6ab03bd05a Add form for creating a new StockItem allocation 2020-04-22 21:26:38 +10:00
Oliver Walters
2972aec759 Cleverer rendering of sales order allocations 2020-04-22 20:26:05 +10:00
Oliver Walters
b70e79b778 Optionally add all SalesOrderAllocations to the SalesOrderLineItem serializer 2020-04-22 20:10:23 +10:00
Oliver Walters
5d1754ec32 Better display of where a StockItem is allocated 2020-04-22 17:39:59 +10:00
Oliver Walters
eb7b49784b StockItem serializer now includes the allocated quantity 2020-04-22 15:24:11 +10:00
Oliver Walters
d9698b10cc PEP fixes 2020-04-22 13:21:45 +10:00
Oliver Walters
1373425c29 Update definition for StockItemAllocation model 
- Limit foreignkey choices
- Error checking
- Check if a StockItem is over-allocated
- Fix API serialization and filtering
 2020-04-22 13:11:19 +10:00
Oliver Walters
2cb1b076f6 Create "SalesOrderAllocation" object 
- Links multiple StockItem objects to a single SalesOrderLineItem
 2020-04-22 12:12:48 +10:00
Oliver Walters
3a71a4f63a Fix for StockItem model 
- Allow sales_order_line to be blank
 2020-04-22 10:16:54 +10:00
Oliver Walters
6dd79af0b6 Expose "is_allocated" parameter on StockItem API 2020-04-22 10:11:40 +10:00
Oliver Walters
12daf15406 Update build page 2020-04-22 09:53:11 +10:00
Oliver Walters
372958d939 Migrate more pages to the two_column template 2020-04-22 09:50:10 +10:00
Oliver Walters
808a636484 Move "Company" view to new two-column template 2020-04-22 09:01:52 +10:00
Oliver Walters
79ea744280 Supplier part rendering fix 2020-04-21 22:39:47 +10:00
Oliver Walters
09ccd6c5e2 PEP style fixes 2020-04-21 22:37:35 +10:00
Oliver Walters
b75c343236 Add action buttons to the sales order page 2020-04-21 22:02:17 +10:00
Oliver Walters
15166c7797 Add a custom "id" to the progress bar 2020-04-21 21:43:04 +10:00
Oliver Walters
4979c690d9 Prevent BOM price calculation from becoming too recursive 2020-04-21 21:38:22 +10:00
Oliver Walters
cb636e000d Display a sub-list of stock items which are allocated to a SalseOrderLineItem 2020-04-21 21:38:04 +10:00