22126 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	85c328e522	fix: refs #7039 hotFixcountry	2024-05-31 10:07:27 +02:00
Jorge Penadés	38bea60776	refactor: refs #6889 script sql	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 ... 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	2024-05-31 09:29:47 +02:00
Javier Segarra	e5c7bfdb33	Merge branch 'dev' into 7228_croppieUploadPhoto	2024-05-31 07:25:39 +00:00
Sergio De la torre	188137848b	Merge pull request 'feat: packaging refs #4021' (!2526) from 4021_packaging into dev ... Reviewed-on: #2526 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-31 06:44:37 +00:00
Alex Moreno	bd82bb011a	fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests	2024-05-31 08:44:30 +02:00
Sergio De la torre	1944a4f308	Merge branch 'dev' into 4021_packaging	2024-05-31 06:43:20 +00:00
Jorge Penadés	eb15262fb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 08:37:28 +02:00
Pablo Natek	c6c05bf3f5	Merge pull request 'feat: refs #6404 add deadline field' (!2527) from 6404-fixrefernce into master ... Reviewed-on: #2527 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-31 06:20:29 +00:00
Javi Gallego	d4c76ed20e	Merge pull request 'refs: #7108 weekends' (!2524) from 7108-exchange into dev ... Reviewed-on: #2524 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-31 05:39:06 +00:00
Javi Gallego	ef4d17c0e6	Merge branch 'dev' into 7108-exchange	2024-05-31 05:13:52 +00:00
Robert Ferrús	fd233a5e51	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-31 05:09:16 +00:00
Pablo Natek	81e1179ce0	Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-fixrefernce	2024-05-30 19:13:27 +02:00
Pablo Natek	eac3fa1e2f	feat: refs #6404 fix packagejson	2024-05-30 19:09:29 +02:00
Pablo Natek	d901584c3f	feat: refs #6404 add deadline field	2024-05-30 18:39:06 +02:00
Sergio De la torre	db1c352be3	feat: packaging refs #4021	2024-05-30 18:06:35 +02:00
Jorge Penadés	8a54f7c5c7	refactor: refs #6889 improve file loading logic	2024-05-30 14:34:27 +02:00
Jorge Penadés	8212eb82c7	refactor: refs #6889 improve file loading logic	2024-05-30 14:29:13 +02:00
Jorge Penadés	002111d8d1	fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer	2024-05-30 11:47:12 +02:00
Jorge Penadés	5158017edd	fix: refs #6889 fix back tests	2024-05-30 11:21:42 +02:00
Robert Ferrús	69518ab3e2	Merge pull request 'feat: refs #6477 productionConfig add column' (!2525) from 6477-stickerQr into dev ... Reviewed-on: #2525 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-30 09:10:54 +00:00
Robert Ferrús	467383d7f4	feat: refs #6477 productionConfig add column	2024-05-30 10:32:17 +02:00
Alex Moreno	6dca7915c8	deploy: increase version	2024-05-30 10:17:02 +02:00
Alex Moreno	c071005a9e	Merge pull request 'fix(util_log): refs #7268 fix getChanges when is datestring' (!2370) from 7268-hotFix_getChanges_datestring into master ... Reviewed-on: #2370 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-05-30 08:13:34 +00:00
Jorge Penadés	05e6e10337	fix: refs #6889 fix back tests	2024-05-30 10:04:34 +02:00
Alex Moreno	9e384487cf	Merge branch 'master' into 7268-hotFix_getChanges_datestring	2024-05-30 08:01:33 +00:00
Javi Gallego	7186686548	Merge branch 'dev' into 4560-GastosReparto	2024-05-30 09:44:06 +02:00
Javi Gallego	5e55f2d92d	feat: refs # 6408 test ok	2024-05-30 09:35:42 +02:00
Jorge Penadés	4fa2a4d58c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-30 08:45:01 +02:00
Alex Moreno	ce2721ca47	deploy: increase version	2024-05-30 08:16:57 +02:00
Alex Moreno	f9d25ccd6c	hotFix(updateClaim): salesPerson undefined	2024-05-30 08:14:10 +02:00
Guillermo Bonet	d461b78c7b	Merge branch 'test' into dev	2024-05-30 07:19:03 +02:00
Guillermo Bonet	255a2c5283	fix: refs #7258 Proc bs.claim_ratio_routine	2024-05-30 07:18:30 +02:00
Jorge Penadés	d866ec6417	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-29 16:59:19 +02:00
Jorge Penadés	a32db7840e	feat: refs #6889 fixtures & models	2024-05-29 16:54:24 +02:00
Javi Gallego	d9d7904aaf	refs: #7108 weekends	2024-05-29 11:58:13 +02:00
Pako Natek	dccfe4847b	Merge pull request 'nuevo enfoque recipe y manejo de errores en order_confirm' (!2523) from 6021-floranet_beta into dev ... Reviewed-on: #2523 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-29 09:40:44 +00:00
Pako Natek	a2029f7934	Merge branch 'dev' into 6021-floranet_beta	2024-05-29 09:39:31 +00:00
Jorge Penadés	fc606f7e36	fix: refs #6889 rollback	2024-05-29 10:22:22 +02:00
Jorge Penadés	9d58c67b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-29 09:16:25 +02:00
Jorge Penadés	b50b1f2b13	Merge pull request '#6942 toUnbook' (!2135) from 6942-improveInvoiceIn into dev ... Reviewed-on: #2135 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-29 07:03:34 +00:00
Jorge Penadés	d35bbe5c06	Merge branch 'dev' into 6942-improveInvoiceIn	2024-05-29 07:00:17 +00:00
Pako Natek	03fa06a9fb	Merge branch 'dev' into 6021-floranet_beta	2024-05-29 06:37:44 +00:00
Pako Natek	e0d8a46cd6	nuevo enfoque recipe y manejo de errores en order_confirm	2024-05-29 08:36:18 +02:00
Guillermo Bonet	f87ee5cb91	Merge branch 'test' into dev	2024-05-29 08:09:53 +02:00
Guillermo Bonet	f770bce54c	fix: refs #7486 Deleted get_lock collection_assign	2024-05-29 07:55:33 +02:00
Jorge Penadés	885aa5208a	feat : refs #6889 wip: check if is productionReviewer or owner	2024-05-28 17:23:58 +02:00
Carlos Andrés	aefe6dc4f4	Merge pull request 'Hotfix payments ticket 188787' (!2521) from Hotfix-payments-Ticket-#188787 into master ... Reviewed-on: #2521 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-28 13:01:47 +00:00
Carlos Andrés	a022ed0854	Hotfix payments ticket 188787	2024-05-28 14:50:58 +02:00