master -> test #1477

Merged

alexandre merged 5 commits from master-to-test into test 2023-04-24 06:37:45 +00:00

Conversation 0 Commits 5 Files Changed 1 +1 -1

alexandre commented 2023-04-24 06:14:54 +00:00

Contributor

Copy Link

No description provided.

alexandre added 123 commits 2023-04-24 06:14:55 +00:00

f2bd0253e2 refs #5092 added unbilled tickets section

4e800a7a45 .

b828d40464 Merge branch 'dev' into 5092-listado-ticketsSinFacturar

23a15ee15c Merge branch 'dev' into 5092-listado-ticketsSinFacturar

b1d5a2ba1a Merge branch 'dev' into 5092-listado-ticketsSinFacturar

c4d6a19666 refs #5092 download as csv button

efcf224962 Merge branch 'dev' into 5092-listado-ticketsSinFacturar

8a4d9bd2bf refs #5211

eee4c815e7 Merge branch 'dev' into 5092-listado-ticketsSinFacturar

38bf49c0b6 refs #5410 fix: se mantenien los checkbox marcados al paginar

0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar

c46e15c8e4 refs #5092 changed section name

3f356335db refs #5092 added popovers

bc47fc35d6 refs #5410 feat: añadido filtro a las columnas created y defaulterSinced

5794ae5130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked

98916bf5e1 refs #5410 add changelog

a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar

61a0d8bcb2 refs #5092 showing clients with multiple negative bases

306573b1bf refs #5439 campos fecha y salesperson

1bc3103d9f refs #5439 filtro comercial

41c79263c4 refs #5410 feat: envia email cuando se añade una nota

700151b500 refs #5092 amount <> 0

bf38098e5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked

1b1bca28bd refs #5410 add frontTest

fde854f5c2 refs #5250 campo de notes

3fd1e7a086 refs #5439 se elimina el filtro de fecha añadido

79c42384ee refs #5439 role actualizado

a17016a1d8 refs #5439 arreglo getUserConfig

36af9d45e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra

fa78649607 refs #5439 url filter

6c75853ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked

f689d35100 refs #5410 fix test

c68c78cc5b refs #5250 solucion error WorkerObserv

b199ca4a6e Merge branch 'dev' into 5250-observacionesWorker

87d0dc3cec refs #5092 changed name to negative bases

05caf0c6d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar

06ac8f9910 refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas

564165dc0f refs #5250 Self.validatesPresenceOf

809c24f6cf Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker

fb1b39da17 refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto

b4e04fcdad refs #5275 feat: colorear fechas

c53c54b6cd refs #5275 feat: modificar masivamente

3b615d9879 refs #5275 fix: actualiza correctamete los elementos del checkedDummy

d066c4ea0b refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'

5a67f47305 refs #4856 fix: actualizar estado a 'SENDED' movido al back

4edb2463b8 refs #5250 eliminacion isEnabled

60383eda0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker

6ff6004627 Added version 2314.01

e1bfdc3f3c eliminada variable que no se usa

67689695e4 refs #5275 filtra por defecto por el this.vnConfig.warehouseFk

0ea30552dd Eslint as default formatter

9944e9a645 Merge branch 'dev' into 5250-observacionesWorker

862101c4b0 refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador

d1100384bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2

24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar

32df51ecca refs #5092 moved sql

98f61ecfdb refs #5092 changelog

25df36eec9 Merge pull request 'fixes #5092 Listado tickets sin facturar' (!1368) from 5092-listado-ticketsSinFacturar into dev ...

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

21b7050cfd refs #4856 otros usuarios pueden actualizar el estado

0db3bc5e26 refs #4856 fix test

9380b88460 refs #5437 back and test deprecated

c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked

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

c126c6044a Updated format

3630c7d398 refs #5410 creada ruta de back para enviar emails

7a274e2721 Merge branch 'dev' into 5410-client.defaulter_getChecked

35d19e586a add translatiojn

eed1ecc208 refs #4954 trigger modified

81cf35f2d3 refs #5259 drop procedure invoiceOut_afterInsert

589e996b69 refs #5259 minor fix

8f4de7e7e9 refs #5259 undo delete, update trigger

28a12d0706 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor

e97b5a9f80 refs #5275 fix backTest

77b91b77b2 refs #5439 requesterFk solve

fb5969a120 refs #5275 add test

7d3c6a98f3 refs #5439 search panel solve

8741a9f913 Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra

3450e7ffdf refs #5275 fix test e2e

44d4df9c21 Merge branch 'dev' into 5211-cleanItemShelvings

de31d98e2e refs #5275 fix test e2e

6a0bca1a94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2

a44a640d15 refs #4856 manejo errores

c823a0d6f1 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk

1e01f26d76 refs #5211 empty commit

041590e541 refs #4856 maneja errores y notifica a los jefes

033927d5b4 Merge pull request '5410-client.defaulter_getChecked' (!1403) from 5410-client.defaulter_getChecked into dev ...

Reviewed-on: #1403
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

a8af280de5 Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev ...

Reviewed-on: #1406
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

b71ad207ff Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev ...

Reviewed-on: #1420
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk

213766afdf Merge pull request 'fixes #5259 Envío de factura electrónica en clientes sin el check "Factura electrónica"' (!1423) from 5259-invoice-electronic-without-check into dev ...

Reviewed-on: #1423
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

68a24b7335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker

f307f79dc2 refs #5250 cambio a ult version de changes

30761781fa Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker

05912610f8 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk

8a297469d6 refs #4856 añadido myOptions

d9ae24c927 Merge branch 'dev' into 4856-worker.time-control_2

49300b6f19 Merge pull request 'fixes #4954 cliente datos comprobados' (!1421) from 4954-client-isTaxDataChecked-businessTypeFk into dev ...

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

b3f946e15f Merge branch 'dev' into 5250-observacionesWorker

ba31613ac9 Merge branch 'dev' into 5275-item.fixed-price_refactor

5e6cccbf57 Merge pull request '5275-item.fixed-price_refactor' (!1426) from 5275-item.fixed-price_refactor into dev ...

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

fe0d861dc0 Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev ...

Reviewed-on: #1418
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

5732f9a33b Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev ...

Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert

53bd6cd729 Merge branch 'dev' into 5522-loggable-deadlock

ec03c6edfa fix intermittent backTest

5ab2913c39 Merge pull request 'fix intermittent backTest' (!1431) from fix_backTest into dev ...

Reviewed-on: #1431
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

ccf26c5413 Merge branch 'dev' into 5211-cleanItemShelvings

736d0375f6 Merge pull request 'refs #5211' (!1385) from 5211-cleanItemShelvings into dev ...

Reviewed-on: #1385
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

7e1d6f4339 Merge branch 'dev' into 5522-loggable-deadlock

847d0f6c43 Merge pull request 'fixes #5522 Loggable - Deadlock en inserción múltiple' (!1430) from 5522-loggable-deadlock into dev ...

Reviewed-on: #1430
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

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

8ade602563 hotfix one sign for every ticket

9e4c261a87 Merge pull request 'hotfix saveSign one sign for every ticket' (!1440) from hotfix-saveSign-oneSignForEveryTicket into test ...

Reviewed-on: #1440
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

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

b3fb661f12 hotfix minor version delivery

095135807d Merge branch 'test' into hotfix-applyChanges-delivery

5a2dbbabfd template string

18b859ae71 Merge branch 'hotfix-applyChanges-delivery' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-applyChanges-delivery

2192cd4066 Merge pull request 'hotfix minor version delivery' (!1454) from hotfix-applyChanges-delivery into test ...

Reviewed-on: #1454
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

2975e7fae3 hotfix savesign

bbf1c40987 Merge branch 'master' into hotfix-dms-hasFile

d945707761 Merge pull request 'hotfix savesign dms hasFile' (!1474) from hotfix-dms-hasFile into master ...

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

d48ede678d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into master-to-test

alexandre requested review from alexm 2023-04-24 06:19:10 +00:00

alexandre added 17 commits 2023-04-24 06:19:31 +00:00

e6355e3232 hotfix paginate negative bases

b364564e4d Merge branch 'test' into hotfix-paginate-negativeBases

ce3e299d09 fix intermintent test

edc49ab5b3 refactor code

fef9387782 Merge pull request 'fix intermintent test' (!1456) from fix_intermitentTest into test ...

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

89f6f0fbdb hotfix delivery

4eb7e19c43 Merge branch 'test' into hotfix-delivery-231401

cebab42b47 Merge pull request 'hotfix delivery' (!1457) from hotfix-delivery-231401 into test ...

Reviewed-on: #1457
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

bf335a0447 Merge branch 'test' into hotfix-paginate-negativeBases

8f100c6021 Merge pull request 'hotfix paginate negative bases' (!1444) from hotfix-paginate-negativeBases into test ...

Reviewed-on: #1444
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

239685b43f (231401) master to test

df3f2f3b62 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test

3103e60d4b fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 60000

9766008ca9 fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 90000

1842a5c464 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test

25414f23f0 Merge pull request '(231401) master to test' (!1466) from 231401_master_to_test into test ...

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

84c01ecea7 Merge branch 'test' into master-to-test

alexm approved these changes 2023-04-24 06:27:19 +00:00

alexandre merged commit 5b44323009 into test 2023-04-24 06:37:45 +00:00

alexandre deleted branch master-to-test 2023-04-24 06:37:45 +00:00

alexandre referenced this issue from a commit 2023-04-24 06:37:46 +00:00

Merge pull request 'master -> test' (!1477) from master-to-test into test

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#1477

No description provided.