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
719 Commits 6 Branches 99 Tags 484 MiB
66cf8239fc
Commit Graph

719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
b522ca5b29 Don't render editable items when ont in editing mode 2019-04-15 18:41:48 +10:00
Oliver Walters
ec98f7829e Add context flag to enable editing mode 
- pass ?edit=1 to the BOM
- Display page differently if in editing mode
-
 2019-04-15 18:32:15 +10:00
Oliver Walters
258555a813 Add placeholder text option for field editing 2019-04-15 00:11:26 +10:00
Oliver Walters
264f189917 Add function to wrap a value in an in-line editable field 
- Requires bootstrap-editable
 2019-04-15 00:11:14 +10:00
Oliver Walters
e370cb8d3c Add note field to BomItem serializer 2019-04-14 22:20:11 +10:00
Oliver Walters
d5186fc615 Add 'note' field to BOM item model 2019-04-14 18:26:11 +10:00
Oliver Walters
9e5eed5d5e Move the export_bom function to the part model 2019-04-14 12:34:14 +10:00
Oliver Walters
b8e28c003d Provide download link to export BOM file 
- Helper function for generating temporary file (in memory) for exporting
 2019-04-14 12:34:14 +10:00
Oliver Walters
b58c49e066 Create BOM export form 
- Select output format
 2019-04-14 12:34:13 +10:00
Oliver Walters
14de111130 Allow better passthrough of context variables for non-form views 2019-04-14 12:34:13 +10:00
Oliver Walters
0cc59540ef Generate modal form to export BOM 
- Doesn't do anything yet
- Extends AjaxView
 2019-04-14 12:34:13 +10:00
Oliver
73b7c178d4
Merge pull request #121 from SchrodingersGat/category-display 
Category display
 2019-04-14 12:32:34 +10:00
Oliver Walters
2202dfd55d Peppy fixes 2019-04-14 12:30:06 +10:00
Oliver Walters
00c21d521e Always display category 
- Display full category path
 2019-04-14 12:25:21 +10:00
Oliver Walters
9d98c429d6 Complex filtering for parts 
- Allow filtering against child categories
- Could potentially be slooow
 2019-04-14 11:59:07 +10:00
Oliver
a465e990b9
Merge pull request #118 from SchrodingersGat/travis-fix 
Updated travis environment
 2019-04-14 09:41:34 +10:00
Oliver Walters
1ef81ecf2e Ignore some rules 2019-04-14 09:39:01 +10:00
Oliver Walters
29ab19d51d PEP fixes in /InvenTree 2019-04-14 09:33:17 +10:00
Oliver Walters
ac3a4e3de4 PEP fixes for /company 2019-04-14 09:30:45 +10:00
Oliver Walters
b9f23554a5 PEP fixes for /build 2019-04-14 09:29:05 +10:00
Oliver Walters
cf374252c1 PEP fixes for /part 2019-04-14 09:25:46 +10:00
Oliver Walters
76b0d17b11 PEP fixes for /stock 2019-04-14 09:23:24 +10:00
Oliver Walters
c3312ac935 Re-enable PEP style testing 2019-04-14 08:41:13 +10:00
Oliver Walters
87eaaa7cbe Add requirement for psycopg2 2019-04-14 08:37:45 +10:00
Oliver Walters
d0bc35f670 Updated travis environment 
Following example at https://stackoverflow.com/questions/55521832/update-sqlite-in-travis-ci
 2019-04-14 08:34:37 +10:00
Oliver
7cc4af1da4
Merge pull request #115 from SchrodingersGat/python-version 
Bumped python version for Travis
 2019-04-14 00:38:01 +10:00
Oliver Walters
4a89ea6cb8 Bumped python version for Travis 2019-04-14 00:37:29 +10:00
Oliver
643bc5dd94
Merge pull request #113 from SchrodingersGat/master 
Simplified custom button text for modal forms
 2019-04-13 23:03:07 +10:00
Oliver Walters
e6e03963c4 Simplified custom button text for modal forms 
- Now only configured from the javascript end
- No server-side configuration of button text
 2019-04-13 23:02:23 +10:00
Oliver
53bb1d7bb8
Merge pull request #112 from SchrodingersGat/submit-text-fix 
Submit text fix
 2019-04-13 21:20:49 +10:00
Oliver Walters
0e7472dabc Fix display of custom button text 
- Missing first parameter (modal object) to function call
 2019-04-13 21:20:02 +10:00
Oliver Walters
f44ba1c011 Commonized 'submit_label' text option 2019-04-13 21:11:42 +10:00
Oliver
b0bdaab213
Merge pull request #108 from SchrodingersGat/qr-code 
Qr code
 2019-04-13 07:57:54 +10:00
Oliver Walters
51d77ce4d2 Include uuid in serializer and api 2019-04-13 07:56:06 +10:00
Oliver Walters
7b68bac32f Display UUID and QR code on stockitem page 
- The actual display of this can be improved upon at a later stage
 2019-04-13 01:14:24 +10:00
Oliver Walters
b64e584b52 Add UUID field to StockItem model 2019-04-13 01:12:47 +10:00
Oliver Walters
b0f42fd30f Add qr_code to list of installed addons 2019-04-13 01:03:56 +10:00
Oliver Walters
dffb2b4dbe Added base requirement for django-qr-code 2019-04-13 01:01:09 +10:00
Oliver Walters
1b5287307b Add some help text 2019-04-13 00:52:26 +10:00
Oliver Walters
1dcbff9bcd Merge branch 'stock-improvements' 2019-04-13 00:15:39 +10:00
Oliver
ff50bc3ad5
Merge pull request #104 from SchrodingersGat/stock-improvements 
Stock improvements
 2019-04-13 00:15:12 +10:00
Oliver Walters
926d717190 Add quantity field to StockItemTracking 
- Keep track of historical levels of part availability
 2019-04-13 00:14:10 +10:00
Oliver Walters
93bb0bf6f4 Improved 'move stock' form 
- Better error checking on the form (provides form validation messages to user)
 2019-04-13 00:08:13 +10:00
Oliver Walters
f451d31f00 Rearrange stockitem drop-down menu for more logical operations 2019-04-12 23:10:47 +10:00
Oliver Walters
e560ea4a41 Update edit form for StockItem 
- Disallow direct quantity editing (must perform stocktake)
- Add notes field to allow editing
 2019-04-12 23:10:32 +10:00
Oliver Walters
7566c3769a Added a note for future work 2019-04-12 23:05:12 +10:00
Oliver Walters
68ec5df371 Correctly handle StockTrackingItem if there is no user data 2019-04-12 23:03:02 +10:00
Oliver Walters
738afa264a Merge branch 'stock-fix' 2019-04-12 22:48:55 +10:00
Oliver
20acf1f692
Merge pull request #101 from SchrodingersGat/stock-fix 
Fixes error in StockItem serializer
 2019-04-12 22:48:30 +10:00
Oliver Walters
88103b63d2 Cannot filter by STATUS 
- Is this because it is a dict?
- Need to address this in the future
 2019-04-12 22:46:48 +10:00