6378 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias	984efd7493	sort graph-data as well	2021-06-27 17:51:49 +02:00
Matthias	16f25f54d4	sorting price-breaks on start	2021-06-27 17:45:31 +02:00
Matthias	547f7a8f36	Merge branch 'master' of https://github.com/inventree/InvenTree into one-pricing-view	2021-06-27 14:40:17 +02: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
Oliver	0e9b82c475	Load default values into rendered form	2021-06-27 21:58:22 +10:00
Matthias	a3ec24fbcc	Reenabling prices for BOM items ... Closes #1721	2021-06-27 13:48:08 +02:00
Oliver	d80948369b	Include 'default' value in OPTIONS request for any fields with specified default values	2021-06-27 21:44:21 +10: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	67f76c8bca	Merge remote-tracking branch 'inventree/master' into drf-api-forms	2021-06-27 09:26:23 +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	f696bb2e2a	Correctly read out boolean fields	2021-06-26 19:49:56 +10:00
Oliver	2eb7565683	Callback handler for form success	2021-06-26 19:30:57 +10:00
Oliver	9dd2765bd2	Handle returned error messages	2021-06-26 19:11:20 +10:00
Oliver	e9db72017d	Extract field data on submit	2021-06-26 17:54:14 +10:00
Oliver	949c7dd81b	Set modal form title	2021-06-26 14:30:14 +10:00
Oliver	565631ef87	More features ... - Custom renderers depending on specified model name - Paginate API results	2021-06-26 14:09:35 +10:00
Matthias	d28d66795d	linked price break graphs	2021-06-25 07:41:00 +02:00
Matthias	4921cd47f9	refactor for better readabilty	2021-06-25 07:40:01 +02:00
Oliver	b29db6f258	Remove old debug message	2021-06-25 15:22:40 +10:00
Oliver	d411728be6	Start of custom rendering support based on model	2021-06-25 13:58:36 +10:00
Oliver	4cf69a5a4c	Custom rendering functions	2021-06-25 13:47:33 +10:00
Oliver	341467ae8d	Fixes for base template	2021-06-25 13:47:09 +10:00
Oliver	c07aeddfdb	Move select2 files around	2021-06-25 13:39:06 +10:00
Oliver	9e7d1710db	Fixes for select2 rendering issues	2021-06-25 13:23:29 +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
Oliver	b20af54b76	Create select2 instance for related field	2021-06-25 07:36:37 +10:00
Oliver	9977b0bf59	Include model name in metadata	2021-06-25 07:36:13 +10:00
Matthias	b99af16bfd	preparing for price breaks diagrams	2021-06-24 22:13:56 +02: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	c5df91efce	PEP Fix	2021-06-25 00:38:28 +10:00
Oliver	970a5d5eed	Include API endpoints in OPTIONS metadata	2021-06-25 00:36:22 +10:00