Oliver Walters 394a9208a1 Merge remote-tracking branch 'inventree/master' into sales-order ... # Conflicts: # InvenTree/InvenTree/version.py		2020-04-27 22:04:05 +10:00
..
build	Add some further unit tests for the Build model	2020-04-27 21:44:59 +10:00
common	fixes for unit testing	2020-04-06 21:01:24 +10:00
company	Template fixes	2020-04-24 13:03:38 +10:00
img_source	Changed some category views to use boostrap list-group	2018-04-14 23:05:36 +10:00
InvenTree	Bumped version thing	2020-04-27 22:03:15 +10:00
locale	Update translations	2020-04-23 09:20:25 +10:00
order	Add some more unit testing for the builds	2020-04-27 21:28:44 +10:00
part	Merge remote-tracking branch 'inventree/master' into sales-order	2020-04-27 22:04:05 +10:00
plugins	Delete unused import	2020-04-17 08:40:37 +10:00
stock	Bug fix for a code path which resulted in a form failing validation but not showing any errors!	2020-04-27 20:45:01 +10:00
templates	Calculate 'fulfilled' quantity once a sales order is marked as shipped	2020-04-27 08:58:18 +10:00
users	Improvements for token authentication	2020-04-18 12:06:50 +10:00
config_template.yaml	Small fix for config template	2020-04-18 13:22:52 +10:00
gunicorn.conf.py	doc fix	2019-07-12 00:15:47 +10:00
manage.py	Fixing python errors	2017-04-11 17:21:05 +10:00
setup.py	Copy config template to config file if it does not exist	2019-08-14 12:05:47 +10:00