Commit Graph

22449 Commits

Author SHA1 Message Date
Carlos Andrés 49183c79f1 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 16:47:24 +02:00
Carlos Andrés cbd46330b3 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 13:01:42 +02:00
Sergio De la torre b47637610b Merge pull request 'feat: refs #7168 Added vRecords param in proc' (!2305) from 7168-itemShelvingLog_get into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2305
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-25 14:26:21 +00:00
Sergio De la torre 75f8de9277 Merge branch 'dev' into 7168-itemShelvingLog_get
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 14:16:29 +00:00
Guillermo Bonet b9278f3b3a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 14:02:16 +02:00
Guillermo Bonet 2e1ab3af20 refs #7486 Fix same assign collection
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 14:00:46 +02:00
Sergio De la torre e55af8d36f feat itemShelvingLog refs #7168
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 13:41:10 +02:00
Sergio De la torre acf308fd16 feat itemShelvingLog refs #7168
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 13:35:21 +02:00
Sergio De la torre c551e229fb feat itemShelvingLog refs #7168
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 13:30:46 +02:00
Carlos Andrés ff1918ef06 Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2176
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-25 11:21:02 +00:00
Carlos Satorres 087a051a4a Merge pull request 'refs #7406 worker formation' (!2511) from 7406-workerFormation into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2511
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-25 11:17:56 +00:00
Alex Moreno dbab56a566 Merge branch 'dev' into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 11:15:02 +00:00
Alex Moreno 85854e0713 warmFix: use vn
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 13:14:44 +02:00
Carlos Satorres f811e7e96c Merge branch 'dev' into 7406-workerFormation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 10:39:38 +00:00
Carlos Satorres 655bbe4967 refs #7406 fix pr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 12:29:17 +02:00
Alex Moreno 45e8674087 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 11:34:35 +02:00
Alex Moreno 89dba7c3c0 Merge pull request 'build: db dump' (!2635) from 7631_dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2635
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-06-25 09:32:00 +00:00
Alex Moreno 6150f64e88 build: db dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-25 09:29:42 +02:00
Alex Moreno cf0f80142f hotFix: create view vn.expeditionTruck
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 09:24:34 +02:00
Guillermo Bonet 134c38b9fd refs #6753 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 08:57:21 +02:00
Alex Moreno ece055ca1e Merge pull request '7631_testToMaster_2426' (!2634) from 7631_testToMaster_2426 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2634
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-06-25 06:36:57 +00:00
Alex Moreno 3f327866ca Merge branch 'master' into 7631_testToMaster_2426
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-25 06:35:33 +00:00
Robert Ferrús dfd53f73e5 Merge pull request 'fix: refs #7611 & ticket195937 incoterms' (!2613) from 195937-icoterms into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2613
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-25 05:58:30 +00:00
Robert Ferrús f2caa4bec9 Merge branch 'master' into 195937-icoterms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-25 05:55:26 +00:00
Alex Moreno 0284f3b1ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 07:30:20 +02:00
Alex Moreno f2ee1df8ac Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-25 07:29:56 +02:00
Sergio De la torre 2012560d70 Merge pull request '7357_dipole_review' (!2615) from 7357_dipole_review into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2615
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-24 11:49:10 +00:00
Carlos Andrés cf79711f6a feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-24 13:30:03 +02:00
Pako Natek 708937b99c Merge pull request 'tested proc' (!2632) from supplierPackaging_ReportSource_masterHotFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2632
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-06-24 10:52:45 +00:00
Pako Natek 6244509e3d Merge pull request 'supplierPackaging_ReportSource_hotFix' (!2633) from supplierPackaging_ReportSource_hotFix into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2633
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-06-24 10:50:49 +00:00
Pako Natek c32a87126c Merge branch 'master' into supplierPackaging_ReportSource_masterHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 10:50:31 +00:00
Pablo Natek 738ba11ad3 Merge pull request 'fix: business overlapping' (!2631) from fixBusinessOverlaping into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2631
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-24 10:21:54 +00:00
Pako Natek 5f329fde38 or replace
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-24 10:32:51 +02:00
Pako Natek f999010c6c tested proc
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 10:32:12 +02:00
Pako Natek 8c5f468087 tested proc 2024-06-24 10:30:25 +02:00
Pablo Natek ea0b0dc779 fix: business overlapping
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-24 08:08:39 +02:00
Sergio De la torre 6a4b44733f Merge branch 'dev' into 7357_dipole_review
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-24 05:15:32 +00:00
Sergio De la torre 72ef84d6c2 Merge pull request 'feat itemShelving_filterBuyer refs #7023' (!2622) from 7023_itemShelving_filterBuyer into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2622
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-24 05:15:05 +00:00
Sergio De la torre 429149d4e0 Merge branch 'dev' into 7023_itemShelving_filterBuyer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-24 05:05:27 +00:00
Alex Moreno 1dd0357a34 Merge pull request 'test to dev' (!2629) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2629
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-21 12:33:58 +00:00
Jorge Penadés 87b69e0455 Merge pull request '#6238 add scheme' (!2628) from 6238-warmfix-useDb into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2628
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-21 11:40:11 +00:00
Jorge Penadés 5ef0dffa3e fix: refs #6238 add scheme
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-21 13:38:00 +02:00
Jorge Penadés 2d38c370a9 Merge pull request '#6238 add travelKgPercentage table and model' (!2626) from 6238-warmfix-addTable into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2626
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-21 11:34:47 +00:00
Jorge Penadés 24cf23dddc feat: refs #62add travelKgPercentage table and model
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-21 13:16:01 +02:00
Sergio De la torre 4131653700 feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 13:02:36 +02:00
Sergio De la torre 3fa7eb1d2a feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-21 13:01:19 +02:00
Robert Ferrús c42a21bc6f fix: refs #19537 changes required
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-21 11:47:34 +02:00
Robert Ferrús fb58e8226d Merge branch 'master' into 195937-icoterms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-21 08:52:14 +00:00
Sergio De la torre ccc0dc2ee3 Merge branch 'dev' into 7357_dipole_review
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:16:15 +00:00
Pako Natek fc0c03f01a Merge pull request 'Warehouse name' (!2610) from 7420-supplierPackaging_reportSource_update into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2610
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-21 07:02:31 +00:00