Commit Graph

20454 Commits

Author SHA1 Message Date
Carlos Satorres f3f0360059 refs #5858 fix conflicts
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 13:19:31 +01:00
Carlos Satorres 8514a23f9c refs #5858 fix conflicts 2024-02-20 13:18:37 +01:00
Carlos Satorres ed37902291 Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 13:14:54 +01:00
Ivan Mas 3813dbb9fd refs #6784 Delete clientTypeFk 2024-02-20 13:10:03 +01:00
Carlos Satorres 728224cad9 refs #5858 fix accepts 2024-02-20 13:04:45 +01:00
Alex Moreno bbc3940cd9 Merge pull request 'hotFix_workerTimeControl_reUse_hasToRefill' (!2049) from hotFix_workerTimeControl_reUse_hasToRefill into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2049
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-20 11:30:24 +00:00
Alex Moreno 7fbb9b5c3f Merge branch 'master' into hotFix_workerTimeControl_reUse_hasToRefill
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-20 11:15:16 +00:00
Alex Moreno ab9c952afc hotFix(sendMail): hasToRefill
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-20 12:13:49 +01:00
Jorge Penadés 9ce162da71 fix: refs #6776 back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 10:59:13 +01:00
Carlos Satorres f3511d4a43 refs #6414 tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 09:53:28 +01:00
Jorge Penadés 55b490160b fix: refs #6776 back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 09:27:37 +01:00
Alex Moreno 668903fa5f hotFix(getUrl): fix prop name environment
gitea/salix/pipeline/head This commit looks good Details
2024-02-20 09:08:32 +01:00
Alex Moreno 06445f3ec1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-20 09:04:53 +01:00
Alex Moreno 4952e0be20 hotFix(getUrl): fix prop name environment 2024-02-20 09:04:50 +01:00
Jorge Penadés 072280cc9c fix: refs #6776 method names
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 08:48:47 +01:00
Jorge Penadés 9b5823384a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-20 08:26:02 +01:00
Guillermo Bonet 4d2637764e Merge pull request 'refactor: refs #5586 Optimized SQL negativeBases' (!2007) from 5586-optimizeNegativeBases into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #2007
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-20 06:28:04 +00:00
Guillermo Bonet 6daa7a03ff Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 06:26:16 +00:00
David Domenech 8f80b6ab7b Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 06:05:34 +00:00
Javi Gallego 175f141fbe Merge pull request '6392-balance-produccion-propia' (!2009) from 6392-balance-produccion-propia into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2009
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-19 14:10:35 +00:00
Javi Gallego a7c48e9132 feat: #6392 quito de fixtures para que no falle la fk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 15:05:11 +01:00
Jorge Penadés e9f7fbed86 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:56 +01:00
Jorge Penadés d5a3413307 fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:42 +01:00
Javi Gallego c53ff1243f feat: #6392 no es necesario agencyTermConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:37:36 +01:00
Pablo Natek f731fbe01c Merge pull request 'fix(usesMana): refs #6879 add mana excluded worker' (!2053) from 6879-fixUsesManaExlusion into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2053
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-19 13:22:44 +00:00
Pablo Natek 011880eb72 fix(spec): refs #6879 remove f from describe
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 14:15:44 +01:00
Pablo Natek 7b0dd6975d fix(usesMana): refs #6879 add mana excluded worker
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-19 14:13:36 +01:00
Javi Gallego 2c1172bd88 feat: #6392 sin gastos
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-19 13:56:16 +01:00
Javi Gallego 8642ddcd7f Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-19 13:34:27 +01:00
Carlos Satorres 9e3b4e8451 refs #6842 sql mod sage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 13:30:03 +01:00
Jorge Penadés 6720ef89b9 Merge pull request '#6776 makeMulti & itemShelvin_add refactor' (!1970) from 6776-makeMulti into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1970
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-19 12:23:44 +00:00
Jorge Penadés d127354905 Merge branch 'dev' into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 12:21:48 +00:00
Pablo Natek 46043eef9a refactor(description): refs #6403 modify description
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 12:54:24 +01:00
Alex Moreno 231ebf78d7 hotFix: remove console.log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 12:33:33 +01:00
Alex Moreno 8328dd6f4c hotFix: workerTimeControl use department.hasToRefill 2024-02-19 12:31:14 +01:00
Pako Natek 84a93cafd2 Merge pull request 'packing' (!2046) from 6358-boxPicking-BluePinguin into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2046
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-02-19 10:56:20 +00:00
Pako Natek f0d59f12e6 Merge branch 'dev' into 6358-boxPicking-BluePinguin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 10:55:11 +00:00
Alex Moreno e8a945ba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-19 11:49:20 +01:00
David Domenech 9bc676ddfd Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 10:35:32 +00:00
Pablo Natek b3ce6e8d45 fix(spec): refs #6403 add mrwSpec
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 11:33:56 +01:00
Sergio De la torre 7e9d222b35 Merge pull request 'refs #6669 fix:ticket_isOutClosureZone' (!1984) from 6669_ticketClosure into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1984
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-19 10:33:51 +00:00
Sergio De la torre a656447fdb Merge branch 'dev' into 6669_ticketClosure
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 10:31:49 +00:00
David Domenech c12fdc2ed4 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 10:29:47 +00:00
David Domenech 3d47c9e5e8 refs #6372
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-19 11:27:37 +01:00
Sergio De la torre 7a0320270a Merge pull request 'test' (!2048) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2048
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-19 10:25:33 +00:00
Jorge Penadés 8d1dea8a00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 11:19:59 +01:00
Jorge Penadés fc6e34ddfd fix: refs #6776 replace name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 11:18:05 +01:00
Jorge Penadés 882c179e89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti 2024-02-19 11:14:02 +01:00
David Domenech 12f3af68bf refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 11:04:07 +01:00
Sergio De la torre 3a4463d0a4 Merge pull request 'refs #6531 feat:showLastTickets' (!2045) from 6531-showTickets into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2045
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-19 10:00:32 +00:00