6082 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver	6274cb1495	Merge remote-tracking branch 'inventree/master'	2021-06-28 20:19:39 +10:00
Oliver	b5086ab731	Merge pull request #1726 from matmair/bom-pricing ... Bom pricing	2021-06-28 09:15:52 +10:00
Matthias	cd6d13fa7d	Merge branch 'master' of https://github.com/inventree/InvenTree into bom-pricing	2021-06-27 14:38:23 +02:00
Matthias	e4a9d56ba0	style fixes	2021-06-27 14:26:51 +02:00
Matthias	4f726931a6	adds in money-conversion helper	2021-06-27 14:18:37 +02:00
Matthias	a3ec24fbcc	Reenabling prices for BOM items ... Closes #1721	2021-06-27 13:48:08 +02:00
Oliver	604c136b00	Update version.py	2021-06-27 21:00:01 +10:00
Oliver	786e994e19	Update version.py ... 0.2.4	2021-06-27 20:58:24 +10:00
Matthias	67128c308b	fixing typo	2021-06-27 12:26:02 +02:00
Oliver	029fe5d965	Merge remote-tracking branch 'inventree/master'	2021-06-27 09:26:05 +10:00
Oliver	42ed95c936	Merge pull request #1588 from matmair/part-import ... Part import	2021-06-27 09:24:10 +10:00
Oliver	9e720ea620	Merge pull request #1700 from SchrodingersGat/api-default-values ... Unit testing for default values	2021-06-27 09:01:01 +10:00
Matthias Mair	e760aa172a	Merge branch 'master' into part-import	2021-06-26 23:58:41 +02:00
Oliver Walters	34a374ce9a	Add try/except around callable default	2021-06-27 01:18:09 +10:00
Oliver Walters	0cc999410b	More unit test fixes	2021-06-27 01:03:54 +10:00
Oliver Walters	7505d7b3c5	Unit test fixes	2021-06-27 00:47:12 +10:00
Oliver Walters	d3e9803fd4	Remove debug statement	2021-06-27 00:25:49 +10:00
Oliver Walters	232899e0c4	Simpler implementation	2021-06-27 00:25:23 +10:00
Oliver Walters	8913b74f41	Typo fixes	2021-06-27 00:12:10 +10:00
Oliver Walters	ae1a1e139f	Further fixes for default API values ... - Account for callable defaults - Extra check in is_valid()	2021-06-27 00:01:40 +10:00
Oliver	a0390f0821	PEP style fixes	2021-06-26 21:14:47 +10:00
Oliver	b2aa38fefa	Override get_initial() rather than is_valid()	2021-06-26 21:14:10 +10:00
Oliver	ddbf863617	Merge remote-tracking branch 'inventree/master' into api-default-values ... # Conflicts: # InvenTree/InvenTree/serializers.py	2021-06-26 21:04:41 +10:00
Oliver	ba1c70e86b	Intercept is_valid() method to set default values	2021-06-26 20:48:09 +10:00
Oliver	3f1aca9e94	Translation merge (#1724) ... * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * New Crowdin updates (#1670) * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * updated translation base * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2021-06-26 20:18:25 +10:00
Oliver	a2841d1bf5	Merge remote-tracking branch 'inventree/master'	2021-06-26 19:56:52 +10:00
Oliver	76ec51a93b	Merge pull request #1722 from matmair/internal-price-op ... full Internal price coverage	2021-06-25 07:37:06 +10:00
Matthias	9ce5a9823e	added doc for internal price	2021-06-24 21:48:00 +02:00
Matthias	abe00232f3	use internal price in more places	2021-06-24 21:47:11 +02:00
Oliver	be85de4a7b	Merge pull request #1719 from SchrodingersGat/test-results-fix ... Fixes table data nesting	2021-06-24 13:40:09 +10:00
Oliver	a12790d5ca	Fixes table data nesting ... Sometimes you just need a quick break	2021-06-24 13:23:12 +10:00
Oliver	fcbb4c593b	Merge pull request #1715 from SchrodingersGat/tweaks ... Change some warnings to infos	2021-06-23 19:50:07 +10:00
Oliver	f0db9bc3d5	Live update of Company image	2021-06-23 19:29:41 +10:00
Oliver	70a073be21	Live update part image	2021-06-23 19:28:23 +10:00
Oliver	2e1ad0c245	Change some warnings to infos	2021-06-23 18:54:01 +10:00
Oliver	5e338dca3f	Merge pull request #1710 from SchrodingersGat/inventree-api-image-upload ... Allow direct upload of images via the API	2021-06-23 11:54:01 +10:00
Oliver	36e6b9f164	Set allow_null flag on image fields	2021-06-23 11:40:37 +10:00
Oliver	5ba7aeaa27	Fixes: ... - Use DRF ImageField, not FileField - Ensure that permissions get updated correctly in 'test' mode - Allow file upload in the APITester class	2021-06-23 10:28:21 +10:00
Oliver	a866001ffe	Bump API version to 6	2021-06-23 08:40:51 +10:00
Oliver	878f26c770	Enable upload of company image via the API	2021-06-23 08:39:06 +10:00
Oliver	f199feb8d9	Use the part detail API for uploading a new image	2021-06-23 08:34:45 +10:00
Oliver	b8e4b58df0	Catch potential error updating image that does not exist...	2021-06-22 22:23:27 +10:00
Oliver	2fc7c3d883	fix typo	2021-06-22 22:16:11 +10:00
Oliver	e29594811b	Allow direct upload of images via the API	2021-06-22 22:09:30 +10:00
Oliver	962badc36d	Merge pull request #1682 from matmair/order-modal-show-price ... Order modal show price	2021-06-22 21:27:59 +10:00
Oliver	6457250776	Merge remote-tracking branch 'inventree/master'	2021-06-22 21:17:20 +10:00
Oliver	37cbb6f6b8	Merge pull request #1709 from SchrodingersGat/python-ci-fixes ... Fixes for python integration	2021-06-22 21:15:30 +10:00
Oliver	3884ab0df2	Change workflow target	2021-06-22 20:58:29 +10:00
Oliver	691888ec1e	Fixes for python integration	2021-06-22 20:49:49 +10:00
Oliver	e0301c56fb	Merge pull request #1708 from SchrodingersGat/python-ci ... Add workflow to build python bindings	2021-06-22 20:40:59 +10:00