Commit Graph

21232 Commits

Author SHA1 Message Date
Alex Moreno 51d09b4f2a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-04-18 09:27:15 +02:00
Alex Moreno 1ea4aa9d05 Merge pull request 'deploy: refs #7226 dump' (!2324) from 7226-dump into master
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 2024-04-18 09:20:47 +02:00
Alex Moreno 7a021c9ac6 fix(payrollCenter): refs #6738 2024-04-18 09:13:15 +02:00
Pablo Natek 77f7348acb feat(workcenter): refs #4988 add workcenter config menu 2024-04-18 09:02:01 +02:00
Alex Moreno af06ef30d4 hotFix(workerDms): document.isDocuware 2024-04-18 08:50:17 +02:00
Alex Moreno e53f1092f4 fix: enable debug 2024-04-18 08:39:10 +02:00
Jon Elias d42aab346f refactor: refs #7139 replace warehouse with ticket 2024-04-18 08:17:43 +02:00
Jon Elias f41177643f refactor: refs #6899 corrected Lilium styles and functionalities 2024-04-18 08:01:16 +02:00
Alex Moreno 6580c5bd6a Merge pull request '7226-testToMaster_2416' (!2320) from 7226-testToMaster_2416 into master
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 2024-04-18 07:12:43 +02:00
Pablo Natek eee7062e3f Merge pull request 'test' (!2319) from test into dev
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
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 2024-04-17 16:43:17 +02:00
Pablo Natek 07f95f3f6c Merge pull request 'master' (!2318) from master into test
Reviewed-on: #2318
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-17 13:25:56 +00:00
Sergio De la torre 3f291da02c refs #6921 feat: addFromDelivery 2024-04-17 13:57:56 +02:00
Sergio De la torre 32e2827287 refs #6921 feat: addFromDelivery 2024-04-17 13:55:07 +02:00
Robert Ferrús c62ec8798b Merge pull request 'feat: refs #6500 procRefactor8' (!2131) from 6500-procRefactor8 into dev
Reviewed-on: #2131
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-17 11:32:53 +00:00
Robert Ferrús edc6e4a5e3 Merge branch 'dev' into 6500-procRefactor8 2024-04-17 11:30:45 +00:00
Sergio De la torre a3c8532661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery 2024-04-17 13:27:00 +02:00
Juan Ferrer 7cda14c424 Merge branch 'dev' into 4409-binlog 2024-04-17 13:24:32 +02:00
Juan Ferrer ae326e6e2e feat(binlog): refs #4409 Old recalc code removed
Queues: orderTotal, ticketTotal and travelEntries
2024-04-17 13:21:27 +02:00
Robert Ferrús e769081a74 feat: refs #6500 2024-04-17 13:11:28 +02:00
Pablo Natek bed85cfe92 Merge pull request 'fix(view): refs #6372 fix' (!2317) from 6372-fixTable into master
Reviewed-on: #2317
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-17 10:35:18 +00:00
Pablo Natek d93dc28728 fix(view): refs #6372 fix 2024-04-17 12:32:33 +02:00
Robert Ferrús 998466f6eb Merge pull request 'test' (!2316) from test into dev
Reviewed-on: #2316
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-17 10:28:45 +00:00
Guillermo Bonet 0d50f5b405 Merge pull request 'master' (!2315) from master into test
Reviewed-on: #2315
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-17 10:20:20 +00:00
Robert Ferrús 062bda548f Merge pull request 'feat: refs #7219' (!2307) from 7219-sale_replaceItem into test
Reviewed-on: #2307
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 10:10:42 +00:00
Robert Ferrús 90c002294e Merge pull request 'feat: company_getSuppliersDebtHotFix' (!2314) from company_getSuppliersDebtHotFix into master
Reviewed-on: #2314
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-17 10:08:00 +00:00
Robert Ferrús 3e5b6a9ad1 Merge branch 'dev' into 6500-procRefactor8 2024-04-17 09:01:39 +00:00
Robert Ferrús 8ca278b5a9 feat: refs #6500 cambios solicitados 2024-04-17 11:00:00 +02:00
Javier Segarra 799427b388 Merge pull request '#6930 - Revert/Undo rollback' (!2313) from 6930_undo_rollback into dev
Reviewed-on: #2313
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-17 08:33:25 +00:00
Javier Segarra ae2468da0e Merge branch 'dev' into 6930_undo_rollback 2024-04-17 08:27:56 +00:00
Guillermo Bonet cffc1964b6 feat: refs #6968 Transactioned and isTriggerDisabled 2024-04-17 10:26:21 +02:00
Javier Segarra d5cb52cb64 feat(salix): refs #6930 Undo rollback salix-front 2024-04-17 10:03:01 +02:00
Robert Ferrús 0a4cd4d4d0 feat: company_getSuppliersDebtHotFix 2024-04-17 09:58:27 +02:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Guillermo Bonet 9f9662924d Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev
Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 06:48:43 +00:00
Robert Ferrús a0f3c6183b Merge branch 'test' into 7219-sale_replaceItem 2024-04-17 06:42:18 +00:00
Guillermo Bonet f1bb2fbcb3 Merge branch 'test' into dev 2024-04-17 08:41:33 +02:00
Guillermo Bonet 7d50907676 Merge branch 'master' into test 2024-04-17 08:41:10 +02:00
Guillermo Bonet 786a5a68b9 hotfix: EKT 2024-04-17 08:40:25 +02:00
Sergio De la torre ae88a8a281 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery 2024-04-17 07:44:08 +02:00
Juanjo Breso 3950d60387 feat: refs#6493 Cambios solicitados procedimientos 2024-04-17 07:37:58 +02:00
Juanjo Breso 97c0db62ac Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2 2024-04-17 07:33:11 +02:00
Juanjo Breso 187c918a21 feat: refs#6493 Cambios solicitados procedimientos 2024-04-17 07:33:08 +02:00
Juanjo Breso 81b2e89fd8 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2 2024-04-17 05:30:39 +00:00
Guillermo Bonet bc2b6ff97e feat: refs #7173 Added traduction 2024-04-17 07:25:46 +02:00
Guillermo Bonet 36bf770ed4 Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev
Reviewed-on: #2258
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 05:17:36 +00:00
Guillermo Bonet d92d373db4 Merge branch 'dev' into 6968-groupingModeRefactor 2024-04-17 05:15:37 +00:00