Commit Graph

22934 Commits

Author SHA1 Message Date
Robert Ferrús 1e3376f908 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 08:05:01 +00:00
Robert Ferrús a42562b0ca fear: refs #5855 claim_ratio_routine
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 10:01:32 +02:00
Pako Natek c989cebbfc Merge pull request '7420-supplierPackaging_ReportSource' (!2607) from 7420-supplierPackaging_ReportSource into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2607
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-06-19 07:56:53 +00:00
Javi Gallego 637c6a9035 feat: refs #7216 logUnpaid
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 09:40:24 +02:00
Pako Natek bb496124ac Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 06:37:33 +00:00
Alex Moreno f8407a83fe Merge pull request 'fix: refs #6408 quito state.js' (!2608) from hotfix-stateFk into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2608
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-19 06:17:30 +00:00
Javi Gallego df4b3add8d fix: refs #6408 quito state.js
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-19 07:59:45 +02:00
Pako Natek 1fa0a841da TP previous
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 07:26:30 +02:00
Pako Natek cccc87d211 Merge pull request 'tickets deleted excluded' (!2601) from 7420-supplierPackaging_ReportSource into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2601
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-19 05:17:58 +00:00
Pako Natek bf62f40c87 actualizada la rama 2024-06-19 07:17:25 +02:00
Pako Natek 841f8e9cac Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 18:38:48 +00:00
Sergio De la torre caec6c7f6f Merge pull request 'hotFix delete unique refs #6281' (!2606) from 6281_hotFix_itemShelving into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2606
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-18 17:08:40 +00:00
Sergio De la torre ae01fb6440 hotFix delete unique refs #6281
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-18 17:00:15 +02:00
Sergio De la torre 16d50ca2e5 Merge pull request '6964-hasItemOlder' (!2560) from 6964-hasItemOlder into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2560
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-18 14:27:07 +00:00
Sergio De la torre 5694d9a9fe Merge branch 'test' into 6964-hasItemOlder
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-18 14:20:57 +00:00
Jorge Penadés 116ec6bba9 Merge pull request '#6238 use scheme' (!2604) from 6238-fix-useDb into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2604
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-18 11:20:16 +00:00
Jorge Penadés 6cf7c58671 fix: refs #6238 use scheme
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 12:59:55 +02:00
Ivan Mas b8b88cdb92 Merge pull request 'refs #7313 delete vn.itemPackaging.workerFk' (!2599) from 7313-Delete_vn.ticketPackaging.workerFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2599
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-06-18 10:10:49 +00:00
Ivan Mas 49943e4f25 Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 10:09:04 +00:00
Pako Natek 66ed958c72 Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 09:07:24 +00:00
Guillermo Bonet 5e1bfc12f2 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-06-18 11:04:11 +02:00
Guillermo Bonet a61c12a06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-06-18 11:04:01 +02:00
Guillermo Bonet b7fadddbb1 Merge branch 'master' into dev 2024-06-18 11:03:56 +02:00
Guillermo Bonet 4d5f3e43ed Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-18 11:03:49 +02:00
Guillermo Bonet 2b1de271a9 refs #7552 Added force vShowType true
gitea/salix/pipeline/head This commit looks good Details
2024-06-18 11:03:30 +02:00
Jorge Penadés 0bf0c6ce8c Merge pull request '#6238 add travelKgPercentage table and model' (!2590) from 6238-addPercentage into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2590
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-18 08:41:29 +00:00
Sergio De la torre 239814e6b4 feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-06-18 10:08:40 +02:00
Jorge Penadés 3070d1ef01 refactor: refs #6238 drop useless round
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 10:04:21 +02:00
Jorge Penadés 87feddaedb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 09:55:22 +02:00
Carlos Satorres 52a34c8f2d refs #7409 fix acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 09:18:09 +02:00
Pako Natek 3711f26b5f Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 06:24:59 +00:00
Sergio De la torre 46cd20a1fd feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 08:24:15 +02:00
Pako Natek 9fc027a3c6 tickets deleted excluded
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 08:24:06 +02:00
Alex Moreno 7566ca1acb build: increase version 2428
gitea/salix/pipeline/head This commit looks good Details
2024-06-18 08:21:38 +02:00
Alex Moreno 65238e19ca Merge pull request '7596-devToTest_2426' (!2600) from 7596-devToTest_2426 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2600
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-06-18 06:19:50 +00:00
Carlos Satorres ac8780f47f Merge pull request 'refs #6897 remove code redirection' (!2531) from 6897-entryMigration into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2531
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-18 06:14:16 +00:00
Alex Moreno deb0f8e828 Merge branch 'dev' into 6897-entryMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 06:04:12 +00:00
Sergio De la torre eedcdb54fa feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 19:50:51 +02:00
Sergio De la torre dc777b2d7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 19:12:00 +02:00
Ivan Mas 671290b9a0 refs #7313 delete vn.itemPackaging.workerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 16:45:51 +02:00
Carlos Satorres 3e25fff90f refs #7409 acl
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 15:50:58 +02:00
Guillermo Bonet a84badff87 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-17 14:52:55 +02:00
Guillermo Bonet 9b3f67ff62 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 14:52:40 +02:00
Guillermo Bonet ce709798b4 hotfix: refs #7486 collection_new debug error
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 14:51:04 +02:00
Alex Moreno e8c7b55329 fix(WorkerIncome): refs #7409 fix models
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 14:17:43 +02:00
Carlos Satorres fa8c1b3879 acls, fixtures, models
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 13:50:07 +02:00
Guillermo Bonet 664f4299b3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 13:42:51 +02:00
Guillermo Bonet 9df3e914bd Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 13:42:33 +02:00
Guillermo Bonet 131b44305d hotfix: refs #7552 item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-06-17 13:38:40 +02:00
Guillermo Bonet 39381a4a7c Merge pull request 'fix: refs #5995 Optimized downloadCmrsZip' (!2596) from 5995-optimizedDownloadCmr into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2596
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-17 11:22:30 +00:00