Commit Graph

1609 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 70f093e1a1 resolve conflict 2022-03-08 10:30:31 +01:00
Cayo Puigdefabregas a983ebd6cf add all devices as option in the select of filter 2022-03-08 10:15:53 +01:00
Cayo Puigdefabregas 62f42e9e05 fix bug 2022-03-08 10:15:21 +01:00
Santiago L c67bd93ef6 Fix flake8 unused import 2022-03-08 10:05:32 +01:00
Santiago L 5158340523 Fix black & isort compatibility config on pre-commit 2022-03-08 10:04:59 +01:00
Santiago L 7000b58c6e
Merge pull request #205 from eReuse/feature/server-side-render-UX-improvements
Feature/server side render ux improvements
2022-03-07 18:34:42 +01:00
Santiago L 46a3fc57dd Replace add supplier & add receiver pictograms
Create visual relation between:
a) Supplier and incoming lot
b) Receiver and outgoing lot
2022-03-07 18:30:32 +01:00
Santiago L bb588b10d2 Refactor HTML: use d-flex 2022-03-07 18:28:45 +01:00
Cayo Puigdefabregas bd716e2ef8 add more devices to the filter 2022-03-07 15:17:03 +01:00
Cayo Puigdefabregas 34aab019b9 fix computer option 2022-03-07 13:09:11 +01:00
Cayo Puigdefabregas 598b91e22b filter search in lists 2022-03-07 13:07:26 +01:00
Cayo Puigdefabregas e90ac224c1 use commit=True for default as django pattern, when we save or remove one model 2022-03-07 11:37:32 +01:00
Cayo Puigdefabregas 54a938071b fix bug when add or delete one device of a lot. For fix this we use the pattern of flask doing the commit in the view 2022-03-07 11:31:38 +01:00
Cayo Puigdefabregas 5df74d7742 extra message confirm when you want delete one lot with devices 2022-03-07 11:24:02 +01:00
Cayo Puigdefabregas 9d43299592 now is possible delete a temporary lot when this lot have one or more devices 2022-03-07 10:20:18 +01:00
Cayo Puigdefabregas 4fbed3c5ef drop class col in forms when is not neccesary 2022-03-04 18:50:47 +01:00
Cayo Puigdefabregas 496763473e always show the button to delete a lot and show an error message if you try to delete a lot with devices 2022-03-04 18:30:14 +01:00
Cayo Puigdefabregas 6b3ccee58f #2890
Go back to lot detail when cancel lot edit
2022-03-04 13:51:05 +01:00
Cayo Puigdefabregas d98d09cc7d propagate error of connection with the tag server to the view 2022-03-04 13:32:37 +01:00
Cayo Puigdefabregas b737aaf50a add verbose_name in device.model instead of use template system 2022-03-04 13:31:33 +01:00
Cayo Puigdefabregas 95a8b13a6b form select type of device in the list of device. Step 1 2022-03-04 13:00:51 +01:00
Cayo Puigdefabregas 075135c191 Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements 2022-03-03 11:18:57 +01:00
Santiago L ceb63b4eb3 Fix broken coverage command 2022-03-03 09:59:47 +01:00
Santiago L b8a5ddd8d7 Optimize apt avoiding install recommends 2022-03-03 09:35:52 +01:00
Santiago L c2e5fef0bd Drop references to venv (tests are run on global env) 2022-03-03 09:35:36 +01:00
Santiago L 4ec63762d9
Merge pull request #206 from eReuse/bugfix/server-side-render-#2841
Bugfix/server side render #2841
2022-03-02 18:51:18 +01:00
Santiago L 473a7a02de
Update ereuse_devicehub/inventory/forms.py 2022-03-02 18:51:04 +01:00
Cayo Puigdefabregas fc4ba2041e remove imported but unused 2022-03-02 13:45:52 +01:00
Cayo Puigdefabregas 7f0167f688 remove imported but unused 2022-03-02 13:39:15 +01:00
Cayo Puigdefabregas eb84884db4 remove imported but unused 2022-03-02 13:38:22 +01:00
Cayo Puigdefabregas 56b8e0886c ignoring warnings of too complex functions 2022-03-02 13:36:06 +01:00
Cayo Puigdefabregas e45a4982c6 ignoring warnings of too complex function 2022-03-02 13:31:21 +01:00
Cayo Puigdefabregas c52480231b add error msg when there are more than one device selected for add or remove one tag 2022-03-02 13:08:23 +01:00
Cayo Puigdefabregas ad09d298a0 add order by code in tags lists and select 2022-03-02 13:07:04 +01:00
Cayo Puigdefabregas 806e9ad8d0 fix bug #2840 about trade without confirm and with code 2022-03-02 10:56:31 +01:00
Cayo Puigdefabregas 15d913efea add message with result when a devices is add or remove of a lot 2022-03-02 10:36:26 +01:00
Cayo Puigdefabregas 6389956adc fix bug #2841. Show lot and devices for all users involved in a trade 2022-03-01 14:29:25 +01:00
Cayo Puigdefabregas ab89b7eff0 #2736 Move simple-datatables to base 2022-03-01 10:30:47 +01:00
Cayo Puigdefabregas 3886076f50 #2736 Move jquery to base 2022-03-01 10:07:05 +01:00
Cayo Puigdefabregas f9840e9f2b fix buttons of form of upload trade document 2022-02-28 13:33:03 +01:00
Cayo Puigdefabregas 823594dce4 add tab documents 2022-02-28 13:27:12 +01:00
Cayo Puigdefabregas b6cf1f1e3e Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements 2022-02-28 13:06:04 +01:00
Cayo Puigdefabregas 9a95587cf3 remove lot in top 2022-02-28 13:05:36 +01:00
Cayo Puigdefabregas 560d9fae05 task #2740 add tag code in name of pdf file 2022-02-28 12:16:33 +01:00
Santiago L 1e9b65e0b5
Merge pull request #204 from eReuse/feature/server-side-render-exports
Feature/server side render exports
2022-02-28 12:13:15 +01:00
Cayo Puigdefabregas c6538333f7 task #2739 Manufacter and Model empty instead of None 2022-02-28 12:02:56 +01:00
Cayo Puigdefabregas a45fd815a2 task #2741 fix Handle error message, provider connection when we are creating an unnamed tag 2022-02-28 11:46:31 +01:00
Cayo Puigdefabregas b6de721da3 Merge branch 'feature/server-side-render-exports' of github.com:eReuse/devicehub-teal into feature/server-side-render-exports 2022-02-28 11:19:30 +01:00
Cayo Puigdefabregas 692358c343 add alert when no there are any device selected 2022-02-28 11:19:22 +01:00
Santiago L 21ee6003fd Merge branch 'feature/server-side-render' into feature/server-side-render-exports 2022-02-28 10:20:05 +01:00