Commit Graph

1157 Commits

Author SHA1 Message Date
Alex Moreno 63a4cb1847 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-24 12:25:41 +02:00
Alex Moreno afbf084535 Merge branch 'test' into 8032-devToTest_2440
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-24 09:29:38 +00:00
Pablo Natek a5f3dbc15a fix: refs #7404 last entries spec 2024-09-24 08:55:24 +02: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
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
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
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
Javi Gallego da0e735fb2 fix: hotFix limit 5
gitea/salix/pipeline/head This commit looks good Details
2024-09-18 23:41:01 +02:00
Guillermo Bonet 5c7a537275 feat: refs #7912 Added new waste types
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:32:52 +02:00
Guillermo Bonet 4c6aba96e5 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:16 +02:00
Jorge Penadés d98f0a2493 chore: refs #7524 rollback 2024-09-10 13:15:58 +02:00
Jorge Penadés b16c2bed2b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 13:09:33 +02:00
Javier Segarra 7710b87f4a test(salix): refs #7671 #7671 improve and revert where changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 10:07:05 +02:00
Javier Segarra 6012604946 perf(salix): refs #7671 #7671 imrpove and revert where changes 2024-09-09 09:57:38 +02:00
Javier Segarra 5c4a30f2f9 perf: refs #7671 improve showBadDates
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-08 12:50:32 +02:00
Javier Segarra dbd8f94555 perf: refs #7671 improve showBadDates 2024-09-08 12:49:55 +02:00
Javier Segarra 59cce5d349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices 2024-09-08 12:31:39 +02:00
Juan Ferrer e2c6a45756 fix: refs #7931 Available back test fix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-06 12:57:57 +02:00
Juan Ferrer 382e54b572 fix: refs #7931 Back test fix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 11:30:43 +02:00
Juan Ferrer d44dec3703 fix: refs #7931 Back test fix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 11:25:49 +02:00
Juan Ferrer 48f94140e2 fix: refs #7931 Back test fix 2024-09-06 09:16:22 +02:00
Jorge Penadés d82f9b2cd6 chore: refs #7524 fix test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 14:55:59 +02:00
Jorge Penadés e3015a6559 feat: refs #7524 no apply limit
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-04 14:52:53 +02:00
Javier Segarra ef26d7f437 fix(salix): #7283 ItemFixedPrice duplicated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 06:05:39 +00:00
Robert Ferrús 619dd2fbe8 Merge pull request 'master' (!2823) 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: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-08-01 05:05:14 +00:00
Sergio De la torre 70b931553b hotFix itemShelving refs #6861
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-31 18:14:09 +02:00
Sergio De la torre 952b7a5054 hotFix model itemShelving refs #7805
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 07:10:38 +02:00
Guillermo Bonet f9c58e63e1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-29 09:24:57 +02:00
Guillermo Bonet c713c3a5c0 fix: refs #6861 Unhandled error
gitea/salix/pipeline/head This commit looks good Details
2024-07-29 09:21:35 +02:00
Guillermo Bonet 169534568e Merge branch 'test' into dev 2024-07-22 12:36:27 +02:00
Guillermo Bonet ab45b988c8 feat: refs #7704 Added itemMinimumQuantity_check
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 10:27:24 +02:00
Guillermo Bonet ce59a2bbbf fix: refs #6769 Item diary redirection to Lilium
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 08:40:12 +02:00
Guillermo Bonet ca48c64163 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 13:19:02 +02:00
Sergio De la torre 0181764744 Merge pull request 'master' (!2750) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2750
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 15:09:35 +00:00
Sergio De la torre 3aea6fdd46 hotFix reservas refs #6861 2024-07-17 16:13:31 +02:00
Javier Segarra 9206826135 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 12:57:22 +02:00
Guillermo Bonet f8f6950de1 Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2683
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 08:13:27 +00:00
Guillermo Bonet bb787b1581 refactor: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:03:37 +02:00
Guillermo Bonet 5c80a99543 feat: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:58:59 +02:00
Guillermo Bonet 31530d6d3d feat: refs #6769 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:22:22 +02:00
Javier Segarra 9c5f38648a feat(ssalix): refs #7671 #7671 checkDates to present
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 00:24:26 +02:00
Guillermo Bonet 9e3baeffa6 feat: refs #7704 Added tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 14:27:16 +02:00
Guillermo Bonet 02bcfd9be3 feat: refs #7704 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 08:57:45 +02:00
Javier Segarra ea626821fc feat(ssalix): refs #7671 #7671 checkDates 2024-07-11 06:17:19 +02:00
Guillermo Bonet 1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:02:15 +02:00
Guillermo Bonet e64f56cff1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 07:55:00 +02:00
Guillermo Bonet 5213fd4feb Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 07:54:42 +02:00
Sergio De la torre 159f2f5f1c hotFix itemNewer refs #6964
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-05 08:44:09 +02:00