Commit Graph

22685 Commits

Author SHA1 Message Date
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
Carlos Satorres 424e0c430c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 09:50:29 +02: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
Pako Natek 9694c80c09 Merge branch 'dev' into 7420-supplierPackaging_reportSource_update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 07:00:16 +00:00
Javi Gallego 925e28115c Merge pull request 'feat: refs #7555 remove account.password__' (!2624) from 7555-remove_account_password__ into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2624
2024-06-21 06:50:12 +00:00
Carlos Satorres a80b0c3b4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:36:50 +02:00
Alex Moreno 42b483e27e feat: refs #7555 remove account.password__
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:35:35 +02:00
Pako Natek 7347c50f8e Merge branch 'dev' into 7420-supplierPackaging_reportSource_update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 06:33:15 +00:00
Pako Natek fe154b9ee8 sref
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:32:22 +02:00
Sergio De la torre da40b705c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 07:20:00 +02:00
Sergio De la torre 13952f60e1 feat boxPicking refs #7357
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 07:18:10 +02:00
Javier Segarra a303d22a18 Merge pull request '#6264 - FIX - Log renewToken when not success' (!2619) from 6264_log_tmp_renewToken into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2619
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-21 05:17:18 +00:00
Guillermo Bonet 6874474207 Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2394
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-21 05:05:20 +00:00
Guillermo Bonet a899ecaab7 Merge pull request 'refactor: refs #7490 Deleted update duaInvoiceInBooking' (!2561) from 7490-duaInvoiceInBooking into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2561
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-21 05:04:32 +00:00
Javier Segarra 3c71764529 Merge branch 'master' into 6264_log_tmp_renewToken
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 21:29:58 +00:00
Javier Segarra ba48d93c1e perf(salix): refs #6264 #6264 remove save token as debug row
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 23:28:11 +02:00
Carlos Andrés f7b8bd2df6 Merge branch '6861-Pasar-modo-trabajo-de-previa-a-reservas' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 18:18:05 +02:00
Carlos Andrés ed49c98c1c fnpmeat: previas con sitema de reservas refs #6861 2024-06-20 18:18:03 +02:00
Carlos Andrés 9565bc1d77 Merge pull request 'feat: sincro client supplier sage refs #7595' (!2623) from 7595-sincro-sage into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2623
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-06-20 15:33:18 +00:00
Carlos Andrés 68f48de6f0 feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 17:14:38 +02:00
Sergio De la torre 9b0913e439 Merge branch 'dev' into 7023_itemShelving_filterBuyer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 14:36:25 +00:00
Sergio De la torre 833a7c87db feat boxPicking refs #7357
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 16:26:56 +02:00
Carlos Andrés b5cd57e660 Merge pull request 'test' (!2621) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2621
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-06-20 13:47:11 +00:00
Carlos Andrés 691413a854 Merge pull request 'master' (!2620) 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: #2620
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-06-20 13:44:37 +00:00
Carlos Andrés 11675c2e35 Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2618
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-20 13:34:55 +00:00
Javier Segarra bfb6689835 test: add CALL util.debugAdd
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 15:15:56 +02:00
Javier Segarra 31a75956c0 feat: add CALL util.debugAdd 2024-06-20 15:15:51 +02:00
Carlos Andrés 414bf9eb03 feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 14:48:32 +02:00
Carlos Andrés e0d105313d feat: sincro client supplier sage refs #7595
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 14:27:11 +02:00
Carlos Satorres 59abcaa654 Merge pull request 'Actualizar README.md' (!2616) from sergiodt-patch-1 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2616
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-06-20 12:05:35 +00:00
Carlos Satorres 926982d5e0 Merge branch 'dev' into sergiodt-patch-1
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 12:04:03 +00:00
Robert Ferrús 4b58afadae Merge branch '195937-icoterms' of https://gitea.verdnatura.es/verdnatura/salix into 195937-icoterms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 14:03:34 +02:00
Robert Ferrús 8fc231da2f feat: refs #195937 2024-06-20 14:03:31 +02:00
Robert Ferrús 72fd806750 Merge branch 'master' into 195937-icoterms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 11:49:09 +00:00
Robert Ferrús 852785b4c1 fix: refs #195937 refactor incoterms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 13:45:38 +02:00
Guillermo Bonet b02a4721af Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 13:10:31 +02:00
Guillermo Bonet 074d4f4755 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 13:10:07 +02:00
Guillermo Bonet 9a4ec46073 hotfix: refs #6820 Deleted km validation
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 13:09:40 +02:00
Sergio De la torre 7d3c07aaae Actualizar README.md
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 10:44:31 +00:00
Jon Elias 419de69690 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 12:24:06 +02:00
Sergio De la torre 182cd3fa8e feat boxPicking refs #7357
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-20 11:34:51 +02:00
Robert Ferrús 46792ba30e fix: refs #195937 changes requerid
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 11:04:42 +02:00
Alex Moreno f99b1beb86 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 09:48:57 +02:00
Alex Moreno f84e85e443 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 09:48:34 +02:00
Sergio De la torre c1c01df3c3 feat itemShelving_filterBuyer refs #7023
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-20 09:37:22 +02:00
Robert Ferrús 5a40952547 fix: refs #195937 icoterms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 09:34:13 +02:00
Sergio De la torre c87f060d51 feat boxPicking refs #7357 2024-06-20 09:21:27 +02:00
Javi Gallego 018972b948 Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2609
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-20 05:50:14 +00:00
Jorge Penadés 4b7fa29189 Merge pull request '#6744 hotfix show change password' (!2595) from 6744-hotfix-showChangePass into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
Reviewed-on: #2595
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-06-19 14:55:15 +00:00