Oliver Walters
|
bf1490c68a
|
Merge remote-tracking branch 'inventree/master'
|
2020-11-05 18:29:53 +11:00 |
|
Oliver Walters
|
b8c4690fd8
|
Merge branch 'master' of https://github.com/SchrodingersGat/InvenTree
|
2020-11-05 18:29:30 +11:00 |
|
Oliver
|
7e4b84f016
|
Merge pull request #1105 from SchrodingersGat/build-fix-fixes
Set the specified location of a build output
|
2020-11-05 18:25:00 +11:00 |
|
Oliver Walters
|
2591d34260
|
Fixed bug where "New output" button stopped working
- Build status was changing from "PENDING" to "PRODUCTION"
- Created new check for active builds
|
2020-11-05 15:57:46 +11:00 |
|
Oliver Walters
|
d44092b209
|
Fix issue with shadowed form field
- Rename "quantity" to "output_quantity" to address this
|
2020-11-05 15:52:38 +11:00 |
|
Oliver Walters
|
8b7789cdb3
|
Set the specified location of a build output
|
2020-11-05 15:46:42 +11:00 |
|
Oliver
|
6c89a2aaeb
|
Merge pull request #1099 from eeintech/fix_related_parts
Fix PartRelated (based on updated AjaxCreateView class)
|
2020-11-05 09:51:06 +11:00 |
|
eeintech
|
142cea0cbb
|
Removed custom form save method, remove unused model methods, restored InvenTree CreateAjaxView, improved part related testing
|
2020-11-04 07:44:06 -05:00 |
|
eeintech
|
853a821497
|
Merge branch 'master' of git://github.com/inventree/InvenTree into fix_related_parts
|
2020-11-04 06:46:20 -05:00 |
|
Oliver Walters
|
c9cbea95c9
|
Merge remote-tracking branch 'inventree/master'
|
2020-11-04 19:54:11 +11:00 |
|
Oliver
|
dc626ed68b
|
Merge pull request #1103 from SchrodingersGat/image-upload-fixes
Bug fix: Part thumbnail API list was not working
|
2020-11-04 16:24:04 +11:00 |
|
Oliver Walters
|
f560be1a9a
|
Bug fix: Part thumbnail API list was not working
- Part images could not be selected from grid
|
2020-11-04 15:41:17 +11:00 |
|
Oliver
|
ede7d6dbde
|
Merge pull request #1102 from SchrodingersGat/coveralls-fix
Updated to latest version of coverage and coveralls
|
2020-11-04 14:12:57 +11:00 |
|
Oliver Walters
|
8a1b255b67
|
Merge remote-tracking branch 'upstream/master'
|
2020-11-04 14:01:06 +11:00 |
|
Oliver Walters
|
5f6f722d6c
|
Change from python-coveralls to coveralls
|
2020-11-04 13:30:17 +11:00 |
|
Oliver Walters
|
f8da15287c
|
Updated to latest version of coverage and coveralls
|
2020-11-04 09:35:43 +11:00 |
|
Oliver
|
fc99086c8f
|
Merge pull request #1101 from SchrodingersGat/delete-on-deplete-fix
Logic fix for editing stock item creation form
|
2020-11-04 09:33:52 +11:00 |
|
Oliver Walters
|
56b287b2c8
|
Logic fix for editing stock item creation form
|
2020-11-04 08:29:09 +11:00 |
|
eeintech
|
0882528b82
|
Missing class trailing space
|
2020-11-03 11:15:16 -05:00 |
|
eeintech
|
32b46cdc2a
|
Added better PartRelated creation test
|
2020-11-03 11:14:31 -05:00 |
|
eeintech
|
de2b7e5daf
|
Re-added post_save method in AjaxCreateView
|
2020-11-03 08:03:16 -05:00 |
|
Oliver Walters
|
a8f77e7b71
|
Merge remote-tracking branch 'inventree/master'
|
2020-11-03 22:59:39 +11:00 |
|
Oliver
|
1e844c642f
|
Merge pull request #1063 from SchrodingersGat/build-fixes
Build system updates
|
2020-11-03 22:58:38 +11:00 |
|
Oliver Walters
|
2e1a5a85a3
|
Bug fix for unit testing
|
2020-11-03 22:14:02 +11:00 |
|
Oliver Walters
|
3ea671986c
|
Merge conflicting migration files
|
2020-11-03 21:29:25 +11:00 |
|
Oliver Walters
|
083dac1300
|
Merge remote-tracking branch 'inventree/master' into build-fixes
|
2020-11-03 21:26:39 +11:00 |
|
Oliver
|
1c503adced
|
Merge pull request #1026 from eeintech/user_unique_group_validation
Added check for multiple groups assigned to user
|
2020-11-03 21:21:08 +11:00 |
|
Oliver
|
ef2c04baa8
|
Merge pull request #1048 from eeintech/related_parts
Related Parts
|
2020-11-03 21:18:27 +11:00 |
|
Oliver Walters
|
897d9b4831
|
Update translation files
|
2020-11-03 21:02:31 +11:00 |
|
Oliver Walters
|
5988e847ce
|
Add serial number suggestions
|
2020-11-03 21:01:14 +11:00 |
|
Oliver Walters
|
8d0845d92b
|
Mark a build as "production" whenever a build output is created
|
2020-11-03 20:43:49 +11:00 |
|
Oliver Walters
|
ac03dab8de
|
Tweaks
|
2020-11-03 20:37:33 +11:00 |
|
Oliver Walters
|
2b91f69c7d
|
Fix unit tests
|
2020-11-03 20:19:24 +11:00 |
|
Oliver Walters
|
b936f67d87
|
Various form fixes
- Updating forms, a lot has changed!
|
2020-11-03 16:21:40 +11:00 |
|
Oliver Walters
|
152801f06f
|
Dramatic speed improvements for build completion
- Might still need to be a background task at some point..
|
2020-11-03 15:56:20 +11:00 |
|
Oliver Walters
|
3f03adba72
|
Bug fix for stock table
- Grouped rows were not displaying the part name
|
2020-11-03 15:05:13 +11:00 |
|
Oliver Walters
|
05613b9642
|
Further build tweaks / improvements
|
2020-11-02 23:47:36 +11:00 |
|
Oliver Walters
|
f5d0d54ded
|
Improve modal error message
|
2020-11-02 23:02:02 +11:00 |
|
Oliver Walters
|
500da8099b
|
Add forms / views for creating a new build output, and completing the build
- Also some refactoring of how forms are handled and saved
|
2020-11-02 22:56:26 +11:00 |
|
Oliver Walters
|
b02c87ea50
|
Lots of work towards multiple build output
|
2020-11-02 01:24:31 +11:00 |
|
Oliver Walters
|
f1b83f1c17
|
Update fixtues for unit testing
|
2020-11-01 15:34:42 +11:00 |
|
Oliver Walters
|
95fadf1300
|
Update unit testing
|
2020-10-30 23:08:12 +11:00 |
|
Oliver Walters
|
3a702266e6
|
Merge remote-tracking branch 'inventree/master' into build-fixes
# Conflicts:
# InvenTree/InvenTree/views.py
# InvenTree/build/views.py
# InvenTree/locale/de/LC_MESSAGES/django.po
# InvenTree/locale/en/LC_MESSAGES/django.po
# InvenTree/locale/es/LC_MESSAGES/django.po
# InvenTree/order/views.py
# InvenTree/part/api.py
# InvenTree/part/views.py
# InvenTree/templates/js/bom.js
|
2020-10-30 22:44:25 +11:00 |
|
Oliver
|
ad90adbc04
|
Merge pull request #1095 from SchrodingersGat/forms
Refactor how form errors are handled
|
2020-10-30 22:12:45 +11:00 |
|
Oliver Walters
|
1caa341f8e
|
Fixes for unit tests
|
2020-10-30 21:34:56 +11:00 |
|
Oliver Walters
|
e049ca1a85
|
More refactoring
|
2020-10-30 16:54:05 +11:00 |
|
Oliver
|
87903f27ed
|
Merge pull request #1094 from SchrodingersGat/typo-fix
Fixed a typo in bom.js
|
2020-10-30 16:23:07 +11:00 |
|
Oliver Walters
|
c533f59405
|
Refactor how form errors are handled
- Use form.add_error (as the django gods intended)
|
2020-10-30 16:04:56 +11:00 |
|
Oliver Walters
|
cabbdbb5cf
|
Fixed a typo in bom.js
|
2020-10-30 15:53:13 +11:00 |
|
Oliver
|
fb28204dfd
|
Merge pull request #1093 from SchrodingersGat/bom-filters
Add filtering for BOM table
|
2020-10-30 12:45:46 +11:00 |
|