11084 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias	045d0c241d	add package-log back in	2021-12-02 17:33:03 +01:00
Matthias	3b311d62e4	Merge branch 'matmair/issue2201' of https://github.com/matmair/InvenTree into matmair/issue2201	2021-12-02 17:24:11 +01:00
Matthias	0f0460f8ea	merge	2021-12-02 17:24:07 +01:00
Matthias	329b00ae07	Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037	2021-12-02 17:16:26 +01:00
Matthias Mair	ec3b5b6cbc	Merge branch 'inventree:master' into workflow-remaster	2021-12-02 17:13:49 +01:00
Oliver	3c3dd9368d	Do not auto-complete salesorder when shipment is done ... - User might want to add more line items?	2021-12-03 00:45:44 +11:00
Oliver	732034d9e5	Merge conflicting migrations	2021-12-03 00:43:10 +11:00
Oliver	96c1f74cd8	Merge pull request #2408 from SchrodingersGat/initial-stock-when-duplicating ... Add option for creating initial stock quantity when duplicating a part	2021-12-03 00:29:37 +11:00
Oliver	84a4060cd9	Merge pull request #2401 from matmair/load-minified-fa ... Load minified fa	2021-12-03 00:23:58 +11:00
Matthias	440f5e560e	qucik fix	2021-12-02 14:19:20 +01:00
Matthias	6355d2e8c2	maybe this way?	2021-12-02 14:17:15 +01:00
Matthias	0f4991db0a	fix port envs?	2021-12-02 14:15:13 +01:00
Matthias	b99d5a28e9	fix? postgres user	2021-12-02 14:10:34 +01:00
Oliver	80b615bfb7	Import fix	2021-12-03 00:08:05 +11:00
Oliver	9ca6204d4b	Add option for creating initial stock quantity when duplicating a part ... Fixes https://github.com/inventree/InvenTree/issues/2407	2021-12-03 00:05:55 +11:00
Matthias	bab7b766b5	Revert "seems like it does not like comments between envs" ... This reverts commit e7087aafda.	2021-12-02 14:05:55 +01:00
Matthias	e7087aafda	seems like it does not like comments between envs	2021-12-02 14:05:09 +01:00
Matthias	281ea37bd6	maybe fix coveralls connection?	2021-12-02 14:03:40 +01:00
Oliver	93173ef1ee	Merge remote-tracking branch 'inventree/master' into partial-shipment ... # Conflicts: # InvenTree/order/serializers.py	2021-12-02 23:58:52 +11:00
Oliver	ecf70b6d4d	Some PEP fixes	2021-12-02 23:58:02 +11:00
Matthias	dd9eed3da6	needed for import / export checks	2021-12-02 13:54:40 +01:00
Matthias	961c161b3c	rename to better reflect function	2021-12-02 13:54:24 +01:00
Oliver	e1668c8662	More stuffs: ... - Allow filtering of salesorderlineitem by "completed" status - Allow deletion of (empty) shipment - Show which items are going to be shipped	2021-12-02 23:52:53 +11:00
Matthias	b0f14d23b2	use envs everywhere	2021-12-02 13:45:20 +01:00
Matthias	340c7574e4	optimise envs	2021-12-02 13:45:09 +01:00
Matthias	cc5ba37850	use env for db name	2021-12-02 13:39:12 +01:00
Matthias	840c1c12c5	use env for version	2021-12-02 13:37:53 +01:00
Matthias	cc5a03bb58	merge mysql	2021-12-02 13:37:26 +01:00
Matthias	a071d61ba7	use env for version	2021-12-02 13:34:55 +01:00
Matthias	ee60cbf603	merge in postgres	2021-12-02 13:34:01 +01:00
Matthias	f7b8cf2bb1	refactor envs	2021-12-02 13:29:01 +01:00
Matthias	0ce9e55933	add envs	2021-12-02 13:25:50 +01:00
Matthias	bb22f7565b	merge in sqlite / coverage	2021-12-02 13:25:01 +01:00
Matthias	3dbe7f8f29	more env variables	2021-12-02 13:17:45 +01:00
Matthias	21aabda8cd	merge in python bindings check	2021-12-02 13:14:38 +01:00
Matthias	a9aa55d76f	refactor envs	2021-12-02 13:10:40 +01:00
Matthias	b8a76429d1	only run if successfull	2021-12-02 13:09:30 +01:00
Matthias	3e021f35ba	only run if sucessfull	2021-12-02 13:08:47 +01:00
Matthias	8f8a1bbdeb	refactor env	2021-12-02 13:08:19 +01:00
Matthias	9718b6559e	remove unneeded install statements	2021-12-02 13:03:20 +01:00
Matthias	90fcde5a74	run js / and htm in paralell	2021-12-02 13:01:55 +01:00
Matthias	f71ac93668	Merge branch 'master' of https://github.com/inventree/InvenTree into workflow-remaster	2021-12-02 12:58:58 +01:00
Matthias	a7a63dc3f7	only run db stuff after pre flight checks	2021-12-02 12:57:44 +01:00
Matthias	0e55a07def	merge in html	2021-12-02 12:49:37 +01:00
Oliver	eca3aaa0b2	Merge pull request #2402 from matmair/matmair/issue2400 ... Fix to big / small references	2021-12-02 22:48:00 +11:00
Matthias	90f4e788ea	merge in javascript	2021-12-02 12:47:04 +01:00
Matthias	3c460dfc32	change names	2021-12-02 12:46:31 +01:00
Matthias	996554541c	use env for python version	2021-12-02 12:35:08 +01:00
Matthias	dd91329ed7	fix python version	2021-12-02 12:32:20 +01:00
Matthias	62694b8dae	add style checks	2021-12-02 12:30:44 +01:00