inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 05:05:42 +00:00
Code Activity
3,756 Commits 6 Branches 132 Tags
42c1210fbabc0cac6a2d60fc23110232c0f75777
Commit Graph

3756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
a95dd86540 Limit choices for the 'Part' reference in the new model 2020-09-18 09:16:59 +10:00
Oliver Walters
71c0406cf3 Register new model in the admin interface 2020-09-18 09:16:41 +10:00
eeintech
945c3c214d Added outstanding purchase and sales orders views to homepage 2020-09-17 17:19:19 -05:00
eeintech
3d597cc3c3 Added 'Pending' builds report to homepage, includes builds with 'Allocated' status 2020-09-17 14:36:05 -05:00
Oliver Walters
8f1b018f0a Add table for price breaks for selling a part 2020-09-17 23:22:37 +10:00
Oliver Walters
e51fee081b SupplierPart price break table now uses API rather than django template 2020-09-17 23:19:50 +10:00
Oliver Walters
805e8daa57 Convert SupplierPriceBreak model to use the abstract PriceBreak class 2020-09-17 22:47:31 +10:00
Oliver Walters
95c5c4b575 Fix issues with circular imports 2020-09-17 22:44:17 +10:00
Oliver
25e73db455 Merge pull request #981 from wolffam/build-allocated-no-location-fix 
Handle situation where allocated items within a build do not have a location set
 2020-09-17 19:33:47 +10:00
alex
d10ba5edc3 handle case where stock item does not have a location set; also show header 2020-09-17 00:55:54 -07:00
alex
6ed604bbb8 fix erroring html 2020-09-17 00:49:17 -07:00
eeintech
28a55f0a58 Merge branch 'master' of git://github.com/inventree/InvenTree into new_homepage_layout 2020-09-16 17:03:59 -05:00
eeintech
a9fffe6a73 Added latest parts and invalid BOMs on homepage 2020-09-16 17:02:24 -05:00
Oliver
4af6b65ac3 Merge pull request #978 from eeintech/fix_navbar_barcode_border 
Fixed borders of navbar barcode button
 2020-09-17 07:54:28 +10:00
eeintech
472e2d0acd Fixed borders of navbar barcode button 2020-09-16 09:44:12 -05:00
Oliver
303db293b7 Merge pull request #976 from SchrodingersGat/path-fix 
Ensure correct path separator is returned
 2020-09-13 21:22:15 +10:00
Oliver Walters
d674eacd78 Ensure correct path separator is returned 2020-09-13 21:10:11 +10:00
Oliver
adaaa1e81d Merge pull request #975 from SchrodingersGat/dropdown-css 
Dropdown css
 2020-09-13 21:05:18 +10:00
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
Oliver
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
Oliver
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
Oliver
8c9491f3ca Merge pull request #970 from eeintech/color_themes 
Color theme selection added to settings
 2020-09-10 09:28:40 +10:00
eeintech
28585644ea Added automatic listing of custom CSS sheets (no more hardcoded), added error message when current selection is not valid and select default theme 2020-09-09 14:55:32 -05:00
eeintech
8198fad6d5 Updated common.colortheme migration 2020-09-08 16:36:58 -05:00
eeintech
35060ce8dc Merge branch 'master' of git://github.com/inventree/InvenTree into color_themes 2020-09-08 16:33:22 -05:00
eeintech
896fa131f0 Moved color themes CSS sheets to own folder, nicer crispy form for selecting theme 2020-09-08 16:24:22 -05:00
Oliver
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
eeintech
8e2d568a42 Style correction (missing ending new line), removed commented line in ColorThemeSelectForm 2020-09-07 17:01:05 -05:00
eeintech
10dd8fad80 Renamed Theme to ColorTheme, ColorTheme is now a per-user selection 2020-09-07 16:27:23 -05:00
eeintech
2e5ec5d249 Theme change works but applies to all user 2020-09-07 15:15:51 -05:00
eeintech
0548bee8ad Added Color Theme view in settings 2020-09-07 11:29:24 -05:00
eeintech
27241e217f Style correction 2020-09-07 08:46:39 -05:00
eeintech
c5efce36b6 Added PartDetailFromIPN view tests 2020-09-07 08:40:37 -05:00
eeintech
41071f0ed4 Moved IPN url pattern to right before Part index to avoid catching others 2020-09-05 12:03:07 -05:00
eeintech
8198e919b1 Merge branch 'master' of git://github.com/inventree/InvenTree into part_ipn_slug 2020-09-05 11:42:33 -05:00
Oliver
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
Oliver
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