dev #1731

Merged

jgallego merged 105 commits from dev into test 2023-08-31 09:13:29 +00:00

Conversation 0 Commits 105 Files Changed 80 +1196 -465

jgallego commented 2023-08-31 09:13:13 +00:00

Owner

Copy Link

No description provided.

jgallego added 105 commits 2023-08-31 09:13:16 +00:00

6cf1e0953d refs #5244 feat: intento de crear el componente workerAutocomplete

daeed312d0 refs #5244 fix: añadido vn-drop-down em html

a539abf3d8 refs #5244 feat: creado back para buscar trabjadores por name. nickname y code

02665ec8e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

3b4626ee74 a

0d85069e0f refs #5561 feat: permite colorear

d727ea83ab refs # 5561 feat: cambiar url del crud-model

cf2bf0a17b refs #5561 delete: codigo obsoleto

02d2afcb8b refs #5561 feat: permite coloear todos los circulos

ccc386454c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel

ba64dbbe46 refs #5561 refactor: actualizados nombres

67413360c6 refs #5561 feat: utilizar métodos bd

b253ea8edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel

5eac9d20dc a

024cb1e3f4 refs #5561 feat: permite modificar registros

391dba6d2c refs #5561 feat: add async functions

874255f2e5 refs #5244 feat: extiende correctamente

1e759119db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

7dd5a5ac8e refs #5244 feat: hereda correctamente

f47a049d7a refs #5244 fix: cambiada descripción erronea

5195c0100b refs #5244 fix: sql

55e123e795 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

dd75302bbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

a699e2d874 refs #5244 feat: añadido 'depatments' como binding

e9ef81f8d7 refs #5244 feat: coge todos los hijos recursivamente

011db142d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

3cedef6f16 refs #5244 fix: add id

f3e771747a refs #5244 fix: getItemTypeWorker permite filtrar por id

7b4e8570aa refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker

bd85cf4e90 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

954c2f5435 refs #5244 feat: carga valor inicial

1d7f0e2135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

c876719a5c refs #5244 fix: corregidos errores

75a66571ba refs #5244 refactor: modificados todos los url='activeWith...'

28eedbfd23 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel

04ca5743a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

a6b8f4ddf8 refs #5244 fix: tfront

d6a27741b5 a

7312ed9cc4 refs #5244 fix back test

2f27f32c45 refs #5244 fix: e2e

8f7caa1183 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel

7d2e98267f refs #5561 eliminados valores a piñon

f52b398596 refs #5561 refactor: sustituidos sql por loopback

cf0b6f8c6e refs #5561 fix: saleGroupDetail.saleFk UNIQUE

51f9055d23 remove file

f926c60017 remove file

9bf891fcec refs #5561 fixed

ea4190f15c refs #5216 update expedition state added

fa9dfdf411 refs #5216 try ACL updateExpeditionState

05eff94217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd

0b88194f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd

bbc26d8ba4 WIP refs #5216 addExpeditionState

10361ba78e refs #5216 addExpeditionState refactored

777426aa05 refs #5561 add backTest

7367d1cdfe refs #6013 fix: add await

0054f2d82f refs #6013 fix: codigo no bloqueante

251ed36eca refs #6013 feat: mostrar error en el mail

7d10be37ec Merge branch 'dev' into 6013-sendMail_fix

0f7f996e3a refs #6126 feat(deploy): init 2336 version

b140f69614 Merge branch 'test' into dev

2f2611a705 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel

9479b1931f Merge pull request '5561-ticket.sale-tracking_cambiandoCrudModel' (!1614) from 5561-ticket.sale-tracking_cambiandoCrudModel into dev ...

Reviewed-on: #1614
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

c7c17e6e4a Merge branch 'dev' into 6013-sendMail_fix

dd1dbcbd4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete

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

59888dfdb8 Merge branch 'dev' into 5244-component_workerAutocomplete

4657bf4e43 refs #6143 refactor: ibanValidation with countryCode param

82d08261e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd

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

dad792cb76 refs #5244 move changes sql

3cffdca0c7 Merge branch 'dev' into 5244-component_workerAutocomplete

0f3b633de4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd

470f511b30 refs #5881 createRolAndGrantAcl

fb9b249c7b Merge branch 'dev' into 5881-createRolClaim

beeebbdf9c refs #6013 refactor: siempre se crea una tranacción para cada dia

9a12169ba4 Merge branch 'dev' into 6013-sendMail_fix

bda3937417 refs #5216 path replaced and test created

3694fcbbfb refs #5881 fixCreateRol

6e6e4d40d0 Merge pull request '6013-sendMail_fix' (!1694) from 6013-sendMail_fix into dev ...

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

b5b7770f3f refs #6146 fixes: muestra la agencia de la ruta

c997ad6ccb Merge branch 'dev' into 5881-createRolClaim

c5006b6be6 refs #5881 insertAcl

386de69bce refs #5216 fix error handling

671e34da9a Merge pull request 'refs #5881 createRolAndGrantAcl' (!1715) from 5881-createRolClaim into dev ...

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

a3d301f12e Merge branch 'dev' into 6143-refactor-iban-con-country

083f19fd41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd

f54a239229 fixes #6143 fixes: this.bankEntityFk no existe

351096bd11 Merge pull request 'refs #6143 refactor: ibanValidation with countryCode param' (!1713) from 6143-refactor-iban-con-country into dev ...

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

1d300237f2 Merge branch 'dev' into 6146-route-sugestedTicket-error

b304210e8f Merge branch 'dev' into 5244-component_workerAutocomplete

864ffd032f Merge pull request '5244-component_workerAutocomplete' (!1679) from 5244-component_workerAutocomplete into dev ...

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

45c58feb8c Merge branch 'dev' into 6146-route-sugestedTicket-error

ca28d2d78f ref #5216 myOptions added

5fe12d9281 Merge branch 'dev' into 5216-expeditionStateAdd

cfbd24c721 Merge pull request '6146-route-sugestedTicket-error' (!1722) from 6146-route-sugestedTicket-error into dev ...

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

7f1db050ad Merge branch 'dev' into 5216-expeditionStateAdd

d424714956 Merge pull request '5216-expeditionStateAdd' (!1717) from 5216-expeditionStateAdd into dev ...

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

de8aba289a refs #5991 Deleted view currentWorkersStats

6292d4302d Merge pull request 'refs #5991 Deleted view currentWorkersStats' (!1724) from 5991-deletedCurrentWorkersStats into dev ...

Reviewed-on: #1724
Reviewed-by: JORGE PENADES HURTADO <jorgep@verdnatura.es>

7848634bff refs #5300 Deleted postgresql dependences

4d802182f5 refs #5300 calendar_employee depend. (refs #5378)

f38ff9ef9c refs #5300 calendar_employee depend. (refs #5378)

1ad9a30848 Merge pull request '5300-byePostgresql' (!1725) from 5300-byePostgresql into dev ...

Reviewed-on: #1725
Reviewed-by: JORGE PENADES HURTADO <jorgep@verdnatura.es>

ea5e10faed Merge pull request 'test' (!1730) from test into dev ...

Reviewed-on: #1730

b1978b07bd changes path desactualizado

jgallego merged commit be41a62bd7 into test 2023-08-31 09:13:29 +00:00

jgallego referenced this issue from a commit 2023-08-31 09:13:30 +00:00

Merge pull request 'dev' (!1731) from dev into test

Sign in to join this conversation.

Reviewers

No reviewers

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

1 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#1731

No description provided.