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
7,681 Commits 6 Branches 99 Tags 484 MiB
391bb0dbe4
Commit Graph

7681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
6d803d48b5 Add fixtures to the part test 
- Make development of further tests much easier
 2019-05-04 22:58:55 +10:00
Oliver Walters
d97484b30b Merge remote-tracking branch 'inventree/master' 2019-05-04 22:03:18 +10:00
Oliver
d6285643b6
Merge pull request #224 from SchrodingersGat/cat-default-location 
Cat default location
 2019-05-04 22:02:00 +10:00
Oliver Walters
d5ad888b0a Merge remote-tracking branch 'inventree/master' 2019-05-04 21:59:48 +10:00
Oliver Walters
bc7f3f77de PEPEP 2019-05-04 21:57:43 +10:00
Oliver Walters
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
Oliver Walters
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
Oliver
1a967947d9
Merge pull request #222 from SchrodingersGat/tweaks 
Tweaks - A quantity thereof
 2019-05-04 19:03:44 +10:00
Oliver Walters
f270375847 Add ability to edit default_location for a PartCategory 2019-05-04 19:03:32 +10:00
Oliver Walters
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
Oliver Walters
59987940c8 green frog memes 2019-05-04 18:47:54 +10:00
Oliver Walters
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
Oliver Walters
8e65c0a120 Fixes for some broken views 2019-05-04 17:20:05 +10:00
Oliver Walters
4ef1e4fc78 Explicitly mark some CharField as non blank 2019-05-04 17:01:31 +10:00
Oliver Walters
1d9e31c229 Add a spinning loading icon to modal forms 2019-05-04 16:58:03 +10:00
Oliver Walters
b6cace2681 Add 'options' drop-down for Part table in Category view 
- Doesn't do anything yet
 2019-05-04 16:41:45 +10:00
Oliver Walters
b1cdb7833d Add confirmation modal to activate/deactivate a part 
- New question modal available
 2019-05-04 16:31:23 +10:00
Oliver Walters
a7cec1627f Merge remote-tracking branch 'inventree/master' 2019-05-04 11:49:49 +10:00
Oliver
cac281599a
Merge pull request #220 from SchrodingersGat/about 
Add 'About InvenTree' modal
 2019-05-04 11:41:03 +10:00
Oliver Walters
7dc24e5a55 ARRH 2019-05-04 11:31:07 +10:00
Oliver Walters
4fe3b9d779 add docstrings 2019-05-04 11:28:23 +10:00
Oliver Walters
28600ebc79 There's always another PEP 2019-05-04 11:27:11 +10:00
Oliver Walters
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
Oliver Walters
e42a1b7b88 Merge remote-tracking branch 'inventree/master' 2019-05-04 10:47:55 +10:00
Oliver
293b386286
Merge pull request #219 from SchrodingersGat/backup-restore 
Add django-dbbackup app
 2019-05-04 01:07:36 +10:00
Oliver Walters
517262b233 PEP fixes 2019-05-04 01:04:30 +10:00
Oliver Walters
6c7613ba2f Fix form title 2019-05-04 01:03:43 +10:00
Oliver Walters
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
Oliver Walters
dc03283e14 Merge branch 'image-upload-fix' 2019-05-04 00:43:47 +10:00
Oliver
689445a9bd
Merge pull request #218 from SchrodingersGat/image-upload-fix 
Fixed part image upload
 2019-05-04 00:41:21 +10:00
Oliver Walters
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
Oliver Walters
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
Oliver
b6d6b648ef
Merge pull request #217 from SchrodingersGat/no-records-found 
Improved table rendering
 2019-05-04 00:21:36 +10:00
Oliver Walters
ac17cf0121 Merge remote-tracking branch 'inventree/master' 2019-05-04 00:03:46 +10:00
Oliver
4619cf91f7
Merge pull request #216 from SchrodingersGat/stock-item-fix 
Handle case where a new stock item is to be created without the part …
 2019-05-04 00:03:02 +10:00
Oliver Walters
2eb825b0e6 Improved table rendering 2019-05-04 00:02:53 +10:00
Oliver Walters
e19061c902 Merge remote-tracking branch 'inventree/master' 2019-05-03 23:53:37 +10:00
Oliver
f286effd62
Merge pull request #215 from SchrodingersGat/modal-improvements 
Modal improvements
 2019-05-03 23:52:48 +10:00
Oliver Walters
a116c3f191 Handle case where a new stock item is to be created without the part being specified 2019-05-03 23:52:30 +10:00
Oliver Walters
109b6b868c Cature all form AJAX errors 
- remove all references to alert()
- Display error modal instead
 2019-05-03 23:46:00 +10:00
Oliver Walters
2b3094eac4 Add error dialog box for forms 
- Display status message
- Display status code
- Display extended error message in collapsible section
 2019-05-03 23:41:31 +10:00
Oliver Walters
bade13f3b8 Fixed stocktake form to match new scheme 2019-05-03 23:08:31 +10:00
Oliver Walters
11af4e5683 Disable form input unless the form is valid 
- Disable on first open until server responds
- Disable after form submission until next server response
 2019-05-03 23:00:05 +10:00
Oliver Walters
8d6a4415e5 Better documentation for the modal form jQuery code 2019-05-03 22:33:55 +10:00
Oliver Walters
db71993905 Merge remote-tracking branch 'inventree/master' 2019-05-03 08:08:31 +10:00
Oliver
598ddaace9
Merge pull request #210 from SchrodingersGat/completed_by 
Add 'completed_by' field to Build
 2019-05-03 08:07:09 +10:00
Oliver Walters
9c4a5d10fa PEP fixes 2019-05-03 08:04:30 +10:00
Oliver Walters
019d5aa4ba Add 'completed_by' field to Build 
- On Complete() or Cancel() user field is filled in
 2019-05-03 07:58:46 +10:00
Oliver Walters
3f8f7ed32c Merge remote-tracking branch 'inventree/master' 2019-05-02 21:33:51 +10:00
Oliver
a70ec0b179
Merge pull request #207 from SchrodingersGat/build-list 
Split build list display
 2019-05-02 21:32:33 +10:00