Commit Graph

25592 Commits

Author SHA1 Message Date
Javier Segarra 70b1628649 Merge pull request 'HOTFIX: RecalculatePrice not working with all ids' (!3144) from hotfix_recalculatePrice_list_ids into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3144
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-24 08:36:34 +00:00
Javier Segarra 070a5640df fix: recalculatePrice not working with all ids
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-24 08:16:04 +00:00
Alex Moreno 7ae99fe6a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-24 07:47:54 +02:00
Alex Moreno 4660118211 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-24 07:47:41 +02:00
Guillermo Bonet 4d96b1df68 Merge branch '7266-itemLabels' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemLabels
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-24 07:31:30 +02:00
Guillermo Bonet 4c529da620 feat: refs #7266 Requested changes and query optimization 2024-10-24 07:31:26 +02:00
Guillermo Bonet 4c9682e107 Merge branch 'dev' into 7266-itemLabels
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-24 05:16:16 +00:00
Pablo Natek 838dd9e1b4 Merge branch 'dev' into 7457-orderFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-24 04:36:11 +00:00
Javi Gallego ed6a062ca3 Merge pull request 'feat: refs #8083 add field' (!3143) from 8083-hotfix-insertRecord into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3143
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-23 14:25:41 +00:00
Jorge Penadés 43f8b22593 feat: refs #8083 add field
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-23 16:10:00 +02:00
Sergio De la torre 5a8f43d0ea Merge pull request 'feat: refs #8020 machineWorkerDeprecated' (!3141) from 8020-mahineWorkerDeprecated into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3141
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-23 12:14:36 +00:00
Guillermo Bonet db4b540958 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-23 12:44:55 +02:00
Guillermo Bonet fc56dbc5fb Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-23 12:44:35 +02:00
Guillermo Bonet 9341a51ed4 Merge pull request 'feat: refs #8119 itemCampaignQuantity' (!3117) from 8119-itemCampaignQuantity into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3117
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-23 10:40:42 +00:00
Guillermo Bonet 9eaa5a7585 Merge branch 'master' into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-23 10:38:00 +00:00
Sergio De la torre 3da08e3a23 feat: refs #8020 machineWorkerDeprecated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-23 11:33:45 +02:00
Carlos Satorres f552a3b7e1 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-23 09:51:38 +02:00
Guillermo Bonet b1a295dca4 feat: refs #7266 Print corrections
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-23 09:46:06 +02:00
Guillermo Bonet 3cde6b6bc6 feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-23 08:30:21 +02:00
Guillermo Bonet 31c89538bc feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-23 08:27:07 +02:00
Guillermo Bonet 37050361c2 feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-23 08:26:36 +02:00
Guillermo Bonet baec188ff5 feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-23 08:23:28 +02:00
Javi Gallego 2f5f4ecc7c Merge pull request 'feat: refs #7943 quitar lectura en metodos comunes' (!3136) from 7943-permisosWorker into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3136
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-23 05:53:03 +00:00
Carlos Satorres 72662b3112 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-23 07:50:40 +02:00
Javi Gallego 62f9f31279 feat: refs #7943 usa back con permisos
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-23 07:44:41 +02:00
Guillermo Bonet 30c1a57b68 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-23 07:19:07 +02:00
Guillermo Bonet fe3e7342bc fix: refs #7935 version
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-10-23 07:14:07 +02:00
Alex Moreno b4e1b015de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-22 15:08:29 +02:00
Alex Moreno f47043cae4 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-dev This commit looks good Details
2024-10-22 15:07:24 +02:00
Guillermo Bonet 6227ef0821 Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-22 12:50:10 +00:00
Jorge Penadés 13a30783d9 Merge pull request 'feat: refs #8083 add prop' (!3115) from 8083-changeState into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3115
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-22 12:47:51 +00:00
Jorge Penadés e772776028 Merge branch 'dev' into 8083-changeState
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 12:45:56 +00:00
Jorge Penadés a543fca01a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8083-hotfix-changeState
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-22 14:23:53 +02:00
Javi Gallego 4844bcf06f Merge pull request '#7524 myteam filter' (!3134) from 7524-hotfix-myTeamFilter into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3134
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-22 11:59:44 +00:00
Guillermo Bonet c3f8da52c6 feat: refs #7266 Item label barcode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 13:43:54 +02:00
Jorge Penadés 1c5e4f40ce feat: refs #8083 add prop
gitea/salix/pipeline/pr-master This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-22 12:25:43 +02:00
Jorge Penadés ee0c0996f6 feat: refs #7524 add e2e
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-22 12:16:26 +02:00
Guillermo Bonet 0af58b20be feat: refs #7266 Item label QR finished
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 12:02:04 +02:00
Sergio De la torre 29745d0af4 Merge pull request 'fix: refs #6861 fixTransactionCommit' (!3139) from 6861-Reservas into master
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-22 10:06:59 +02:00
Guillermo Bonet b4d2c69b37 Merge branch 'master' into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-22 06:42:02 +00:00
Guillermo Bonet 5162c2037b feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-22 08:41:46 +02:00
Alex Moreno db8573dd40 Merge pull request '8144-devToTest_2444' (!3137) from 8144-devToTest_2444 into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3137
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-10-22 06:07:14 +00:00
Guillermo Bonet bf2d7541a5 feat: refs #7266 Item label QR
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-21 14:57:55 +02:00
Carlos Satorres 56cba385cf Merge pull request 'fix: refs #6850 remove notifyPickUp' (!3132) from 6850-removeChandgeUpdateClaim into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
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
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-21 14:30:45 +02:00
Carlos Satorres aad616ff83 Merge branch 'dev' into 6850-removeChandgeUpdateClaim
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-21 12:26:53 +00:00