inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-24 23:53:08 +00:00
Code Activity
1,575 Commits 8 Branches 164 Tags
b77bfc74eae6f08110e3b43d096496f40d4ded19
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters b77bfc74ea Pass column and index data through to each cell in the template 
Allows for much more intelligent template rendering
 2019-07-07 09:50:59 +10:00
Oliver Walters 0e95fb773f Column adjustments 2019-07-07 08:48:42 +10:00
Oliver Walters b1bcb0d3d2 Extract quantity data from BOM 2019-07-03 21:45:56 +10:00
Oliver Walters fa90c92a2a Redirect to step 3 2019-07-03 21:19:31 +10:00
Oliver Walters 064431e94f Fix template to display list of missing BOM columns 2019-07-03 20:14:13 +10:00
Oliver Walters 29a27ce598 Improve rendering for field selection form 2019-07-03 20:08:49 +10:00
Oliver Walters c419207420 Insert a blank <td> as needed 2019-07-02 19:48:30 +10:00
Oliver Walters a25522746e Reposition buttons 2019-07-02 19:46:39 +10:00
Oliver Walters c959e8f62c Add ability to remove individual rows from BOM uploader 2019-07-02 19:45:26 +10:00
Oliver Walters fc5682f565 Form is now fully transferred to a formview 2019-07-02 19:20:45 +10:00
Oliver Walters 4008a9fb45 Upload the selected BOM file 2019-07-02 19:07:59 +10:00
Oliver Walters 802255c62d Render GET as a formview rather than ajaxview 2019-07-02 19:02:19 +10:00
Oliver Walters 3c44fcaf5b moving towards implementing bom upload as a page form rather than a modal form 2019-07-02 18:43:26 +10:00
Oliver Walters a23595c28d Improve data importing 
- Automatically prune empty rows
- prevent automatic conversion of integers to floats
 2019-06-29 19:56:04 +10:00
Oliver Walters b089a61f74 Improve rendering a bit 2019-06-29 19:48:15 +10:00
Oliver Walters ad27d912e1 Add some optional upload fields 
(These will come in handy later)
 2019-06-28 20:48:23 +10:00
Oliver Walters cfbfc6e258 Delete columns in-place using javascript 2019-06-28 20:41:45 +10:00
Oliver Walters 3c2f3c2c2c Add option to delete columns 2019-06-28 20:24:18 +10:00
Oliver Walters 54762713f3 Pass row data back through again 2019-06-28 20:21:21 +10:00
Oliver Walters fd8ed44833 Detect duplicate columns, and missing columns 2019-06-28 20:16:17 +10:00
Oliver Walters 857a214e7d Pass the form field data back to the server 2019-06-28 19:58:56 +10:00
Oliver Walters 58336482fe POST the data back again 2019-06-28 19:48:22 +10:00
Oliver Walters fb96651c15 Render column selection options 
- Guess which header is which
 2019-06-28 19:40:27 +10:00
Oliver Walters 60050e9f32 Don't restrict BomItem form to active parts for editing 2019-06-28 10:20:37 +10:00
Oliver Walters b6a6e2dae7 Change the manner in which active parts are filtered for BOM 
- Prevented BOM from displaying for an inactive part
- Now manually filter the queryset in the form view
 2019-06-28 10:00:23 +10:00
Oliver Walters ed2461adf1 Show which variants are inactive in the variant table 2019-06-28 09:43:50 +10:00
Oliver Walters 047d2f2f4c Include part revision in stock API / table 2019-06-28 09:35:29 +10:00
Oliver Walters 67b53d9983 PEP 2019-06-28 00:15:23 +10:00
Oliver Walters 872329c340 Fix BOM validation button 2019-06-28 00:10:24 +10:00
Oliver Walters 808d332bda Show BomItem reference field in BOM table 2019-06-27 23:57:21 +10:00
Oliver Walters 4648db6ce5 Pass file data through to the next form page 2019-06-27 23:49:01 +10:00
Oliver Walters a9396f4c74 Fix uggo buttons 2019-06-27 23:13:12 +10:00
Oliver Walters 6af51c5b35 Limit the number of lines returned in row_count 2019-06-27 23:11:54 +10:00
Oliver Walters c4944268f3 Count the number of rows in the BOM file 2019-06-27 23:09:06 +10:00
Oliver Walters 9813205419 Perform 'matching' on imported field names 2019-06-27 22:57:55 +10:00
Oliver Walters 45d16f2c42 Create new file bom.py for BOM helper functions 
- New class for managing BOM upload
 2019-06-27 22:46:11 +10:00
Oliver Walters 65c7454124 Require certain headers to be present in the file 2019-06-27 22:16:24 +10:00
Oliver Walters 2831ac55c4 Link to download a BOM template file 2019-06-27 22:15:58 +10:00
Oliver Walters 3085db44af Add 'reference' field to BOM item model 2019-06-27 21:44:40 +10:00
Oliver Walters 72486448b8 Fix form title 2019-06-27 21:17:33 +10:00
Oliver Walters 686a61fba9 Hide checkboxes when BOM is not being edited 2019-06-27 21:09:33 +10:00
Oliver Walters 86695cf2bb Validate uploaded BOM file with tablib 
- Check to see if a bom_file file object was uploaded
- Pass off to the BOM file validity checker
- Only a valid tabulated dataset will be accepted
 2019-06-27 21:09:33 +10:00
Oliver Walters 8b207d0d1d Initial work towards uploading a BOM file 
- Create a form with a single FileField
 2019-06-27 21:09:33 +10:00
Oliver Walters 2dc43f0cf1 no message 2019-06-27 21:08:49 +10:00
OliverandGitHub 9176792fa0 Merge pull request #410 from SchrodingersGat/set-category 
Set category
 2019-06-25 19:25:10 +10:00
Oliver Walters cbfb6bd24c no message 2019-06-25 19:16:24 +10:00
Oliver Walters d6fcf85cd2 Set part category for multiple parts at once 2019-06-25 19:15:39 +10:00
OliverandGitHub ea44f28bc7 Merge pull request #409 from SchrodingersGat/info-endpoint 
Add a simple endpoint with server information
 2019-06-25 00:41:01 +10:00
Oliver Walters 566b6a43da Add a simple endpoint with server information 2019-06-25 00:18:00 +10:00
OliverandGitHub a1daea77e1 Merge pull request #408 from SchrodingersGat/token-auth 
Remove a debug message
 2019-06-24 00:30:47 +10:00
Oliver Walters d70140e256 Remove a debug message 2019-06-24 00:20:22 +10:00
OliverandGitHub 1e661f3884 Merge pull request #407 from SchrodingersGat/token-auth 
Token auth
 2019-06-24 00:18:56 +10:00
Oliver Walters 071695bfe1 Moar tabs plz 2019-06-24 00:12:31 +10:00
Oliver Walters 5567339e7a no message 2019-06-24 00:06:41 +10:00
Oliver Walters faf2fd408f PEP fix 2019-06-24 00:01:34 +10:00
Oliver Walters 881adb9487 Add API endpoint for user to request auth token 2019-06-23 23:47:06 +10:00
Oliver Walters e91eac0c66 Include PK in user serializer 2019-06-23 22:44:57 +10:00
OliverandGitHub cb41236738 Merge pull request #406 from SchrodingersGat/yet-more-buttons 
Yet more buttons
 2019-06-20 21:49:02 +10:00
Oliver Walters a5306ec81b Add 'revision' field to part 
- e.g. different versions of a product
- Can keep old versions in database and mark as inactive
 2019-06-20 21:46:16 +10:00
Oliver Walters 8328e7e13c Improve uniqueness checking for Part 2019-06-20 21:37:25 +10:00
Oliver Walters b71d5b474a Fix BOM edit bug 2019-06-20 21:31:23 +10:00
Oliver Walters d5119e1aff Replace some cog icons 2019-06-20 21:28:00 +10:00
OliverandGitHub 7a2dbce282 Merge pull request #405 from SchrodingersGat/yet-more-buttons 
Yet more buttons
 2019-06-19 19:40:31 +10:00
Oliver Walters 5ab3c386bb Buttons for purchase order table 2019-06-19 19:09:31 +10:00
Oliver Walters d07d815cb2 Buttons for BOM editing table 2019-06-19 19:07:18 +10:00
Oliver Walters 6e1b7bf3f0 Fix buttons in attachment table 2019-06-19 19:05:18 +10:00
Oliver Walters d837a1f9a2 Buttonize the part category page 2019-06-19 18:54:32 +10:00
Oliver Walters 1fc39d56df Add 'new stock location' button to top-level locatino 2019-06-19 18:50:05 +10:00
Oliver Walters fefbcf2ed9 Clean up buttons for stock location 2019-06-19 18:49:05 +10:00
OliverandGitHub 21479e39d9 Merge pull request #404 from SchrodingersGat/stock-item-buttons 
Added pretty buttons to stock item page
 2019-06-19 08:11:51 +10:00
Oliver Walters 05a5ab222d Some more changes 2019-06-19 08:09:05 +10:00
Oliver Walters 776ca7db12 Visual style for build 2019-06-19 08:03:39 +10:00
Oliver Walters afcbd73026 Consolidate visual style for "Part" tabs 2019-06-19 07:58:14 +10:00
Oliver Walters 3e6cdb15be Clean up display of company pages 
- Add some more buttons
- visual style consolidation
 2019-06-19 07:48:05 +10:00
Oliver Walters 7effe3af9d Add buttons to company page 2019-06-19 00:01:30 +10:00
Oliver Walters c0e66dd9a0 Added pretty buttons to stock item page 2019-06-18 23:56:00 +10:00
OliverandGitHub b4833fbb7d Merge pull request #402 from SchrodingersGat/buttons 
Buttons
 2019-06-18 23:26:13 +10:00
Oliver Walters fe4bc15c8e Improved button layout for purchase order page 2019-06-18 23:18:48 +10:00
Oliver Walters 3dddb10f5d Pretty toggle buttons in modal forms 2019-06-18 23:12:13 +10:00
Oliver Walters 0285d3ee83 Improved button mechanics 2019-06-18 22:54:32 +10:00
Oliver Walters 8842d50c72 Replace a whole bunch o' drop-down options with pretty buttons 2019-06-18 22:49:43 +10:00
OliverandGitHub 8bc60f5339 Merge pull request #401 from SchrodingersGat/virtual-parts 
Visual Niceness
 2019-06-18 22:26:28 +10:00
Oliver Walters ee5722857f Re-add 'new stock item' button 2019-06-18 22:13:54 +10:00
Oliver Walters 3349d0c0df Remove part 'type' fields from form 
These are now presented as virtual buttons
 2019-06-18 21:43:51 +10:00
Oliver Walters 1d67b4cdaa Sliders now update the part options via AJAX 2019-06-18 19:24:10 +10:00
Oliver Walters 65a8a30f87 Many improves of the slidies 2019-06-18 19:05:09 +10:00
Oliver Walters 783b8964d1 Add 'slide' for part type 2019-06-18 18:49:52 +10:00
Oliver Walters b1c1015778 Add bootstrap-toggle 2019-06-18 18:38:03 +10:00
Oliver Walters c9c851bead Add 'virtual' part flag 2019-06-18 18:34:07 +10:00
OliverandGitHub f114192264 Merge pull request #400 from SchrodingersGat/python-api-doc 
Added some docs
 2019-06-18 08:39:34 +10:00
OliverandGitHub 03cd8a1e15 Merge pull request #399 from SchrodingersGat/tree-speed 
Tree speed
 2019-06-18 01:50:17 +10:00
Oliver Walters 2768a7cdf3 Added some docs 2019-06-18 01:49:07 +10:00
Oliver Walters a47be24410 Fixed test cases 2019-06-18 01:38:43 +10:00
Oliver Walters ea0da4c8f8 PEP 2019-06-18 01:32:29 +10:00
Oliver Walters 79cd05423c Custom aggregation of Part API 
- Reduced full part query from 2.5s to 200ms!
 2019-06-18 01:31:30 +10:00
Oliver Walters 37dba91b4a Add 'include self' option to getUniqueChildren 2019-06-18 01:02:56 +10:00
Oliver Walters 16b6ae8d61 Fixed up some stupid recursion on the Tree model template 2019-06-18 00:59:54 +10:00
Oliver Walters 642660d76e Improved speed of stock tree 2019-06-18 00:09:42 +10:00
Oliver Walters a796b984ff Merge branch 'tree-speed' of https://github.com/SchrodingersGat/InvenTree into tree-speed 
# Conflicts:
#	InvenTree/InvenTree/views.py
 2019-06-17 23:55:21 +10:00
Oliver Walters 037dc6a0d6 Reduced tree time with some better queries 2019-06-17 23:52:49 +10:00