Commit Graph

756 Commits

Author SHA1 Message Date
Robert Ferrús 30a905f40b Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 05:08:26 +00:00
Jorge Penadés f7cdbd39f0 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:08:52 +02:00
Javi Gallego 4f20224acc Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 14:28:53 +02:00
Javi Gallego 7d3870e4a1 feat: refs#6382 test fixed 2024-04-25 14:28:47 +02:00
Pablo Natek c5b02dc239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 09:46:53 +02:00
Jorge Penadés 88b06ebef5 feat: refs #7211 check if there's available clockIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 08:49:22 +02:00
Sergio De la torre d4d31c6d9e refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-25 08:35:59 +02:00
Sergio De la torre 46f2d790db refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-25 08:01:32 +02:00
Guillermo Bonet 60a3ec99d0 Merge branch 'dev' into 7258-lastChangesMigrationVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 05:02:17 +00:00
Sergio De la torre 8bb2fa93a7 Merge branch 'dev' into 6574_itemGetBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 13:46:53 +00:00
Alex Moreno 917592cdad Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2366
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-24 12:34:46 +00:00
Pablo Natek f2d4283304 fix: refs #7187 number on de code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:29:57 +02:00
Alex Moreno 2638b93299 Merge branch '7225-hotFix_ticket_advanced_movable' of https://gitea.verdnatura.es/verdnatura/salix into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-24 11:40:25 +02:00
Alex Moreno eced03f69b fix(ticket_getMovable): refs #7225 stock add ifnull 2024-04-24 11:40:24 +02:00
Pablo Natek a15970c95f fix: refs #7187 sql for pdaFreelancer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:08:57 +02:00
Guillermo Bonet 71e1e53ccd refactor: #7258 Fixes 2024-04-24 10:57:35 +02:00
Alex Moreno 2e1ad0c000 Merge branch 'master' into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-24 08:42:26 +00:00
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 10:31:26 +02:00
Guillermo Bonet f7ebd071bf refactor: #7258 Deleted all dependences of vn2008 schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 09:53:31 +02:00
Robert Ferrús ffe56edc9c feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:24:42 +02:00
Robert Ferrús 7899cf230e feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:05:29 +02:00
Robert Ferrús ec7dc390b9 Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-24 06:05:03 +00:00
Robert Ferrús e36e997844 feat: refs #6223 ticketCalculateClon 2024-04-24 08:04:28 +02:00
Alex Moreno cc06698214 hotFix(ticket): refs #7225 fix advanced and movable
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-23 15:37:04 +02:00
Juanjo Breso 9c306d4cc2 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:55:02 +00:00
Juanjo Breso 5efb6acafe feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 14:55:05 +02:00
Guillermo Bonet e0393a6e72 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:43:19 +02:00
Guillermo Bonet f5844ff426 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:42:57 +02:00
Guillermo Bonet ec23cc7619 hotfix: entry_checkBooked
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 14:41:43 +02:00
Juanjo Breso 022264ffff Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 14:05:51 +02:00
Juanjo Breso d1c72a0be3 feat: refs#6493 Cambios solicitados procedimientos 2024-04-23 14:05:48 +02:00
Juanjo Breso 9b2bb4be0e Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:04:19 +00:00
Guillermo Bonet afe2669b27 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 13:57:42 +02:00
Guillermo Bonet 36c8a8db0f Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-23 13:57:18 +02:00
Ivan Mas e7055e2428 Merge branch 'dev' into 7032-Delete-vn.recipeCook
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 10:26:42 +00:00
Guillermo Bonet 8dd4ac9119 hotfix: Throw msg and entry_updateComission start transaction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-23 11:50:48 +02:00
Juanjo Breso d7e4dd4fc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 08:03:17 +02:00
Juan Ferrer d58607f26e Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 19:43:48 +00:00
Pablo Natek 71a9aed1bb fix: refs #7187 check for multiple device on freelancer 2024-04-22 18:03:17 +02:00
Ivan Mas 9899efab97 refs #7032 Delete vn.recipe_Cook
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 17:55:49 +02:00
Ivan Mas f03a431ea2 Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 13:08:06 +00:00
Ivan Mas 0284b138d7 refs #7191 requested modifications
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 15:03:08 +02:00
Guillermo Bonet eb9f81c81d feat #7181 Rollback creditInsurance_getRisk
gitea/salix/pipeline/head This commit looks good Details
2024-04-22 13:05:16 +02:00
Robert Ferrús debd163b3f Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 10:16:01 +00:00
Robert Ferrús b0289d2e18 Merge pull request 'test' (!2344) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2344
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-22 09:34:45 +00:00
Robert Ferrús b88dff0d99 feat: refs #6777
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 10:48:37 +02:00
Robert Ferrús e8d7f20221 Merge branch 'master' into 174903-item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-22 07:43:39 +00:00
Robert Ferrús a1a3470df4 feat: refs #174903
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-22 09:43:13 +02:00
Juan Ferrer 739ae82ace fix(binlog): refs #4409 Fix cursor name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 09:02:43 +02:00
Juan Ferrer bc45cafb40 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 08:54:14 +02:00
Robert Ferrús e09b828d88 Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 05:49:53 +00:00
Sergio De la torre 081c97828c Merge branch 'master' into hotFix_Ubicador
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-22 05:08:59 +00:00
Guillermo Bonet e7f81e99bc Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-19 14:40:26 +02:00
Guillermo Bonet 65892625d5 feat: #7231 Collection_assing more time and throw
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 14:17:49 +02:00
Sergio De la torre e6258dc9e5 refs #6413 hotFix fix:ubicadorChecking
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 13:03:57 +02:00
Robert Ferrús 28c08d8b18 feat: refs #7237 company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-19 10:58:19 +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
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
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
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
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 7a021c9ac6 fix(payrollCenter): refs #6738
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 09:13:15 +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 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
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
Robert Ferrús edc6e4a5e3 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 11:30:45 +00:00
Juan Ferrer 7cda14c424 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 13:24:32 +02:00
Juan Ferrer ae326e6e2e feat(binlog): refs #4409 Old recalc code removed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Queues: orderTotal, ticketTotal and travelEntries
2024-04-17 13:21:27 +02:00
Robert Ferrús e769081a74 feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 13:11:28 +02:00
Robert Ferrús 998466f6eb Merge pull request 'test' (!2316) from test into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2315
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-17 10:20:20 +00:00
Robert Ferrús 3e5b6a9ad1 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 09:01:39 +00:00
Robert Ferrús 8ca278b5a9 feat: refs #6500 cambios solicitados
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 11:00:00 +02:00
Robert Ferrús 0a4cd4d4d0 feat: company_getSuppliersDebtHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-17 09:58:27 +02:00
Guillermo Bonet 9f9662924d Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 06:48:43 +00:00
Juanjo Breso 3950d60387 feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 05:30:39 +00: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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 05:15:37 +00:00
Guillermo Bonet c8e7706652 feat: refs #6968 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 07:15:24 +02:00
Carlos Andrés c262805d33 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 18:29:14 +02:00
Carlos Andrés 7bbf113ffa feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 18:26:57 +02:00
Carlos Andrés d53f19b47d feat: Turn problems into calculated columns
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 17:01:14 +02:00
Pablo Natek d0dfdc668b feat(agency): refs #4988 add new agency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 16:25:27 +02:00
Robert Ferrús 01d959f6f4 feat: refs #7219
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-16 12:46:50 +02:00
Guillermo Bonet 7a557be09a feat: refs #6968 Changed groupingMode to enum
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 11:07:57 +02:00
Jorge Penadés 976b18203e feat: refs #7187 check if is freelancer on insert & update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 10:49:17 +02:00
Guillermo Bonet 45fac06c6b feat: refs #7173 Added restrictions in invoiceIn structure 2024-04-16 08:58:26 +02:00
Guillermo Bonet 91d5f51e73 Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 08:44:51 +02:00
Guillermo Bonet 93abfdd8a1 feat: refs #7173 Added restrictions in invoiceIn structure 2024-04-16 08:44:50 +02:00
Guillermo Bonet 0c24e67af1 Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 05:42:59 +00:00
Pablo Natek 0418540ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 07:39:13 +02:00
Pablo Natek 336c3274ea feat(agency): refs #4988 add summary 2024-04-16 07:38:48 +02:00
Ivan Mas 5bb3dccd19 Merge branch 'dev' into 7161DeleteitemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 14:03:42 +00:00
Ivan Mas 6e183b7426 refs #7161 change vAddress to vAddressShortage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 15:59:05 +02:00
Juan Ferrer 133d45eecf Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 10:22:04 +02:00
Robert Ferrús f30f907d8e feat: refs #6500 cambios solicitados
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 12:13:07 +02:00
Robert Ferrús adadf70f1e feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 08:44:06 +02:00
Robert Ferrús 800fa36d04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 08:40:50 +02:00
Robert Ferrús f545a57c9f feat: refs #6500
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-12 07:58:18 +02:00
Guillermo Bonet d86bb6b004 Merge pull request 'refactor: refs #7181 vn2008.Deleted risk_vs_client_list' (!2283) from 7181-risk_vs_client_list into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2283
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-12 05:18:06 +00:00
Guillermo Bonet 2226922366 Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-04-11 14:52:16 +02:00
Robert Ferrús 04c5a9a004 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 12:21:32 +00:00
Juanjo Breso aee638c3a9 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 11:43:07 +00:00
Guillermo Bonet c190d2bef1 Merge branch 'master' into ticket168996-hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-11 07:31:31 +00:00
Guillermo Bonet c9b2bb5b5e Merge branch 'dev' into 7181-risk_vs_client_list
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 07:29:32 +00:00
Guillermo Bonet b1dc5efc8b refactor: refs #7181 Requested changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-11 09:29:25 +02:00
Alex Moreno 3635a4b6d0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-11 07:46:16 +02:00
Pablo Natek b2c3442c12 Merge branch 'master' into 7024-fixInventorryError
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-11 05:33:44 +00:00
Pablo Natek 68ca5d369c fix: refs #7024 fix error on setting local variable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-11 07:33:31 +02:00
Guillermo Bonet 7b3472aa0b refactor: refs #7181 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 14:23:24 +02:00
Pablo Natek 2c5c2ca5a7 fix: refs #7024 fix condition sintax
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-10 14:17:08 +02:00
Guillermo Bonet 5044cd454d refactor: refs #7181 vn2008.Deleted risk_vs_client_list
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 14:17:03 +02:00
Robert Ferrús e2eff4df54 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 12:04:40 +00:00
Pablo Natek 2e15b35fd1 fix: refs #7024 create exception for inventory
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-10 14:01:03 +02:00
Robert Ferrús 7c550f1dbc Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 11:06:32 +00:00
Guillermo Bonet 1fe783cf0e hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-10 12:00:52 +02:00
Juanjo Breso 2d4524a34c feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 09:00:41 +02:00
Jorge Penadés a3c1bceb7e refactor: refs #6492 use enum
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 15:57:34 +02:00
Jorge Penadés dca75437f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 15:20:30 +02:00
Robert Ferrús d151d57613 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-09 14:25:48 +02:00
Ivan Mas 90c26959af refs #7161 change longName to name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 13:39:33 +02:00
Ivan Mas b75af7b192 Merge branch 'dev' into 7161DeleteitemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 11:22:32 +00:00
Guillermo Bonet 0e2e68488d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 13:08:54 +02:00
Robert Ferrús c6ece4619f feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 11:40:12 +02:00
Jorge Penadés 9a28a59d00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 11:11:30 +02:00
Sergio De la torre 75293fbb9a refs #6276 hotFix:itemShelving_add
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-09 07:38:28 +02:00
Robert Ferrús 1743f7501a Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 05:37:18 +00:00
Robert Ferrús 2c0c346a7b feat: refs #6500
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 07:34:43 +02:00
Sergio De la torre 9da7cdfa39 Merge branch 'dev' into 6574_itemGetBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 13:32:15 +00:00
Juanjo Breso 1534402640 feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 13:28:56 +02:00
Sergio De la torre 2f7f237422 refs #6574 feat: add order
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 13:28:38 +02:00
Juan Ferrer 9da9478daf Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 13:11:59 +02:00
Juanjo Breso 351d5b5ba3 Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 12:57:03 +02:00
Juanjo Breso d3df3e3376 feat: refs#6493 Cambios solicitados procedimientos 2024-04-08 12:57:01 +02:00
Juanjo Breso eab1bfe6ab Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 10:43:39 +00:00
Carlos Andrés 5558e92b1e Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2163
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-08 10:36:21 +00:00
Robert Ferrús 2d18f01a15 feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 12:18:13 +02:00
Robert Ferrús dddcacee7a feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 12:01:27 +02:00
Robert Ferrús 2037b17f4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8 2024-04-08 11:57:00 +02:00
Sergio De la torre a29dcdd33b Merge branch 'dev' into 6574_itemGetBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 09:38:32 +00:00
Sergio De la torre 42b033dde2 refs #6574 feat: add order
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 11:35:10 +02:00
Sergio De la torre 957b0c71ca refs #6574 feat: add order
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 10:06:33 +02:00
Juanjo Breso 92cd61460e feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 09:56:36 +02:00
Guillermo Bonet 0b96471c7d feat: refs #6714 Added businessType zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 09:27:07 +02:00
Juan Ferrer 283d8b1241 feat: refs #4409 Disable old available triggers 2024-04-08 09:11:40 +02:00
Juanjo Breso 55949d0979 feat: refs#6493 Cambios solicitados procedimientos 2024-04-08 07:44:45 +02:00
Alex Moreno 93000aaecf Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 12:20:09 +00:00
Juanjo Breso 07b45748f0 Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 12:58:36 +02:00
Juanjo Breso c74aea74bc feat: refs#6493 modificaciones solicitadas. 2024-04-05 12:58:31 +02:00
Juanjo Breso f316ca6974 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 10:55:20 +00:00
Guillermo Bonet 0cd4013f5e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 07:51:19 +02:00
Guillermo Bonet 7ea917dc4d hotfix: #6875 packing DEFAULT 1
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 07:49:37 +02:00
Carlos Andrés d18721f50d feat: bloquear facturas recibidas contabilizadas refs #7173
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-04 18:05:45 +02:00
Carlos Andrés bd661befb6 feat: bloquear facturas recibidas contabilizadas refs #7173
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 15:04:23 +02:00
Robert Ferrús 9801279370 refs #169673 item_getSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 13:28:29 +02:00
Guillermo Bonet 29eee4e8a7 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 11:30:03 +02:00
Guillermo Bonet 8702a6808c hotfix: #7024 Modified duaInvoiceInBooking 2024-04-04 11:25:03 +02:00
Alex Moreno ff2e00c51c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-04-03 16:24:45 +02:00
Ivan Mas b9520b53ab hotfix_clientsDisable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 10:03:59 +02:00
Javi Gallego d71f3e0818 test
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-03 09:02:34 +02:00
Javi Gallego 52457b9642 feat: sin concatenar en el nombre 2024-04-03 07:09:07 +02:00
Juanjo Breso 4767b98442 Merge branch '6493--refactorizar-procedimientos-vn2008-parte2' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-02 10:59:25 +02:00
Juanjo Breso 4389cd5d74 feat: refs#6493 modificar procedimiento available_traslate 2024-04-02 09:56:46 +02:00
Pako Natek cb745b0f4d release_lock
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-01 14:21:34 +02:00
Pako Natek bfa59bdcea release_lock 2024-04-01 14:20:25 +02:00
Pako Natek 3a1f5109d9 lines and volume
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-01 11:58:16 +02:00
Pako Natek 7c4fc31b50 version productionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:55:21 +02:00
Pako Natek df911b9b75 fora comentaris
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:47:47 +02:00
Pako Natek 547df47049 delete old proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:47:16 +02:00
Pako Natek 98b1e933f7 prova
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:46:07 +02:00
Pako Natek 9aae9677e6 modificaciones
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:43:26 +02:00
Jorge Penadés df271a242d fix: refs #6492 procedure
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 15:03:33 +01:00
Pako Natek c942786783 pruebas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:54:30 +01:00
Juanjo Breso a911d7fc88 Merge branch '6493-refactorizar-procedimientos-vn2008-parte2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:27:38 +01:00
Juanjo Breso 46f60615bd feat: refs#6493 modificar procedimiento available_traslate 2024-03-28 14:27:29 +01:00
Jorge Penadés e851c3b481 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:15:31 +01:00
Robert Ferrús 9a7bcdf104 fix: company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 13:26:09 +01:00
Pako Natek d031fef1a0 Merge branch 'dev' into 6358-boxPicking_blueMammut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 11:47:40 +00:00
Pako Natek 1d906c993b portes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 12:43:13 +01:00
Pako Natek b445d745a5 cambios 2024-03-28 11:40:18 +01:00
Robert Ferrús 1c18b09531 fix: company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 10:47:47 +01:00
Robert Ferrús 063745167e fix: modificar company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 10:30:41 +01:00
Javi Gallego 585dd70a60 Merge pull request 'feat: #7117 company_getSuppliersDebt devolver el pais del banco' (!2211) from 7117 into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2211
2024-03-28 08:02:30 +00:00
Javi Gallego 699883182c Merge pull request '7120-specialPrice' (!2213) from 7120-specialPrice into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #2213
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-28 08:01:45 +00:00
Javi Gallego 6596efdc91 Merge pull request '7013-solunionRiskRequest' (!2190) from 7013-solunionRiskRequest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2190
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-28 08:01:28 +00:00
Pako Natek 8396b8cd64 Merge branch 'dev' into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:19:12 +00:00
Alex Moreno f1931fce69 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-28 08:19:26 +01:00
Robert Ferrús 1f819ab16a fix: riesgos
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 19:02:05 +01:00
Carlos Andrés 4ac418111b fix: TRIGGER incorrecto en travel refs #7148
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 14:12:34 +01:00