3100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Oliver Walters	7a7b0aea33	Changed 'stocklocation.items' to 'stocklocation.stock_items'	2019-04-12 22:46:15 +10:00
Oliver	426f460916	Merge pull request #100 from SchrodingersGat/master ... Updated to django 2.2	2019-04-12 22:43:48 +10:00
Oliver Walters	84d2d2e45b	Changed 'stocklocation.items' to 'stocklocation.stock_items'	2019-04-12 22:43:22 +10:00
Oliver Walters	2d21bf0626	Part BOM list now shows how many of each sub-item are available ... - If there are enough to build the available quantity is shown in green - Otherwise, shown in orange	2019-04-12 22:09:50 +10:00
Oliver Walters	8a3706dd76	Added MPN field to supplier part lists	2019-04-12 21:54:53 +10:00
Oliver Walters	25f1d643b8	Add indicator to show no stock in part listing	2019-04-12 21:21:50 +10:00
Oliver Walters	7341fe4542	Fix modal form for creating company	2019-04-12 21:09:31 +10:00
Oliver Walters	c67dc6f56e	Initial updates required to run under django 2.2 ... - Change to middleware.py - Change some URLs formatting - Fix django version at 2.2	2019-04-12 20:44:22 +10:00
Oliver	ceea053368	Added part API ... - Build allocation table now makes use of this API - Further steps towards allocation table	2018-05-12 12:44:29 +10:00
Oliver	1b9c98ae3e	Bug fix for stock item traking list ... - Query was returning ALL stock tracking objects! - Now filter by StockItem ID	2018-05-10 21:27:41 +10:00
Oliver	4b4db50de5	Display username in stock-tracking ... - Add UserSerializer	2018-05-10 21:20:12 +10:00
Oliver	dcf74292b6	Changed tracking into to datetime field ... - Added moment.js for formatting dates -	2018-05-10 21:13:36 +10:00
Oliver	7b478fed4e	Redirect if not authed ... If user not logged in, redirect any requests to login page	2018-05-10 20:40:08 +10:00
Oliver	57713556d1	Revert default db to sqlite3 (for now)	2018-05-10 19:19:13 +10:00
Oliver	07f16d8891	Small improvements for build display ... Working toward build management	2018-05-09 22:02:56 +10:00
Oliver	690ec83265	Woohoo for .then	2018-05-09 21:48:36 +10:00
Oliver	517569f510	Clicking on logo returns user to index page	2018-05-09 00:19:34 +10:00
Oliver	7644617af0	Better string formatting for models ... Allows for easier searching in drop-downs for ForeignKeys	2018-05-09 00:17:39 +10:00
Oliver	233f093093	Update supplier part detail page ... - Consolidated buttons into dropdown - Make look like other pages	2018-05-09 00:12:21 +10:00