Commit Graph

1228 Commits

Author SHA1 Message Date
Pako Natek 5c8f42a3ae fix: refs #8030 redmine revision updates
Changes recomended by the reviewer

Refs: #8030
2024-09-24 10:38:56 +02:00
Pako Natek fb7208d898 fix: refs #8030 warehouse filter
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Warehouse is also needed to make the filter

Refs: #8030
2024-09-24 09:05:30 +02:00
Pako Natek acabd3e154 feat(catalog_componentCalculate): refs #8030 new component improved
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
The procedure has now the component "bonus", a special price increasing for a group of items

Refs: #8030
2024-09-24 08:50:34 +02: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
Alex Moreno ccb60eee87 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-19 12:42:12 +02:00
Alex Moreno b7e712b738 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-19 12:38:08 +02:00
Pablo Natek 6f5cb6c70a Merge branch 'master' into hotFix-productionControl
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 15:47:15 +00:00
Pablo Natek 8aad80cbf1 fix(productionControl): refs #7969
gitea/salix/pipeline/pr-master Build queued... Details
2024-09-18 17:45:58 +02:00
Guillermo Bonet e3c92c3644 fix: refs #6421 worker_getHierarchy infinite loop 2024-09-18 13:43:00 +02:00
Carlos Andrés ba6b6572c3 fix: collection_new
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-18 09:45:12 +02:00
Ivan Mas 7cd8e535f0 refactor: refs #7934 Delete vn.MIDNIGHT function
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 16:19:09 +02:00
Carlos Andrés 8f9a7802ab fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 15:50:51 +02:00
Sergio De la torre 974827443c fix: refs #6861 itemShelvingSale transaction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 13:11:27 +02:00
Pako Natek 8b8c64ed65 Merge branch 'master' into 7969-plantTray
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 10:53:44 +00:00
Guillermo Bonet 4a102d315d fix: refs #7564 Ticket volume item cost 2024-09-17 12:10:47 +02:00
Pako Natek 829475b49b feat(collection_new): refs #7969 new restriction hasPlantTray for pickers
gitea/salix/pipeline/pr-master This commit looks good Details
Refs: #7969
2024-09-17 11:57:00 +02:00
Pako Natek 019d855fbf fix: refs #7969 new plantTray restriction 2024-09-17 11:22:07 +02:00
Pablo Natek d308f185bc Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 08:11:17 +00:00
Guillermo Bonet 55df919076 fix: refs #7760 collection_new
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:37:25 +02:00
Guillermo Bonet 267ce3167c fix: refs #7760 collection_new
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:30:40 +02:00
Guillermo Bonet 3fe1724e84 fix: refs #7760 ticket_splitItemPackingType
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:12:25 +02:00
Guillermo Bonet 88f434435b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 08:42:34 +02:00
Pablo Natek 9896ac2361 fix: refs #7760 remove throw on ticket split
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 08:21:29 +02:00
Javi Gallego 361d60a8a8 Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2945
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-17 05:28:48 +00:00
Carlos Andrés faf963ba52 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 15:11:51 +02:00
Carlos Andrés 1d42f58c39 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-16 15:09:34 +02:00
Carlos Andrés 2e03fe8193 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:41:29 +02:00
Alex Moreno cabc9660d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:27:08 +02:00
Alex Moreno 8803ae0534 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:25:27 +02:00
Carlos Andrés 33540063f4 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-16 14:17:51 +02:00
Carlos Andrés e7343b7e25 fix: refs #7760 tmp.ticketIPT 2024-09-16 14:16:48 +02:00
Sergio De la torre c33740e36e fix: refs #6861 itemShelvingSale debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 13:00:20 +02:00
Pablo Natek 88962b051f Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:13:13 +00:00
Pablo Natek 8f4f2d2d15 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:06:04 +02:00
Javi Gallego d7679fcb50 feat: refs #7977 muestra las facturas sin vencimientos tambien
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:01:47 +02:00
Pako Natek 6983a2fbd9 fix: refs #7969 no agency restriction removed
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 08:38:06 +02:00
Pako Natek 390b8271c2 fix: root instead of vn
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 08:20:17 +02:00
Pako Natek 6cbf25dee5 fix: refs #7969 fix on collectionNew
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-16 08:10:58 +02:00
Sergio De la torre 630e9cec1e Merge pull request 'test' (!2958) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2958
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-09-13 05:41:50 +00:00
Sergio De la torre 1ef9cc0458 Merge pull request 'master' (!2957) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2957
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-09-13 05:39:45 +00:00
Pako Natek a0bfc20595 revision
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 14:34:19 +02:00
Pako Natek b1027f454b locallyTested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 14:13:17 +02:00
Ivan Mas 4f9eb865d0 Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 10:27:27 +00:00
Guillermo Bonet fcfef2a970 Merge pull request 'refactor: refs #7900 Deleted sectorProdPriority column' (!2941) from 7900-sectorProdPriority into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2941
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-12 08:21:32 +00:00
Javier Segarra 504e2f0ed2 Merge branch 'dev' into 7956-itemGetSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 17:42:05 +00:00
Sergio De la torre 99761c97e8 Merge pull request '6861-availableReserve' (!2952) from 6861-availableReserve into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2952
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-11 12:38:14 +00:00
Guillermo Bonet 956058c10c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:19:51 +02:00
Guillermo Bonet 8518351790 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:19:37 +02:00
Guillermo Bonet 889f3bdab4 fix: refs #7213 risk F11
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:12:07 +02:00