Commit Graph

15970 Commits

Author SHA1 Message Date
Carlos Satorres 8578e3ca49 Merge pull request 'refs #5090 mod golabel' (!1496) from 5090-modGolLabel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1496
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-04 08:46:31 +00:00
Carlos Satorres cfc02cd669 Merge branch 'dev' into 5090-modGolLabel
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 08:20:04 +00:00
Carlos Satorres 49233eefcd refs #5580 add button, yml
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 10:18:37 +02:00
Juan Ferrer 677764f302 refs #5517 Fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 10:00:21 +02:00
Alex Moreno 9030aea17c Merge pull request 'fix(client): use account setPassword' (!1500) from client_use_account_setPassword into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1500
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-04 07:38:09 +00:00
Alex Moreno 1fa5926c17 Merge branch 'dev' into client_use_account_setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 07:06:44 +00:00
Alexandre Riera e93b1cba63 Merge pull request 'fixes #4713 ENC - Modificar como se generan los avisos de cambios de cantidades al encajar' (!1374) from 4713-saleTracking into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1374
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-04 07:04:55 +00:00
Alex Moreno 2e020b5ebb fix(): correct version
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 09:02:23 +02:00
Alexandre Riera a2d3b79246 Merge branch 'dev' into 4713-saleTracking
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 06:42:39 +00:00
Alex Moreno b64f6d8489 Merge pull request 'refs #4617 use temporary instead of vn' (!1451) from 4617-use_tmp_in_ticketToInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1451
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-04 05:07:18 +00:00
Alex Moreno b2027fddf3 fix(client): use account setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:56:14 +02:00
Alex Moreno a712c0a303 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 12:51:10 +00:00
Juan Ferrer 4c0f59399b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 11:57:16 +02:00
Juan Ferrer bbd2137e57 refs #5517 Avatar componetized 2023-05-03 11:57:13 +02:00
Alex Moreno a1521f5220 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 09:39:39 +00:00
Carlos Satorres 2467534d1f refs #5090 mod golabel
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 09:23:16 +02:00
Carlos Satorres 34a9b3768c Merge pull request '5316-kkeoEntryNotes' (!1449) from 5316-kkeoEntryNotes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1449
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-03 06:33:55 +00:00
Carlos Satorres 3f9d711f90 Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 06:24:04 +00:00
Juan Ferrer a029071c4e refs #5517 User image fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 20:47:56 +02:00
Juan Ferrer 0ed6fe3d32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 17:17:18 +02:00
Juan Ferrer a5c11a0154 refs #5517 Hide worker image on error 2023-05-02 17:17:16 +02:00
Carlos Satorres 17425a627c Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head Build queued... Details
2023-05-02 11:25:17 +00:00
Alex Moreno 88b4abc2d2 Merge pull request 'solve' (!1495) from fdescribe03-fiscal-data into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1495
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-05-02 10:22:46 +00:00
Carlos Satorres ca2ab8d7b2 Merge branch 'dev' into fdescribe03-fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 10:18:48 +00:00
Alex Moreno 306d73eb69 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 09:42:56 +00:00
Carlos Satorres 754c5488bf Merge pull request '5540-validarSupplierIsVies' (!1438) from 5540-validarSupplierIsVies into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1438
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-02 09:29:08 +00:00
Carlos Satorres ea73e7697d solve
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 11:27:25 +02:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 08:41:18 +00:00
Carlos Satorres 5436eec63e Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 10:00:50 +02:00
Carlos Satorres 8156c17c7d refs #5540 del jasmine 2023-05-02 10:00:47 +02:00
Carlos Satorres d9aae670f7 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 06:07:17 +00:00
Javi Gallego 659d76f022 Merge pull request 'refs #5615' (!1493) from 5615-getShipped into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1493
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-01 19:23:00 +00:00
Javi Gallego ed6b2cf25b refs #5615
gitea/salix/pipeline/head This commit looks good Details
2023-05-01 14:57:50 +02:00
Juan Ferrer ddec9fe406 refs #5517 Set tests timezone
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 19:53:13 +02:00
Juan Ferrer eb2c2b386a refs #5517 Duplicated pagination removed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 19:48:36 +02:00
Carlos Satorres 06c01f3e94 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 13:02:10 +00:00
Carlos Satorres fb59371d54 refs #5540 quit logs 2023-04-28 14:38:49 +02:00
Carlos Satorres 0e0db960af refs #5540 supplier 2023-04-28 14:23:44 +02:00
Alex Moreno a89f400f10 use iban
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 14:22:24 +02:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 14:17:19 +02:00
Carlos Satorres c0deb745d6 refs #5540 arreglo en supplier 2023-04-28 14:03:21 +02:00
Carlos Satorres 38142c121d refs #5540 mods client 2023-04-28 12:12:26 +02:00
Alex Moreno e00edf0266 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required 2023-04-28 12:06:45 +02:00
Alex Moreno c3038a4d61 fix(imageCollection):
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 11:54:11 +02:00
Juan Ferrer e70b0b22f3 refs #5517 Code clean
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 11:43:45 +02:00
Juan Ferrer 14170286d7 Merge pull request '5517-improveLogs+translations' (!1439) from 5517-improveLogs+translations into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1439
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-04-28 09:35:38 +00:00
Juan Ferrer 4982fb254c refs #5517 Final style fixes, production ready
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 11:27:02 +02:00
Pablo Natek 8651898a1f Merge branch 'dev' into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 08:36:47 +00:00
Carlos Satorres cdbbec9d36 refs #5540 validate
gitea/salix/pipeline/head Build queued... Details
2023-04-28 10:21:54 +02:00
Alex Moreno 42e3c8f29d refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 09:35:15 +02:00