Commit Graph

860 Commits

Author SHA1 Message Date
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
Pablo Natek d93dc28728 fix(view): refs #6372 fix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-17 12:32:33 +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
Robert Ferrús a0f3c6183b Merge branch 'test' into 7219-sale_replaceItem
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-17 06:42:18 +00:00
Guillermo Bonet f1bb2fbcb3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-17 08:41:33 +02:00
Guillermo Bonet 7d50907676 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-17 08:41:10 +02:00
Guillermo Bonet 786a5a68b9 hotfix: EKT
gitea/salix/pipeline/head This commit looks good Details
2024-04-17 08:40:25 +02: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
Pablo Natek e15fb8dec6 fix: refs #6021 proc 2024-04-16 18:00:15 +02:00
Pablo Natek 70c9bae710 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-fix-item_get 2024-04-16 17:58:04 +02:00
Pablo Natek dac562e960 Merge pull request 'feat: refs #6021 order_put refactor' (!2311) from 6021-fix-orderPut into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2311
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-04-16 15:54:19 +00:00
Pablo Natek 1d29c77aa7 feat: refs #6021 fix proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 17:53:21 +02:00
Pablo Natek 70836b93b6 fix: refs #6021 catalogue_findById 2024-04-16 17:51:34 +02:00
Pako Natek 12f7cc85ed Merge branch 'dev' into 6021-floranet_item_get
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 15:45:41 +00:00
Pako Natek c1c6204eab Merge branch 'dev' into 6021-fix-orderPut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 15:44:02 +00:00
Pablo Natek f05b33787f feat: refs #6021 order_put refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 17:42:36 +02:00
Guillermo Bonet e4c3704231 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-16 17:25:49 +02:00
Guillermo Bonet 62596de1dd Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-16 17:25:28 +02:00
Guillermo Bonet db5b0d7967 hotfix: ticket#174761 Greatest fix null possibility
gitea/salix/pipeline/head This commit looks good Details
2024-04-16 17:19:25 +02:00
Pako Natek f5fd708891 item_get
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 17:08:45 +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
Ivan Mas 3a7b0df36f Merge branch 'dev' into 7161DeleteitemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 11:29:03 +00: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 56dc0ddb68 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-16 12:32:53 +02:00
Guillermo Bonet 9ea1ac2a56 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-16 12:32:27 +02:00
Guillermo Bonet 7fda58d4a4 hotfix: ticket#174308 Ekt load packing
gitea/salix/pipeline/head This commit looks good Details
2024-04-16 12:29:44 +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
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
Robert Ferrús a41aa46c3a Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 09:35:52 +00:00
Juan Ferrer 42fe7fb1e2 feat(binlog): refs #4409 Disable order recalc from triggers
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-15 11:32:44 +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
Juan Ferrer 50d6c234be feat(binlog): refs #4409 New function for binlog queue monitoring
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 09:31:24 +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
Juan Ferrer ccf77ed356 fix(util): refs #7205 util.slowLog_prune code clean
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-12 09:24:48 +02:00
Juan Ferrer 622075a9aa fix(util): refs #7205 fix util.slowLog_prune
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-12 09:21:34 +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 ec481b4141 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-11 14:52:42 +02: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
Guillermo Bonet f69acf3a05 Merge branch 'dev' into 7181-risk_vs_client_list
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 12:41:37 +00: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
Pako Natek 9de4095260 moreProcs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 13:25:43 +02:00
Pako Natek bff3aef73b recovering procs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 13:20:41 +02: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
Ivan Mas 83befbd120 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 15:21:42 +00: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
Ivan Mas 08948ad360 Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 12:05:04 +00: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
Ivan Mas 0b7042d597 refs #6732 change Proveedores isReal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 13:55:25 +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
Jorge Penadés 099fb70582 Merge branch 'dev' into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 09:29:15 +00:00
Robert Ferrús 7d0f5cd78a Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 07:44:02 +00:00
Robert Ferrús c2a2a86f35 feat: refs #6777 ultima comprobacion
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 09:42:55 +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
Robert Ferrús 2c91385e62 Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 08:09:57 +02:00
Robert Ferrús c30c0de92c feat: refs #7150 2024-04-10 08:09:54 +02:00
Robert Ferrús 3420667ae5 Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 06:05:03 +00:00
Ivan Mas eedf30a2dd refs #6732 salix dependencies and undo changes Proveedores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 17:31:34 +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
Ivan Mas f02c4354ba Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 14:45:29 +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 521033edd2 Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 11:54:41 +00: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
Robert Ferrús 4a31fe29b8 Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 05:40:01 +00: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
Pablo Natek 1c064c7bfc Merge branch 'dev' into 6021-floranet_RedMoon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 05:23:34 +00: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
Pako Natek 2eb229adf7 catalogue fixed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 14:30:46 +02:00
Robert Ferrús 6ba43a3c6d Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 11:29:09 +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 0c5b9e3544 Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 10:28:02 +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
Robert Ferrús 657150a9a7 feat: refs #7150 greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 08:57:56 +02:00
Robert Ferrús 1e8e6a67a3 Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 06:39:22 +00:00
Robert Ferrús 5517c29c1c fet: refs #7150 greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 08:37:37 +02:00
Juanjo Breso e721023184 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 07:44:48 +02:00
Juanjo Breso 55949d0979 feat: refs#6493 Cambios solicitados procedimientos 2024-04-08 07:44:45 +02:00
Juanjo Breso f06bbef0eb Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 05:08:53 +00: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
Robert Ferrús cf5113c5a6 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 10:23:55 +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
Robert Ferrús 448b8e6ea3 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-03 07:50:06 +00: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
Robert Ferrús 9667d31441 feat: refs #7150
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 17:00:27 +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
Pako Natek 09c9a3d7ef vRest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 12:25:57 +01:00
Pako Natek 8f872b4bbb Merge branch '6358-boxPicking_YellowZebra' of https://gitea.verdnatura.es/verdnatura/salix into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 12:22:26 +01:00
Pako Natek c9431e605e second proposals 2024-03-27 12:22:22 +01:00
Robert Ferrús c3e3d72182 Merge branch 'master' into 7141-sale_replaceItem
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 10:53:31 +00:00
Alex Moreno b532ce3f77 hotFix: recreate addressTaxArea
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 08:30:45 +01:00
Javi Gallego fe0a1ad7be feat: #7013 purge productionError
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 08:12:05 +01:00
Javi Gallego 4b41ac68aa feat: #7013 en mayusculas y con espacio en comentarios
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 08:05:33 +01:00
Pako Natek b1a91ab7d3 Merge branch 'dev' into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 06:55:41 +00:00
Javi Gallego c3aa4c9355 Merge branch 'dev' into 6782-productionError_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 06:22:48 +00:00
Juan Ferrer 2604fb28f8 Merge pull request 'test' (!2217) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2217
2024-03-26 16:04:28 +00:00
Juan Ferrer 9aa46c3a90 fix: HOTFIX PROC vn.collection_new release lock on error
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-03-26 16:50:15 +01:00
Robert Ferrús 8e2770aa56 feat: refs #7141
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-26 16:27:49 +01:00
Pako Natek 861d9b3135 javi's proposals
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 14:59:06 +01:00
Pako Natek 5d813784b4 Merge branch 'dev' into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 14:17:34 +01:00
Javi Gallego 1472fc6fc2 feat: #6782 sin as
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 14:02:47 +01:00
Jorge Penadés 94f6d20bb1 feat: refs #6942 add Insert
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 13:41:53 +01:00
Jorge Penadés 634bfc5091 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008 2024-03-26 12:30:07 +01:00
Javi Gallego 57c42b6808 feat: #7117 añado NOT
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 12:16:03 +01:00
Javi Gallego 587dd8f4d9 feat: #7013 sin tabular
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 12:12:27 +01:00
Javi Gallego c99de95b33 feat: #7120 con tabla temporal
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 12:07:23 +01:00
Javi Gallego 04117d2c27 fix: #7013 quito vn.
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 10:13:10 +01:00
Javi Gallego b978833a64 fix: #6782 with con esquema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 09:46:53 +01:00
Javi Gallego 7f14211b80 feat: #7117 company_getSuppliersDebt devolver el pais del banco
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 09:27:30 +01:00