inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-21 22:23:03 +00:00
Code Activity
1,769 Commits 10 Branches 164 Tags
84ea95181da3995ed0f71201db6ee2b20e234de5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 84ea95181d Merge remote-tracking branch 'inventree/master' 2019-08-02 22:37:26 +10:00
OliverandGitHub ecff9b7209 Merge pull request #433 from SchrodingersGat/order-api 
Add API endpoint for purchase orders
 2019-08-02 22:37:02 +10:00
Oliver Walters 76ed23852a Fix the travis script to prevent requesting user input 
(cherry picked from commit 9253ee2c9a)
 2019-08-02 22:32:21 +10:00
OliverandGitHub 73eada17bc Merge pull request #432 from SchrodingersGat/tweaks 
Tweaks
 2019-08-02 21:55:02 +10:00
Oliver Walters 9253ee2c9a Fix the travis script to prevent requesting user input 2019-08-02 21:51:24 +10:00
Oliver Walters b5f2c9d311 Add API endpoint for purchase orders 
- List and create purchase orders
- List and create purchase order line items
 2019-08-02 21:46:26 +10:00
OliverandGitHub 8bfbb8dfbb Merge pull request #430 from diegoherranz/phony 
Makefile: add .PHONY targets
 2019-08-02 20:11:32 +10:00
Oliver Walters e66fd956f9 Fix available stock display 2019-08-02 15:13:47 +10:00
Oliver Walters 0a328687a5 BOM hash includes reference fields 2019-08-02 11:11:28 +10:00
OliverandGitHub b18cfc3794 Merge pull request #428 from SchrodingersGat/install-fixes 
Update installation routine and docs
 2019-08-01 20:10:33 +10:00
Oliver Walters 5ee07eae7c Update installation routine and docs 
- Single call of "make install" does everything
- Add backup_dir option to yaml config file
 2019-08-01 20:07:06 +10:00
Oliver Walters c8bf20ad41 Add part hover image 2019-07-25 11:08:22 +10:00
Oliver Walters fe7392f152 Prevent stock adjustments for serialized stock items 2019-07-25 11:05:09 +10:00
Oliver Walters 94c0102742 Improve validation logic for StockItem 
- Allow tracked items to exist without a serial number (e.g. non-serialized tracked items)
 2019-07-25 11:04:45 +10:00
Oliver Walters 42e1370e92 Bug fix 2019-07-25 10:36:59 +10:00
Oliver Walters 3058b895dd Prevent auto-delete of stock items which have a serial number 2019-07-24 20:24:12 +10:00
Oliver Walters 33fe4d186d Include more fields when splitting stock 2019-07-24 19:48:37 +10:00
Oliver Walters 163f076565 Merge remote-tracking branch 'inventree/master' 2019-07-23 12:07:13 +10:00
OliverandGitHub e55d59ebf1 Merge pull request #425 from SchrodingersGat/tracking 
Improvements to stock tracking information
 2019-07-23 12:06:46 +10:00
Oliver Walters 077ad9482e Fix display of part trackable status info 2019-07-23 11:57:33 +10:00
Oliver Walters a42371598c Fix part deletion template 
- Display list of stock items which will be thusly deleted
 2019-07-23 11:55:51 +10:00
Oliver Walters b546b5e0cc Create separate entries for each unique serial number 2019-07-23 11:45:03 +10:00
Oliver Walters d82d8f5cd1 Re-implement item saving for non-tracked parts 2019-07-23 11:31:29 +10:00
Oliver Walters 9e5eadd6c3 Set serial numbers when creating a new stock item 2019-07-23 10:31:34 +10:00
Oliver Walters 23d03d6b9b Build completion now handles unique serial numbers 
Provide a method to test if a serial number matches for a given part
 2019-07-22 15:55:36 +10:00
Oliver Walters 9a8e4d25d2 Input serial numbers when creating a new build 2019-07-22 13:45:09 +10:00
Oliver Walters 44c9683d48 Extract serial numbers from a simple input string 
- Individual numbers can be separated by comma or whitespace
- Provide a series of numbers with hyphen-separation
 2019-07-22 13:43:39 +10:00
Oliver Walters 8ca14efa53 Delete stock tracking entries 2019-07-22 10:46:42 +10:00
Oliver Walters 118a6887bc Edit stock tracking entry 2019-07-22 10:36:39 +10:00
Oliver Walters 0305d2f865 Improve rendering of stock tracking table 
- Date only (no time)
- Display URL if set
- Edit/Delete buttons for manually created entries
 2019-07-22 10:30:53 +10:00
Oliver Walters c27e8e809a Endpoint for editing a stock tracking entry 2019-07-18 08:55:57 +10:00
Oliver Walters bb799d98be Add ability to create new stock tracking note for a stock item 2019-07-16 00:10:24 +10:00
Oliver Walters 310d4b5f07 Added descriptive help text 2019-07-15 23:53:25 +10:00
Oliver Walters d800ed715e Add (optional) URL to stock tracking info 2019-07-15 22:33:00 +10:00
Oliver Walters c9bee19b8a Remove thingy 2019-07-15 19:26:41 +10:00
Oliver Walters 7d2d6a79e4 Merge remote-tracking branch 'inventree/master' 2019-07-12 00:20:54 +10:00
OliverandGitHub 20037a6edb Merge pull request #424 from SchrodingersGat/dev 
Working towards deployment
 2019-07-12 00:20:11 +10:00
Oliver Walters 31e6aa6906 doc fix 2019-07-12 00:15:47 +10:00
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
Oliver Walters 40695b3288 Merge remote-tracking branch 'inventree/master' 2019-07-10 20:13:35 +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