Commit Graph

24001 Commits

Author SHA1 Message Date
Jorge Penadés 32da39899a fix: refs #7211 test e2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:16:43 +02:00
Pablo Natek 5c45dd6c17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 16:18:18 +02:00
Sergio De la torre 611f907ef0 refs #6861 feat:reserveWithReservation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 16:15:53 +02:00
Jorge Penadés 180a484c55 fix: refs #7211 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:14:34 +02: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
Jorge Penadés edeed037a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl 2024-04-25 15:38:40 +02:00
Jorge Penadés 4e864fed52 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 15:38:21 +02:00
Javi Gallego 2e2bc3d594 Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:31:06 +00: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
Javier Casado 89ffdbfdf7 Merge pull request '#6697 - removeClaimQuantity' (!2363) from 6697-removeClaimQuantity into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2363
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-25 11:55:33 +00:00
Javier Casado a9e4b2cd36 Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 11:46:53 +00:00
Javier Segarra 5bbf5887b9 fix(salix): refs #7272 #7272 Bug when acl not loaded
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 13:15:05 +02:00
Jorge Penadés 931c2c4f5e feat: refs #7211 error & locale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 13:12:06 +02:00
Javi Gallego a4f1183df6 feat: refs #7108 pascalCase
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 13:11:57 +02:00
Pablo Natek 48d3ee373e fix: refs #4988 yml
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:47:52 +02:00
Pablo Natek 00359a0a6b fix: refs #4988 traduction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:44:27 +02:00
Pablo Natek c2888e4f97 fix: refs #4988 correct yml
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:43:47 +02:00
Pablo Natek 4e11e46fff feat: refs #4988 capture error on duplicate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:40:54 +02:00
Robert Ferrús 8153a526ce feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:35:21 +02:00
Alex Moreno a15b7e0eb8 fix(util_log): refs #7268 fix getChanges when is datestring
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-25 10:44:08 +02:00
jcasado f34c960f5d refs: #6939 changeREADME
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 10:10:14 +02:00
Jorge Penadés 6749722634 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 10:10:06 +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
Pablo Natek 42591af5c7 fix: refs #4988 create table 2024-04-25 09:46:15 +02:00
Jorge Penadés c9dfccbc53 feat: refs #7211 add test & changelog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 09:35:53 +02:00
Javi Gallego 1b34822fb7 Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 07:13:57 +00:00
Sergio De la torre 8ad61026ea Merge pull request 'refs #6312 hotFix fix:replaceItem' (!2367) from 6312_originalQuanitty into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2367
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-25 07:10:50 +00: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
Alex Moreno f1f2dfea35 Merge pull request 'hotFix(ticket): refs #7225 fix advanced and movable' (!2356) from 7225-hotFix_ticket_advanced_movable into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2356
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-25 05:52:39 +00: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 b8fdd7d726 Merge pull request 'refs #6574 feat: add order' (!2264) from 6574_itemGetBalance into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2264
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-24 13:55:05 +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 69486fb29f fix(componentUpdate): refs #7225 fix transfer all lines to newTicket
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:15:27 +02:00
Pablo Natek e8a32d8e13 fix: refs #7187 db version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:09:42 +02:00
Pablo Natek 008b6f6f41 fix: refs #7187 unify versions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:08:26 +02:00
Pablo Natek 88ef12032b feat: refs #7187 serialNumber new column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:05:18 +02:00
Carlos Satorres b7b9035f72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6976-supplierConsumption 2024-04-24 12:45:22 +02:00
Robert Ferrús 5efe286382 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 10:14:49 +00:00
jcasado aeee012c2b refs #6697 fix sql test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:43:10 +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
Guillermo Bonet 6fb87531c4 refactor: #7258 Deprecated last tables vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:27:16 +02:00
jcasado 87d5e0a311 Merge branch '6697-removeClaimQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 11:19:17 +02:00
jcasado d1659ce04c refs #6697 fix claimQuantity 2024-04-24 11:19:15 +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