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
2,588 Commits 6 Branches 99 Tags 484 MiB
435c13cf7c
Commit Graph

2066 Commits

Author SHA1 Message Date
Oliver Walters
4db345d0c2 Perfom serialization 2019-08-28 22:47:46 +10:00
Oliver Walters
76ec44d770 Form improvements 2019-08-28 22:04:04 +10:00
Oliver Walters
15b38000d5 Improved serial number extraction 
- Check data types
- Translation for error messages
 2019-08-28 22:03:40 +10:00
Oliver Walters
6c5b09efd4 Provide initial data 2019-08-28 21:50:44 +10:00
Oliver Walters
7575a39b7f Add form / view for serializing a stock item 
- Back end doesn't do anything yet
 2019-08-28 21:46:26 +10:00
Oliver Walters
3b8f5872ac Add button to serialize stock 2019-08-28 21:21:26 +10:00
Oliver Walters
43967e302b Add ablity to serialize an existing quantity of stock 
- Do not have to serialize all the stock
- Add tests
- Add function to copy entire stock transaction history
 2019-08-28 21:12:16 +10:00
Oskar Jaskolski
8949542baf fixed response text 2019-08-28 12:53:08 +02:00
Oskar Jaskolski
0a6abd21be fixed responde text 2019-08-28 12:47:56 +02:00
Oskar Jaskolski
3c70c3a29c clean 2019-08-28 12:41:46 +02:00
Oskar Jaskolski
981884f368 test 2019-08-28 12:40:06 +02:00
Oskar Jaskolski
5dcfc20d82 test 2019-08-28 12:39:25 +02:00
Oskar Jaskolski
381e58ab1c added import 2019-08-28 12:35:00 +02:00
Oskar Jaskolski
105b93a0e3 added method allowing to remove token 2019-08-28 12:30:31 +02:00
Oliver Walters
bc03ae53bd Changes for clean of StockItem 2019-08-28 20:01:38 +10:00
Oliver Walters
88b90281f5 Do not enforce serialization when creating a stock item 2019-08-28 19:56:35 +10:00
Oliver Walters
d5ad53c788 Add docstring 2019-08-28 19:44:46 +10:00
Oliver Walters
f94be40857 Style fixes 2019-08-28 19:44:02 +10:00
Oliver Walters
586a46175d Add modals for editing or deleting part parameters 2019-08-28 19:39:47 +10:00
Oliver Walters
51e4bdd821 URL / view for editing a PartParameter 2019-08-21 13:11:19 +10:00
Oliver Walters
e77aeec2ce Change to ImportExport model admin 2019-08-20 18:04:22 +10:00
Oliver Walters
9630c90924 Add buttons to edit/delete parameters 2019-08-20 18:01:20 +10:00
Oliver Walters
307a04da58 Add View/Form for creating a new PartParameterTemplate 2019-08-20 14:33:18 +10:00
Oliver Walters
15a42878db Improved view for creating a new part parameter 
- Hide the Part input
- Reduce options based on parameters that already exist!
 2019-08-20 14:28:15 +10:00
Oliver Walters
c68c79ea43 Create view / form / URL for PartParameter creation 2019-08-20 14:14:21 +10:00
Oliver Walters
db834802e3 Add uniqueness check for PartParameterTemplate name field 
- Case insensitive
 2019-08-20 13:08:06 +10:00
Oliver Walters
a228b38e5d Fix parameter lookup 2019-08-20 13:03:36 +10:00
Oliver Walters
e6819b5396 Change model - add PartParameterTemplate 2019-08-20 13:02:00 +10:00
Oliver Walters
6393ddad53 Add param tab to Part detail view 2019-08-20 12:44:00 +10:00
Oliver Walters
0955166fae Add admin interface for PartParameter 2019-08-20 12:43:23 +10:00
Oliver Walters
1cd0051316 Add page to display part parameters 2019-08-20 12:43:12 +10:00
Oliver Walters
2f6357b136 Add PartParameter table 2019-08-20 12:31:43 +10:00
Oliver Walters
41bfdc1432 Enforce usage of sqlite3 for running tests 
- Simplifies tests by creating a database in memory
- Does not affect the user setup at all
 2019-08-15 21:57:34 +10:00
Oliver Walters
9f5325d61f PEP fixes 2019-08-15 21:50:42 +10:00
Oliver Walters
087492faf8 More build tests 2019-08-15 21:49:40 +10:00
Oliver Walters
cd05ed91aa More tests for Build API and views 2019-08-15 21:35:16 +10:00
Oliver Walters
62f007529e Bug fix in build views 
- Untested code path meant variable was not being set
 2019-08-15 21:19:59 +10:00
Oliver Walters
80771beee9 FIxtures for build testing 2019-08-15 21:16:12 +10:00
Oliver Walters
5501fecbc4 PEP 2019-08-15 19:36:03 +10:00
Oliver Walters
b8d7cefa95 Add button to delete a build (only if it has been cancelled) 2019-08-15 19:35:12 +10:00
Oliver Walters
03b7e3a815 Add view / template to delete a build 2019-08-15 19:34:55 +10:00
Oliver Walters
d9e5bfd971 Use button row rather than drop-down for build display 2019-08-15 19:26:13 +10:00
Oliver Walters
c81f8e6d87 Add 'new supplier part' button to stock item creation form 2019-08-15 13:17:33 +10:00
Oliver Walters
475c532514 Fix config template file 2019-08-14 16:56:54 +10:00
Oliver Walters
6106d33732 More span / button fixes 2019-08-14 16:40:14 +10:00
Oliver Walters
6c73649687 PEP fix 2019-08-14 16:35:26 +10:00
Oliver Walters
5963f7ed01 Deleted unused form 2019-08-14 13:54:16 +10:00
Oliver Walters
f90ffcd3db Fix buttons for BOM upload form 2019-08-14 13:35:48 +10:00
Oliver Walters
f9fa16a397 Fix remove-row button in stock-adjust form 2019-08-14 13:29:51 +10:00
Oliver Walters
335066aef6 Fix buttons for order form 2019-08-14 13:28:06 +10:00
Oliver Walters
b19472ad73 Bump version 2019-08-14 13:27:51 +10:00
Oliver Walters
0a97bc1b40 PEP fixes 2019-08-14 13:15:36 +10:00
Oliver Walters
ea669e7562 Print warnings to stderr not stdout 2019-08-14 12:13:31 +10:00
Oliver Walters
905c02d86f Copy config template to config file if it does not exist 2019-08-14 12:05:47 +10:00
Oliver Walters
b7391231aa Fixes for default config file 2019-08-14 11:43:48 +10:00
Oliver Walters
df470ca26d Tests for serial number extraction 2019-08-09 20:30:31 +10:00
Oliver Walters
a36d99b3e7 PEP fixes 2019-08-09 20:14:47 +10:00
Oliver Walters
bd61c89094 Tests for stock app views 2019-08-09 20:13:23 +10:00
Oliver Walters
e849f62a6a PEP 2019-08-08 23:50:11 +10:00
Oliver Walters
b924265c9a Some tests for views in order app 2019-08-08 23:49:35 +10:00
Oliver Walters
45d5667ccc PEP fixes 2019-08-08 23:36:32 +10:00
Oliver Walters
b872a12131 Test for making part variant 2019-08-08 23:34:32 +10:00
Oliver Walters
3a87cd866c Tests for part creation 
- Need more tests for POST action
 2019-08-08 23:32:34 +10:00
Oliver Walters
51e4a4c006 Tests for BomItem forms 2019-08-08 23:22:26 +10:00
Oliver Walters
d6f1fe74d1 Tests for PartCategory forms 2019-08-08 23:16:03 +10:00
Oliver Walters
ab3e66d578 Test for BOM download 2019-08-08 23:10:07 +10:00
Oliver Walters
f299248063 Improve testing for part export 2019-08-08 23:06:22 +10:00
Oliver Walters
21d2c434ff Test for part export view 
- Needs some more work (parts need supplier parts!)
 2019-08-08 23:04:58 +10:00
Oliver Walters
afcd411358 (partial) tests for attachment forms 2019-08-08 23:00:01 +10:00
Oliver Walters
3a9494ee69 Test for Part Editing form 2019-08-08 22:50:17 +10:00
Oliver Walters
7db97f2226 Test Part QR Code view 2019-08-08 22:45:10 +10:00
Oliver Walters
a70484caff Test PartDetail view 2019-08-08 22:45:02 +10:00
Oliver Walters
f26243af97 Tests for Part index / 2019-08-08 22:19:17 +10:00
Oliver Walters
adbc4db3d5 Remove 'set part category' button (doesn't do anything) 2019-08-07 10:11:00 +10:00
Oliver Walters
4fc2a22ba6 PEP fix 2019-08-07 10:07:30 +10:00
Oliver Walters
8904733ac0 Include part stock information 2019-08-07 10:05:12 +10:00
Oliver Walters
ab0da6aaae Include more part data in export 2019-08-07 09:55:18 +10:00
Oliver Walters
dda4569f76 Export selected parts 
- Select which parts to export in the table
- Export base information
- Include supplier part information
 2019-08-07 09:52:49 +10:00
Oliver Walters
3dca7ba353 Include supplier information in BOM 2019-08-07 09:12:53 +10:00
Oliver
ecff9b7209
Merge pull request #433 from SchrodingersGat/order-api 
Add API endpoint for purchase orders
 2019-08-02 22:37:02 +10:00
Oliver
73eada17bc
Merge pull request #432 from SchrodingersGat/tweaks 
Tweaks
 2019-08-02 21:55:02 +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
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
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
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
31e6aa6906 doc fix 2019-07-12 00:15:47 +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
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
820d8da2ef Allowed hosts and CORS hosts now moved to the config file 2019-07-10 23:25:15 +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
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
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
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
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
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
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
Oliver Walters
566b6a43da Add a simple endpoint with server information 2019-06-25 00:18:00 +10:00
Oliver Walters
d70140e256 Remove a debug message 2019-06-24 00:20:22 +10:00
Oliver Walters
071695bfe1 Moar tabs plz 2019-06-24 00:12:31 +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
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
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
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
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
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
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
Oliver Walters
b519a1981d Split tree generation off into a separate function 2019-06-17 23:44:36 +10:00
Oliver Walters
1cbbe9e7c6 Split tree generation off into a separate function 2019-06-17 23:39:43 +10:00
Oliver Walters
008a55d3d7 Squashed a bug 2019-06-17 23:02:44 +10:00
Oliver Walters
a147a704bf Pepper 2019-06-17 22:45:48 +10:00
Oliver Walters
760d08608f Minor test addition for builds 2019-06-17 22:41:44 +10:00
Oliver Walters
38ef9b2b13 Tests for helper functions 2019-06-17 22:36:17 +10:00
Oliver Walters
08358f6961 Run tests on custom validators 2019-06-17 22:18:00 +10:00
Oliver Walters
b9dc4a0c2f Further tests for order 2019-06-17 22:10:37 +10:00
Oliver Walters
9c29976511 More tests for order module 
- Also fixed some bugs along the way!
 2019-06-17 21:55:51 +10:00
Oliver Walters
0857ec61fd Add a test fixture for orders 2019-06-17 19:47:16 +10:00
Oliver Walters
78bfc0b6a8 Improve the 'creation date' for order 
- Automatically set on first save
 2019-06-17 19:44:36 +10:00
Oliver Walters
93667f942f Add button to remove line items from the 'receive' form 2019-06-15 19:47:16 +10:00
Oliver Walters
3405fb93a9 Peppy fixes 2019-06-15 19:42:09 +10:00
Oliver Walters
1290e7f289 Implement POST for receiving items 
- Create new StockItem in the correct location
 2019-06-15 19:39:57 +10:00
Oliver Walters
c7ca9a3d8f Display table of outstanding line items 2019-06-15 17:29:33 +10:00
Oliver Walters
bbd6b15089 Add a VIew for receiving purchase order 2019-06-15 17:09:25 +10:00
Oliver Walters
11d9312c45 Improve rendering of purchase order table 2019-06-15 15:33:10 +10:00
Oliver Walters
0fa8e3809e Limit PO selection to only those which are PENDING 2019-06-15 15:33:03 +10:00
Oliver Walters
ff6df9741f Perform model validation on API serializers 
If you have a class, why not subclass it?!
 2019-06-13 23:03:58 +10:00
Oliver Walters
222c9f1876 Allow quantity editing via /api/stock/ endpoint 
- Allows creation of a new StockItem with a specified quantity
 2019-06-13 22:58:02 +10:00
Oliver Walters
5aac603d63 Satisfying the frog 2019-06-13 22:43:31 +10:00
Oliver Walters
a424a805e4 Bump version string 2019-06-13 22:39:57 +10:00
Oliver Walters
1b06d86f59 Export purchase order to CSV 2019-06-13 22:38:10 +10:00
Oliver Walters
73b9881dc5 Improve table rendering for build allocation view 2019-06-13 22:18:27 +10:00
Oliver Walters
38001b5358 Peppy fixes 2019-06-13 22:16:27 +10:00
Oliver Walters
c9cddd2a19 Add ability to edit and delete a purchase order line item 2019-06-13 22:13:22 +10:00
Oliver Walters
fe5bb23d13 Add notes field to purchase order line item 2019-06-13 21:57:35 +10:00
Oliver Walters
d860336060 Add some pretty buttons to the purchase order detail table 2019-06-13 21:44:09 +10:00
Oliver Walters
a37a2120fa Add some context data to build views 2019-06-13 21:32:37 +10:00
Oliver Walters
2b74a0ed2c Don't show zero-quantity items when ordering against a build 2019-06-13 21:28:01 +10:00
Oliver Walters
771a008e84 Printable string for PurchaseOrderLineItem 2019-06-13 21:21:22 +10:00
Oliver Walters
52b7051060 Automatically add line items to an order 2019-06-13 21:17:06 +10:00
Oliver Walters
f52aa0af21 Create a new purchase order directly from the "Order Parts" form wizard 2019-06-13 20:42:09 +10:00
Oliver Walters
915395e676 Create a new supplier part directly from the order form 2019-06-13 20:35:15 +10:00
Oliver Walters
4be82a31ce Remove rows from order form 2019-06-13 20:26:53 +10:00
Oliver Walters
3bb76060d9 Extract supplier purchase order selection information 2019-06-13 20:17:36 +10:00
Oliver Walters
3f809a9001 List active purchase orders for each selected supplier 2019-06-13 19:35:38 +10:00
Oliver Walters
7049ab1d8c Collate parts by supplier and present a purchase-order form 2019-06-13 19:30:18 +10:00
Oliver Walters
2fffd874a3 Use integer ordering for part quantity 2019-06-13 19:12:34 +10:00
Oliver Walters
15432fd6b7 Handle list of parts sent back to the order-parts form 
- Eliminate parts which are zero quantity
- Display an error message when no supplier is selected
 2019-06-13 19:10:31 +10:00
Oliver Walters
c9b946655c Add some more data to Part serializer 2019-06-13 18:33:15 +10:00
Oliver Walters
a41a6c52ca Peppy fixes 2019-06-12 00:39:33 +10:00
Oliver Walters
f0796327b3 Improve display of part base page 2019-06-12 00:29:47 +10:00
Oliver Walters
b138a4bd5f Order parts directly from a build 2019-06-12 00:21:18 +10:00
Oliver Walters
74327d3094 Order from supplier 'parts list' page 2019-06-12 00:10:39 +10:00
Oliver Walters
e4f5cc8ccd Order from a part page 2019-06-12 00:04:20 +10:00
Oliver Walters
3460a48b63 Extra form info 2019-06-11 23:58:00 +10:00
Oliver Walters
1cb6c67086 Launch order dialog from the 'Parts' table 2019-06-11 23:55:20 +10:00
Oliver Walters
0ca01fb0e7 Template improvements 2019-06-11 23:47:09 +10:00
Oliver Walters
0bc8190e8c Style supplier-part selection as 'select2' 2019-06-11 23:41:15 +10:00
Oliver Walters
bc05146e72 First pass at 'order parts' fom 
- Select parts in modal form window
 2019-06-11 23:37:32 +10:00
Oliver Walters
8e82488f70 Display 'net stock' value on front page 2019-06-11 21:58:20 +10:00
Oliver Walters
50bab299c5 Add hover image to 'parts to order' table 2019-06-11 21:52:43 +10:00
Oliver Walters
d8d41c6eff PEP fixes 2019-06-10 23:08:08 +10:00
Oliver Walters
3954b33fb7 Use 'on_order' count in calculation for parts we need to order 2019-06-10 23:05:14 +10:00
Oliver Walters
04a9b1a980 Create a new purchase order from a company page 2019-06-10 22:56:34 +10:00
Oliver Walters
c132f275f5 Split display of purchase orders by company view 2019-06-10 22:43:09 +10:00
Oliver Walters
b8bcc5ce0c Separate display of open and closed purchase orders (per part) 2019-06-10 22:31:19 +10:00
Oliver Walters
228bf4e1da Business logic 2019-06-10 22:17:19 +10:00
Oliver Walters
ec669dd670 Ability to 'issue' a purchase order 2019-06-10 22:14:23 +10:00
Oliver Walters
9efdd836f4 Tweak the 'on_order' calculation 2019-06-10 21:56:50 +10:00
Oliver Walters
351c5fb7d0 Fix for 'on_order' calculation 
- Handle null results
 2019-06-07 09:54:36 +10:00
Oliver Walters
31ad31365a Calculate parts on order for a Part / SupplierPart 2019-06-07 08:37:25 +10:00
Oliver Walters
4af1f6ca9f Update a TODO comment 2019-06-06 21:56:20 +10:00
Oliver Walters
4048091c2b Prevent user from inputting a 'blank' supplier part into a line item 2019-06-06 21:55:02 +10:00
Oliver Walters
7b139a7f05 Form / view for creating a new purchase order 2019-06-06 21:39:04 +10:00
Oliver Walters
c1f3bddf45 Secondary modal for creating a new stock location when moving stock 2019-06-06 19:28:52 +10:00
Oliver Walters
ad5c6630bd Bug fix in Build.completeBuild 2019-06-06 10:43:34 +10:00
Oliver Walters
96eb4086cf Add form / view to edit purchase order details 
- Cannot edit the COMPANY if there are line items already
 2019-06-05 22:24:18 +10:00
Oliver Walters
bcc08f982b Set default ajax form template 2019-06-05 22:08:22 +10:00
Oliver Walters
eced012ece PEP fixes 2019-06-05 21:56:52 +10:00
Oliver Walters
04abe2b3d1 Display list of purchase orders against a particular supplier par 2019-06-05 21:50:11 +10:00
Oliver Walters
67248ec4dd List purchase orders for a given part 2019-06-05 21:47:22 +10:00
Oliver Walters
9b2b2841d9 Hide 'order' input 2019-06-05 21:19:41 +10:00
Oliver Walters
8aa5452dd4 Add secondary modal to create a new supplier part 2019-06-05 21:17:29 +10:00
Oliver Walters
aee1ea9e35 Limit queryset 
- Only parts from the supplier
- Exclude parts already in the order
 2019-06-05 21:13:08 +10:00
Oliver Walters
f4abfc158f Improve rendering of purchase order list 2019-06-05 21:02:51 +10:00
Oliver Walters
be6b1ae2f8 Updates for purchase order line items 
- Display list of line items
- Add a form to create a new line item
 2019-06-05 20:59:30 +10:00
Oliver Walters
e199ed2281 PEP fixes 2019-06-05 00:21:19 +10:00
Oliver Walters
c82d5482aa Add a detail view for purchase orders 2019-06-05 00:17:25 +10:00
Oliver Walters
7bca9cc7af Improve display of list of purchase orders 2019-06-05 00:02:34 +10:00
Oliver Walters
a9ba419503 Fix testing code 2019-06-05 00:00:05 +10:00
Oliver Walters
c49b8546f0 Index page for showing all purchase orders 2019-06-04 23:59:15 +10:00
Oliver Walters
4f1acddb5d Fix some build status code thingies 2019-06-04 23:42:48 +10:00
Oliver Walters
f731c45ce8 Replace other choice fields with commonized status code 2019-06-04 23:38:52 +10:00
Oliver Walters
8d70d2f28a Fix rendering of purchase order status codes 2019-06-04 23:14:57 +10:00
Oliver Walters
76a72be926 Add order status field 
- Display status field in PurchaseOrder list view
 2019-06-04 23:09:51 +10:00
Oliver Walters
da53de844a Add page for detailing company purchase orders 2019-06-04 22:39:46 +10:00
Oliver Walters
c45d8a5782 Add 'purchase orders' tab for company 2019-06-04 22:35:34 +10:00
Oliver Walters
cc2e3351ff Search for company 2019-06-04 22:34:58 +10:00
Oliver Walters
0e29f9b88c Fix related name 2019-06-04 22:26:40 +10:00
Oliver Walters
54b1ccd585 Allow blank PO description and add URL field 2019-06-04 22:26:19 +10:00
Oliver Walters
68d514d478 Limit choices for supplier in PurchaseOrder 2019-06-04 22:20:49 +10:00
Oliver Walters
d840b44f7a Create initial models for 'Order' 
- PurchaseOrder
- PurchaseOrderLineItem

(These are based on some abstract model classes)
 2019-06-04 22:19:04 +10:00
Oliver Walters
60f5160d24 Show total stock rather than taking allocation into account 2019-06-03 22:04:48 +10:00
Oliver Walters
782ad57f52 Re-enable image hovering where appropriate 2019-06-03 22:03:22 +10:00
Oliver Walters
8e0e2979b5 Rename parts tab in build view 2019-06-03 22:01:23 +10:00
Oliver Walters
68e4adda48 Simplified build allocation view 2019-06-03 21:59:15 +10:00
Oliver Walters
7a3b186a0c Fix double loading of modals.html 2019-06-03 21:51:59 +10:00
Oliver Walters
7a244f48ae Solve weird collapse bug 
- HTML is so gross
- Disable image hover seems to work...
 2019-06-03 21:35:40 +10:00
Oliver Walters
bb5ed0b9fe Fix bug for BuildItem with no part image 
- Can't request a field what don't exist
 2019-06-03 21:25:37 +10:00
Oliver Walters
219c438b82 Part name uniqueness is case insensitive 2019-06-02 20:37:59 +10:00
Oliver Walters
64d541f453 Hide result types which return no results 2019-06-02 20:28:17 +10:00
Oliver Walters
0b88953706 Form field rearrangement 2019-06-02 20:07:30 +10:00
Oliver Walters
ba26acd487 Rename some fields 
- Oops didn't think that through, gotta go through and fix the data now...
 2019-06-02 19:46:30 +10:00
Oliver Walters
fd2e2a71f9 Add search results for part-category and stock-location 2019-06-02 19:15:05 +10:00
Oliver Walters
3427f81a34 Improve part information display 
- Better terminology
 2019-06-02 14:47:40 +10:00
Oliver Walters
6e7f354a23 Add a 'LOST' status code for stockitem 2019-06-02 13:53:54 +10:00
Oliver Walters
013a85e6f7 Better dispaly of stock status 
- Send status text in JSON
- Only display status if it is not "OK"
 2019-06-02 13:53:11 +10:00
Oliver Walters
6982b2f0c2 Making PEP happy 2019-06-02 12:47:40 +10:00
Oliver Walters
802ff35cf3 Remove some now unused forms / views / etc 2019-06-02 12:45:44 +10:00
Oliver Walters
5177b7f836 Remove some defunct javascript 2019-06-02 12:24:40 +10:00
Oliver Walters
2ee35ec062 Stock counting now works 2019-06-02 12:20:26 +10:00
Oliver Walters
d365d7cc44 remove from stock now works 2019-06-02 12:15:44 +10:00
Oliver Walters
1b3ffada6d Add-stock is now working 2019-06-02 12:13:22 +10:00
Oliver Walters
8dd9034563 Remove 'destination' field if we are not moving stock 
- Allow different stock adjustment actions
 2019-06-02 12:00:39 +10:00
Oliver Walters
d1ff115f74 Simplifiy js and improve template / form 2019-06-02 11:47:21 +10:00
Oliver Walters
c7503b4f9f Consolidated form/view into single 'stock-adjust' endpoint 2019-06-02 11:37:04 +10:00
Oliver Walters
fe31205017 Stock movement now works! 2019-06-02 11:27:03 +10:00
Oliver Walters
0b54baf6db POST the stock adjustment method back as a hidden form input 2019-06-02 11:15:12 +10:00
Oliver Walters
1b7762470d catch a ValueError 2019-06-02 11:14:56 +10:00
Oliver Walters
96f6f6068e Return message on succses 2019-06-02 11:05:40 +10:00
Oliver Walters
20963f83d9 Better error reporting for quantity 2019-06-02 11:00:28 +10:00
Oliver Walters
c228a4998c Extract stock items from POST and return to form 2019-06-02 10:25:19 +10:00
Oliver Walters
e278bdbb90 Improve filtering for stock items 2019-06-02 09:14:45 +10:00
Oliver Walters
011f5a5efd Delete rows interactively from stock adjustment form 2019-06-01 22:04:03 +10:00
Oliver Walters
6a04c8cbd3 Update stock_move form template 2019-06-01 21:16:59 +10:00
Oliver Walters
8214aef0db Add template for hover_image 2019-06-01 21:13:51 +10:00
Oliver Walters
3869bc27c9 Whoops, that form was being used. 
Created a copy of the form for multiple-item-stock-movements
 2019-05-30 09:01:16 +10:00
Oliver Walters
56821abd09 CSS tweaks for modals 2019-05-29 23:13:26 +10:00
Oliver Walters
d321947026 Add stock item fields for each item passed to the form 2019-05-29 22:38:42 +10:00
Oliver Walters
0e3f74ef31 Pass list of selected stock items to the view 2019-05-29 22:24:22 +10:00
Oliver Walters
0ce6c5f7d5 Redirect non-ajax forms to / 2019-05-29 22:24:17 +10:00
Oliver Walters
2b4cb4d3e0 Beginning to move the stocktake forms server side 2019-05-29 22:24:11 +10:00
Oliver
da4f68e5a5
Merge pull request #375 from SchrodingersGat/group-stock-items 
Group stock items
 2019-05-29 01:05:57 +10:00
Oliver Walters
6a30485a4e Initial work toward fixing stock issues 2019-05-29 01:03:21 +10:00
Oliver Walters
d512232aac Readable css 2019-05-29 00:54:00 +10:00
Oliver Walters
ea03205c50 Don't need to detach and re-attach rows any more!! 2019-05-29 00:47:36 +10:00
Oliver Walters
2ccb014d9e FINALLY sorting is working well 
- Wrote a custom sorter which takes group rows into account
 2019-05-29 00:45:35 +10:00
Oliver Walters
ecde201bb0 Update to newest bootstrap-table script 2019-05-29 00:20:01 +10:00
Oliver Walters
729968e65d Better message for no stock found 2019-05-28 22:05:30 +10:00
Oliver Walters
1232a6cf17 PEP fixes 2019-05-28 22:01:52 +10:00
Oliver Walters
8c583750a2 Update the stock list API 
- Custom data serialization is MUCH faster (~400ms compared to 3s)
- Cache location queries
- Flatten related field data
- Update stock table javascript to match
 2019-05-28 21:45:27 +10:00
Oliver Walters
f7d521ca97 Reorder stock table columns 2019-05-28 19:13:46 +10:00
Oliver Walters
7ac52d4d9f Optionally select which column gets grouped 
- Allow grouping by numerical values
 2019-05-28 19:12:10 +10:00
Oliver Walters
e4acca2951 Display stock item serial number (if it exists)! 2019-05-28 18:29:12 +10:00
Oliver Walters
807798810b Color sub-group rows slightly differently 2019-05-28 18:17:16 +10:00
Oliver Walters
8255332950 Remove some debug messages 2019-05-28 18:12:47 +10:00
Oliver Walters
4011d66b6f Display sub-location information 2019-05-28 18:08:50 +10:00
Oliver Walters
7120b940f0 Pre-collapse grouped columns 2019-05-28 17:51:02 +10:00
Oliver Walters
4218cf8b45 Client-side grouping 
- Cusomizations made to bootstrap-table-group-by.js
- Group by part name
- Display total stock count per group
- Only group if there are more than 1 item in the group
- Groups send checkbox signals through appropriately!
 2019-05-28 17:21:29 +10:00
Oliver Walters
64403f824a And deltaco some code that went along with it 2019-05-27 22:46:17 +10:00
Oliver Walters
7de4ee80f1 Deltaco some dead code 2019-05-27 22:44:38 +10:00
Oliver Walters
5a9c19492b Design an aggregation filter for stock items 
- If 'aggregate=1' is sent to the stock API, aggregate the returned stock items by part and location
- Suprisingly this actually works right out of the gate
 2019-05-27 22:44:13 +10:00
Oliver Walters
a305301b95 Switch between display and edit mode for build allocations 2019-05-27 08:07:38 +10:00
Oliver Walters
4d518f4512 PEP 2019-05-26 16:05:54 +10:00
Oliver Walters
8715e29c31 Add ability to make variant from template 2019-05-26 16:00:27 +10:00
Oliver Walters
91a5a7f051 Simplify part model 
- Remove 'varian't or ''revision' field
- Part name must be unique across database
 2019-05-26 12:16:57 +10:00
Oliver Walters
1312148721 Filter parts by template or variant status (in API) 2019-05-26 11:15:41 +10:00
Oliver Walters
41eb195940 Thanks, PEP 2019-05-26 00:42:40 +10:00
Oliver Walters
e5bb6284db Add variant-of to part detail view 2019-05-26 00:41:24 +10:00
Oliver Walters
2138977b07 Include template attachments in attachment count 2019-05-26 00:39:36 +10:00
Oliver Walters
d563e873ed Change some icons 2019-05-26 00:35:52 +10:00
Oliver Walters
f3b17b2164 Add some form fields (might have to remove later) 2019-05-26 00:32:18 +10:00
Oliver Walters
21dd893c01 Display templated parts as italic in the part list 2019-05-26 00:29:17 +10:00
Oliver Walters
6603d6e9ed PEP fixes 2019-05-26 00:22:05 +10:00
Oliver Walters
75b21bdd8f Visual tweaks 2019-05-26 00:20:03 +10:00
Oliver Walters
7881a67db4 Calculate stock based on variant stock if part is a template 2019-05-26 00:01:01 +10:00
Oliver Walters
c45a506a10 Rename field part.has_variants to part.is_template 2019-05-25 23:58:31 +10:00
Oliver Walters
c3d75deb16 More 'limit_choices_to' limitations for template parts 2019-05-25 23:55:16 +10:00
Oliver Walters
9c1c008f33 Show attachments for the Template part under attachments tab 2019-05-25 23:50:24 +10:00
Oliver Walters
08ac7e2a36 Rendering tweaks 2019-05-25 23:45:26 +10:00
Oliver Walters
3d57483f0e Add a 'new varian't button 2019-05-25 23:43:06 +10:00
Oliver Walters
bbe66472ee Display list of part variants 2019-05-25 23:40:59 +10:00
Oliver Walters
39c4611598 Add a tab for part variants 2019-05-25 23:31:23 +10:00
Oliver Walters
75d38489d7 Add ability to filter stock by variants for a templated part 2019-05-25 23:26:46 +10:00
Oliver Walters
0e684071fa Display message if a part is a template or a variant 2019-05-25 23:21:38 +10:00
Oliver Walters
d70110690b Validate uniqueness for StockItems 
- If the Part is a variant of a template, ensure that the serial numbers are unique across all instances of the template
- Prevent instantiation of a StockItem for a part which has variants
 2019-05-25 23:09:04 +10:00
Oliver Walters
bc778c1451 Prevent a Part from both having variants and being a variant of something else 2019-05-25 22:43:47 +10:00
Oliver Walters
1a2fb9e170 Add 'has_variants' and 'variant_of' field for Part 
- StockItem cannot point to a part which is a template part
 2019-05-25 22:27:36 +10:00
Oliver Walters
9f4105e2e4 PEP fix 2019-05-25 22:02:36 +10:00
Oliver Walters
2760efac18 Fix similar error for Build object 2019-05-25 22:01:30 +10:00
Oliver Walters
ecfde46838 Fix error in BomItem creation 2019-05-25 21:57:59 +10:00
Oliver Walters
add601e296 Display supplier part results on search page 2019-05-24 21:34:00 +10:00
Oliver Walters
d5da93b9d0 Make supplier part list API searchable 2019-05-24 21:33:45 +10:00
Oliver
632be8f04f
Merge pull request #364 from SchrodingersGat/bom-footer 
Display total part quantity in BOM footer
 2019-05-23 23:23:52 +10:00
Oliver Walters
2bf80efc09 Display total part quantity in BOM footer 
- https://stackoverflow.com/questions/45190917/bootstrap-table-footer-functions-not-working-data-footer-formatter
 2019-05-23 23:18:35 +10:00
Oliver
aeaf4e7dc9
Merge pull request #363 from SchrodingersGat/rest-simplify 
Rest simplify
 2019-05-23 23:03:39 +10:00
Oliver Walters
c2ca5a24f8 PEP 2019-05-23 22:59:56 +10:00
Oliver Walters
5664fc5472 Detail in StockItem API now optional 2019-05-23 22:57:45 +10:00
Oliver Walters
9052ccc181 Make 'part_detail' field in SupplierPart serializer optional 2019-05-23 22:44:37 +10:00
Oliver Walters
cf5b8d0249 Optional part_detail and sub_part_detail for BOM API 
- Significant speed boost on request
- Request the relevent information at the right place
 2019-05-23 22:36:19 +10:00
Oliver Walters
d386c2a6f9 Include total stock in PartBrief serializer 2019-05-23 21:51:27 +10:00
Oliver Walters
a6f95c70aa Add detail view for Build model 2019-05-23 21:36:54 +10:00
Oliver Walters
4d35841233 Consolidate on 'pk' as the ID field in the API 2019-05-23 00:31:27 +10:00
Oliver Walters
27f956bffa Part detail rendering improvements 2019-05-22 23:27:43 +10:00
Oliver Walters
cd7bc6cce5 Include pricing information in part supplier view 
Also some CSS tweaks to secondary modal buttons
 2019-05-22 22:11:27 +10:00
Oliver Walters
d3a5661dbd Serializer fix 2019-05-21 15:42:52 +10:00
Oliver Walters
d1dfad591d Pepperoni 2019-05-21 15:38:22 +10:00
Oliver Walters
988a35d237 Serialize BOMItem pricing information 
- Account for quantity
- Prefetch required items
 2019-05-21 15:15:54 +10:00
Oliver Walters
2817e6ca31 Added further part pricing 2019-05-21 14:08:40 +10:00
Oliver Walters
cdcc4f9ca1 Simple tests for price breaks 2019-05-21 13:53:25 +10:00
Oliver Walters
6f73c379c2 Remove 'minimum' order from SupplierPart 
- This can be handled using the 'PriceBreak' set
 2019-05-21 13:51:43 +10:00
Oliver Walters
357bfdae3f Add some test fixtures for Company app 2019-05-21 13:33:05 +10:00
Oliver Walters
f19d4eec79 Improve query speed for supplierpart api 2019-05-21 08:19:16 +10:00
Oliver Walters
9d5b938ced Don't serialize 'available_stock' in PartSerializer 2019-05-21 07:57:44 +10:00
Oliver Walters
ca9d6e6e25 PEP fixes 2019-05-21 00:54:48 +10:00
Oliver Walters
49ed17db56 Add a line 2019-05-21 00:52:17 +10:00
Oliver Walters
ae865d1de1 Commit 2019-05-21 00:40:42 +10:00
Oliver Walters
4b41766312 And mode 2019-05-21 00:31:34 +10:00
Oliver Walters
72aba30e81 More hungry fetching 2019-05-21 00:16:00 +10:00
Oliver Walters
157919f47a More prefetching 
-
 2019-05-21 00:06:57 +10:00
Oliver Walters
6ae48d07c4 Cleanup pricing algorithms 2019-05-20 23:53:39 +10:00
Oliver Walters
8adb4f6c20 Further query reduction 
- Also improved query reporting middleware
 2019-05-20 23:26:27 +10:00
Oliver Walters
d15b09a5f4 Don't serialize pricing 
- Saves MANY queries and provides drastic speedup
 2019-05-20 23:03:19 +10:00
Oliver Walters
18ff80312b Fixes 2019-05-20 22:53:01 +10:00
Oliver Walters
4bde00d925 AND AGAIN 
Use --fake to force the migration
 2019-05-20 22:24:18 +10:00
Oliver Walters
ee2ddbf512 Reduce some database queries by using aggregate Sum 2019-05-20 21:47:30 +10:00
Oliver Walters
dd5de91c23 Add middleware to report response time (and number of queries) 2019-05-20 21:46:50 +10:00
Oliver Walters
70be052c74 Rebuilt migrations again (arrrrrrrrrrrrrrrrrrrrrrrrrrgh never do this) 2019-05-20 21:45:37 +10:00
Oliver Walters
34620b22b0 Add a middleware to count queries 
- https://www.dabapps.com/blog/logging-sql-queries-django-13/
 2019-05-20 18:51:57 +10:00
Oliver Walters
fc75ab7420 Reduce response time for stock list 
Initial time - 6.2s
After prefetch - 4.3s
 2019-05-20 08:44:52 +10:00
Oliver Walters
5055226490 Reduce BOM listing time to ~1.8s 2019-05-20 08:31:03 +10:00
Oliver Walters
cee1062b51 Prefetch locations - 2.6s 
However the 'total_stock' and 'available_stock' fields are still the majority of the response time
 2019-05-20 08:24:05 +10:00
Oliver Walters
6766063c8b Reducing request time for PartList API 
- Initial query time = 5.91s
- Prefetch related part categories = 3.64s
 2019-05-20 08:13:22 +10:00
Oliver Walters
73041a3fe6 Fix div-by-zero for part pricing 2019-05-20 07:53:23 +10:00
Oliver Walters
9ddedc6915 Restart migrations 
- Easier to delete all the migrations and start again :'(
 2019-05-19 00:11:41 +10:00
Oliver Walters
a8846dc515 Hopefully fix the thingy 2019-05-18 23:52:22 +10:00
Oliver Walters
a54760b219 Improve pricing display 2019-05-18 23:44:43 +10:00
Oliver Walters
ffda5a1b29 Add warning if no pricing data available 2019-05-18 23:13:18 +10:00
Oliver Walters
368193d397 Fix formatting 2019-05-18 23:09:12 +10:00
Oliver Walters
dcf79338c1 Add pop-up pricing window for part 
- Cost to purchase from suppliers
- Cost to build from BOM
 2019-05-18 23:09:08 +10:00
Oliver Walters
54ccf6c7b3 PEP 2019-05-18 23:09:04 +10:00
Oliver Walters
b64a29b897 Display build pricing information 2019-05-18 23:09:00 +10:00
Oliver Walters
2b098942b0 Fix pricing bug 
- Include BOM item pricing in API
 2019-05-18 23:08:56 +10:00
Oliver Walters
2a1fd2b03b More complex pricing calculations 
- Calculate BOM price for a part
- Calculate total pricing for a part (build or purchase)
- Display pricing information in BOM table
 2019-05-18 23:08:51 +10:00
Oliver Walters
4c82714777 Allow 5 decimal places for pricing info 2019-05-18 23:08:47 +10:00
Oliver Walters
cdc55bb5d3 PEP fixes 2019-05-18 23:08:42 +10:00
Oliver Walters
a3d1591929 Display part pricing in Part view 
- Calculate min_price and max_price based on provided supplier information
 2019-05-18 23:08:38 +10:00
Oliver Walters
0cfb243eb3 Move SupplierPart and SupplierPriceBreak to the 'Company' app 
- https://docs.djangoproject.com/en/2.2/ref/models/options/#django.db.models.Options.db_table
- https://stackoverflow.com/questions/3519143/django-how-to-specify-a-database-for-a-model
- And others, presumably
 2019-05-18 23:08:34 +10:00
Oliver Walters
5043c354b1 Set default value for SupplierPriceBreak 
Edit or Delete a SupplierPriceBreak
 2019-05-18 23:08:30 +10:00
Oliver Walters
fc3072a459 Form for creating a new price break for a supplier part 2019-05-18 23:08:25 +10:00
Oliver Walters
1163f60b23 Return price breaks in the correct order 2019-05-18 23:08:21 +10:00
Oliver Walters
a3cd54875c Update validator for supplier price break 2019-05-18 23:08:17 +10:00
Oliver Walters
92632b2ef7 PartAttachment attachment file is actually required! 2019-05-18 23:08:13 +10:00
Oliver Walters
a1461de297 Add supplierpricebreak model to the admin interface 2019-05-18 23:08:09 +10:00
Oliver Walters
613c96e093 Part attachment comment field is required 2019-05-18 23:08:04 +10:00
Oliver Walters
a2dbdfe794 Remove 'single_price' field from supplier part 
- Instead we will rely entirely on the SupplierPriceBreak model
 2019-05-18 23:07:58 +10:00
Oliver Walters
001dacc14e Display 'no stock available' warning 2019-05-18 13:24:15 +10:00
Oliver Walters
04420b7f6b Improve display of allocation page 2019-05-18 13:06:19 +10:00
Oliver Walters
a95e77c429 Pre-fill allocation count 2019-05-18 12:17:57 +10:00
Oliver Walters
34d1ef7d8d Change label size for build status 2019-05-18 09:44:16 +10:00
Oliver Walters
0ce5240361 More UI stuff for the Build page 2019-05-17 16:35:23 +10:00
Oliver Walters
a2eeb7e946 Bug fix for part/stock 
- Re-introduce the button to create a new stock item
 2019-05-17 16:35:16 +10:00
Oliver Walters
3a3662ae14 Add part image 2019-05-17 00:31:35 +10:00
Oliver Walters
489d5de9c4 UI tweaks 2019-05-17 00:23:08 +10:00
Oliver Walters
2da3a022bf Add allocation tab 2019-05-17 00:20:48 +10:00
Oliver Walters
bf987f23f3 Add 'tabbed' page set for Build app 2019-05-17 00:14:29 +10:00
Oliver Walters
b77b6d2256 Display number of supplier parts in supplier list 2019-05-16 22:29:39 +10:00
Oliver Walters
5ebc7b040a Show current quantity in stocktake form 2019-05-16 22:23:31 +10:00
Oliver Walters
117fd701cd Refactor some code 2019-05-16 22:19:49 +10:00
Oliver Walters
0a1887477c Create template for stock table 2019-05-16 22:15:44 +10:00
Oliver Walters
b8f5c8cca7 Add confirmation box to stocktake form 2019-05-16 22:12:13 +10:00
Oliver Walters
7ef448d205 PEP 2019-05-16 21:26:53 +10:00
Oliver Walters
64a82389a2 Add ability for Company model to count stock sourced from that supplier 2019-05-16 21:26:12 +10:00
Oliver Walters
1b06cd23af Add 'stock' tab for supplier page 2019-05-16 21:16:19 +10:00
Oliver Walters
c1224048ad Add ability to filter stock by supplier 2019-05-16 21:01:34 +10:00
Oliver Walters
b4df96aaee Simplify extended filters 2019-05-16 19:14:43 +10:00
Oliver Walters
e1558a7a96 Add ability to filter stock items by part category 
- Using the REST API
- Add &category=x to the query string
- Add &include_child_categories to include child categories
 2019-05-16 18:54:14 +10:00
Oliver Walters
387711a9a1 Fix help string 2019-05-16 18:08:37 +10:00
Oliver Walters
fae44c3002 Bug fix for part deep-copy 
- Don't copy an image if an image doesn't exist
 2019-05-15 09:21:31 +10:00
Oliver Walters
292e29e95e Add some more secondary modals 2019-05-15 07:50:54 +10:00
Oliver Walters
a1d587b7f4 Rename 'Company' to 'Suppliers' in front-end 2019-05-15 07:44:13 +10:00
Oliver Walters
c6331255de Fixes 2019-05-15 07:23:55 +10:00
Oliver Walters
8c92c2c2a1 Display overage values in BOM table 2019-05-15 07:23:02 +10:00
Oliver Walters
68ae38a7d7 Calculate total quantity required for a build (including overages) 2019-05-15 00:36:02 +10:00
Oliver Walters
a80c11f3ce Add function to infer default_supplier for a Part 2019-05-15 00:22:10 +10:00
Oliver Walters
f6baf5d2ae Add 'overage' field to BOM item 
- Accepts absolute or percentage numbers
- Default = blank
- Now with custom validator! (for limited time only, limit one per customer)
 2019-05-15 00:16:34 +10:00
Oliver Walters
f979edef8e Prevent double loading of stock.js 2019-05-14 23:47:15 +10:00
Oliver Walters
2e5b3bfdf9 Prevent multiple loads of part.js 2019-05-14 23:44:33 +10:00
Oliver Walters
58cc1cda77 Only load api.js once 2019-05-14 23:43:16 +10:00
Oliver Walters
0ffe2666b3 Added some missing help text 2019-05-14 23:36:22 +10:00
Oliver Walters
505b7941b1 Add link to delete a part 
- Part must first be deactivated
 2019-05-14 23:33:25 +10:00
Oliver Walters
76e6094977 Add secondary modal to BOM 2019-05-14 23:30:32 +10:00
Oliver Walters
9d50f2a6ac Toot toot all aboard the refactor tractor 
- launchModalForm now accepts a 'secondary' parameter which is a list of secondary modals to attach
 2019-05-14 23:27:45 +10:00
Oliver Walters
97c4e5acbf Add some secondary buttons to the part-create form 2019-05-14 23:19:56 +10:00
Oliver Walters
be1b458634 Upon successful creation (in a secondary modal) update the field in the primary modal 2019-05-14 23:04:49 +10:00
Oliver Walters
a316681ec8 Pass object data back to modal when creating new object 2019-05-14 23:04:00 +10:00
Oliver Walters
21c238e96a Secondary modal is slightly smaller than primary 
- So that the primary modal is still visible underneath
 2019-05-14 22:44:57 +10:00
Oliver Walters
226644e59a Open a secondary modal over the top of a primary one 2019-05-14 22:37:45 +10:00
Oliver Walters
dc3abec899 Add a secondary modal in modals.html 2019-05-14 22:30:24 +10:00
Oliver Walters
a96cd2240c Function to insert a 'create new' button into a form 
- Look for a label like <label for="id_<field>">
 2019-05-14 22:12:22 +10:00
Oliver Walters
0cc2e71843 Provide an after_render callback 
- User callback after the form data are rendered
 2019-05-14 19:00:59 +10:00
Oliver Walters
2164cac28a PEP 2019-05-14 18:32:20 +10:00
Oliver Walters
46ab6e40eb Bug fix for build allocation 
- If the part did not have an image file the template failed to render
 2019-05-14 18:31:19 +10:00
Oliver Walters
9986df2074 Add confirmation to cancel a build 2019-05-14 18:20:54 +10:00
Oliver Walters
e87f545d75 Render zero stock as 'No Stock' in BOM table 2019-05-14 18:12:17 +10:00
Oliver Walters
d1de6eb1f9 Copy across default tags when creating a new part 2019-05-14 17:32:29 +10:00
Oliver Walters
0842bd5833 Add 'default_keywords' field to a category 2019-05-14 17:30:24 +10:00
Oliver Walters
02033c2157 Add 'keywords' field to Part 
- Shows up in search results
 2019-05-14 17:23:20 +10:00
Oliver Walters
7447561f77 Fix link for part stock in BOM table 2019-05-14 17:12:06 +10:00
Oliver Walters
74c8b6768d BOM table fixes 
- Reorder columns
- Allow proper part name filtering
 2019-05-14 15:43:16 +10:00
Oliver Walters
df227a375c Allow some more chars in part names 2019-05-14 15:42:53 +10:00
Oliver Walters
ba1e24cce8 PEP 2019-05-14 13:59:10 +10:00
Oliver Walters
b996c03f61 Add a 'set password' form 2019-05-14 13:58:23 +10:00
Oliver Walters
0032ea3409 Add a form to edit basic user settings 
- First / last name
- Email address
 2019-05-14 13:33:47 +10:00
Oliver Walters
3c6d5756c5 Create a simple user settings view 2019-05-14 13:21:20 +10:00
Oliver Walters
069cebb669 PEP 2019-05-13 23:03:37 +10:00
Oliver Walters
edc2cc49c2 Fix deletion form for BuildItem 2019-05-13 23:03:32 +10:00
Oliver Walters
06e95819c9 Update form for deleting a BOM item 2019-05-13 23:00:04 +10:00
Oliver Walters
d679ee9971 Update form for deleting stock location 2019-05-13 22:58:42 +10:00
Oliver Walters
00b37b62db Updated form to delete part category 2019-05-13 22:55:40 +10:00
Oliver Walters
ffa5a25fa9 Updated form for deleting part attachments 2019-05-13 22:53:58 +10:00
Oliver Walters
fcdddf6bb6 Cleaup for delete supplier part form 2019-05-13 22:52:20 +10:00
Oliver Walters
0e0096467c Update delete form for Company objects 2019-05-13 22:50:05 +10:00
Oliver Walters
a78106526a Remove launchDeleteForm JS function 
- All should be consolidated upon launchModalForm
- StockItem delete now uses this
 2019-05-13 22:47:36 +10:00
Oliver Walters
e35a9284eb Add a generic DeleteForm and update AjaxDeleteView 2019-05-13 22:46:47 +10:00
Oliver Walters
3e4d778539 Change menu ordering 2019-05-13 21:56:39 +10:00
Oliver Walters
e1e5cde60f Renamed copyBomFrom to deepCopy 
- Allows passing of more data (in the future) e.g. tags, etc
- Performs copy of the part image
 2019-05-13 21:54:52 +10:00
Oliver Walters
00f7ece6b4 PEP fixes 2019-05-13 21:42:05 +10:00
Oliver Walters
2408318eae Add new view to duplicate a part 
- Allows 'deep_copy' (copies all BOM items for the duplicated part)
 2019-05-13 21:41:32 +10:00
Oliver
6ae185ec0e
Merge pull request #316 from SchrodingersGat/stock-bug-fix 
Fix part name display
 2019-05-13 19:00:26 +10:00
Oliver Walters
fa7555e34b Fix part name display 2019-05-13 18:56:51 +10:00
Oliver Walters
150c68e65b Bug fix 
- Turns out 'item_count' was actually used for something (that I wrote... recently...)
 2019-05-13 18:52:54 +10:00
Oliver Walters
b7d3bbd836 PEP 2019-05-13 18:46:48 +10:00
Oliver Walters
0813f8cbd5 More test coverage for Stock 2019-05-13 18:45:52 +10:00
Oliver Walters
42bbf95c42 Include the sub_part ID in the BOM hash 2019-05-13 18:09:59 +10:00
Oliver Walters
f410957d8d Refactored Stock test to use fixtures 2019-05-12 21:46:38 +10:00
Oliver Walters
25e41b3fa2 Allow null values for StockItem.updated 
- Just to make the tests run better
 2019-05-12 21:20:43 +10:00
Oliver Walters
e3a9a70678 Add a form/view/etc for BOM validation 2019-05-12 16:27:50 +10:00
Oliver Walters
c7f0d56be4 Don't display BOM hash any more! 2019-05-12 16:09:11 +10:00
Oliver Walters
d17e36b9f9 Add BOM checksum info panels to the BOM view 2019-05-12 13:24:58 +10:00
Oliver Walters
9149619f38 Make BOM tab badge red if the BOM is not validated 2019-05-12 13:12:04 +10:00
Oliver Walters
06deccca1c Rename check_bom to validate_bom 2019-05-12 13:01:41 +10:00
Oliver Walters
985986a844 New functions for Part model 
- is_bom_valid() - Tests if bom checksums match
- check_bom() function to mark the BOM as valid
 2019-05-12 12:53:56 +10:00
Oliver Walters
2431ba2a04 Add new fields to Part model 
- bom_checksum (stores checksum calculated when the BOM was checked)
- bom_checked_by (User who checked the BOM)
- bom_checked_date (When the BOM was last checked)
 2019-05-12 12:47:28 +10:00
Oliver Walters
4c3032e2f0 Add function to calculate BOM hash 
- Uses hashlib.md5
 2019-05-12 12:42:20 +10:00
Oliver Walters
82fb43e1e3 PEP 2019-05-12 12:29:16 +10:00
Oliver Walters
d5dbc1b072 Display supplier part URL in table 2019-05-12 12:20:15 +10:00
Oliver Walters
1d36ea3e2e Add a 'full_name' field for Part 
- Combines IPN | Name | Variant
- Use this to display in most views
 2019-05-12 12:16:04 +10:00
Oliver
08d743a735
Merge pull request #309 from SchrodingersGat/fuzzy-search 
Fuzzy search
 2019-05-11 18:47:48 +10:00
Oliver Walters
988670cdbf PEP 2019-05-11 18:37:34 +10:00
Oliver Walters
b3cca1d851 Improve form management when possible part matches are found 
- Display the checkbox always
- Display a warning message above the form
 2019-05-11 18:07:37 +10:00
Oliver Walters
7b4584ba2f Add some more options for modal forms 
- Ability to display info or warning panels before the form
 2019-05-11 18:06:43 +10:00
Oliver Walters
19854b4709 Improve str2bool to validate checkbox return values 
- A checked checkbox returns 'on' :|
 2019-05-11 18:06:17 +10:00
Oliver Walters
2e5b0bc961 PEP 2019-05-11 12:29:51 +10:00
Oliver Walters
84d2fce8ca Add a 'confirm_creation' input if there are possible part matches 2019-05-11 12:29:02 +10:00
Oliver Walters
d9c0d2f5e3 Update PartCreate form 
- Display list of close matches
- Invalidate form (for now)
 2019-05-11 11:55:17 +10:00
Oliver Walters
4e4ee2742b Move modal form error messages to the top 2019-05-11 11:50:00 +10:00
Oliver Walters
1b8ca34ddb Added fuzzy search function for matching against part names 2019-05-11 10:36:24 +10:00
Oliver Walters
343850c4f0 Cleanup for part.views 2019-05-11 09:51:45 +10:00
Oliver Walters
b73583be40 Make the 'quantity' field optional in the stock move API 
If not specified, the entire quantity will be moved
 2019-05-11 09:02:30 +10:00
Oliver Walters
271c684b22 Making the frog happy 2019-05-11 00:43:02 +10:00
Oliver Walters
97b9cac205 Successfully move multiple parts with partial quantities 2019-05-11 00:42:24 +10:00
Oliver Walters
306a981ca1 Allow partial-quantity move 
- Automatically split out the stock
- Move the specified quantity to the new location
 2019-05-11 00:40:37 +10:00
Oliver Walters
c376f38a8d Added function to split stock 
- Specify the quantity to move into the NEW stock item
- The left over quantity will remain in the current stock item
 2019-05-11 00:37:54 +10:00
Oliver Walters
6561a613d7 Add extra validation step 2019-05-11 00:07:21 +10:00
Oliver Walters
8d5c4c521c Pass stock move quantity through per item 2019-05-11 00:04:45 +10:00
Oliver Walters
99c0921113 Add quantity selector to 'move items' modal form 2019-05-10 23:51:26 +10:00
Oliver
9ba91a9d80
Merge pull request #299 from SchrodingersGat/part-revision 
Part revision
 2019-05-10 23:26:28 +10:00
Oliver Walters
914fe8988e Merge remote-tracking branch 'inventree/master' into part-revision 2019-05-10 23:21:56 +10:00
Oliver Walters
b4074afbad Merge remote-tracking branch 'inventree/master' into select2-search 2019-05-10 23:21:03 +10:00
Oliver Walters
31b42ac3a6 Remove comment, maybe? 2019-05-10 23:18:13 +10:00
Oliver Walters
6c394728cd Modal dropdowns now implement a partial-match search 
- SO MUCH BETTER ZOMG
- https://select2.org/searching
 2019-05-10 23:06:38 +10:00
Oliver Walters
7f1cdaf73f PEP 2019-05-10 22:52:45 +10:00
Oliver Walters
8ac180a9e3 Add validator to part name 
- Check for 'illegal' characters
- Mostly just as a test for validators!
 2019-05-10 22:52:06 +10:00
Oliver Walters
68b273aae1 Fixed some more part name displays 2019-05-10 22:18:56 +10:00
Oliver Walters
f76f1f54ae Add 'variant' field to Part model 
- Display 'long_name' which is concatenation of name and variant
 2019-05-10 22:17:13 +10:00
Oliver
164f98540d
Merge pull request #297 from SchrodingersGat/field-doc 
Field doc
 2019-05-10 20:18:51 +10:00
Oliver Walters
01778f996e PEP fixes 2019-05-10 20:12:15 +10:00
Oliver Walters
ba2f565e35 docstring improvements 
- Added Attribute docstring to all model objects
 2019-05-10 20:11:52 +10:00
Oliver Walters
763e0a991c Limit user choices in the manual part allocation form 2019-05-10 19:12:56 +10:00
Oliver Walters
bbf46c4580 Display 'take_from' location on build detail page 2019-05-10 19:07:38 +10:00
Oliver Walters
3588161632 Build.getAutoAllocations() only selects parts from the designation location 2019-05-10 19:03:45 +10:00
Oliver Walters
468322fa9d Add field 'take_from' to Build 2019-05-10 19:03:10 +10:00
Oliver
7ba5f7869a
Merge pull request #290 from SchrodingersGat/auto-allocation 
Auto allocation
 2019-05-10 08:52:21 +10:00
Oliver Walters
66b729d579 Moved 'complete build' button to the build detail page 2019-05-10 08:44:07 +10:00
Oliver Walters
932c07287b Button fixes 2019-05-10 08:38:50 +10:00
Oliver Walters
b377efbbec Replaced button text with icons 2019-05-10 08:36:08 +10:00
Oliver Walters
05f5aa27c5 Add a 'Remove build allocation' function 
- Removes all parts allocated to a given build
 2019-05-10 08:33:54 +10:00
Oliver Walters
345913bc90 Improve rendering of 'Complete Build' form 2019-05-09 23:59:39 +10:00
Oliver Walters
7835562396 Auto-allocation form now working 
- Displays a list of stock items which will be allocated
 2019-05-09 23:55:30 +10:00
Oliver
e1fbd4611f
Merge pull request #289 from SchrodingersGat/delete_on_empty 
Delete on empty
 2019-05-09 23:26:19 +10:00
Oliver
793b4f8063
Merge pull request #288 from SchrodingersGat/tree-badges 
Tree badges
 2019-05-09 23:06:32 +10:00
Oliver Walters
027e1cf130 Add ability to edit 'delete_on_deplete' field 2019-05-09 23:06:19 +10:00
Oliver Walters
ac326c135f Auto delete stock items when they are depleted 2019-05-09 23:01:32 +10:00
Oliver Walters
61351a8f8d Renamed add_transaction_note to addTransactionNote 2019-05-09 22:52:38 +10:00
Oliver Walters
897c0b5261 Send item 'pk' in tree JSON 2019-05-09 22:42:43 +10:00
Oliver Walters
92930766c6 Tree view now supports root URL link 2019-05-09 22:23:56 +10:00
Oliver Walters
d04f38c724 Improve CSS for main page 
- Breadcrumb now appears above sidenav tree
- Better margin / etc
 2019-05-09 22:23:43 +10:00
Oliver Walters
34225193fa Improve tree toggle icon 2019-05-09 21:46:11 +10:00
Oliver Walters
bff0f30b13 Save tree state 'per tree' 
- Separate save state for Part and Stock tree
 2019-05-09 21:41:44 +10:00
Oliver Walters
45223fb607 Display count badges in sidenav tree 
Uses the 'tags' parameter as according to the docs - https://github.com/jonmiles/bootstrap-treeview

- Part
- Stock
 2019-05-09 20:30:23 +10:00
Oliver
f4941d55ed
Merge pull request #285 from SchrodingersGat/hide-supplier-part 
Hide supplier_part field if the part cannot be purchased
 2019-05-09 18:46:48 +10:00
Oliver
41d237c0e4
Merge pull request #284 from SchrodingersGat/hide-fields 
Hide some fields from forms
 2019-05-09 18:43:30 +10:00
Oliver Walters
2c5bb6b126 Hide supplier_part field if the part cannot be purchased 2019-05-09 18:43:22 +10:00
Oliver
a94f4baa55
Merge pull request #283 from SchrodingersGat/can-build 
If a part has no bom items, the 'can_build' function now returns zero
 2019-05-09 18:39:06 +10:00
Oliver Walters
ef9fb5b018 Hide some fields from forms 2019-05-09 18:38:37 +10:00
Oliver
459699bcd6
Merge pull request #282 from SchrodingersGat/stock-form-fix 
Enable 'Submit' button for Move Stock form
 2019-05-09 18:36:06 +10:00
Oliver Walters
1a115104d2 If a part has no bom items, the 'can_build' function now returns zero 2019-05-09 18:35:55 +10:00
Oliver
8bf09300bb
Merge pull request #281 from SchrodingersGat/page-title 
Page title
 2019-05-09 18:33:03 +10:00
Oliver Walters
d891c8d7ea Enable 'Submit' button for Move Stock form 2019-05-09 18:32:30 +10:00
Oliver Walters
6724717346 Added title for Index and Search pages 2019-05-09 18:28:19 +10:00
Oliver Walters
40ca468b51 Added title for 'Build' app 2019-05-09 18:27:16 +10:00
Oliver Walters
ca6bd0a999 Add page title for company page 2019-05-09 18:17:28 +10:00
Oliver Walters
a067d9f4cd Add page title for Part app 2019-05-09 18:13:54 +10:00
Oliver Walters
b9b17f39d9 Override page title for Stock app 2019-05-09 18:11:13 +10:00
Oliver Walters
873bd182f0 Vertical alignment of button toolbars 2019-05-09 18:04:42 +10:00
Oliver Walters
37405f4ec8 Align navigation bar with rest of content 2019-05-09 18:01:45 +10:00
Oliver Walters
4f56abf312 Fix scaling for thumbnail icons 2019-05-09 17:49:41 +10:00
Oliver Walters
6c4b5731db Reduce padding 2019-05-09 17:49:05 +10:00
Oliver Walters
9fc6268558 Increase size of part image display 2019-05-09 17:47:38 +10:00
Oliver Walters
15cd93a773 Display company thumb in company index 2019-05-09 00:49:19 +10:00
Oliver
b41ff3c42a
Merge pull request #266 from SchrodingersGat/side-bar-improvements 
Side bar improvements
 2019-05-09 00:43:57 +10:00
Oliver
fa2bf947ab
Merge pull request #267 from SchrodingersGat/bom-img 
BOM table improvements
 2019-05-09 00:42:33 +10:00
Oliver Walters
7ac4308c22 PEP fix 2019-05-09 00:40:44 +10:00
Oliver Walters
94ad378b9d Part and company images return the 'no image found' image if they do not have an image 2019-05-09 00:39:51 +10:00
Oliver Walters
4c4df194fa BOM table improvements 
- Add part image
- Replace button text with icons
- Fix bug in BOM download
 2019-05-09 00:29:16 +10:00
Oliver
aafc4e367d
Merge pull request #265 from SchrodingersGat/help-text 
Help text
 2019-05-09 00:15:55 +10:00
Oliver Walters
cc7fb31d6d Save and recall expansion state of tree 
- Save choices to sessionStorage
 2019-05-09 00:15:43 +10:00
Oliver Walters
206720849c Reduce icon size in sidenav bar 2019-05-09 00:12:50 +10:00
Oliver Walters
f05e05664b PEP fix 2019-05-08 23:33:37 +10:00
Oliver Walters
e9c904076f Added help text for model fields 2019-05-08 23:32:57 +10:00
Oliver
82eceac604
Merge pull request #264 from SchrodingersGat/build-image-fix 
Improved part thumbnails in build allocation
 2019-05-08 23:27:53 +10:00
Oliver Walters
d971747404 Improved part thumbnails in build allocation 2019-05-08 23:03:28 +10:00
Oliver Walters
92d0af4291 Modal fixes 
- Increase width of modal dialog
- Select inputs inside modals are now 100% width
 2019-05-08 22:29:23 +10:00
Oliver Walters
8fbba6846f Display part description in stock table 2019-05-08 22:05:46 +10:00
Oliver Walters
b4b9d1514e Mark 'inactive' parts in part list table 
- Fix part display in search results page
 2019-05-08 22:03:59 +10:00
Oliver Walters
1f9aa7a8fc Display thumbnail in Part 'used_in' detail view 2019-05-08 20:26:39 +10:00
Oliver Walters
58e5b10d26 Display supplier logo in part suppliers list 
- Also add a background colour for popup image in case of transparent image file
 2019-05-08 20:23:54 +10:00
Oliver Walters
0754afd5f5 Display icons in supplier_part list 
- Bug fix for part list API query
 2019-05-08 20:16:53 +10:00
Oliver Walters
88a1df75d2 Render part image in the stock location list display 2019-05-08 19:32:00 +10:00
Oliver Walters
0058207fad Functionalize loadPartTable 2019-05-08 19:31:43 +10:00
Oliver Walters
2a66224952 Part image hover preview working in part-category-list 
- Yay for CSS!
 2019-05-08 19:15:41 +10:00
Oliver Walters
afffd06fb8 Limit choices for 'parent' field when editing StockLocation 2019-05-08 18:00:34 +10:00
Oliver Walters
fb38ddb1b3 Limit choices for 'parent' field when editing PartCategory 2019-05-08 17:57:31 +10:00
Oliver Walters
ab76525da2 Initially sort part list by 'name' 2019-05-08 15:53:03 +10:00
Oliver Walters
416b5c9820 Include part image URL in Part API 2019-05-08 15:25:28 +10:00
Oliver Walters
6a04e8b059 Allow sorting by BOM notes 2019-05-08 14:14:46 +10:00
Oliver Walters
d96989f640 Reorder BOM table 2019-05-08 13:42:20 +10:00
Oliver Walters
40d8332e7f Add 'allocated' status code to build 
- This means that parts have been taken from stock
 2019-05-08 07:48:39 +10:00
Oliver Walters
cd514bf1db Mark who a build was completed by 2019-05-07 23:39:42 +10:00
Oliver Walters
85869c07f6 Add 'allocated' column to Build detail view 2019-05-07 23:31:41 +10:00
Oliver Walters
29b94c91f3 Display part images in build allocation list 
(CSS needs some work)
 2019-05-07 23:28:46 +10:00
Oliver Walters
7101d9cb7e Add part description to build allocation table 2019-05-07 23:09:36 +10:00
Oliver Walters
7dd7b68ed6 Improve functions 2019-05-07 23:03:05 +10:00
Oliver Walters
4f84febbd1 More intelligent BuildItem allocation 
- Set initial value for quantity based on how many parts are left to allocate
- Auto select the StockItem to take from (if there is only one)
 2019-05-07 22:46:37 +10:00
Oliver Walters
e58bed41b0 Visual style improvements 2019-05-07 21:24:09 +10:00
Oliver Walters
7e81d9021f Auto-show the active build table 2019-05-07 21:24:09 +10:00
Oliver Walters
c10ddab30c Improve display of Build index 2019-05-07 21:24:09 +10:00
Oliver Walters
ff14b0b363 Ensure that a StockItem is not already allocated to a Build 2019-05-07 21:24:09 +10:00
Oliver Walters
7c70b31af4 Build no longer auto-allocates on creation 
- Provide 'auto allocation' function which can be run by the user
 2019-05-07 21:24:09 +10:00
Oliver Walters
6ac3f58e97 Added favicon 
generated using https://www.favicon-generator.org/
 2019-05-07 20:24:27 +10:00
Oliver Walters
9a6cf259a6 PEP fixes 2019-05-07 14:48:35 +10:00
Oliver Walters
dcbd5d819c Enable DnD for Company image 
- Can actually use the existing form to do partial upload!
- Generecise the drag-and-drop upload function
- Remove some (now unnecessary) Python View code
 2019-05-07 14:47:31 +10:00
Oliver Walters
1cff778a29 Added extra CORS options 
- Allows AJAX requests from external sites
- If DEBUG mode is enabled, all CORS requests are allowed
 2019-05-07 10:24:39 +10:00
Oliver
b222897358
Merge pull request #250 from SchrodingersGat/tweaks 
Some tweaks
 2019-05-07 08:13:44 +10:00
Oliver Walters
983804fa1f PEP fix 2019-05-07 08:11:19 +10:00
Oliver Walters
0969edc431 Some tweaks 
- Add (unused) function to download an external file
- JS tweaks
 2019-05-07 08:07:33 +10:00
Oliver Walters
a03027ec9b Add makefile option for quick backup 2019-05-07 07:46:29 +10:00
Oliver
e0b4a59258
Merge pull request #247 from SchrodingersGat/drag-n-drop 
Drag n drop
 2019-05-07 00:18:37 +10:00
Oliver Walters
22ff085b15 PEP fixes 2019-05-07 00:11:27 +10:00
Oliver Walters
fe4acd48a7 Add the ability to extract image URL information when drag-and-dropping image URL from a browser window 
- Can't do anything with it yet...
- Code is almost there but leaving for now
 2019-05-07 00:04:35 +10:00
Oliver Walters
3c7238f29c Extract img URL from a drag-and-dropped image from another website 
- https://stackoverflow.com/a/19268449
 2019-05-06 22:34:38 +10:00
Oliver Walters
bb702367b6 Test that uploaded image is an image file, return error otherwise 
- New javascript function inventreeFileUpload
 2019-05-06 22:20:06 +10:00
Oliver Walters
c88149b9aa POST image data to View 
- https://developer.mozilla.org/en-US/docs/Web/API/FormData/Using_FormData_Objects
- https://stackoverflow.com/questions/25390598/append-called-on-an-object-that-does-not-implement-interface-formdata#25390646
 2019-05-06 21:49:01 +10:00
Oliver Walters
eec0fc34d2 Provide function callback when file is dropped 
- https://stackoverflow.com/questions/6756583/prevent-browser-from-loading-a-drag-and-dropped-file
-
 2019-05-06 21:28:49 +10:00
Oliver Walters
dca26b5810 Change the display of the part thumbnail when dragging a file overhead 
Refs:
- https://stackoverflow.com/questions/26756176/jquery-dragenter-or-dragover-to-include-children#26777526
- https://stackoverflow.com/questions/10867506/dragleave-of-parent-element-fires-when-dragging-over-children-elements

Thanks, StackOverflow!
 2019-05-06 19:21:14 +10:00
Oliver Walters
abb8930702 Limit SupplierPart choices in EditStockItem view 2019-05-06 18:06:06 +10:00
Oliver Walters
02bd9c2d05 Search part by IPN 2019-05-06 11:23:55 +10:00
Oliver Walters
b9e5afa768 PEP 2019-05-05 22:35:39 +10:00
Oliver Walters
9bbcc35959 Builds can only be made for active parts 2019-05-05 22:34:14 +10:00
Oliver Walters
b85a4d0895 Limit choices for BomItem Part foreignkey fields 
- Only allow 'active' Parts
 2019-05-05 22:34:00 +10:00
Oliver Walters
726109457c Add icon to navbar dropdown 2019-05-05 11:51:35 +10:00