Commit Graph

11187 Commits

Author SHA1 Message Date
Oliver Walters
906353eb52 Remove makefile comment which breaks make on windows 2019-04-26 21:25:40 +10:00
Oliver Walters
27c7f6589c Merge remote-tracking branch 'inventree/master' 2019-04-26 21:25:00 +10:00
Oliver Walters
edad4f9cf1 Merge branch 'master' of https://github.com/SchrodingersGat/InvenTree
# Conflicts:
#	Makefile
2019-04-26 21:24:03 +10:00
Oliver Walters
14e9b71ebb Remove comment line in Makefile which doesn't play nice on Windows 2019-04-26 18:51:37 +10:00
Oliver
2ff5f57f60
Merge pull request #154 from SchrodingersGat/tracking
Tracking
2019-04-25 23:42:30 +10:00
Oliver Walters
d78841a665 Allow editing of more stockitem options 2019-04-25 23:35:48 +10:00
Oliver Walters
8d5850248e PEP fixes 2019-04-25 23:25:52 +10:00
Oliver Walters
1f8632c77c Improved response message for stocktake 2019-04-25 23:19:22 +10:00
Oliver Walters
990808ec03 Fix code to move multiple parts via AJAX / JSON 2019-04-25 23:16:54 +10:00
Oliver Walters
757cd539b2 Enforce 'notes' field for StockItem move
- Better error handling for StockItem.move
2019-04-25 23:01:03 +10:00
Oliver Walters
38fa89d1da Bug fix for javascript
- If location not set for StockItem, display special text
2019-04-25 22:34:30 +10:00
Oliver Walters
053e9c9795 Add a stock tracking index
- Shows entire history of stocktracking items
2019-04-25 22:11:10 +10:00
Oliver Walters
79f8736b6b Add note on creation of StockItem 2019-04-25 22:10:46 +10:00
Oliver Walters
533fdb71c4 Javascript function to render stock tracking table
- Added extra info to StockItemTracking serializer
2019-04-25 22:04:32 +10:00
Oliver
cece28fc50
Merge pull request #151 from SchrodingersGat/flake
Moved flake settings to setup.cfg
2019-04-25 21:28:51 +10:00
Oliver Walters
a3bbd5f8cb Increase allowed complexity 2019-04-25 21:09:02 +10:00
Oliver
77298c8fe8
Merge pull request #152 from SchrodingersGat/requirements
Cleanup requirements file
2019-04-25 21:07:29 +10:00
Oliver Walters
c6b5177f5c Cleanup requirements file 2019-04-25 21:04:33 +10:00
Oliver Walters
f9a54af9b1 Moved flake settings to setup.cfg 2019-04-25 20:59:41 +10:00
Oliver
f0ab95306b
Merge pull request #150 from SchrodingersGat/coverage
Improving test coverage
2019-04-25 19:00:56 +10:00
Oliver Walters
470dee48b3 Ignore some files for coverage report 2019-04-25 18:54:36 +10:00
Oliver Walters
1112e5e3e2 PEP fixes 2019-04-25 18:50:22 +10:00
Oliver Walters
2ab8276672 better coverage for part/models
- Increase from 57% to 67%
2019-04-25 17:51:02 +10:00
Oliver Walters
f36f02b27f Tests for stock app
- Increase coverage of Stock/models.py to 84%
2019-04-25 17:30:44 +10:00
Oliver
19001b98f7
Merge pull request #149 from SchrodingersGat/get_absolute_url
Get absolute url
2019-04-25 13:40:10 +10:00
Oliver
7fc77ccb10
Merge pull request #148 from SchrodingersGat/secret-key
SECRET_KEY is now generated by a script and stored as a local file
2019-04-25 09:38:10 +10:00
Oliver Walters
3c40418f04 100% coverage on company/models.py 2019-04-25 04:20:40 +10:00
Oliver Walters
6625d89eb2 Remove references to apps that don't yet exist 2019-04-25 03:34:56 +10:00
Oliver Walters
7b68310d73 PEP fixes 2019-04-25 03:20:25 +10:00
Oliver Walters
7c91c9ba79 Reverse URL for stock models
- stock location
- stock item
- stock tracking

- Added blank test files
2019-04-25 03:13:41 +10:00
Oliver Walters
b45b63545e Improved makefile
- Separate make for coverage of testing
- the 'test' option needs some work (have to pass all app names for some reason)
2019-04-25 03:12:41 +10:00
Oliver
d46afcdfe8
Merge pull request #147 from SchrodingersGat/coverage
Coverage
2019-04-25 01:40:15 +10:00
Oliver Walters
e6617fef80 reverse URL lookup for BomItem and SupplierPart
- created empty test files
2019-04-25 01:05:08 +10:00
Oliver
b092e00a71
Update README.md 2019-04-25 01:02:14 +10:00
Oliver Walters
0bc5617825 Reverse url lookup for Part model 2019-04-25 01:00:01 +10:00
Oliver Walters
f9db3b680d Reverse lookup for part category URL
- Added some test cases for PartCategory model
2019-04-25 00:28:40 +10:00
Oliver Walters
a2d4403968 Reverse lookup for company URL
- Added some simple tests
2019-04-24 23:55:11 +10:00
Oliver Walters
5098712d9c Use reverse to get Build URL
- Add test cases to Build
2019-04-24 23:47:39 +10:00
Oliver Walters
887250cd06 PEP fixes 2019-04-24 23:26:16 +10:00
Oliver Walters
40a18d0ce4 Ensure settings.py knows how to access secret_key.txt 2019-04-24 23:19:36 +10:00
Oliver Walters
7a65144641 Use random.choice instead of random.choices
- Allows compatibility with python3.5
2019-04-24 16:08:59 +10:00
Oliver Walters
3827806603 SECRET_KEY is now generated by a script and stored as a local file
- key file ignored from git
2019-04-24 16:01:47 +10:00
Oliver Walters
3ca5aba533 Fix typo 2019-04-24 15:36:45 +10:00
Oliver Walters
fa46f14f5d Run coveralls step after success 2019-04-24 15:32:50 +10:00
Oliver Walters
4e7e2b7295 Added source path to coveragerc 2019-04-24 15:24:45 +10:00
Oliver Walters
ff2ec3bfca Ignore generated reports 2019-04-24 15:22:21 +10:00
Oliver Walters
5996a17eca Ignore database migration files in coverage report 2019-04-24 15:21:44 +10:00
Oliver Walters
aca78e9d94 Add requirement for coverage module 2019-04-24 15:14:20 +10:00
Oliver
ecce8a6fec
Merge pull request #137 from SchrodingersGat/delete-old-forms
Delete old forms
2019-04-18 23:52:30 +10:00
Oliver Walters
0cdf660a80 Merge remote-tracking branch 'inventree/master' into delete-old-forms
# Conflicts:
#	InvenTree/part/views.py
2019-04-18 23:51:58 +10:00