2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-11 01:25:40 +00:00
Commit Graph

12499 Commits

Author SHA1 Message Date
8a6932e993 Improve QR code display
- Pretty little glyphicon button!
2019-05-05 08:39:16 +10:00
d218f07940 Merge remote-tracking branch 'inventree/master' 2019-05-05 01:07:35 +10:00
e63ae5e92f Merge pull request from SchrodingersGat/fixes
Fixes
2019-05-05 01:07:18 +10:00
a66bc2fe72 Reload after adjusting Part attachments 2019-05-05 00:53:42 +10:00
ecb8e71d75 Fixed a missing form title 2019-05-05 00:46:11 +10:00
0da2999c75 Merge remote-tracking branch 'inventree/master' 2019-05-05 00:39:36 +10:00
33947df3b6 Merge pull request from SchrodingersGat/modal-dismiss
Bug fix for modal question box
2019-05-05 00:39:18 +10:00
c383b2b246 Bug fix for modal question box 2019-05-05 00:38:19 +10:00
67cfd22084 Merge branch 'part-image-hover' 2019-05-05 00:30:23 +10:00
ecb8995e3e Merge pull request from SchrodingersGat/coverage-testing
Coverage testing
2019-05-05 00:27:00 +10:00
22afccd294 Add tests for the custom templates 2019-05-05 00:21:54 +10:00
fcc83ca7c7 Part API test suite now uses test data fixtures 2019-05-05 00:15:25 +10:00
e2ced18753 Added some more BomItem tests 2019-05-05 00:00:30 +10:00
c0e3007e4f Add some BomItem tests
- Add a bom fixture
2019-05-04 23:50:24 +10:00
1f80e8c655 More tests for Part
- barcode
- category_path
2019-05-04 23:35:52 +10:00
3fda5a3925 Convert test_part to use fixture data 2019-05-04 23:30:41 +10:00
663cc269b4 Test recursive child count 2019-05-04 23:22:32 +10:00
ab6673caa3 Add tests for default location traversal 2019-05-04 23:20:59 +10:00
6d803d48b5 Add fixtures to the part test
- Make development of further tests much easier
2019-05-04 22:58:55 +10:00
d97484b30b Merge remote-tracking branch 'inventree/master' 2019-05-04 22:03:18 +10:00
d6285643b6 Merge pull request from SchrodingersGat/cat-default-location
Cat default location
2019-05-04 22:02:00 +10:00
d5ad888b0a Merge remote-tracking branch 'inventree/master' 2019-05-04 21:59:48 +10:00
bc7f3f77de PEPEP 2019-05-04 21:57:43 +10:00
67eda51cd2 Add part category tree traversal
- If a category doesn't have a default_location, look at the parent category
- And so on and so on
2019-05-04 21:56:18 +10:00
71972f4454 Add function to get the default location for a part
- If field not specified, look at the part category
2019-05-04 19:06:39 +10:00
1a967947d9 Merge pull request from SchrodingersGat/tweaks
Tweaks - A quantity thereof
2019-05-04 19:03:44 +10:00
f270375847 Add ability to edit default_location for a PartCategory 2019-05-04 19:03:32 +10:00
4ffaad3f1a Add a default_location to the PartCategory model
- If a part does not specify a default location, look at the default location of  the category
2019-05-04 19:00:11 +10:00
59987940c8 green frog memes 2019-05-04 18:47:54 +10:00
9aa1a70f18 QR code improvements
- Display QR codes as links to served images
- The qr_code plugin caches these images in the background
- Make a qr_code template to push out as a modal form
- Create a QRCodeView to simplify display of QR codes
- Add option to launchModalForm() to disable the 'submit' button

Refactored QR code display for

- StockLocation
- StockItem
- Part
2019-05-04 18:46:57 +10:00
8e65c0a120 Fixes for some broken views 2019-05-04 17:20:05 +10:00
4ef1e4fc78 Explicitly mark some CharField as non blank 2019-05-04 17:01:31 +10:00
1d9e31c229 Add a spinning loading icon to modal forms 2019-05-04 16:58:03 +10:00
b6cace2681 Add 'options' drop-down for Part table in Category view
- Doesn't do anything yet
2019-05-04 16:41:45 +10:00
b1cdb7833d Add confirmation modal to activate/deactivate a part
- New question modal available
2019-05-04 16:31:23 +10:00
a7cec1627f Merge remote-tracking branch 'inventree/master' 2019-05-04 11:49:49 +10:00
cac281599a Merge pull request from SchrodingersGat/about
Add 'About InvenTree' modal
2019-05-04 11:41:03 +10:00
7dc24e5a55 ARRH 2019-05-04 11:31:07 +10:00
4fe3b9d779 add docstrings 2019-05-04 11:28:23 +10:00
28600ebc79 There's always another PEP 2019-05-04 11:27:11 +10:00
b32a9ed597 Add 'About InvenTree' modal
- Accessible from the top-right dropdown menu
- Add InvenTree/version.py which contains helper functions
2019-05-04 11:23:30 +10:00
e42a1b7b88 Merge remote-tracking branch 'inventree/master' 2019-05-04 10:47:55 +10:00
293b386286 Merge pull request from SchrodingersGat/backup-restore
Add django-dbbackup app
2019-05-04 01:07:36 +10:00
517262b233 PEP fixes 2019-05-04 01:04:30 +10:00
6c7613ba2f Fix form title 2019-05-04 01:03:43 +10:00
5f6909d32a Add django-dbbackup app
- https://github.com/un1t/django-cleanup
- Backup location defaults to temp directory
2019-05-04 01:00:58 +10:00
dc03283e14 Merge branch 'image-upload-fix' 2019-05-04 00:43:47 +10:00
689445a9bd Merge pull request from SchrodingersGat/image-upload-fix
Fixed part image upload
2019-05-04 00:41:21 +10:00
4af59f0ca9 Fixed part image upload
- Image was being saved twice
- Don't call super().post in AjaxUpdateView
- Instead, handle properly
2019-05-04 00:38:17 +10:00
4aef7643a0 Fixed part image upload
- Image was being saved twice
- Don't call super().post in AjaxUpdateView
- Instead, handle properly
2019-05-04 00:37:08 +10:00