Commit Graph

23519 Commits

Author SHA1 Message Date
Alex Moreno 5b5ec11973 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 08:58:17 +02:00
Jon Elias 9dedd5383c Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 06:10:49 +00:00
Javier Segarra 1b6f7a49fd Merge pull request 'hotFix: change require to import' (!2328) from hotFix_ImportUserError_front into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev Build started... Details
Reviewed-on: #2328
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-04-19 05:53:09 +00:00
Jon Elias f40c730f6e refactor: refs #6899 changed comercial value in negativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 07:52:43 +02:00
Robert Ferrús 44f36e640b Merge branch '6777-changeDependenciesVn2008toVnPart7' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-19 07:48:47 +02:00
Robert Ferrús 067e71e3ce feat: refs #6777 puppeteer 2024-04-19 07:48:45 +02:00
Alex Moreno 91e13070c7 fix: try to fix puppeteer
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 07:27:54 +02:00
Robert Ferrús c375223ae5 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-19 05:23:23 +00:00
Alex Moreno 8b468b52ea fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-19 07:21:35 +02:00
Alex Moreno f766b9a3b1 fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-19 07:17:53 +02:00
Carlos Andrés 27d59f4a8f fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 19:12:24 +02:00
Sergio De la torre f4afda8cb2 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 14:52:57 +00:00
Ivan Mas 7e488ee601 refs #7191 check isBooked in entry_BeforeUpdate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 16:09:05 +02:00
Alex Moreno 9ec51e534d fix: jenkins puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 15:39:25 +02:00
Alex Moreno 87e23b49e7 hotFix: change require to import
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 15:19:19 +02:00
Jon Elias 08ca1a302b Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary 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: #2323
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 12:55:58 +00:00
Robert Ferrús f269d41596 Merge branch 'master' into 174903-item_getSimilar
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 12:52:52 +00:00
Guillermo Bonet bb8379f8db refactor: refs #6724 Minor change
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 14:42:29 +02:00
Robert Ferrús 4f7d315719 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 14:07:23 +02:00
Guillermo Bonet 8f9adbb37c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 13:55:22 +02:00
Guillermo Bonet 5c5d0ec9dc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 13:52:31 +02:00
Guillermo Bonet d5dc057c36 hotfix: changes 2024-04-18 13:52:30 +02:00
Sergio De la torre 279c300fbf Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 11:08:15 +00:00
Guillermo Bonet 2b11f85b67 Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 11:06:47 +00:00
Robert Ferrús 9295bddaa8 feat: refs #174903 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-18 13:06:45 +02:00
Carlos Andrés 0ebdd032e5 Merge pull request 'testToMaster fix' (!2325) from test into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2325
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-18 10:39:19 +00:00
Guillermo Bonet d6ec84e1fe hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 12:07:00 +02:00
Jon Elias f7a6d47c04 Merge pull request 'feat: #7130 added "served" field to RouteList table(Salix).' (!2219) from 7130-addFieldInRoutes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2219
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 09:34:35 +00:00
Sergio De la torre 958759dc80 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:12:46 +00:00
Sergio De la torre e909d64757 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 10:01:22 +02:00
Alex Moreno 9143447eb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 09:27:46 +02:00
Alex Moreno 51d09b4f2a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-18 09:27:15 +02:00
Alex Moreno 1ea4aa9d05 Merge pull request 'deploy: refs #7226 dump' (!2324) from 7226-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2324
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-04-18 07:25:49 +00:00
Alex Moreno 659adfd87d deploy: refs #7226 dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-18 09:20:47 +02:00
Sergio De la torre ad13ad856b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:13:48 +02:00
Alex Moreno 7a021c9ac6 fix(payrollCenter): refs #6738
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 09:13:15 +02:00
Pablo Natek 77f7348acb feat(workcenter): refs #4988 add workcenter config menu
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 09:02:01 +02:00
Alex Moreno af06ef30d4 hotFix(workerDms): document.isDocuware
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 08:50:17 +02:00
Alex Moreno e53f1092f4 fix: enable debug
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 08:39:10 +02:00
Jon Elias d42aab346f refactor: refs #7139 replace warehouse with ticket
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:17:43 +02:00
Jon Elias f41177643f refactor: refs #6899 corrected Lilium styles and functionalities
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:01:16 +02:00
Alex Moreno 6580c5bd6a Merge pull request '7226-testToMaster_2416' (!2320) from 7226-testToMaster_2416 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2320
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-18 05:39:35 +00:00
Sergio De la torre 76fb9bf7a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 07:12:43 +02:00
Pablo Natek eee7062e3f Merge pull request 'test' (!2319) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2319
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-18 05:05:40 +00:00
Jorge Penadés d16a3e3b78 Merge pull request '#6492 warmfix-fixCalculatedCode' (!2321) from 6492-warmfix-fixCalculatedCode into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2321
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-17 15:09:51 +00:00
Jorge Penadés b83e0a4ae2 fix: refs #6492 castToInt
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-17 16:43:17 +02:00
Pablo Natek 07f95f3f6c Merge pull request 'master' (!2318) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2318
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-17 13:25:56 +00:00
Carlos Andrés 9ca1b9f104 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 15:02:58 +02:00
Sergio De la torre 3f291da02c refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:57:56 +02:00
Sergio De la torre 32e2827287 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:55:07 +02:00