441 Commits

Author	SHA1	Message	Date
Alex Moreno	30d118f9df	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-08 14:32:43 +02:00
Carlos Satorres	06ae86d78f	refs #5525 fix adt	2024-07-08 13:45:16 +02:00
Carlos Satorres	03b95eb9f6	refs #5525 fix accountDetailValue	2024-07-08 13:43:08 +02:00
Guillermo Bonet	5712fbd782	Merge branch 'master' into test	2024-07-05 13:50:43 +02:00
Carlos Satorres	64f5ad0e19	refs #5525 remove AS	2024-07-04 16:54:57 +02:00
Carlos Satorres	cf621071d0	refs #5525 fixear sql, fixtures, js	2024-07-04 16:50:54 +02:00
Carlos Satorres	fcec3bc0ae	refs #5525 fix sql accountDetail	2024-07-04 09:54:09 +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	19bf606330	refs #7644 First commit	2024-06-28 12:57:27 +02:00
Jorge Penadés	0da6d633fd	fix: refs 197934 add alias	2024-06-26 17:21:22 +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
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
Robert Ferrús	eb503238d7	feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk	2024-05-27 09:07:23 +02:00
Robert Ferrús	1ee29036f4	Merge branch 'dev' into 7296-expeditionTruck	2024-05-15 08:22:00 +00: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
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
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	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
jcasado	09e1e4de19	refactor: #7123 change credit document	2024-04-03 07:23:36 +02:00
jcasado	f6ba5224e6	refs #7123 first edit pdf	2024-03-22 15:00:30 +01:00
Guillermo Bonet	00d5d06c6a	Merge branch 'test' into dev	2024-03-05 12:38:15 +01:00