Cayo Puigdefabregas
|
71d30548cc
|
resolve conflict
|
2022-02-25 12:56:01 +01:00 |
|
Cayo Puigdefabregas
|
826584450a
|
resolve conflict
|
2022-02-25 12:34:02 +01:00 |
|
Cayo Puigdefabregas
|
b85f4f298c
|
pre-commit
|
2022-02-25 12:27:14 +01:00 |
|
Cayo Puigdefabregas
|
26f3a64b46
|
there are views than doesn't have any lot on sidebar because lots are missing as template context
|
2022-02-25 12:25:00 +01:00 |
|
Cayo Puigdefabregas
|
37f50624fa
|
change redirect to unansigned lot next to do login instead of go to profile page
|
2022-02-25 11:49:05 +01:00 |
|
Cayo Puigdefabregas
|
c2f392787c
|
Merge branch 'feature/server-side-render-actions-trade' into feature/server-side-render-exports
|
2022-02-25 10:17:26 +01:00 |
|
Cayo Puigdefabregas
|
1772b4090c
|
close div tag in trade template
|
2022-02-25 10:16:59 +01:00 |
|
Cayo Puigdefabregas
|
e614908c73
|
resolve conflict
|
2022-02-25 10:15:23 +01:00 |
|
Cayo Puigdefabregas
|
04cc244f2d
|
resolve conflict
|
2022-02-25 10:07:44 +01:00 |
|
Cayo Puigdefabregas
|
c54d9a902c
|
fix bug in trade template
|
2022-02-25 09:49:15 +01:00 |
|
Cayo Puigdefabregas
|
179feaba44
|
add exports in front end
|
2022-02-24 14:15:58 +01:00 |
 Santiago L
|
919e4f4e48
|
Merge pull request #99 from eReuse/dependabot/pip/sqlalchemy-1.3.0
Bump sqlalchemy from 1.2.17 to 1.3.24
|
2022-02-22 13:19:35 +01:00 |
|
Santiago L
|
c51f1aa2e3
|
Pin itsdangerous version
Fix ImportError: cannot import name ‘json’ from itsdangerous
|
2022-02-22 12:31:56 +01:00 |
|
Santiago L
|
197caa5068
|
Merge branch 'testing' into dependabot/pip/sqlalchemy-1.3.0
|
2022-02-22 12:26:26 +01:00 |
|
Santiago L
|
fbedbc8f7f
|
Drop Additional keyword arguments
[Deprecated since version 0.9](https://docs.sqlalchemy.org/en/12/core/type_basics.html#sqlalchemy.types.Float.params.**kwargs)
|
2022-02-22 12:22:23 +01:00 |
|
Santiago L
|
d4e61d992b
|
Raise error if trying to save when validation has failed
|
2022-02-22 12:04:26 +01:00 |
|
Santiago L
|
bacf14ece8
|
Fix method call to `get_or_create_user()`
|
2022-02-22 11:55:01 +01:00 |
|
Cayo Puigdefabregas
|
bfbd7c02b7
|
.
|
2022-02-22 11:40:05 +01:00 |
|
Cayo Puigdefabregas
|
90eb279008
|
fix get_or_create_user
|
2022-02-22 11:31:11 +01:00 |
|
Cayo Puigdefabregas
|
88deb71a26
|
changes of review
|
2022-02-22 11:24:11 +01:00 |
|
Cayo Puigdefabregas
|
eed2849af3
|
Merge branch 'feature/server-side-render-actions-trade' of github.com:eReuse/devicehub-teal into feature/server-side-render-actions-trade
|
2022-02-22 11:17:39 +01:00 |
|
Cayo Puigdefabregas
|
96a240b3cd
|
drop enconded as unicode
|
2022-02-22 11:15:37 +01:00 |
|
Santiago L
|
2cff0499cb
|
Apply suggestions from code review
|
2022-02-22 11:13:00 +01:00 |
|
Santiago L
|
6eb3c62b83
|
Update ereuse_devicehub/inventory/forms.py
|
2022-02-22 11:12:15 +01:00 |
|
Cayo Puigdefabregas
|
60d9c04e2d
|
view of export
|
2022-02-22 11:11:53 +01:00 |
|
Cayo Puigdefabregas
|
4ce359fec4
|
Merge branch 'feature/server-side-render' into feature/server-side-render-actions-trade
|
2022-02-21 13:05:38 +01:00 |
|
Cayo Puigdefabregas
|
83a9c66a46
|
show documents in list device of trade lot
|
2022-02-21 13:04:56 +01:00 |
|
Cayo Puigdefabregas
|
bda39d0fc9
|
add trade document template
|
2022-02-21 13:04:13 +01:00 |
|
Cayo Puigdefabregas
|
d056d1867b
|
fix template trade
|
2022-02-21 13:03:35 +01:00 |
|
Cayo Puigdefabregas
|
c18532f265
|
new view and endpoint for trade document
|
2022-02-21 13:03:03 +01:00 |
|
Cayo Puigdefabregas
|
4a2cd7adfe
|
new form for trade documents
|
2022-02-21 13:02:28 +01:00 |
|
Cayo Puigdefabregas
|
791d2a5894
|
manager better the error messages in trade form
|
2022-02-18 13:37:45 +01:00 |
|
Cayo Puigdefabregas
|
b72f9f37c6
|
add trade action iun devices when this device is insert in a lot with a trade
|
2022-02-18 11:29:12 +01:00 |
|
Cayo Puigdefabregas
|
a2b074e707
|
problem display none for adding tag form
|
2022-02-18 11:18:54 +01:00 |
|
Cayo Puigdefabregas
|
8b27b18fc1
|
change supplier for user_from and receiver for user_to
|
2022-02-18 09:30:20 +01:00 |
|
Cayo Puigdefabregas
|
538e355026
|
add save instance correctly, create phantom accounts and change the owner for devices
|
2022-02-17 13:52:55 +01:00 |
|
Cayo Puigdefabregas
|
37779ca05c
|
fix trade form for unassigned list
|
2022-02-17 13:51:59 +01:00 |
|
Cayo Puigdefabregas
|
403717ccf2
|
fix readonly and deviceslist
|
2022-02-17 13:51:27 +01:00 |
|
Cayo Puigdefabregas
|
5e46141622
|
fix save trade action
|
2022-02-16 14:03:01 +01:00 |
|
Santiago L
|
17ed850e10
|
Merge branch 'testing' into feature/server-side-render
|
2022-02-11 12:03:46 +01:00 |
|
Santiago L
|
5335507c40
|
Merge pull request #202 from eReuse/autoformat-black
Run black, flake8 & isort as pre-commit hook
|
2022-02-11 11:33:03 +01:00 |
|
Santiago L
|
36da72ac6b
|
Add check pdb as pre-commit hook
Avoid commits with pdb.set_trace() statements
|
2022-02-11 11:30:57 +01:00 |
|
Santiago L
|
e2d412c7d0
|
Add CONTRIBUTING.nd & requirements-dev.txt
|
2022-02-10 20:30:40 +01:00 |
|
Santiago L
|
e31104d038
|
Add pre-commit hook to run black, flake8 & isort
|
2022-02-10 14:05:26 +01:00 |
|
Cayo Puigdefabregas
|
86f3c3f483
|
fix validate trade form
|
2022-02-10 13:53:52 +01:00 |
|
Cayo Puigdefabregas
|
adad689acd
|
type to message from form.type.data instead of instance
|
2022-02-10 13:31:49 +01:00 |
|
Cayo Puigdefabregas
|
f3ffcd89ca
|
fixing js form for trade
|
2022-02-10 13:22:47 +01:00 |
|
Santiago L
|
9cfcbd1c22
|
flake8: exclude legacy code
|
2022-02-10 11:37:45 +01:00 |
|
Santiago L
|
ea26dc2e2f
|
Merge pull request #201 from eReuse/feature/server-side-render-actions-documents
Server side render Data Wipe Action
|
2022-02-10 11:30:16 +01:00 |
|
Santiago L
|
df4c6f7407
|
flake8: remove unused imports & sort them
|
2022-02-10 11:29:47 +01:00 |