inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-02 19:52:59 +00:00
Code Activity
1,619 Commits 7 Branches 165 Tags
04efa2ece88789df4105b5d2ecbeccb81bc157f9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 04efa2ece8 Add simple deployment documentation 2019-07-12 00:14:40 +10:00
Oliver Walters d0e1dc52f8 Example gunicorn conf file 2019-07-11 23:57:07 +10:00
Oliver Walters df6db38535 Move static files into the app directory 
- As it is written
- Look where properly reading the docs gets you!
- manage.py collectstatic now actually works...
 2019-07-11 23:47:46 +10:00
Oliver Walters 07c95f2032 Doc tweaks 2019-07-11 23:15:24 +10:00
Oliver Walters 23d19d6784 Remove old debug messages 2019-07-11 23:07:52 +10:00
Oliver Walters 377b2f94ce Remove unused io module 2019-07-10 23:54:33 +10:00
Oliver Walters ee223e5649 Location of static files is also configurable 2019-07-10 23:48:33 +10:00
Oliver Walters 194c15492f MEDIA_ROOT is now provided in config.yaml 2019-07-10 23:41:33 +10:00
Oliver Walters e231de6951 Documentation for allowed hosts / CORS headers 2019-07-10 23:33:46 +10:00
Oliver Walters 820d8da2ef Allowed hosts and CORS hosts now moved to the config file 2019-07-10 23:25:15 +10:00
Oliver Walters b941a4115f Documentation for settings file 2019-07-10 23:11:41 +10:00
Oliver Walters f36757c87b Load database settings from config.yaml file 
- Provide an initial config file
 2019-07-10 23:11:13 +10:00
OliverandGitHub 1f9e6f4a68 Merge pull request #411 from SchrodingersGat/bom-upload 
BOM upload
 2019-07-10 15:17:58 +10:00
Oliver Walters 3e9288b26d Better display of stock availability 2019-07-10 14:50:21 +10:00
Oliver Walters d6750652f0 Python styling fixes 2019-07-10 13:38:14 +10:00
Oliver Walters c5e17070fb Reference and note fields cannot be None 2019-07-10 13:30:51 +10:00
Oliver Walters 8637d46981 Display inactive parts in part used_in view 2019-07-10 13:18:07 +10:00
Oliver Walters 322710d603 Handle dimension error in tablib 2019-07-10 13:04:47 +10:00
Oliver Walters 482a5dae4b Save the selected BOM data 2019-07-10 12:27:19 +10:00
Oliver Walters c2dbc37f70 Display rows that contain errors with a reddish background 2019-07-10 12:04:24 +10:00
Oliver Walters 2e3676207e Reference and notes fields now persist too 2019-07-10 09:40:04 +10:00
Oliver Walters 99dee64f79 Pass part selection back-and-forwards between client/server 2019-07-10 09:22:38 +10:00
Oliver Walters 782d740323 Pass row quantity back to the server 2019-07-09 19:45:36 +10:00
Oliver Walters e9eb814990 Rendering for part selection step 2019-07-09 19:21:54 +10:00
OliverandGitHub 70c68c02bf Merge pull request #423 from SchrodingersGat/supplier-part-buttons 
Fix buttons and rendering for supplierpart page
 2019-07-08 20:14:22 +10:00
Oliver Walters 6e22ee86ba Run with python 3.7 also 2019-07-08 19:24:46 +10:00
Oliver Walters cb5734db1a Require python 3.6 
- To get travis to work
 2019-07-08 19:23:30 +10:00
Oliver Walters 20ec36d3ea Enforce authentication for API access 2019-07-08 19:20:00 +10:00
Oliver Walters 16e1be61f5 Fix buttons and rendering for supplierpart page 2019-07-08 19:15:20 +10:00
OliverandGitHub 328f7887e8 Merge pull request #420 from SchrodingersGat/apidoc-fix 
Catch case in which a request.GET is not available
 2019-07-08 09:45:08 +10:00
Oliver Walters b185abbb87 Catch case in which a request.GET is not available 
(cherry picked from commit 9296c0ba0f8c4914cd04b820c6172f8c3a794750)
 2019-07-08 09:41:20 +10:00
Oliver Walters dff8d1fb95 Supply part name for auto-fill when creating a new part 2019-07-08 09:33:44 +10:00
Oliver Walters 85e803f345 Create a new part directly from the BOM view 
- Pass data through to the part creation
- Populate the new part into the select dropdown
-
 2019-07-07 13:06:59 +10:00
Oliver Walters ff5af8f217 Add a button to create a new part if necessary 2019-07-07 11:56:44 +10:00
Oliver Walters a6da3ed4a4 Match each part to the list of available parts 
- Order selections based on "best" match
 2019-07-07 11:44:17 +10:00
Oliver Walters f251620917 select2ify part selection 2019-07-07 11:24:40 +10:00
Oliver Walters bd30ac037b Generate a list of allowed BOM items and pass to the form template 2019-07-07 11:22:01 +10:00
Oliver Walters 3930651c59 Make Reference and Notes fields editable 2019-07-07 09:57:23 +10:00
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
OliverandGitHub 5d2c96b96f Merge pull request #417 from inventree/dependabot/pip/django-2.2.3 
Bump django from 2.2.2 to 2.2.3
 2019-07-04 08:49:31 +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
OliverandGitHub cf02cb9c28 Merge pull request #416 from SchrodingersGat/no-postgresql 
Comment out postgres requirement
 2019-07-02 18:47:30 +10:00
OliverandGitHub 986691e6c6 Merge pull request #414 from diegoherranz/python3-typo 
doc: python3 instead of python
 2019-07-02 18:46:42 +10:00
Oliver Walters 4f5b87dd38 Comment out postgres requirement 2019-07-02 18:44:49 +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