Commit Graph

20721 Commits

Author SHA1 Message Date
Alex Moreno 3bfaa97ddd fix: refs #6995remove preparation_exception
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:18:30 +01:00
Alex Moreno 62de03e630 Merge pull request 'fix: refs #6995 restore vn.exchangeInsuranceInPrevious' (!2145) from 6995-hotFix_restoreExchangeInsuranceInPrevious into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2145
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
Reviewed-by: David Domenech <davidd@verdnatura.es>
2024-03-07 09:10:09 +00:00
Alex Moreno 463714de14 Merge branch 'master' into 6995-hotFix_restoreExchangeInsuranceInPrevious
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 09:08:49 +00:00
Alex Moreno 99c9ad77d2 fix: refs #6995 restore vn.exchangeInsuranceInPrevious
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 10:07:42 +01:00
Alex Moreno 06e4477a52 Merge pull request 'fix: refs #6995 restore vn.exchangeInsuranceInPrevious' (!2144) from 6995-hotFix_restoreExchangeInsuranceInPrevious into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2144
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-03-07 08:57:41 +00:00
Alex Moreno 572a09f704 fix: refs #6995 restore vn.exchangeInsuranceInPrevious
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 09:55:29 +01:00
Alex Moreno 625abbb804 Merge pull request 'fix: refs #6995 restore vn2008.jerarquia' (!2143) from 6995-hotFix_restoreJerarquia into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2143
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-03-07 08:35:50 +00:00
Alex Moreno b8f09f363f fix: refs #6995 restore vn2008.jerarquia
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 09:33:32 +01:00
Jorge Penadés a94fd1a61c fix: refs #6744 change error kind
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 09:29:51 +01:00
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +01:00
Jorge Penadés 05f3a3f31b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 08:43:01 +01:00
Robert Ferrús 1d684d171e Merge pull request 'fix: rutasAnalyzeHotFix' (!2119) from rutasAnalyzeHotFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2119
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-07 07:21:45 +00:00
Alex Moreno b9d1964d19 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 08:16:38 +01:00
Alex Moreno 24d1f63003 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 08:16:11 +01:00
Robert Ferrús bf9842d5fd Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 07:16:11 +00:00
Alex Moreno 4f68b336bc Merge pull request '6995-testToMaster_2410' (!2139) from 6995-testToMaster_2410 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2139
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-03-07 07:09:07 +00:00
Sergio De la torre dd732297c4 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:31:04 +01:00
Alex Moreno 702792ace0 refs #6990 hotFix: puppeteer cluster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 07:28:55 +01:00
Alex Moreno e127457ed6 refs #6990 hotFix: puppeteer cluster
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 07:27:18 +01:00
Alex Moreno a59d45b28c refs #6990 hotFix: puppeteer cluster
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 07:26:31 +01:00
Alex Moreno a8c2779ee7 Merge branch 'master' into 6995-testToMaster_2410
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 06:22:04 +00:00
Guillermo Bonet 134a8e43ab Merge pull request 'refactor: refs #6948 Bank to Accouting' (!2128) from 6948-bank into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2128
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-07 06:19:49 +00:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:18:16 +01:00
Guillermo Bonet 39b4e5db28 Merge branch 'dev' into 6948-bank
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 06:17:26 +00:00
Guillermo Bonet ee08502f33 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 06:07:54 +00:00
Guillermo Bonet cd40bd47e5 refactor: refs #6495 Deleted procs
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:08:40 +01:00
Robert Ferrús 29926db45f Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 06:01:37 +00:00
Javier Segarra 6c06f70121 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 18:18:34 +00:00
Carlos Andrés f1654609df Merge pull request 'test' (!2142) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2142
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-03-06 16:16:16 +00:00
Carlos Andrés fc3c9332b3 Merge pull request 'master' (!2141) from master into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2141
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-06 16:10:42 +00:00
Sergio De la torre 6df84b9840 Merge pull request 'refs #6607 feat:[checking boxes]' (!2129) from 6607_checking_boxes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2129
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-06 16:04:41 +00:00
Sergio De la torre dc6cfafd05 Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 16:03:24 +00:00
Sergio De la torre 28de7bd402 Merge pull request 'refs #6193 feat:modify inventory' (!2078) from 6193_inventory into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2078
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-06 16:01:41 +00:00
Juan Ferrer f63dfb9a46 Merge pull request 'feat: add column department.pbxQueue refs #6987' (!2140) from 6387-add-department.pbxQueue into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2140
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-06 15:47:05 +00:00
Carlos Andrés c81749da78 feat: add column department.pbxQueue refs #6387
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-06 16:38:34 +01:00
Ivan Mas 6b2533cfb1 refs #6498 correccion errores 2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 15:16:55 +01:00
Carlos Satorres 2e4a5029b8 refs #6755 fix restore 2024-03-06 14:52:49 +01:00
Carlos Satorres a14ab90d5a refs #6755 fix restore add fixtures 2024-03-06 14:41:58 +01:00
Alex Moreno 9ab0228714 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-06 13:58:10 +01:00
Carlos Satorres 58a239708d refs #6842 remove sage
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:11:41 +01:00
Carlos Satorres 6a13a33f84 min c
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:09:41 +01:00
Carlos Satorres a24445439a remove v
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:09:03 +01:00
Carlos Satorres 59a0cb3f4a refs #6842 deprecated and move
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:08:20 +01:00
Ivan Mas 19cba0e72a Merge pull request 'refs #6969 Error packaging' (!2124) from 6969-Error_packaging-buyUltimateFromInterval into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2124
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-03-06 11:54:44 +00:00
Ivan Mas 492c6f4dd6 refs #6969 test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-06 12:50:44 +01:00
Ivan Mas 7947d6644e refs #6498 Correcion errores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 12:44:59 +01:00
Sergio De la torre 49800a5cab Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:36:05 +00:00
Sergio De la torre 010f585ed4 Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:33:34 +00:00
Jorge Penadés 9c3facb072 Merge pull request '#6276 createNewWarehouse methods migrated from silex to salix' (!1850) from 6276-createNewWarehouse into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #1850
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-03-06 11:32:10 +00:00
Carlos Satorres 1b3a8ddbdd refs #6755 fix restore 2024-03-06 12:03:35 +01:00