refs #5964 fix supply #1666

Merged

carlossa merged 2 commits from 5964-supplyFixValidation into master 2023-07-14 07:29:24 +00:00

Conversation 0 Commits 2 Files Changed 1 +3 -3

carlossa commented 2023-07-13 11:56:28 +00:00

Member

Copy Link

No description provided.

carlossa added the

CR / Tests passed

label 2023-07-13 11:56:28 +00:00

carlossa added 1 commit 2023-07-13 11:56:30 +00:00

173ed251c3 refs #5964 fix supply

carlossa requested review from alexm 2023-07-13 11:56:37 +00:00

alexm added 222 commits 2023-07-14 05:34:54 +00:00

0d6b248f76 feat(2fa): email 2fa ...

Refs #5475

902709d61b Added authCode table

641fdf39d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

2e0325e567 Validate code

b9e48f2102 Added translations & enable through departments

087e91e898 Updated unit tests

b0f1bae33e Added unit test

4807fcb394 Removed focus

b5f2cf3711 Added unit test & translation fixes

f5d26bdb99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

9aaea7e8ed Changed to new SQL version

ef87dcc0f5 require authentication on every login

cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

d5ea45e36f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

c2af40edb5 changes

c3443ecc7c Updated e2e

8ae67799a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

7021e52705 correct folder

87e1caa4eb refs #5334 department seccion

598067f757 refs #5334 routes

071849065a refs #5334 fix main

443821b5c2 refs #5334 ?q

fd4d04756a refs #5334 routes index fix

612d0a2dfb refs #5334 fix index

3dcdbe0223 refs #5334 summary basic data

d09889b08a refs #5334 fix summary route

9f9963af56 refs #5334 descriptor

5c9ee21cfc refs #5334 department.card

f63dd0f9a3 refs #5334 datos

adafd7444b refs #5334 worker-department

10e085ca1b refs #5334 link department

027d45bc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

2b06c62876 refs #5334 left-menu

0789804352 refs #5334 fix basic-data

f74c370446 refs #5334 checks vertical

07e176ae4f refs #5334 fix checks basic-data

ceaaece007 refs #5334 label-value

3aa5ce6208 refs #5334 fix hasToSendMail

2a78a912eb refs #5334 worker.department

f4e877dada refs #5334 refactor summary

2d6f0bb2ce refs #5334 front fix

9ee653dbd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d9a64211de refs #5334 fix descriptor, basic-data, summary

107d8d1edd refs #5334 model y vista

2778858705 refs #5334 search-panel

cf632040e7 refs #5334 workFk, clientFk

e26eedb51c refs #5334 descriptor wprkerFk clientFk

e7d25a6cf3 refs #5334 filter

45085cccc8 refs #5334 fix search-panel

8860c77147 refs #5334 fix descriptor

26187898e1 refs #5334 popover

1dcaba1fdc refs #5334 department workers list

0fd7f4183e refs #5334 fk

0774a94d8b refs #5334 params

e38bf4f1b3 refs #5334 button delete, btn popover

489012886b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d1a61b3e0d refs #5334 dinamic

eb6953a2b6 refs #5334 department

d5aae8f824 refs #5688 refactor: muestra un mensaje de error controlado

4c7c7f5c96 refs #5334 mod search-panel

f37c66304f refs #5334 change info

bb5247c49b refs #5334 tree

04780e211d refs #5334 test front & 1/2 back

5f72fabf8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

1095a59954 refs #5334 rest back, e2e summary, less e2e basic

5798b28c5e refs #5334 baicData e2e

9ef51f5600 remove fdescribe puppeter

c1cda1a3ff refs #5334 basicData e2e

d8f5978284 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

2545a40087 Merge branch 'dev' into 5334-editDepartment

8afd149954 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d6cde764d7 refs #5334 changelog

0dbd3abd65 refs #5808 fix: corregido el condicional

cf559b2ba5 refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono

051269d646 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

aeb04efe82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired

192f4c7864 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter

b7b6f413ba refs #5688 feat: no mostrar datos si no tiene workerCenterFk

55990869e2 refs #5688 ya no muestra mensaje de error

b96f0f22b5 refs #5475 feat(account_changePassword)

cf01c8d46e refs #5475 feat(account_changePassword)

dd157d59d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

ee1b901dea refs #5475 feat(account_changePassword): accessScope

d4cc9cf82a change log remove

98125f8974 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

3701acd26e refs #5334 error getLeaves solve

168e7f1929 changelog

092471f74e refs #5475 feat(account_changePassword): accessScope and backTest

7f20973650 refs #5334 merge

4537344790 merge

a155f846c2 refs #5334 fix ctx

c63df30e5c refs #5334 fix back

f0f8b112cd Merge branch 'dev' into 5334-editDepartment

a8fafacb82 refs #5475 send email force

e741904250 refs #5347

d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

2ddf8e5de6 Merge branch 'dev' into 5334-editDepartment

168d05a830 refs #5334 fix errors

6ab431f8ef refs #5475 tests

473b218da1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter

5f4b62f133 refs #5688 fix: test front

7f9d8da7a7 refs #5836 defaulter

d26778e94e refs #5688 fix: e2e

4931745cde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d272121258 refs 5688 fix: e2e

27946c0062 Refs #5347

137e01e60c refs #5334 fix acl, filter

d9b1f4b8a1 refs #5688 fix: test e2e

beb173f6ce refs #5334 quit e2e no necesario

f6cc59eafb refs #5347

f0fec2cdd6 refs #5347

203e80afa8 refs #5347

16af0c5d6c Merge branch 'dev' into 5347-clientCreate-→-client_create

798481b24a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

224a44847d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

7d2076ff90 Merge pull request '232402_test_to_dev' (!1637) from 232402_test_to_dev into dev ...

Reviewed-on: #1637
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>

24ea18aeb0 refs #5836 isworker back

e43e52b561 refs #5753 db export and fix fixtures

5216f12001 refs #5836 check fix

87c233d221 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management

f0b238b62a refs #5836 fix e2e

07712f58e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

4b8b7a9d82 refs #5475 fix accessScope

06437c9e80 refs #5334 remove other

162faf0d01 Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

31d637c8a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

9b0cf7f378 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

89c25c07b6 refs #5475 fix e2e and back test

f02019d64d refs #5334 fix words

da50ea1dd0 Merge branch 'dev' into 5688-worker.calendar_workCenter

6894da7e22 refs #5688 fix: front test

65e5c95c07 Merge pull request '5688-worker.calendar_workCenter' (!1580) from 5688-worker.calendar_workCenter into dev ...

Reviewed-on: #1580
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

3128601027 Merge branch 'dev' into 5808-client.credit-management

6e52b3b968 refs #5347

54e75dc850 Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create

8723cf2958 refs #5753 fix legacy bugs

e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa

a6fba97b7d Merge pull request '5808-client.credit-management' (!1640) from 5808-client.credit-management into dev ...

Reviewed-on: #1640
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

c5660a21a1 Merge branch 'dev' into 5774-ticket.lines_evitarCantidadNegativa

33e1d9e3f2 Merge pull request '5774-ticket.lines_evitarCantidadNegativa' (!1597) from 5774-ticket.lines_evitarCantidadNegativa into dev ...

Reviewed-on: #1597
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

bbc5ed2683 Merge branch 'dev' into 5347-clientCreate-→-client_create

c9c20711b9 refs #5347

89b63f47fc Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create

9dc52b6011 refs #5334 fix labels trad

bb4951bbc8 Merge branch 'dev' into 5334-editDepartment

be1c145d9a refs #5347

af91630852 refs #5836 e2e fix

c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

b062cec747 refs #5475 fix setPassword options/cb

0441bc29b7 refs #5475 correct SQL folder

5f42ee5f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

ff320895a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump

6fcbf69f60 refs #5753 isNotEditableCredit to zeroCreditEditor

6b4501146d refs #5334 fix errors

83b096c206 refs #5334 fix errors

3d93043b98 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

e6ed834bf0 refs #5836 remove case

f636c3b1ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

dc36c6fd9d refs #5334 basicData solve e2e

dc10c20fe3 refs #5334 email validate

d1fb2859be Merge branch 'dev' into 5753_232401_db_dump

5e68363312 refs #5334 onsearch postlink

7fe8698b6f refs #5753 fix ticketToInvoice

c3ef642017 refs #5836 fix fk

4d03ef8f09 Merge branch 'dev' into 5836-clientDefaulterisWorker

3b346d673b Merge pull request 'refs #5753 db export and fix fixtures' (!1643) from 5753_232401_db_dump into dev ...

Reviewed-on: #1643
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

2d1420e3f8 Merge branch 'dev' into 5836-clientDefaulterisWorker

5612c56aed Merge pull request '5836-clientDefaulterisWorker' (!1639) from 5836-clientDefaulterisWorker into dev ...

Reviewed-on: #1639
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev

8ef6f0dd17 Merge branch 'dev' into 5347-clientCreateRefactor

ff6d9e427b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

983d028d06 refs #5334 popover y basic data

9fe7024d17 refs #5347

4d0ed75090 Merge branch '5347-clientCreateRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreateRefactor

6b557d5d8a refs #5347

2ccf8d5197 refs #5347

f1502139ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

5000e05e05 refs #5334 merge + e2e solve

089f1e48ac Merge pull request '5347-clientCreateRefactor' (!1644) from 5347-clientCreateRefactor into dev ...

Reviewed-on: #1644
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

59ad603de6 refs #5816 set version

3d9f0e1497 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

83467c3b6c refs #5334 quit es

9c9b53917a refs #5334 fix error

a7ad947168 Merge pull request '5334-editDepartment' (!1521) from 5334-editDepartment into dev ...

Reviewed-on: #1521
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

48951cc5a1 Merge pull request '5475 - Autenticación de doble factor por email' (!1429) from 5475-email_2fa into dev ...

Reviewed-on: #1429
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

ea71e980cc refs #5970 add changelog

a665b6c060 refs #5970 fix sql

7030be3efa fix

6fa6c21cb1 remove fixtures

0afddb546b Merge pull request 'refs #5978 hotfix_workCenter' (!1650) from hotfix_workCenter into test ...

Reviewed-on: #1650
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

1bcd3039cd refs #5475 redesign 2FA email

43bf7ce707 Merge pull request 'refs #5475 redesign 2FA email' (!1657) from 5475_redesign_2FA_email into test ...

Reviewed-on: #1657
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

6978339fd3 refs #5475 fix email translations

d4a4e04f25 refs #5887 feat: cambiados permisos para añadir/quitar alias de correo

e1f12bea02 a

5a5a1ed20b refs #5887 feat: addback test

d4217ff8d3 refs #5887 correct translations

a215797390 tranalstion

808a9976ab refs #5887 fix: back etst

83698522ca Merge pull request '5887-mailAlias_refactor' (!1659) from 5887-mailAlias_refactor into master ...

Reviewed-on: #1659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

d7ac20dc6a hotFix(supplier): fix accessToken in before save

9cb29b9166 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

510b78c703 refs #6006 mod dias anteriores

551d06ee83 refs #5887 para eliminar sigue las mismas reglas que para añadir

78108b2ca5 Merge branch 'master' into hotfix-travel

aea5133f39 refs #5877 fix: aply changes

c0d329edca a

ef6a2ae578 refs #5887 fix: delete requires

7aaaf5492c refs #5887 refacotr: move code to hook

12685e045c tedst

b228b693cc Merge pull request 'refs #6006 mod dias anteriores' (!1662) from hotfix-travel into master ...

Reviewed-on: #1662
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

e994e54e4b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

69c3a49cce warnFix: smtp prevents the sending of emails depending on the condition

978224c21c Merge branch 'master' into hotfix_mailAlias

3a61bc6052 refs #5887 move changes sql

337ce56a60 refs #5887 test exlcuido

988ff96016 Merge pull request 'hotfix_mailAlias' (!1664) from hotfix_mailAlias into master ...

Reviewed-on: #1664
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

ac4e264d53 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

6fbadf7e4e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix

29a4c51518 Merge branch 'master' into 5964-supplyFixValidation

alexm approved these changes 2023-07-14 05:47:47 +00:00

carlossa merged commit 575d7710a6 into master 2023-07-14 07:29:24 +00:00

carlossa deleted branch 5964-supplyFixValidation 2023-07-14 07:29:25 +00:00

carlossa referenced this issue from a commit 2023-07-14 07:29:25 +00:00

Merge pull request 'refs #5964 fix supply' (!1666) from 5964-supplyFixValidation into master

Sign in to join this conversation.

Reviewers

No reviewers

alexm

Labels

Clear labels   

CR / Tests passed

Unit tests and e2e passed

  

e2e

Implement e2e

  

Missing tests

Missing tests

  

Needs refactor

  

Simple

Simple check / No CR needed

No Label

CR / Tests passed

e2e

Missing tests

Needs refactor

Simple

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1666

No description provided.