22692 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	6a4b44733f	Merge branch 'dev' into 7357_dipole_review	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 ... 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	2024-06-24 05:05:27 +00:00
Alex Moreno	1dd0357a34	Merge pull request 'test to dev' (!2629) from test into dev ... 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 ... 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	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 ... 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	2024-06-21 13:16:01 +02:00
Sergio De la torre	4131653700	feat itemShelving_filterBuyer refs #7023	2024-06-21 13:02:36 +02:00
Sergio De la torre	3fa7eb1d2a	feat itemShelving_filterBuyer refs #7023	2024-06-21 13:01:19 +02:00
Robert Ferrús	c42a21bc6f	fix: refs #19537 changes required	2024-06-21 11:47:34 +02:00
Robert Ferrús	fb58e8226d	Merge branch 'master' into 195937-icoterms	2024-06-21 08:52:14 +00:00
Sergio De la torre	ccc0dc2ee3	Merge branch 'dev' into 7357_dipole_review	2024-06-21 08:16:15 +00:00
Carlos Satorres	424e0c430c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-21 09:50:29 +02:00
Pako Natek	fc0c03f01a	Merge pull request 'Warehouse name' (!2610) from 7420-supplierPackaging_reportSource_update into dev ... 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	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 ... 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	2024-06-21 08:36:50 +02:00
Alex Moreno	42b483e27e	feat: refs #7555 remove account.password__	2024-06-21 08:35:35 +02:00
Pako Natek	7347c50f8e	Merge branch 'dev' into 7420-supplierPackaging_reportSource_update	2024-06-21 06:33:15 +00:00
Pako Natek	fe154b9ee8	sref	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	2024-06-21 07:20:00 +02:00
Sergio De la torre	13952f60e1	feat boxPicking refs #7357	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 ... 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 ... 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 ... 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	2024-06-20 21:29:58 +00:00
Javier Segarra	ba48d93c1e	perf(salix): refs #6264 #6264 remove save token as debug row	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	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 ... 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	2024-06-20 17:14:38 +02:00
Sergio De la torre	9b0913e439	Merge branch 'dev' into 7023_itemShelving_filterBuyer	2024-06-20 14:36:25 +00:00
Sergio De la torre	833a7c87db	feat boxPicking refs #7357	2024-06-20 16:26:56 +02:00
Carlos Andrés	b5cd57e660	Merge pull request 'test' (!2621) from test into dev ... 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 ... 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 ... 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	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	2024-06-20 14:48:32 +02:00
Carlos Andrés	e0d105313d	feat: sincro client supplier sage refs #7595	2024-06-20 14:27:11 +02:00
Carlos Satorres	59abcaa654	Merge pull request 'Actualizar README.md' (!2616) from sergiodt-patch-1 into dev ... 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	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	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	2024-06-20 11:49:09 +00:00
Robert Ferrús	852785b4c1	fix: refs #195937 refactor incoterms	2024-06-20 13:45:38 +02:00
Guillermo Bonet	b02a4721af	Merge branch 'test' into dev	2024-06-20 13:10:31 +02:00
Guillermo Bonet	074d4f4755	Merge branch 'master' into test	2024-06-20 13:10:07 +02:00
Guillermo Bonet	9a4ec46073	hotfix: refs #6820 Deleted km validation	2024-06-20 13:09:40 +02:00