Commit Graph

25353 Commits

Author SHA1 Message Date
Pablo Natek bfd52b8773 Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-24 05:31:34 +00:00
Pablo Natek 166ca42e32 Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-24 07:31:24 +02:00
Pablo Natek 3988eb0d97 fix: refs #7404 back and e2e 2024-09-24 07:31:22 +02:00
Sergio De la torre ea06afb361 Merge pull request 'fix: hotFix backLimit refs #6964' (!3003) from 6964-ListItemNewer into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3003
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-24 05:17:02 +00:00
Alex Moreno 882f1eb7c2 feat(travelFilter): add daysOnward
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 15:30:10 +02:00
Jorge Penadés 6ff76fd74b feat: refs #7207 show queue in worker summary
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 14:40:38 +02:00
Robert Ferrús 2a3dcbe71a Merge pull request 'feat: refs #8000 add column' (!3005) from 8000-zoneAddColumn into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3005
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-23 11:23:03 +00:00
Pako Natek 9a0b487d20 feat: refs #8030 new table 2024-09-23 13:12:53 +02:00
Ivan Mas f4de066d16 Merge pull request 'refactor: refs #7725 deprecate worker.isF11Allowed' (!3002) from 7725-refactorIsF11Allowed into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #3002
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-23 10:26:41 +00:00
Robert Ferrús a61d2ceb56 Merge branch 'master' into 8000-zoneAddColumn
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 10:26:19 +00:00
Javier Segarra 21cc899e99 Merge pull request 'HOTFIX: Administrative role ACL' (!3006) from hotfix_administrativeACL into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3006
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-23 10:17:18 +00:00
Javier Segarra 4689681618 fix(salix): add administrative ACLs
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 12:07:06 +02:00
Robert Ferrús 31d5a7a635 feat: refs #8000 add column
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 11:53:27 +02:00
Robert Ferrús c0cc25219f Merge pull request 'feat: refs #8000 refs #8000 catalog_calculate itemMaxLength' (!2992) from 8000-catalog_calculate into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2992
Reviewed-by: Pako Natek <pako@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-23 09:11:10 +00:00
Robert Ferrús b34e8a7b7e Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 08:18:49 +00:00
Pablo Natek ab89c8f3ba Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 08:16:16 +00:00
Pablo Natek 80985fbd56 fix: refs #7404 round data and fix specs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 10:14:09 +02:00
Pablo Natek cd545c0001 Merge pull request 'fix(shelving_clean): less time por shelving removal' (!2988) from fixShelvingClean into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2988
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-23 08:05:09 +00:00
Pablo Natek 459f6601b7 fix: refs #7404 add transaction on detail calculate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-23 10:02:01 +02:00
Jorge Penadés 8ff0dc06fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 09:29:51 +02:00
Jon Elias 6650673c7d Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 06:52:00 +00:00
Sergio De la torre c6d5e2f292 fix: hotFix backLimit refs #6964
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 08:09:24 +02:00
Robert Ferrús e0e3201f78 Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 05:37:43 +00:00
Ivan Mas 06f8f8e95e refactor: refs #7725 deprecate worker.isF11Allowed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-22 08:39:19 +02:00
Ivan Mas 0bf2935c23 Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-22 05:29:26 +00:00
Ivan Mas 753f6d7866 feat: refs #7994 add schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-22 07:27:43 +02:00
Ivan Mas 1ec8d8d5a0 feat: refs #7994 update sale.originalQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-22 07:24:21 +02:00
Javier Segarra 20c42e82e9 Merge pull request 'fix: acls' (!2999) from hotfix-postCodeACLS into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2999
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-20 12:40:28 +00:00
Javier Segarra 8523ec1b8a Merge branch 'master' into hotfix-postCodeACLS
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 12:38:35 +00:00
Carlos Andrés e25415f820 fix: refs#8011 previousSticker_get
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 13:54:22 +02:00
Javier Segarra 6f78a7470c Merge branch 'master' into hotfix-postCodeACLS
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 11:51:11 +00:00
Carlos Andrés 190c964ec2 fix: refs#8011 previousSticker_get
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 13:50:08 +02:00
Carlos Satorres 346893455f fix: remove comment
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 13:38:53 +02:00
Carlos Satorres 564d23653c fix: acls
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 13:24:00 +02:00
Pako Natek ada3fbe019 Merge pull request 'feat(TPV): refs #7999 new frmLongTermStorage' (!2998) from 7999-longTermStorage into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2998
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-20 11:07:43 +00:00
Carlos Andrés 7dce536f43 Merge pull request 'fix: refs #8011 Previas compo F' (!2995) from 8011-previas-campo-F into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2995
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-09-20 10:23:04 +00:00
Pablo Natek fb1e77f9c4 fix: refs #7404 fix back data source 2024-09-20 11:06:38 +02:00
Robert Ferrús 3bdd196fcc Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 08:38:12 +00:00
Robert Ferrús a65700abed feat: refs #8000 modificar comentario
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 10:37:36 +02:00
Jon Elias 2fc07e651f Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-20 08:24:42 +00:00
Pako Natek e9b93ff99b Merge branch 'dev' into 7999-longTermStorage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-20 08:13:52 +00:00
Pako Natek e8add6e614 feat(TPV): refs #7999 new frmLongTermStorage
gitea/salix/pipeline/pr-dev This commit looks good Details
Parking table foreign key updated
Old proc removed

Refs: #7999
2024-09-20 10:12:24 +02:00
Carlos Andrés 633766e58b fix: recupero version anterior
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 10:06:10 +02:00
Carlos Satorres 477ad30c4f Merge pull request 'fix: refs #6898 filter fix' (!2997) from 6898-fixSupplier2 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2997
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-20 07:35:21 +00:00
Carlos Satorres eb3ea010a1 Merge branch 'master' into 6898-fixSupplier2
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 07:31:15 +00:00
Carlos Satorres 889b86644b fix: refs #6898 filter fix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 09:14:38 +02:00
Carlos Andrés cd5efc095f Merge pull request 'solve_merge_problems' (!2986) from solve_merge_problems into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2986
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-20 07:07:22 +00:00
Carlos Andrés 1a44d23239 Merge branch 'master' into solve_merge_problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 08:59:58 +02:00
Robert Ferrús 1b4a324c3c feat: refs #8000 modificar comentarios
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 07:58:15 +02:00
Robert Ferrús f50b8326ba Merge branch '8000-catalog_calculate' of https://gitea.verdnatura.es/verdnatura/salix into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 07:33:08 +02:00