Commit Graph

20253 Commits

Author SHA1 Message Date
Guillermo Bonet 6345d1ae42 fix refs #6780 XDiario
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-02-23 08:14:58 +01:00
Sergio De la torre 08b109140d Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:02:53 +00:00
Alex Moreno 489432b4e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:51:26 +01:00
Alex Moreno 201e70175d Merge pull request 'refs #6414 fix(newWorker): back test' (!2075) from 6414-fix_backTest_newWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2075
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-23 06:47:31 +00:00
Sergio De la torre 131ae6b522 refs #6193 feat:modify inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:44:25 +01:00
Alex Moreno 607b908814 Merge branch 'dev' into 6414-fix_backTest_newWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 06:41:36 +00:00
Alex Moreno 4a2032b9cd refs #5509 fix(EntryDms): sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:39:56 +01:00
Robert Ferrús 2d084b04a4 Merge pull request 'fix: refs #6371 bankPolicy_notifyExpired accountingFk' (!2076) from 6371-bankPolicy_notifyExpired into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2076
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-23 06:38:35 +00:00
Robert Ferrús 6580fd44cd fix: refs #6371 bankPolicy_notifyExpired accountingFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 07:18:32 +01:00
Alex Moreno 1f48245223 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-23 07:13:54 +01:00
Alex Moreno 2b19004783 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 07:13:05 +01:00
Alex Moreno c7dd81e53d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev Build started... Details
2024-02-23 07:12:24 +01:00
David Domenech ba167d52ef Merge pull request '6372-ExpenseManual-Error' (!2072) from 6372-ExpenseManual-Error into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2072
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-23 06:11:30 +00:00
David Domenech f2b1418419 Merge branch 'dev' into 6372-ExpenseManual-Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 06:03:14 +00:00
Juan Ferrer 2bf62dca25 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 16:16:34 +01:00
Juan Ferrer 20e5eda4d1 fix: refs #6915 broken view vn.doc removed 2024-02-22 16:16:32 +01:00
Jorge Penadés 744dd61561 fix: refs #6744 create setUnverifiedPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 15:42:54 +01:00
Jorge Penadés a26dfd8a40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword 2024-02-22 15:18:31 +01:00
Alex Moreno a0593804ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-22 14:56:53 +01:00
Guillermo Bonet df5e9bc830 fix: refs #6184 Rollback saveSign.js
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 14:46:10 +01:00
Carlos Satorres 4c7d7f2ab7 Merge pull request 'refs #6922 change order' (!2071) from 6922-invoiceOutOrder into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2071
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-22 13:40:46 +00:00
Carlos Satorres fac7071bae refs #6414 fix(newWorker): back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:38:26 +01:00
Ivan Mas a0cb32ea10 refs #6784 Delete unnecessary JOINs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:01:19 +01:00
Jorge Penadés 168e8ca205 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 13:21:46 +01:00
Jorge Penadés 76b1433099 fix: refs #6878 use clockIn procedure on update time
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-22 12:48:07 +01:00
Guillermo Bonet 7d3cf162b8 fix: refs #6184 uploadFile
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 11:22:39 +01:00
Carlos Andrés ae58c2219b Merge branch 'dev' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-22 10:16:09 +00:00
Carlos Satorres 8a2cff5308 Merge branch 'dev' into 6922-invoiceOutOrder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 10:01:01 +00:00
David Domenech c348900c80 Merge branch 'dev' into 6372-ExpenseManual-Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 09:50:24 +00:00
David Domenech d9119f9ab7 Merge branch '6372-ExpenseManual-Error' of https://gitea.verdnatura.es/verdnatura/salix into 6372-ExpenseManual-Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 10:47:28 +01:00
David Domenech 13249fae08 refs #6372 2024-02-22 10:47:27 +01:00
Carlos Satorres b6086e74c1 refs #6922 change order
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 10:39:34 +01:00
Juan Ferrer 9f067fc9b3 build: HOTFIX Myt updated
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 10:20:15 +01:00
Guillermo Bonet 80fc9e4472 fix: refs #6184 Quitadas transacciones en los SELECT en saveSign.js
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 10:16:29 +01:00
Juan Ferrer e071f86995 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 09:36:50 +01:00
Juan Ferrer dd3249ea59 ci: HOTFIX Jenkinsfile 2024-02-22 09:36:48 +01:00
Juan Ferrer 3132475d9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-22 09:36:24 +01:00
Juan Ferrer 03ebac78fc ci: HOTFIX Jenkinsfile 2024-02-22 09:36:14 +01:00
Guillermo Bonet 0344a81785 fix: refs #6780 Rollback vn2008.versiones
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-22 09:08:37 +01:00
Alex Moreno 033b176e72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-22 09:06:03 +01:00
David Domenech e833a30eb9 Merge pull request 'refs #6372' (!2070) from 6372-ExpenseManual-Error into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2070
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-22 07:56:17 +00:00
Pablo Natek f4f6eeb6fe fix(version): refs #6372 add semicolon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 08:36:14 +01:00
Alex Moreno 5d195f5d82 Merge pull request 'refs #6915 test_master24_8' (!2067) from test_master24_8 into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2067
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-02-22 07:31:33 +00:00
David Domenech d48fd77f48 refs #6372
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 08:25:38 +01:00
David Domenech 0384f7d83d Merge pull request 'refs #6372 DeleteTablesFromVn2008' (!2055) from 6372-Delete-views-from-vn2008 into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2055
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-22 06:14:25 +00:00
David Domenech 5110d6e71d fix error refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 07:09:35 +01:00
Javier Segarra d0c82f694e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 07:08:41 +01:00
David Domenech e4d60d20c5 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 05:59:00 +00:00
Robert Ferrús 1a8044ee82 Merge pull request 'fix: refs #6371 restore tables' (!2068) from 6371-restoreTables into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2068
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-21 17:50:19 +00:00
Robert Ferrús 0a16335eaa fix: refs #6371 restore tables
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-21 18:48:39 +01:00