1021 Commits

Author	SHA1	Message	Date
Carlos Satorres	dbc3bdbc97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF	2024-07-03 12:52:37 +02:00
Carlos Satorres	7f213a7435	refs #6952 fix producer	2024-07-02 12:02:44 +02:00
Carlos Satorres	2fe995d3ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF	2024-07-02 11:42:44 +02:00
Guillermo Bonet	a23f485296	refactor: refs #7424 Component type refactor	2024-07-01 11:11:16 +02:00
Guillermo Bonet	ac54994760	Merge pull request 'feat: refs #7644 First commit' (!2651) from 7644-entryLabel into dev ... Reviewed-on: #2651 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-01 07:56:14 +00:00
Guillermo Bonet	5c8d8ba280	refs #7644 Added locales and changed name of method	2024-07-01 09:07:36 +02:00
Guillermo Bonet	7bf55c6815	refs #7644 Added control source	2024-07-01 08:00:27 +02:00
Guillermo Bonet	85c7336d92	refs #7644 Minor changes	2024-06-28 14:52:19 +02:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Guillermo Bonet	19bf606330	refs #7644 First commit	2024-06-28 12:57:27 +02:00
Pablo Natek	b6a72a1abb	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-27 07:12:40 +00:00
Jorge Penadés	0da6d633fd	fix: refs 197934 add alias	2024-06-26 17:21:22 +02:00
Pablo Natek	478a38b0ab	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-26 05:14:37 +00:00
Carlos Satorres	2797a731c5	refs #6952 subName	2024-06-25 12:00:49 +02:00
Alex Moreno	45e8674087	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 11:34:35 +02:00
Alex Moreno	3f327866ca	Merge branch 'master' into 7631_testToMaster_2426	2024-06-25 06:35:33 +00:00
Robert Ferrús	c42a21bc6f	fix: refs #19537 changes required	2024-06-21 11:47:34 +02:00
Robert Ferrús	8fc231da2f	feat: refs #195937	2024-06-20 14:03:31 +02:00
Robert Ferrús	852785b4c1	fix: refs #195937 refactor incoterms	2024-06-20 13:45:38 +02:00
Robert Ferrús	46792ba30e	fix: refs #195937 changes requerid	2024-06-20 11:04:42 +02:00
Robert Ferrús	5a40952547	fix: refs #195937 icoterms	2024-06-20 09:34:13 +02:00
Javi Gallego	b2ad449809	feat: refs #7027 mailError managed	2024-06-19 14:38:56 +02:00
Pablo Natek	a30ff44837	fix: refs #6404 fix notification	2024-06-14 17:40:08 +02:00
Pablo Natek	c5227d6cf6	feat: refs #6404 add mail notification	2024-06-10 12:24:23 +02:00
Jorge Penadés	faf450e075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-07 11:45:51 +02:00
Jorge Penadés	58053d8286	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-03 15:22:08 +02:00
Guillermo Bonet	b9d04e9557	Merge branch 'dev' into 7126-improvedWaste	2024-06-03 05:22:15 +00:00
Robert Ferrús	eb503238d7	feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk	2024-05-27 09:07:23 +02:00
Ivan Mas	52400ab626	refs #7393 Modify night ticket closing report	2024-05-20 15:17:41 +02:00
Robert Ferrús	1ee29036f4	Merge branch 'dev' into 7296-expeditionTruck	2024-05-15 08:22:00 +00:00
Guillermo Bonet	b1e136aa47	Fix: refs #7126 Tests back	2024-05-10 11:05:20 +02:00
Robert Ferrús	1eb75599d8	Merge branch 'dev' into 7296-expeditionTruck	2024-05-06 09:38:14 +00:00
Robert Ferrús	87e85e4a4e	Merge branch 'dev' into 7039-country-country	2024-05-06 05:08:07 +00:00
Jorge Penadés	40b2c32a00	feat: refs #6243 show all cmr	2024-05-03 17:37:36 +02:00
Pablo Natek	95aba9e7b3	Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev ... Reviewed-on: #2292 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 11:52:22 +00:00
Pablo Natek	6868863e54	fix: refs #6602 refactor code	2024-05-02 10:32:20 +02:00
Pablo Natek	d45d53d665	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6602-barcode-to-qr	2024-05-02 10:26:46 +02:00
Pablo Natek	bd1499a6f7	feat(collection-label): new option barcode-qr	2024-05-02 10:25:46 +02:00
Jorge Penadés	cc4081d25f	fix: refs #7165 css	2024-04-30 16:17:29 +02:00
Robert Ferrús	e7be1e2efe	feat: refs #7296 expeditionTruck to roadmapStop	2024-04-30 11:48:18 +02:00
Robert Ferrús	d2c3034ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country	2024-04-26 12:07:53 +02:00
Robert Ferrús	fd7dcf2781	fix: refs #7039 fixpr	2024-04-26 10:26:20 +02:00
Carlos Satorres	bc94850cc8	refs #6976 fix pr	2024-04-26 08:59:00 +02:00
Carlos Satorres	e78b23a849	refs #6976 remove css	2024-04-26 08:31:33 +02:00
Robert Ferrús	8153a526ce	feat: refs #7039 country-name	2024-04-25 12:35:21 +02:00
Carlos Satorres	b7b9035f72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6976-supplierConsumption	2024-04-24 12:45:22 +02:00
Carlos Satorres	34bb0e9052	refs #6976 fix pdf	2024-04-23 10:07:40 +02:00
Alex Moreno	e52322f649	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-23 07:42:56 +02:00
Carlos Andrés	d249645c37	Hot fix informe facturas recibidas Ticket #176640	2024-04-22 17:51:21 +02:00
Carlos Satorres	0537a3eca3	refs #6976 entity quantity price	2024-04-22 12:54:48 +02:00
Carlos Satorres	b706d1c1c6	refs #6976 changes back supplier consumption	2024-04-12 14:26:28 +02:00
Pablo Natek	aaef10b8d8	feat(collection-label): refs #6602 add qr to the report	2024-04-12 08:48:29 +02:00
Carlos Satorres	db8d48ccee	refs #6976 changes sql	2024-04-11 14:13:25 +02:00
Pablo Natek	7cb40f5d89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-04-09 09:42:39 +02:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Javier Casado	bf3eb51bad	Merge pull request '#7123 - creditRequestChange' (!2238) from 7123-creditRequestChange into dev ... Reviewed-on: #2238 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-05 07:29:43 +00:00
Pablo Natek	4b4aaa9e10	feat: refs #6005 move logic from report to hook	2024-04-05 08:04:53 +02:00
Guillermo Bonet	0cd4013f5e	Merge branch 'test' into dev	2024-04-05 07:51:19 +02:00
Carlos Andrés	fe0afe30bf	fix: closeTicket idem salix Refs: #6549	2024-04-04 17:50:39 +02:00
Carlos Andrés	75a4d6947f	fix: closeTicket idem salix Refs: #6549	2024-04-04 14:20:55 +02:00
Alex Moreno	20e4ab1d2c	Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master ... Reviewed-on: #2253 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-04 11:35:09 +00:00
Alex Moreno	dd9c7283c3	hotFix: handle mail error	2024-04-04 13:32:39 +02:00
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev	2024-04-04 11:30:03 +02:00
Pablo Natek	2a7807a4ab	remove: refs #7145 dev code	2024-04-04 08:49:47 +02:00
Pablo Natek	de5e954ce2	fix: refs #7145 fix overFlow on driver-route	2024-04-04 08:48:58 +02:00
Javier Segarra	3449e27150	Actualizar print/templates/email/zone-included/zone-included.js	2024-04-03 05:50:04 +00:00
Javier Segarra	1f8afc074d	Actualizar print/templates/email/zone-included/zone-included.html	2024-04-03 05:49:40 +00:00
jcasado	09e1e4de19	refactor: #7123 change credit document	2024-04-03 07:23:36 +02:00
Javier Segarra	1b72572440	FIX render HTML	2024-04-02 11:58:30 +00:00
Carlos Satorres	5d5dc9583a	refs #6532 change url	2024-03-27 14:44:46 +01:00
jcasado	f6ba5224e6	refs #7123 first edit pdf	2024-03-22 15:00:30 +01:00
Carlos Andrés	913b261f86	Merge branch 'dev' into 6549-ticket_close	2024-03-18 17:55:54 +01:00
Javier Segarra	f09283b9c9	refs #5858 perf: html	2024-03-13 15:44:16 +01:00
Carlos Andrés	ff459ea3be	fix: closeTicket idem salix refs #6549	2024-03-13 12:18:43 +01:00
Javier Segarra	8276765225	refs #5858 perf: destinationFk to pepe	2024-03-13 11:54:02 +01:00
Pablo Natek	421ca8654d	fix(changes): refs #6005 remove changes files	2024-03-11 13:39:03 +01:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00
Pablo Natek	ae25ba3fb6	feat(notify): refs #6005 add restriction on created notification time	2024-03-08 13:44:19 +01:00
Pablo Natek	2421cc7c68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-08 08:23:08 +01:00
Alex Moreno	b9d1964d19	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-07 08:16:38 +01:00
Alex Moreno	702792ace0	refs #6990 hotFix: puppeteer cluster	2024-03-07 07:28:55 +01:00
Alex Moreno	e127457ed6	refs #6990 hotFix: puppeteer cluster	2024-03-07 07:27:18 +01:00
Alex Moreno	a59d45b28c	refs #6990 hotFix: puppeteer cluster	2024-03-07 07:26:31 +01:00
Pablo Natek	a44359762b	feat(delay): refs #6005 add new restriction	2024-03-06 14:51:34 +01:00
Javier Segarra	7999a9bf93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-06 11:42:09 +01:00
Alex Moreno	020b0ba797	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-06 09:01:24 +01:00
Alex Moreno	be9b21fccc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-06 09:00:44 +01:00
Alex Moreno	117e550bf2	refs #6990 hotFix: puppeteer cluster	2024-03-06 08:58:30 +01:00
Guillermo Bonet	00d5d06c6a	Merge branch 'test' into dev	2024-03-05 12:38:15 +01:00
Guillermo Bonet	85d3508848	Merge branch 'master' into test	2024-03-05 12:37:06 +01:00
Javier Segarra	753525d0ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-04 11:57:16 +01:00
Alex Moreno	a3052c1cf9	refs #6925 hotFix(invoice) parenthesis & handle incoterms error	2024-03-01 15:05:12 +01:00
Pablo Natek	6e4b4537d3	fix(style): refs #6684 add wordBreak	2024-02-29 12:22:04 +01:00
Guillermo Bonet	3736d0708b	feat: refs #6401 Minor change	2024-02-29 08:16:07 +01:00
Guillermo Bonet	feeb9eece7	feat: refs #6401 Added QR and CIF in the CMR report	2024-02-29 08:12:17 +01:00
Javier Segarra	becd2e6f48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-29 07:49:24 +01:00
Carlos Satorres	b6086e74c1	refs #6922 change order	2024-02-22 10:39:34 +01:00
Pablo Natek	5e97f820a2	feat(spec): refs #6005 add spec	2024-02-21 12:59:42 +01:00
Javier Segarra	811a49275d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-20 13:53:18 +01:00
Pablo Natek	1c40e01fcb	refactor: refs #6005 move the logic to the report	2024-02-20 13:49:42 +01:00