Commit Graph

15574 Commits

Author SHA1 Message Date
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
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
Juan Ferrer 2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 18:13:24 +02:00
Juan Ferrer 6e3e2cf798 refs #5517 Filter RC 2023-04-27 18:13:17 +02:00
Pablo Natek 7189f7dc79 Merge pull request 'refs #4795 clientGetDebt → client_getDebt' (!1442) from 4795-client_getDebt into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1442
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-27 12:58:46 +00:00
Pablo Natek 51624882e8 Merge branch 'dev' into 4795-client_getDebt
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 12:05:12 +00:00
Alexandre Riera 7f8f65567f Merge pull request 'fixes #5255 Revisar ticket/boxing' (!1486) from 5255-revisar-ticketBoxing into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1486
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-27 08:55:05 +00:00
Alexandre Riera 3bd5582794 Merge branch 'dev' into 5255-revisar-ticketBoxing
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 08:42:21 +00:00
Alex Moreno 099ed2578c Merge pull request 'deploy(231601): dev to test' (!1490) from 231601_dev_to_test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1490
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-04-27 07:22:22 +00:00
Alex Moreno 34bb216f17 deploy(231601): dev to test
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 08:53:54 +02:00
Pablo Natek 990bfc63a8 Merge branch 'dev' into 4795-client_getDebt
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 16:10:39 +00:00
Carlos Satorres 636154e4fa Merge pull request '084200-arreglarChanges' (!1488) from 084200-arreglarChanges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1488
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-26 12:50:26 +00:00
Carlos Satorres 15df9518ab Merge branch 'dev' into 084200-arreglarChanges
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:31:33 +00:00
Carlos Satorres 09c1d7e393 refs #084200 add table
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 14:30:58 +02:00
Vicent Llopis f793dd2a82 Merge pull request '5542-refund_refactor' (!1480) from 5542-refund_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1480
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-26 12:26:40 +00:00
Carlos Satorres 480784ee18 refs #084200 cambio nombre
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 13:48:31 +02:00
Vicent Llopis c69e038a56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:45:54 +02:00
Guillermo Bonet 4548fc8552 Merge pull request '5237-greugeAlarmNotification' (!1485) from 5237-greugeAlarmNotification into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1485
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2023-04-26 10:22:45 +00:00
Guillermo Bonet fd36592c70 Merge branch 'dev' into 5237-greugeAlarmNotification
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:18:53 +00:00
Alex Moreno c62f8e1c14 refs #5297 feat(worker): iban and bankEntity not required
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:13:14 +02:00
Alexandre Riera 1219cfcc5c refs #5255 fixed condition
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:03:17 +02:00
Carlos Satorres be6d416f67 Merge pull request 'refs: #084200 mod del footer y readapatacion heade' (!1382) from 084200-footerAlbaranReport into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1382
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-26 08:54:11 +00:00
Carlos Satorres 899ef23541 refs #084200 test back solve
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:03:01 +02:00
Guillermo Bonet 43bb762129 Merge branch 'dev' into 5237-greugeAlarmNotification
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 07:46:15 +00:00
Carlos Satorres a945f4dedd Merge branch '084200-footerAlbaranReport' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 09:22:21 +02:00
Carlos Satorres 57ec0f8587 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-04-26 09:03:37 +02:00
Carlos Satorres ad9c189e35 Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 06:13:50 +00:00
Alexandre Riera 740e03f0ee Merge pull request 'fixes #5293 Añadir secciones en claim' (!1448) from 5293-claim-sections into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1448
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-26 06:10:02 +00:00
Carlos Satorres 24a007d609 Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 06:07:41 +00:00
Alex Moreno 73153071d6 Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 05:56:46 +00:00
Alexandre Riera c9a42f9eb8 Merge pull request 'added #5518 changelog' (!1484) from changelog-5518 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1484
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-26 05:50:39 +00:00
Alexandre Riera 59b556ede1 Merge branch 'dev' into changelog-5518
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 05:28:59 +00:00
Alexandre Riera 60146b8b9c added #5518 changelog
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 07:28:30 +02:00
Alexandre Riera f2bef8dcf6 Merge pull request 'test -> dev' (!1481) from test-to-dev into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1481
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-25 09:36:03 +00:00
Alexandre Riera 83319894b2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 11:25:29 +02:00
Alex Moreno a6653c5622 refs #5542 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 10:40:35 +02:00
Alex Moreno 618100b68a refs #5542 eliminados procesos que no se usan 2023-04-25 10:40:24 +02:00
Alex Moreno 11d1900859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 09:40:36 +02:00
Alexandre Riera 782f86e84c Merge pull request 'master -> test' (!1479) from master-to-test into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1479
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-25 07:05:44 +00:00
Alexandre Riera 91b2d15234 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into master-to-test
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 08:53:50 +02:00
Alexandre Riera 4477976ea6 Merge pull request 'hotfix negativeBases' (!1472) from hotfix-negativeBases into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1472
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-25 06:48:33 +00:00
Alexandre Riera edb1e2197c Merge branch 'master' into hotfix-negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 06:23:08 +00:00
Juan Ferrer 49368a837b refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 19:10:04 +02:00
Pablo Natek 7636302e7f Merge pull request '5075-feat: sendEmail checkBox and docuware open clientBalanceCreate with default data' (!1317) from 5075-client_balance into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1317
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-24 15:51:19 +00:00
Pablo Natek 3e15728db4 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 15:33:28 +00:00
Carlos Satorres b1376a394f Merge pull request 'refs #5575 mod3Decimal' (!1461) from 5575-tercerDecimalLatest into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1461
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-24 13:39:22 +00:00
Carlos Satorres 40da3dfe52 Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 12:53:28 +00:00
Carlos Satorres ce20f46fef Merge pull request '5436-mensajeClienteSinCorreo' (!1469) from 5436-mensajeClienteSinCorreo into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1469
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-24 12:44:58 +00:00