19451 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	1e29b6c1ed	merge test	2024-03-14 11:30:07 +01:00
Carlos Andrés	66b7a3e8f5	feat: restricciones AWB para travel y entry refs #6960	2024-03-05 17:30:29 +01:00
Carlos Andrés	292b77d57e	feat: restricciones AWB para travel y entry refs #6960	2024-03-01 14:36:49 +01:00
Carlos Andrés	b9e774cea0	feat: restricciones AWB para travel y entry refs #6960	2024-03-01 14:26:36 +01:00
Guillermo Bonet	625d19e88c	hotfix: Autoincrement warehouse	2024-02-29 13:44:58 +01:00
Pablo Natek	4fc413cafb	Merge pull request 'fix(style): refs #6684 add wordBreak' (!2114) from 6684-fixOverFlowOnDeliveryReport into master ... Reviewed-on: #2114 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-29 11:39:58 +00:00
Pablo Natek	6f916c9669	Merge branch 'master' into 6684-fixOverFlowOnDeliveryReport	2024-02-29 11:21:48 +00:00
Pablo Natek	6e4b4537d3	fix(style): refs #6684 add wordBreak	2024-02-29 12:22:04 +01:00
Robert Ferrús	de8a5175cd	Merge pull request 'fix: refs #6501 entry_getTransferFix' (!2106) from 6501-entry_getTransferFix into master ... Reviewed-on: #2106 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-29 08:18:55 +00:00
Robert Ferrús	2af7748bcf	Merge branch 'master' into 6501-entry_getTransferFix	2024-02-29 08:17:19 +00:00
Javier Segarra	7f11930154	Merge pull request 'Hotfix_DownloadCSV' (!2110) from Hotfix_DownloadCSV into master ... Reviewed-on: #2110 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-29 07:18:39 +00:00
Javier Segarra	599e8761c1	hotfix fix: replace pdf with csv	2024-02-29 06:26:21 +00:00
Javier Segarra	6b7dc67c3e	hotfix fix: replace pdf with csv	2024-02-29 06:25:41 +00:00
Robert Ferrús	8ce71a06d1	Merge branch 'master' into 6501-entry_getTransferFix	2024-02-28 10:53:25 +00:00
Robert Ferrús	8d96bb0a18	Merge pull request 'fix: refs #6371 restore tables dock y Tramos' (!2103) from 6371-restoreTablesFix into master ... Reviewed-on: #2103 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-28 10:51:39 +00:00
Robert Ferrús	82445683a7	fix: refs #6501 entry_getTransferFix	2024-02-28 09:19:57 +01:00
Robert Ferrús	99805a8edd	Merge branch 'master' into 6371-restoreTablesFix	2024-02-27 12:02:42 +00:00
Robert Ferrús	2fe0d5f5dd	fix: refs #6371 restore tables dock y Tramos	2024-02-27 13:02:15 +01:00
Sergio De la torre	f0924298bd	Merge pull request 'refs #6531_hotFix_lastTickets' (!2101) from 6531_hotFixLastTickets into master ... Reviewed-on: #2101 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-27 11:35:01 +00:00
Sergio De la torre	699af5b9b7	refs #6531_hotFix_lastTickets	2024-02-27 11:53:55 +01:00
Guillermo Bonet	a8065ab1a4	fix: refs #6184 hasFile false in saveSign and saveCmr	2024-02-27 09:43:53 +01:00
Guillermo Bonet	57dd1a4e56	Merge branch 'master' into test	2024-02-26 14:28:08 +01:00
Guillermo Bonet	b561364259	Merge pull request 'fix: refs #6184 saveSign' (!2098) from 6184-saveSignFix into master ... Reviewed-on: #2098 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-02-26 13:21:30 +00:00
Guillermo Bonet	3579c94268	fix: refs #6184 saveSign	2024-02-26 14:09:53 +01:00
Guillermo Bonet	8da9475eb1	Merge pull request 'refs #6184 fixSaveSign' (!2096) from 6184-fixSaveSign into test ... Reviewed-on: #2096	2024-02-26 13:00:35 +00:00
Guillermo Bonet	096987040e	fix: refs #6184 saveSign	2024-02-26 14:00:04 +01:00
Guillermo Bonet	a4419a2542	fix: refs #6184 saveSign	2024-02-26 13:57:07 +01:00
Guillermo Bonet	c1c64d0f89	fix: refs #6184 saveSign	2024-02-26 13:39:57 +01:00
Guillermo Bonet	817f685621	fix: refs #6184 saveSign	2024-02-26 13:00:35 +01:00
Guillermo Bonet	a359ace1b8	fix: refs #6184 saveSign	2024-02-26 12:57:49 +01:00
Guillermo Bonet	413f7eb8c8	fix: refs #6184 saveSign	2024-02-26 12:45:38 +01:00
Guillermo Bonet	e3fc9167a3	Merge pull request 'fix: ticket #158883' (!2095) from hotfix158883-entryObservationClean into master ... Reviewed-on: #2095 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-26 10:06:22 +00:00
Guillermo Bonet	89a9cc26d3	fix: ticket #158883	2024-02-26 09:50:03 +01:00
Juan Ferrer	3f0d301870	Merge pull request 'refs #6915 master into test' (!2092) from master into test ... Reviewed-on: #2092	2024-02-23 18:02:07 +00:00
Juan Ferrer	13aca51f2d	build: refs #6915 dump & rocket shows Jenkins URL	2024-02-23 18:57:32 +01:00
Pablo Natek	35339e430e	Merge pull request 'fix(commit): refs #6403 hotFix add commit' (!2088) from 6403-hotFix-master into master ... Reviewed-on: #2088 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-23 13:45:28 +00:00
Pablo Natek	c8e0195510	fix throw error	2024-02-23 14:44:59 +01:00
Pablo Natek	44668b2445	remove(focus). refs #6403 remove f	2024-02-23 14:41:35 +01:00
Pablo Natek	94b49efb1f	feat(fix): refs #6403 add transaction to createShipment	2024-02-23 14:38:44 +01:00
Guillermo Bonet	e971070f2f	fix: refs #6372 Version	2024-02-23 14:21:40 +01:00
Pablo Natek	277bcafd89	fix(commit): refs #6403 hotFix add commit	2024-02-23 14:11:11 +01:00
David Domenech	1b84082e99	Merge pull request 'refs #6372' (!2087) from 6372-errors-test into test ... Reviewed-on: #2087 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-23 12:58:16 +00:00
David Domenech	d62c7ef0f5	refs #6372	2024-02-23 13:45:48 +01:00
David Domenech	22a274ecc0	Merge pull request 'refs #6372' (!2086) from 6372-Error-vn2008-tables into test ... Reviewed-on: #2086 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-23 12:34:13 +00:00
David Domenech	8076707109	refs #6372	2024-02-23 13:29:36 +01:00
Pablo Natek	03550573b0	Merge pull request '#6403 - mrwIntegration' (!2005) from 6403-mrwIntegration into master ... Reviewed-on: #2005 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-23 08:54:43 +00:00
Pablo Natek	18da27179d	merge(dev): refs #6005 traduction conflict	2024-02-23 09:40:58 +01:00
Alex Moreno	1d4c48e149	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 08:39:26 +01:00
Jorge Penadés	775764c2a9	Merge pull request '#6878 hotfix fix add manual entries' (!2074) from 6878-hotfix-addManualTimeEntries into master ... Reviewed-on: #2074 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-23 07:37:11 +00:00
Alex Moreno	f51df43d17	Merge branch 'master' into 6878-hotfix-addManualTimeEntries	2024-02-23 07:32:18 +00:00