12197 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias	5d277a888d	ignore migration	2022-02-13 04:41:44 +01:00
Matthias	01b8bca501	ignore import error	2022-02-13 04:37:38 +01:00
Matthias	65f3c3fce4	ignore the django import check	2022-02-13 04:33:18 +01:00
Matthias	7de3eb46c5	fix migrations	2022-02-13 04:15:58 +01:00
Matthias	bc17536e6d	fix quotes	2022-02-13 03:49:52 +01:00
Matthias	dcce516c31	Merge branch 'template-reduce-duplication' of https://github.com/matmair/InvenTree into template-reduce-duplication	2022-02-12 00:57:13 +01:00
Matthias	aa3192a106	Merge branch 'master' of https://github.com/inventree/InvenTree into template-reduce-duplication	2022-02-12 00:55:39 +01:00
Matthias	709b7cfda6	Merge branch 'matmair/issue2279' of https://github.com/matmair/InvenTree into matmair/issue2279	2022-02-12 00:52:59 +01:00
Matthias	9eb238c85e	Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279	2022-02-12 00:51:15 +01:00
Matthias Mair	975c81ccfe	Merge branch 'inventree:master' into fix-html-tags	2022-02-12 00:32:26 +01:00
Oliver	8b34ea3066	Merge pull request #2609 from eeintech/child_model_permissions ... Child model permissions	2022-02-10 18:08:38 +11:00
Oliver	7b4b07bac3	Merge pull request #2616 from SchrodingersGat/django-version ... Update base django version	2022-02-10 13:47:28 +11:00
Oliver	9ad0b66ebc	Update base django version	2022-02-10 13:13:51 +11:00
Oliver	6c083622e5	Merge pull request #2615 from SchrodingersGat/delete-multiple-outputs ... Delete multiple outputs	2022-02-10 07:47:00 +11:00
Oliver	6b52a07e71	js linting	2022-02-10 00:53:38 +11:00
Oliver	71f9399760	Cleanup	2022-02-10 00:50:21 +11:00
Oliver	0d7b94fbfa	Remove old form code which is no longer used	2022-02-10 00:48:06 +11:00
Oliver	96af074365	Adds API endpoint to delete build outputs	2022-02-10 00:46:38 +11:00
Oliver	ed9b54d021	Merge pull request #2613 from SchrodingersGat/bom-import-unit-tests ... Bom import unit tests	2022-02-10 00:40:47 +11:00
Oliver	f460b14014	Add more unit testing for BOM file upload ... - Test "levels" functionality - Test part guessing / introspection	2022-02-10 00:13:37 +11:00
Oliver	ffb319e136	Disable "submit" button to prevent multiple simultaneous uploads	2022-02-10 00:00:23 +11:00
Oliver	d38a8adf4c	Add button to display original row data	2022-02-09 23:49:26 +11:00
Oliver	383835aa89	Display initial errors when importing data	2022-02-09 23:26:32 +11:00
Oliver	aa962aac83	Improve part "guess" algorithm	2022-02-09 23:26:13 +11:00
Oliver	c0e940a898	Catch potential error when posting invalid numbers via REST API	2022-02-09 23:26:00 +11:00
Oliver	001437e083	Increased error checking when uploading BOM data	2022-02-09 23:02:09 +11:00
Oliver	2af617e92b	Adds check for duplicate parts when importing	2022-02-09 11:34:25 +11:00
Oliver	67a9c0aeec	PEP fixes	2022-02-09 11:31:36 +11:00
Oliver	a9e1357ffb	Return per-row error messages when extracting data	2022-02-09 11:30:58 +11:00
Oliver	29c3064ae7	Raise error if imported dataset contains no data rows	2022-02-09 11:27:51 +11:00
Oliver	692039f712	Add unit testing for uploading invalid BOM files	2022-02-09 08:38:28 +11:00
Oliver	8fc2695873	Catch potential file processing errors	2022-02-09 08:31:08 +11:00
Oliver	18ac1ceebe	Update README.md ... Reorder sections	2022-02-09 07:56:31 +11:00
Oliver	5376c5b022	Allow POST of files for unit testing	2022-02-08 23:54:48 +11:00
Oliver	1f473e42d0	Update README.md ... Add "follow on twitter" button	2022-02-08 12:07:44 +11:00
Oliver	23e6caf1d9	Merge pull request #2610 from SchrodingersGat/po-button-fix ... Fix logic for enabling "place order" button	2022-02-08 09:27:10 +11:00
Oliver	dbf1e1b463	Fix logic for enabling "place order" button	2022-02-08 08:59:42 +11:00
eeintech	3b45c1406a	Improved approach to permission check at runtime	2022-02-07 15:42:39 -05:00
eeintech	fd63fcde43	Reverted print statement to logger	2022-02-07 15:39:06 -05:00
eeintech	ef70e665bb	Refactored and added permission check for children models	2022-02-07 15:37:07 -05:00
eeintech	d3b2e80e14	Merge branch 'master' of github.com:inventree/InvenTree into permission_experiment	2022-02-07 11:55:47 -05:00
Oliver	ba1c7caa2a	Merge pull request #2605 from SchrodingersGat/po-refresh ... Do not hide the "submit order" button	2022-02-07 15:02:52 +11:00
Oliver	c94c0902b6	Merge pull request #2603 from SchrodingersGat/bom-upload-improvements ... Bom upload improvements	2022-02-07 14:46:25 +11:00
Oliver	55ff026696	Remove incorrect validation routine	2022-02-07 14:24:40 +11:00
Oliver	64b1523013	Do not hide the "submit order" button	2022-02-07 13:55:25 +11:00
Oliver	c906cc5cfa	Merge pull request #2604 from SchrodingersGat/currency-timeout ... Handle errors when connecting to currency exchange	2022-02-07 13:54:25 +11:00
Oliver	11f541303b	unit test fixes	2022-02-07 13:32:35 +11:00
Oliver	11c187f81d	PEP fixes	2022-02-07 13:14:51 +11:00
Oliver	a5a2fcd84a	Only update rates on server launch if there are no rates available	2022-02-07 13:13:45 +11:00
Oliver	7265360648	JS linting	2022-02-07 13:07:03 +11:00