Commit Graph

24977 Commits

Author SHA1 Message Date
Guillermo Bonet 6227ef0821 Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity 2024-10-22 15:00:17 +02:00
Guillermo Bonet 1afb33c306 feat: refs #8119 Requested changes 2024-10-22 15:00:16 +02:00
Jorge Penadés 15fee5ac8d Merge pull request '#8083 add prop' (!3140) from 8083-hotfix-changeState into master
Reviewed-on: #3140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-22 12:50:10 +00:00
Jorge Penadés a543fca01a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8083-hotfix-changeState 2024-10-22 14:23:53 +02:00
Javi Gallego 4844bcf06f Merge pull request '#7524 myteam filter' (!3134) from 7524-hotfix-myTeamFilter into master
Reviewed-on: #3134
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-22 11:59:44 +00:00
Jorge Penadés 1c5e4f40ce feat: refs #8083 add prop 2024-10-22 12:39:51 +02:00
Jorge Penadés e2b57d695e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-myTeamFilter 2024-10-22 12:25:43 +02:00
Jorge Penadés ee0c0996f6 feat: refs #7524 add e2e 2024-10-22 12:16:26 +02:00
Sergio De la torre 29745d0af4 Merge pull request 'fix: refs #6861 fixTransactionCommit' (!3139) from 6861-Reservas into master
Reviewed-on: #3139
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-22 08:13:00 +00:00
Sergio De la torre 6ef7760498 fix: refs #6861 fixTransactionCommit 2024-10-22 10:06:59 +02:00
Guillermo Bonet b4d2c69b37 Merge branch 'master' into 8119-itemCampaignQuantity 2024-10-22 06:42:02 +00:00
Guillermo Bonet 5162c2037b feat: refs #8119 Requested changes 2024-10-22 08:41:46 +02:00
Alex Moreno db8573dd40 Merge pull request '8144-devToTest_2444' (!3137) from 8144-devToTest_2444 into test
Reviewed-on: #3137
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-10-22 06:07:14 +00:00
Carlos Satorres 56cba385cf Merge pull request 'fix: refs #6850 remove notifyPickUp' (!3132) from 6850-removeChandgeUpdateClaim into dev
Reviewed-on: #3132
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 12:31:30 +00:00
Jorge Penadés 1efe258ea0 fix: refs #7524 filter by department 2024-10-21 14:30:45 +02:00
Carlos Satorres aad616ff83 Merge branch 'dev' into 6850-removeChandgeUpdateClaim 2024-10-21 12:26:53 +00:00
Carlos Satorres f8c83c8f68 Merge pull request 'fix: refs #6831 filter observation' (!3131) from 6831-observationDefaulterEmail into dev
Reviewed-on: #3131
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 12:26:04 +00:00
Carlos Satorres c3ffb31348 Merge branch 'dev' into 6831-observationDefaulterEmail 2024-10-21 12:23:39 +00:00
Jorge Penadés b76b1c6d50 Merge pull request '#7919 delete if ticketRefund' (!3091) from 7919-deleteTicketRefund into dev
Reviewed-on: #3091
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 11:21:34 +00:00
Jorge Penadés 2f77359892 Merge branch 'dev' into 7919-deleteTicketRefund 2024-10-21 11:00:31 +00:00
Pablo Natek 69a34ab0fa Merge pull request 'fix: add date format on insert data' (!3135) from fixNightProc into dev
Reviewed-on: #3135
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-21 10:25:41 +00:00
Pablo Natek 1731af13ea Merge branch 'fixNightProc' of https://gitea.verdnatura.es/verdnatura/salix into fixNightProc 2024-10-21 12:19:22 +02:00
Pablo Natek e479873547 fix: restore cursor 2024-10-21 12:19:20 +02:00
Pablo Natek 92f699aac3 Merge branch 'dev' into fixNightProc 2024-10-21 09:37:07 +00:00
Pablo Natek e38c061deb fix: add date format on insert data 2024-10-21 11:36:44 +02:00
Jon Elias d75a032d75 Merge pull request 'Added new filter param in item request' (!3094) from Fix-ItemRequest into dev
Reviewed-on: #3094
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-21 09:34:53 +00:00
Jon Elias 158f701f1e Merge branch 'dev' into Fix-ItemRequest 2024-10-21 09:31:29 +00:00
Jorge Penadés cb4e8355ba feat: refs #7524 myteam filter 2024-10-21 10:58:36 +02:00
Jorge Penadés 288dc1c598 feat: refs #7524 myteam filter wip 2024-10-21 10:05:58 +02:00
Carlos Satorres bf0cc687e1 Merge branch 'dev' into 6850-removeChandgeUpdateClaim 2024-10-21 07:27:46 +00:00
Guillermo Bonet 5d55fb287d Merge branch 'test' into dev 2024-10-21 09:25:39 +02:00
Guillermo Bonet dead904c19 Merge branch 'master' into test 2024-10-21 09:25:29 +02:00
Carlos Satorres eea09a9d4a fix: refs #6850 add code 2024-10-21 09:24:53 +02:00
Guillermo Bonet ca81c2c440 Merge pull request 'fix: refs #230926 item_getSimilar' (!3133) from 230926-hotfix into master
Reviewed-on: #3133
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-21 06:42:32 +00:00
Guillermo Bonet bbc17d1ff8 fix: refs #230926 item_getSimilar 2024-10-21 08:33:16 +02:00
Javi Gallego be9f711cc1 Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev
Reviewed-on: #3110
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 06:31:17 +00:00
Carlos Satorres 19fbb836a6 fix: refs #6850 fix model 2024-10-21 08:30:39 +02:00
Javi Gallego da772cf504 Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev
Reviewed-on: #3114
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 06:29:17 +00:00
Carlos Satorres b88dc1c70f fix: refs #6850 remove notifyPickUp 2024-10-20 16:23:24 +02:00
Carlos Satorres b8e782d3a5 fix: refs #6831 filter observation 2024-10-20 15:59:24 +02:00
Jon Elias 9e9773578a Merge branch 'dev' into Fix-ItemRequest 2024-10-18 11:22:35 +00:00
Carlos Satorres a5bbdd7a01 Merge pull request 'fix: refs #7906 remake method' (!3109) from 7906-notDeleteZone into dev
Reviewed-on: #3109
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-18 08:33:03 +00:00
Carlos Satorres ed69604767 Merge branch 'dev' into 7906-notDeleteZone 2024-10-18 08:31:38 +00:00
Guillermo Bonet 939f083671 Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev
Reviewed-on: #3122
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-10-18 08:27:08 +00:00
Jon Elias 35621e9051 Merge pull request '#7010 added filter fields to show packing type field in ticket list' (!3024) from 7010-AddPackingField into dev
Reviewed-on: #3024
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-18 07:40:35 +00:00
Carlos Satorres 5a14aed73a Merge branch 'dev' into 7906-notDeleteZone 2024-10-18 07:40:04 +00:00
Jon Elias 3139d99130 Merge branch 'dev' into 7010-AddPackingField 2024-10-18 07:30:43 +00:00
Guillermo Bonet 46c7745128 Merge pull request 'refactor: refs #7811 Deleted pm2' (!3127) from 7811-byePm2 into dev
Reviewed-on: #3127
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-10-18 07:30:13 +00:00
Jon Elias 46993ad103 refactor: refs #7010 deleted distinct 2024-10-18 09:29:01 +02:00
Carlos Satorres 1273e895af fix: refs #7906 fix test back 2024-10-18 09:27:43 +02:00