5494 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias	fc9e1e6770	suggested changes @eeintech	2021-06-03 00:17:29 +02:00
Matthias	75cdec81ae	style fix	2021-06-02 00:39:38 +02:00
Matthias	495babe712	Merge branch 'master' of https://github.com/inventree/InvenTree into part-import	2021-06-02 00:36:15 +02:00
Matthias	3c384947b2	spaces cleanup	2021-06-02 00:26:30 +02:00
Matthias	ee582a5490	fixes the problem reported by @eeintech ?	2021-06-02 00:21:01 +02:00
Oliver	720184790e	Merge pull request #1626 from SchrodingersGat/bom-allow-variants ... [Feature] Support BOM items which can allow use of variant stock	2021-06-01 20:07:03 +10:00
Oliver Walters	b31796cbeb	Simplified "installed_in" table	2021-06-01 16:40:02 +10:00
Oliver Walters	ee9df039cb	allocatedItems function now takes variants into account	2021-06-01 16:19:24 +10:00
Oliver Walters	9baf856d75	Fixes for build item allocation rendering	2021-06-01 16:14:26 +10:00
Oliver Walters	ab16e1efc3	Custom migration to find BomItem / BuildItem links where they exist	2021-06-01 15:39:21 +10:00
Oliver Walters	7578cab9a8	Add 'bom_item' field to BuildItem model ... - Required to link the build to the output in case of variant stock	2021-06-01 15:25:39 +10:00
Oliver Walters	9f407df15a	Update BOM table display	2021-06-01 14:17:31 +10:00
Oliver Walters	0bd0e57f16	BomList can be filtered by "allow_variants" flag	2021-06-01 14:03:21 +10:00
Oliver Walters	5c71f04360	Add "allow_variants" field to BomItem	2021-06-01 13:59:01 +10:00
Oliver	96624d1175	Merge pull request #1625 from SchrodingersGat/parent-node-fixes ... Specify a unique parent node that cannot shadow an existing pk	2021-06-01 08:48:57 +10:00
Oliver Walters	0375d5b940	Specify a unique parent node that cannot shadow an existing pk	2021-06-01 08:30:50 +10:00
Oliver	a56d7836d0	Merge pull request #1624 from SchrodingersGat/bootstrap-table-fixes ... Bootstrap table fixes	2021-05-31 17:24:05 +10:00
Oliver Walters	3ba7b2d136	Visual hack for custom part card view	2021-05-31 17:05:12 +10:00
Oliver Walters	f0cf83a0b8	Use tree-grid instead of group-by for showing test results ... - Much more predictable display	2021-05-31 16:55:21 +10:00
Oliver Walters	b10410ca1f	Update bootstrap-table library ... Updated javascript / css to latest version	2021-05-31 12:47:07 +10:00
Oliver	c08ad467be	Merge pull request #1622 from SchrodingersGat/grid-view ... Grid view	2021-05-30 07:50:32 +10:00
Oliver Walters	f1ca17286f	Save grid / list selection to local storage settings	2021-05-30 00:38:59 +10:00
Oliver Walters	e846c744f4	Buttons to toggle between list and grid views	2021-05-30 00:23:05 +10:00
Oliver Walters	ee95cf5c21	Clicking on thumbnail shows modal image	2021-05-30 00:10:46 +10:00
Oliver Walters	887adf35f4	Add simple tile grid view for part list	2021-05-29 23:59:27 +10:00
Oliver Walters	8450029c68	Add custom-view plugin for bootstrap-table	2021-05-29 23:59:07 +10:00
Oliver	dff367b0b0	Update version.py	2021-05-29 19:05:41 +10:00
Oliver	4aa75c25c2	Merge pull request #1620 from SchrodingersGat/template-fix ... Fix part page heading	2021-05-29 19:05:26 +10:00
Oliver Walters	f08c83d6e5	Fix part page heading	2021-05-29 18:48:18 +10:00
Oliver	52ab8b8064	Update docker_publish.yaml ... Add $	2021-05-29 18:28:07 +10:00
Oliver	b94c0b6d9b	Merge pull request #1619 from SchrodingersGat/docker-publish ... Tag with release tag	2021-05-29 18:24:57 +10:00
Oliver Walters	8d33dc5795	Tag with release tag	2021-05-29 17:48:40 +10:00
Oliver	878e9c1e8a	Update version.py ... Bump to v2.2	2021-05-29 17:35:05 +10:00
Oliver	0995ccee67	L10 merge master (#1617) ... * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * Adds a commit message * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * 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 * updated translation base * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * Fix: New translations django.po from Crowdin * updated translation base * New Crowdin updates (#1551) * Fix: New translations django.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 * New Crowdin updates (#1552) * Fix: New translations django.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 * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * New Crowdin updates (#1568) * Fix: New translations django.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 * New Crowdin updates (#1570) * Fix: New translations django.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 * 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 * 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 * Fix: New translations django.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 * 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 * updated translation base * updated translation base * updated translation base * Trans merge fix (#1599) * Fix: New translations django.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 * Fix: New translations django.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 * New Crowdin updates (#1597) * Fix: New translations django.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 * Fix: New translations django.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 * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * updated translation base * Update github actions * L10 merge fix (#1614) * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Update github actions (cherry picked from commit d9bbebddb0) * New Crowdin updates (#1603) * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Update github actions (cherry picked from commit d9bbebddb0) * updated translation base Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2021-05-29 17:33:07 +10:00
Oliver	7f58d95254	Merge pull request #1482 from matmair/price-history ... Stock price history	2021-05-29 17:27:51 +10:00
Matthias Mair	9cc81df276	Merge branch 'inventree:master' into price-history	2021-05-28 12:14:03 +02:00
Oliver	723a900388	Merge pull request #1613 from SchrodingersGat/actions ... Ignore actions for l10 branches	2021-05-28 14:34:08 +10:00
Oliver	4c78f88aa3	Merge pull request #1612 from SchrodingersGat/exchange-fixes ... Remove debug message	2021-05-28 13:26:14 +10:00
Oliver Walters	b716312438	Ignore actions for l10 branches	2021-05-28 13:24:18 +10:00
Oliver Walters	be6e2aa276	Better exception handling	2021-05-28 13:02:34 +10:00
Oliver Walters	7832ccccc2	Check if database tables are ready	2021-05-28 12:54:55 +10:00
Oliver	70e13e4cae	Merge pull request #1581 from eeintech/bom_items_purchase_price ... Added purchase price range and average to BOM items/view	2021-05-28 12:50:31 +10:00
Oliver Walters	0978235370	Fix?	2021-05-28 12:49:50 +10:00
Oliver Walters	4ddeab3330	Update exchange rates when launching the server ... - Ensures that the exchange rates don't get messed up if the base currency is changed!	2021-05-28 12:44:39 +10:00
Oliver Walters	52fc698b51	Remove debug message	2021-05-28 12:07:53 +10:00
eeintech	cdb453b09c	Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price	2021-05-27 10:20:40 -04:00
Oliver	59aca2791a	Merge pull request #1611 from SchrodingersGat/exchange-simplification ... Exchange simplification	2021-05-27 17:10:30 +10:00
Oliver Walters	c71f4ed045	Add currency exchange unit tests	2021-05-27 16:48:13 +10:00
Oliver Walters	4520bb7447	PEP style fixes	2021-05-27 16:36:26 +10:00
Oliver Walters	6085478672	Simplify settings view ... - Show various currency exchange rates - Button to "refresh now"	2021-05-27 16:34:37 +10:00