4830 Commits

Author	SHA1	Message	Date
Oliver Walters	caf52c6ce5	Add optional detail elements to SOAllocation API	2021-06-18 16:49:56 +10:00
Oliver Walters	ad8dbb5900	Add API LIST endpoint for SalesOrderAllocations	2021-06-18 16:48:32 +10:00
Oliver	43478a0be7	Merge pull request #1634 from matmair/internal-price ... Internal price	2021-06-18 10:36:29 +10:00
Oliver	bb910a09fb	Merge pull request #1679 from matmair/fix-for-1678 ... fix for part with no bom-price	2021-06-18 10:35:59 +10:00
Oliver	b6e3df4e6b	Merge pull request #1680 from matmair/modal-options ... more modal options	2021-06-18 10:30:18 +10:00
Matthias	2cbdeae914	style-fix	2021-06-18 00:18:45 +02:00
Matthias	865a2b4af8	Merge branch 'modal-options' of https://github.com/matmair/InvenTree into order-modal-show-price	2021-06-17 23:44:45 +02:00
Matthias	f0dd543ffa	render price in oer-modal if enabled in settings	2021-06-17 23:44:22 +02:00
Matthias	a3a623a5ca	update-button for modal, repeat 1st step on use	2021-06-17 23:24:32 +02:00
Matthias	2d8b96a6b8	setting to control visibility of price	2021-06-17 23:15:42 +02:00
Matthias	4c7508cd6b	tag to call a method with (multiple)args	2021-06-17 23:11:31 +02:00
Matthias	58b6bbb236	tag to read out dict value	2021-06-17 23:09:50 +02:00
Matthias	c74ee4e925	doc for option.buttons	2021-06-17 19:24:08 +02:00
Matthias	96c29847e1	add custom buttons with response	2021-06-17 19:23:30 +02:00
Matthias	3d17388b48	set modal title with response	2021-06-17 19:22:00 +02:00
Matthias	ebe2ae77a5	hide error message with response	2021-06-17 19:18:34 +02:00
Matthias	789865b996	style-fix	2021-06-17 18:25:05 +02:00
Matthias	997d68694e	fix for part with no bom-price #1678	2021-06-17 18:21:11 +02:00
Matthias	6e77029d7d	Revert "fix for part with no bom" ... This reverts commit dd58f8997715bb2e0ac02811fec6e8eb4086c5aa.	2021-06-17 18:12:41 +02:00
Matthias Mair	44464de2b6	Merge branch 'inventree:master' into internal-price	2021-06-17 16:42:57 +02:00
Matthias Mair	e77e89b16c	Merge branch 'inventree:master' into part-import	2021-06-17 16:42:49 +02:00
Matthias	dd58f89977	fix for part with no bom	2021-06-17 14:51:41 +02:00
Oliver	bc46cca9f0	Merge pull request #1677 from SchrodingersGat/new-typo-fix ... Typo fix for excluded commands	2021-06-17 22:37:45 +10:00
Oliver	8766c80233	Merge pull request #1645 from matmair/pricing-reformat ... Pricing reformat	2021-06-17 22:36:07 +10:00
Oliver Walters	f6241031f6	Typo fix for excluded commands ... (cherry picked from commit cf7087747b28c5ad3c900531cb09afb5884dfee6)	2021-06-17 22:21:26 +10:00
Oliver	93e83d0bf9	Merge pull request #1587 from nwns/feature/see_default_location ... feat(purchase orders): show the preferred location for each PO Line	2021-06-17 17:01:05 +10:00
Oliver	b2975596dc	L10 (#1668) ... * 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 * 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 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2021-06-17 09:11:04 +10:00
Matthias	af2cfe55be	missed a translation there	2021-06-17 00:51:53 +02:00
Matthias	ddd84dcd7c	Merge branch 'master' of https://github.com/inventree/InvenTree into so-total	2021-06-17 00:50:39 +02:00
Matthias	bbe7edbf82	totals like in #1666	2021-06-17 00:50:10 +02:00
Matthias	5d3360e63b	added quantity total	2021-06-17 00:23:08 +02:00
Matthias	dac112d908	added footer total for price	2021-06-17 00:22:32 +02:00
Matthias	2fc185bd71	show footer	2021-06-16 23:57:33 +02:00
Matthias	70e0933336	total price column as per #1660	2021-06-16 23:52:00 +02:00
Oliver	9386332de1	Update version.py	2021-06-16 23:54:42 +10:00
Oliver	731ea0238e	Update version.py ... Bump version number	2021-06-16 23:53:58 +10:00
Oliver Walters	513449e13c	Whoops, missed one	2021-06-16 23:03:38 +10:00
Oliver Walters	725d26d76f	Fix default paths in InvenTree settings	2021-06-16 23:03:09 +10:00
Oliver Walters	acd7322ff0	Files under /media require session to be authenticated ... References: - https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/apache-auth/ - https://stackoverflow.com/questions/46421589/nginx-location-and-django-auth - https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/ - https://pawamoy.github.io/posts/django-auth-server-for-shiny/	2021-06-16 21:30:25 +10:00
Oliver Walters	0821ead024	Only provide static redirects if in DEBUG mode	2021-06-15 23:51:37 +10:00
eeintech	08fbdf660b	Fix for #1661	2021-06-14 14:19:10 -04:00
Matthias	447a7dd4e4	style fix	2021-06-13 15:04:57 +02:00
Matthias	3f04a57452	added test for internal prices	2021-06-13 15:01:03 +02:00
Matthias	3fb95bea7e	added test for sell price breaks	2021-06-13 13:31:31 +02:00
Matthias	c0e50128dd	display latest serial on all part-views #1648	2021-06-11 23:43:23 +02:00
Nigel	f8e4a5ac2e	test: improve coverage of new get_destination	2021-06-09 11:04:42 -06:00
Nigel	cd07ea835d	feat(purchase orders): show the preferred location for each PO Line ... Adds the ability for the Purchaser to specify where the item is intentended to go when received. If the Purchaser does not set a preferred location, then the default location for the part is displayed. If the item is received them where it was actually placed is shown. NOTE: if an item is split when received only one of the resulting StockItem location is used. Fixes #1467 Addresses some of the requests in #551	2021-06-09 09:06:03 -06:00
Oliver	0c14457598	Fix typo in getStockItemThumbnail	2021-06-09 11:16:37 +10:00
Oliver	9fd212d1b2	BuildItemSerializer: Handle errors when thumbnail is not found	2021-06-09 09:41:27 +10:00
Oliver	3aadf94a9c	Stock Test: Fix display of stock test table ... - Incorrect parent node was set	2021-06-08 16:15:40 +10:00