Commit Graph

25353 Commits

Author SHA1 Message Date
Jorge Penadés 6927f4b28d feat: refs #6818 saysimple integration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-08 11:51:00 +01:00
Sergio De la torre fd36f7ecc3 feat: refs #8150 movExpeditions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-08 10:44:01 +01:00
Javi Gallego dd7c967624 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-07 14:49:26 +01:00
Javi Gallego d95e455ccf fix: refs #7935 sin modificar autonomy
gitea/salix/pipeline/head This commit looks good Details
2024-11-07 14:48:31 +01:00
Sergio De la torre cab2b7c93c Merge pull request 'feat: refs #6845 userInterface' (!3161) from 6845-UserInterface into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3161
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-06 14:56:13 +00:00
Sergio De la torre 3b87cf0c69 Merge pull request 'feat: refs #7266 buyFkForPrint' (!3159) from 7266-ItemShelvingBuy into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3159
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-06 14:55:55 +00:00
Sergio De la torre c113d83797 feat: refs #6845 userInterface
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-05 16:42:51 +01:00
Alex Moreno c899727bfc Merge pull request 'refactor: refs #6920 add correct role' (!3160) from 6920-dms_invoiceIn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3160
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-11-05 09:57:15 +00:00
Alex Moreno 85ded59cb3 refactor: refs #6920 add correct role
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-04 13:46:54 +01:00
Sergio De la torre 37548e5e64 feat: refs #7266 buyFkForPrint
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-04 08:59:10 +01:00
Sergio De la torre 4c0dec19d4 feat: refs #7266 buyFkForPrint
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-04 07:48:28 +01:00
Guillermo Bonet 6c40934f74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-29 09:57:06 +01:00
Guillermo Bonet 17412c5b84 feat: refs #7266 Version 2024-10-29 09:57:04 +01:00
Robert Ferrús 5a9d254396 Merge pull request 'feat: refs #8071 travel_weeklyClone' (!3058) from 8071-travelWeeklyClone into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3058
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-29 06:48:05 +00:00
Robert Ferrús f699f64caa Merge branch 'dev' into 8071-travelWeeklyClone
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-29 06:45:57 +00:00
Sergio De la torre 6bf186ca66 Merge pull request 'feat: refs #7922 refs #792 scanOrder' (!3157) from 7922-scanOrder into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3157
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-29 06:45:11 +00:00
Sergio De la torre a8cc417fb4 Merge branch 'dev' into 7922-scanOrder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-29 06:32:32 +00:00
Robert Ferrús 8ab6bc39cc Merge branch 'dev' into 8071-travelWeeklyClone
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-29 06:31:21 +00:00
Guillermo Bonet 2f0fa56040 feat: refs #7266 Version
gitea/salix/pipeline/head This commit looks good Details
2024-10-29 07:19:51 +01:00
Guillermo Bonet 6afb8fbeb5 Merge pull request 'feat: refs #7266 Added details and improvements in item label reports' (!3154) from 7266-itemQrBarcodeLabel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3154
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-29 06:04:15 +00:00
Carlos Andrés 66a5708efb Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-28 14:41:01 +00:00
Guillermo Bonet bfc446ab79 feat: refs #7266 Requested changes and improvements
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 14:56:01 +01:00
Guillermo Bonet c8662a5051 Merge branch '7266-itemQrBarcodeLabel' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemQrBarcodeLabel
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-28 14:51:21 +01:00
Guillermo Bonet a37b7b71a8 feat: refs #7266 Requested changes and improvements 2024-10-28 14:51:19 +01:00
Robert Ferrús f05b6a46b0 feat: refs #8071 quitar esquema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 14:36:10 +01:00
Robert Ferrús 994b562823 Merge branch 'dev' into 8071-travelWeeklyClone
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 13:34:54 +00:00
Carlos Andrés bffb13f94a feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 14:24:44 +01:00
Carlos Andrés 511c848342 feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 14:22:08 +01:00
Carlos Andrés 61026d2d34 feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 14:02:27 +01:00
Carlos Satorres b41e703a1b Merge pull request 'fix: refs #7283 item filters' (!3156) from 7283-fixItemFilters into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3156
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-28 12:27:59 +00:00
Carlos Satorres 385279b39d fix: refs #7283 tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 13:15:40 +01:00
Carlos Satorres 0180998683 fix: refs #7283 item filters
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-28 13:08:27 +01:00
Robert Ferrús 6031b1fe3f feat: refs #8169 create table itemTextureTag
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-28 12:17:56 +01:00
Jon Elias 21ddd3fcd0 Merge pull request '#7193 Added scope in parking model' (!3153) from 7193-ParkingCreateScope into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3153
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-28 10:48:09 +00:00
Guillermo Bonet b899a7967f Merge branch 'dev' into 7266-itemQrBarcodeLabel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 10:38:17 +00:00
Guillermo Bonet c43bdb5021 feat: refs #7266 Added details and improvements in item label reports
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 11:29:15 +01:00
Jon Elias b27aa1bd94 Merge branch 'dev' into 7193-ParkingCreateScope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 09:52:17 +00:00
Sergio De la torre 3f04f3f24b Merge pull request 'feat: refs #7921 refs#7921 sendLostExpedition' (!3149) from 7921-sendExpeditionLost into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3149
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-28 09:42:21 +00:00
Jon Elias eb5f57285a feat: refs #7193 added scope in parking model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 10:40:43 +01:00
Sergio De la torre 93feb74949 Merge branch 'dev' of https: refs #7921//gitea.verdnatura.es/verdnatura/salix into 7921-sendExpeditionLost
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 10:22:23 +01:00
Jorge Penadés 78edda56c7 Merge pull request 'feat: refs #7524 restrict fields' (!3151) from 7524-fixE2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3151
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-28 08:47:45 +00:00
Jorge Penadés b20ca1d8d7 Merge branch 'dev' into 7524-fixE2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 08:43:45 +00:00
Sergio De la torre 6efc2c340c feat: refs #7921 refs#7921 sendLostExpedition
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-28 08:57:22 +01:00
Carlos Satorres 2bd3f4514b Merge pull request 'fix: refs #6644 email and translations' (!3152) from 6644-modEmail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3152
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-28 07:07:17 +00:00
Carlos Satorres c8101375a2 Merge branch 'dev' into 6644-modEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 07:04:17 +00:00
Carlos Satorres 869c7ab598 fix: refs #6644 email and translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 07:37:42 +01:00
Guillermo Bonet 8c4d3bac0d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-28 07:11:38 +01:00
Guillermo Bonet 765d125219 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-28 07:11:21 +01:00
Guillermo Bonet a707f9cbff Merge pull request 'fix: refs #235425 sale priceFixed update' (!3146) from hotfix235425-updatePrice into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3146
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-28 06:06:56 +00:00
Jorge Penadés d8e241740f feat: refs #7524 restrict fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-27 13:47:52 +01:00