inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
3,488 Commits 9 Branches 164 Tags
32cde5d8f13a8a74f6db5bb9c4cb43d712c109bd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 32cde5d8f1 Fixx css for multiple button groups 2020-09-13 20:56:05 +10:00
Oliver Walters 04c702e1b8 Improve action buttons for part display 2020-09-13 20:42:59 +10:00
OliverandGitHub eaf87294ce Merge pull request #974 from SchrodingersGat/toggle-fix 
Fix for weird button toggles (it was a doozy!)
 2020-09-13 17:56:08 +10:00
Oliver Walters aa35c787b2 Fix for weird button toggles (it was a doozy!) 
- Turning off autocomplete seems to have done the job
- https://stackoverflow.com/questions/36546775/html-checkboxes-keep-checked-after-refresh#36547079
 2020-09-13 17:47:40 +10:00
OliverandGitHub 65bc23a516 Merge pull request #973 from SchrodingersGat/multi-bom-item-delete 
Multi bom item delete
 2020-09-13 00:47:44 +10:00
Oliver Walters 57e395de71 BOM: Allow multiple BOM items to be selected and deleted 
(in editing mode)
 2020-09-13 00:40:06 +10:00
Oliver Walters 7a7db97914 add inventreeDelete ajax function 2020-09-13 00:39:25 +10:00
Oliver Walters 36ac268b96 BOM Display: Multiple fixes 
- Previous multi-level BOM display changes had broken the table in editing mode
- Simplify code
- Re-implement edit / delete / validate buttons
- Re-enable checkboxes in edit mode
 2020-09-13 00:13:53 +10:00
OliverandGitHub 8c9491f3ca Merge pull request #970 from eeintech/color_themes 
Color theme selection added to settings
 2020-09-10 09:28:40 +10:00
OliverandGitHub 700d522c3c Merge pull request #962 from eeintech/part_ipn_slug 
Added PartDetailFromIPN view (subclass of PartDetail) and url pattern
 2020-09-08 09:40:28 +10:00
OliverandGitHub f0713ce01d Merge pull request #966 from SchrodingersGat/stock-item-link 
Add link from stock item to base part
 2020-09-06 00:01:36 +10:00
Oliver Walters 87f25eacc5 Add link from stock item to base part 2020-09-06 00:01:14 +10:00
OliverandGitHub 22e30903b6 Merge pull request #965 from SchrodingersGat/api-stock-fix 
Major bugfix for multiple annotations in API querysets
 2020-09-05 23:42:25 +10:00
Oliver Walters 46a8107be5 Refactor stock filter 2020-09-05 23:35:48 +10:00
Oliver Walters 2cf40c0e0b Translation updates 2020-09-05 23:32:36 +10:00
Oliver Walters f7ad38dad5 Add unit tests for new aggregation annotation approach 2020-09-05 23:28:54 +10:00
Oliver Walters 5f2e4c3790 Update serializers for Order model 2020-09-05 23:08:59 +10:00
Oliver Walters 598e15af46 Fix annotations for Company serializers 2020-09-05 23:03:38 +10:00
Oliver Walters db214dfd73 Update queryset annotation for StockItem 
- Query time reduced from 4.1 to 3.5s (for sample data)
 2020-09-05 22:50:17 +10:00
Oliver Walters 42967905bc New approach for multiple annotations 
- Use the django-sql-utils addon - https://github.com/martsberger/django-sql-utils
- The "distinct=True" flag was not doing what I thought it was doing...
 2020-09-05 22:35:19 +10:00
OliverandGitHub a2efac4dbe Merge pull request #964 from SchrodingersGat/new-stock-item-form 
Bugfix: CreateStockItem form
 2020-09-05 20:51:36 +10:00
Oliver Walters f737ad2d38 Bugfix: CreateStockItem form 
- hide the field rather than popping it
 2020-09-05 20:31:18 +10:00
OliverandGitHub 2667dc68d7 Merge pull request #963 from SchrodingersGat/variant-form 
Allow selection of bom_copy and parameter_copy when making a new variant
 2020-09-05 20:26:14 +10:00
Oliver Walters c4989e59b2 Allow selection of bom_copy and parameter_copy when making a new variant 2020-09-05 20:10:18 +10:00
OliverandGitHub 6ef4390e29 Merge pull request #961 from eeintech/parameters_copy 
Implemented part parameters copy from template/original part
 2020-09-05 20:03:18 +10:00
OliverandGitHub 11b751323e Merge pull request #953 from SchrodingersGat/part-import-fix 
Part: Alter model fields to fix data import issues
 2020-09-03 00:18:26 +10:00
Oliver Walters 34a334236a Part: Alter model fields to fix data import issues 
Without setting 'null=True' on fields which may be empty,
the import subsequently fails if these fields are indeed empty
 2020-09-03 00:11:20 +10:00
OliverandGitHub 81b50312e2 Merge pull request #952 from SchrodingersGat/variant-table 
Add ability to filter part list by 'ancestor'
 2020-09-03 00:09:53 +10:00
Oliver Walters b89588ffb7 variant of link links to variants page 2020-09-03 00:00:03 +10:00
Oliver Walters 303572bc03 More translation updates 2020-09-02 23:57:51 +10:00
Oliver Walters e3d92e1390 Fixes for translation script 2020-09-02 23:54:35 +10:00
Oliver Walters eaec85398f Treegrid display for part variants 2020-09-02 23:51:28 +10:00
Oliver Walters 62c26c881d Add ability to filter part list by 'ancestor' 2020-09-02 23:18:26 +10:00
OliverandGitHub 104b9d2d44 Merge pull request #949 from SchrodingersGat/multi-db-unit-test 
Add CI tests for MySQL database
 2020-09-02 20:26:51 +10:00
Oliver Walters 36955d6d4f pep fixes 2020-09-02 20:16:46 +10:00
Oliver Walters 92ec849fc1 Add ci settings file for postgresql database 2020-09-02 20:09:11 +10:00
Oliver Walters bb9e8fa97b Merge remote-tracking branch 'inventree/master' into multi-db-unit-test 
# Conflicts:
#	InvenTree/build/test_build.py
 2020-09-02 20:02:22 +10:00
Oliver Walters 911727f7b7 Update test fixtures 
- Can't assume that pk values will be assigned sensibly!
- Need to hard-code them in
 2020-09-02 19:47:07 +10:00
Oliver Walters bc2f131144 travis fixes 2020-09-01 21:24:19 +10:00
Oliver Walters b8856476be More CI file changes 2020-09-01 21:21:32 +10:00
Oliver Walters 37a43c8657 Install required PIP packages 2020-09-01 21:13:38 +10:00
Oliver Walters 85f635c975 Darn spelling misterks 2020-09-01 21:08:58 +10:00
Oliver Walters 3af704c453 Fix - tickmark 2020-09-01 21:05:52 +10:00
Oliver Walters 55c1ea750c Add CI tests for MySQL database 2020-09-01 21:01:38 +10:00
OliverandGitHub cae6fb6731 Merge pull request #948 from SchrodingersGat/bcc-feature-non-int-serial 
Bcc feature non int serial
 2020-09-01 20:31:42 +10:00
Oliver Walters 4613730a19 PEP fixes 2020-09-01 20:24:14 +10:00
Oliver Walters 74f25ee7f9 Part: Extend logic for "latest" serial number 
- Return value if it is a string
- Remove 'getNextSerialNumber' function
- Improve functionality of function which returns serial number placeholder string
 2020-09-01 20:16:46 +10:00
Oliver Walters e6c0a04131 Merge branch 'feature-non-int-serial' of git://github.com/bcc/InvenTree into bcc-feature-non-int-serial 2020-09-01 19:41:48 +10:00
Oliver Walters 1eeaa17085 Merge remote-tracking branch 'inventree/master' 2020-09-01 16:41:07 +10:00
OliverandGitHub c3c5a86ea5 Merge pull request #946 from SchrodingersGat/field-focus 
Add "focus" option when displaying a modal form
 2020-09-01 13:04:02 +10:00
Oliver Walters ffbdb0317f Add "focus" option when displaying a modal form 2020-09-01 12:43:37 +10:00
OliverandGitHub 90d2265dae Merge pull request #945 from SchrodingersGat/template-attachments 
Part: add function to get part attachments for *all* parents of a part
 2020-08-31 22:38:02 +10:00
Oliver Walters 73892e894e Refactoring 2020-08-31 22:30:38 +10:00
Oliver Walters cd8214ff4a Part: add function to get part attachments for *all* parents of a part 2020-08-31 22:26:46 +10:00
OliverandGitHub baaabd00d6 Merge pull request #939 from SchrodingersGat/column-remembering 
Make checkbox field non-switchable for stock table
 2020-08-31 22:08:56 +10:00
Oliver Walters 672936e2d4 Update many tables 2020-08-31 21:55:01 +10:00
Oliver Walters 97ed70502c Fix function which hides table columns based on saved selections 2020-08-31 20:42:11 +10:00
OliverandGitHub 35cd3923a5 Merge pull request #944 from SchrodingersGat/stock-item-api-fix 
Stock item api fix
 2020-08-31 20:13:57 +10:00
Oliver Walters 59e7474f75 Stock: More unit tests 
- Add some more tests (would have caught a bug that was there already, darn it)
 2020-08-31 20:09:43 +10:00
Oliver Walters 8615cad711 Stock: Fix serializers.py 
- Use of read_only PrimaryKeyRelatedField was breaking POST via API
 2020-08-31 20:08:07 +10:00
OliverandGitHub fa540c0096 Merge pull request #943 from SchrodingersGat/order-details 
Order: Improve help text(s)
 2020-08-31 19:32:03 +10:00
Oliver Walters eabb99053c Update requirements.txt 2020-08-31 19:20:16 +10:00
Oliver Walters 5c4781b5b4 Order: Improve help text(s) 2020-08-31 19:13:24 +10:00
OliverandGitHub 406dbc36fa Merge pull request #942 from bcc/bug-invoke-pty 
Fix invoke pty error when running 'invoke superuser'
 2020-08-30 21:32:17 +10:00
Oliver Walters 7829e3654c Add callback when a column is shown / hidden 2020-08-28 10:51:55 +10:00
Oliver Walters 9c2e959ab0 Add function to turn a set of visible columns into a settings string for saving to session 2020-08-28 10:50:43 +10:00
Oliver Walters 86e675dbbd Make checkbox field non-switchable for stock table 2020-08-28 10:49:49 +10:00
Oliver Walters f6d8a3f229 Merge remote-tracking branch 'upstream/master' 2020-08-27 22:50:52 +10:00
OliverandGitHub 2c1d585f8b Merge pull request #937 from SchrodingersGat/dynamic-form-fixes 
Dynamic form fixes
 2020-08-27 08:47:21 +10:00
Oliver Walters b17c3f6e0f Fix for empty option 2020-08-27 08:41:38 +10:00
Oliver Walters 27f7745231 Follow link to newly created StockItem 2020-08-27 08:37:18 +10:00
Oliver Walters 19329a9627 Merge remote-tracking branch 'inventree/master' 2020-08-27 00:21:42 +10:00
OliverandGitHub ce866c6d30 Merge pull request #934 from SchrodingersGat/reactive-forms 
Reactive forms
 2020-08-27 00:12:26 +10:00
Oliver Walters 146dae6d43 Toot toot - it's the refactor tractor! 
- New function for launching a CreateStockItem form
- Wraps up the previous code improvements into a single function
- Oh, the ease!
 2020-08-27 00:08:02 +10:00
Oliver Walters 4be1b2928b PEP fix 2020-08-26 23:50:49 +10:00
Oliver Walters 72899530cf Add helper function to simplify reloading of field options 2020-08-26 23:43:19 +10:00
Oliver Walters 9dcc23ee4e Hide 'supplier part' options if no part is selected in the form 2020-08-26 23:40:15 +10:00
Oliver Walters 3a75682878 Add "pretty" name to the SupplierPart API 
- Quick way to ensure the supplier part objects are printed the same way
- Use the pythonic back-end to render the data
 2020-08-26 23:23:57 +10:00
Oliver Walters 5aa11063a0 Add function to update the 'options' for a given field in a modal 2020-08-26 23:13:32 +10:00
Oliver Walters 2037474fad Option generation function now returns array, rather than flat text 2020-08-26 23:04:50 +10:00
Oliver Walters 02d17378a6 Add function to programatically generate a list of <option> elements 2020-08-26 23:02:25 +10:00
Oliver Walters 6ab34c3d0e SupplierPart - Improve API 
- The default DRF behaviour throws errors if the supplied query params do not conform to the limit_choices_to field
- This is non optimum! Don't want to have to handle these cases
- Do the filtering ourselves!
 2020-08-26 22:44:22 +10:00
Oliver Walters d44ad541eb Add "callback" functionality for modal forms when a given field is changed 
- Attach callback function
- Add a function to retrieve a field by name
 2020-08-26 22:35:36 +10:00
OliverandGitHub 0b4f732160 Merge pull request #933 from SchrodingersGat/report-select-fix 
Bugfix: Select test report template
 2020-08-26 15:03:39 +10:00
Oliver Walters 54d0c4e8a8 Bugfix: Select test report template 
- Actually, two bugs!
 2020-08-26 14:29:49 +10:00
OliverandGitHub ee0df29af0 Merge pull request #921 from eeintech/show_potential_bom_items_stock 
Show 'available_stock' in Part string representation
 2020-08-26 09:36:55 +10:00
OliverandGitHub 60c6d6d33e Merge pull request #919 from eeintech/bom_export_parameter_stock 
BoM export: added option to export part parameters (#126) and stocks (#793)
 2020-08-26 08:41:44 +10:00
OliverandGitHub 788d497e87 Merge pull request #931 from bcc/bug-serialize-no-location 
Fix internal server error when serializing stock with no location
 2020-08-25 08:38:35 +10:00
OliverandGitHub cd016d3f7d Merge pull request #930 from bcc/feature-custom-authentication 
Allow custom authentication/middleware in config.yaml
 2020-08-25 08:37:30 +10:00
Oliver Walters 78826dc20b Merge remote-tracking branch 'inventree/master' 2020-08-23 21:21:18 +10:00
OliverandGitHub 2a4b9c6c5c Merge pull request #929 from SchrodingersGat/label-enable 
Label enable
 2020-08-23 21:18:11 +10:00
OliverandGitHub c3bfcad4df Merge pull request #928 from Kedarius/small-device 
Collapse navbar on small screen
 2020-08-23 21:12:28 +10:00
Oliver Walters ca1985e11a PEP fixes 2020-08-23 21:10:45 +10:00
Oliver Walters 9a35293126 Remove PartFilterMixin class 2020-08-23 21:08:41 +10:00
Oliver Walters ed5ad3c047 Rename 'part_filters' field to 'filters' 2020-08-23 21:05:54 +10:00
Oliver Walters c849f618d5 Clean up implementation of test report matching 2020-08-23 21:03:29 +10:00
Oliver Walters b7ae95686e Add field "enabled" to Report template 2020-08-23 20:51:41 +10:00
Oliver Walters 116d966d29 Delete "ReportTemplate" class 2020-08-23 09:10:56 +10:00
Oliver Walters 771b2117c4 Remove duplicated function 2020-08-23 09:08:24 +10:00
Oliver Walters 8f1af0f5f9 Add "enabled" field to Label class 
- Only list labels which are enabled
- Allows labels to be hidden / disabled without being deleted
 2020-08-23 09:07:15 +10:00