Commit Graph

23369 Commits

Author SHA1 Message Date
Guillermo Bonet 5ab8e79dde Merge branch 'dev' into 6701-clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:11:56 +00:00
Guillermo Bonet 85d68890b8 refactor: refs #6701 New table clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 12:11:26 +02:00
Jorge Penadés 705a873d53 Merge pull request '#6889 drop addSaleByCode' (!2470) from 6889-dropAddSaleByCode into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2470
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-03 10:09:06 +00:00
Guillermo Bonet b8e95c0284 refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 11:46:52 +02:00
Guillermo Bonet 8cef8eace7 refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 11:41:09 +02:00
Guillermo Bonet fd237b6d35 Merge branch 'dev' into 6701-claimRatioRoutine 2024-06-03 11:40:50 +02:00
Guillermo Bonet 4703ebbdf3 refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 11:38:09 +02:00
Alex Moreno 349914743c build: increase version
gitea/salix/pipeline/head This commit looks good Details
2024-06-03 10:48:21 +02:00
Carlos Satorres ed213da040 Merge pull request 'fix acls' (!2535) from hotfix-logisticRefundACL into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2535
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-03 08:45:23 +00:00
Jorge Penadés 39dcb7d6a8 fix: refs #6889 check if has collection or sectorCollection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:30:20 +02:00
Pablo Natek b1a4b42028 fix: refs #6404 change db language on local
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 10:29:38 +02:00
Carlos Satorres 7a92963886 fix acls
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 10:21:25 +02:00
Jon Elias 8ce4b7c2e4 Merge branch 'dev' into 5447-TravelExtraCommunity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 08:15:23 +00:00
Jorge Penadés ea7c2346d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:13:59 +02:00
Jorge Penadés 0448f7b039 Merge pull request '#6600 add column' (!2378) from 6600-createItemPhotoComment into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2378
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-03 08:06:57 +00:00
Jon Elias 594702121c Merge branch '5447-TravelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:04:39 +02:00
Jon Elias cf5b8a27a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity 2024-06-03 10:04:38 +02:00
Jorge Penadés 1382b24c1d refactor: refs #6600 add space
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:38:35 +02:00
Jon Elias 340a8c119e refactor: refs #6753 fix saveSign
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:35:44 +02:00
Jorge Penadés 72630d613b fix: refs #6600 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:32:03 +02:00
Jorge Penadés 790a637d4d feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:25:48 +02:00
Jorge Penadés 084f31e441 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 08:34:10 +02:00
Jorge Penadés 68bb282659 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 08:30:41 +02:00
Robert Ferrús ecd34e080d feat: refs #7039 deleteVirtualColumnCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 07:59:57 +02:00
Sergio De la torre b9a9f52514 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-03 07:56:43 +02:00
Sergio De la torre 9299d8f86c Merge pull request 'refs #6832 fix: ToItem' (!2507) from 6832_refactorBackToItem into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2507
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-03 05:39:59 +00:00
Guillermo Bonet b9d04e9557 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 05:22:15 +00:00
Sergio De la torre 1941d8f5b3 Merge branch 'dev' into 6832_refactorBackToItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 05:04:05 +00:00
Jorge Penadés dc8696b422 feat: refs #6889 add back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 16:31:36 +02:00
Jorge Penadés 836cfcbd07 refactor: refs #6889 sale tests e2e
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-31 13:58:26 +02:00
Sergio De la torre 2985e1c9e8 feat: roadMap refs #7195 2024-05-31 13:08:48 +02:00
Jorge Penadés ee09617b27 fix: refs #6889 e2e tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 13:05:12 +02:00
Jorge Penadés 9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:58:05 +02:00
Jorge Penadés ab9c11ef84 fix: refs #6889 modify fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:56:22 +02:00
Jorge Penadés 4772509b67 fix: refs #6889 e2e tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-31 12:51:06 +02:00
Javi Gallego 5339354b92 Merge pull request 'refs #6408 - rocketChat' (!2520) from 6408-rocketChat into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2520
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-31 10:43:52 +00:00
Carlos Satorres e09a8f2eb7 refs #6897 remove code redirection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:41:38 +02:00
Javi Gallego 6a08a806a9 Merge branch 'dev' into 6408-rocketChat
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 10:39:14 +00:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:29:32 +02:00
Guillermo Bonet d27bbd9a8f hotfix: ticket 189567
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:28:47 +02:00
Pablo Natek 46065a983f Merge pull request '6404-adDeliveryAndCeroField' (!2530) from 6404-adDeliveryAndCeroField into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2530
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-31 10:00:18 +00:00
Pablo Natek 988b3cbbee fix: refs #6404 ref #6404 remove console.log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 11:53:55 +02:00
Pablo Natek 884b5f8475 feat: refs #6404 add cero filler to counter 2024-05-31 11:51:32 +02:00
Alex Moreno 94cc233852 deploy: increase version
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 10:17:21 +02:00
Robert Ferrús 546e067dde Merge pull request 'fix: refs #7039 hotFixcountry' (!2529) from 7039-hotFixCountry into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2529
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-31 08:10:10 +00:00
Robert Ferrús 85c328e522 fix: refs #7039 hotFixcountry
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 10:07:27 +02:00
Jorge Penadés 38bea60776 refactor: refs #6889 script sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 09:49:58 +02:00
Javier Segarra 2b1ebee206 Merge pull request '#7228 - send full size image when croppie it' (!2416) from 7228_croppieUploadPhoto into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2416
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-05-31 07:29:54 +00:00
Alex Moreno 788f334e70 intros
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 09:29:47 +02:00
Javier Segarra e5c7bfdb33 Merge branch 'dev' into 7228_croppieUploadPhoto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 07:25:39 +00:00