19374 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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	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	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
Pablo Natek	277bcafd89	fix(commit): refs #6403 hotFix add commit	2024-02-23 14:11:11 +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
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
Guillermo Bonet	6345d1ae42	fix refs #6780 XDiario	2024-02-23 08:14:58 +01:00
Robert Ferrús	2d084b04a4	Merge pull request 'fix: refs #6371 bankPolicy_notifyExpired accountingFk' (!2076) from 6371-bankPolicy_notifyExpired into master ... Reviewed-on: #2076 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-23 06:38:35 +00:00
Robert Ferrús	6580fd44cd	fix: refs #6371 bankPolicy_notifyExpired accountingFk	2024-02-23 07:18:32 +01:00
Juan Ferrer	2bf62dca25	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-02-22 16:16:34 +01:00
Juan Ferrer	20e5eda4d1	fix: refs #6915 broken view vn.doc removed	2024-02-22 16:16:32 +01:00
Guillermo Bonet	df5e9bc830	fix: refs #6184 Rollback saveSign.js	2024-02-22 14:46:10 +01:00
Jorge Penadés	76b1433099	fix: refs #6878 use clockIn procedure on update time	2024-02-22 12:48:07 +01:00
Guillermo Bonet	7d3cf162b8	fix: refs #6184 uploadFile	2024-02-22 11:22:39 +01:00
Juan Ferrer	9f067fc9b3	build: HOTFIX Myt updated	2024-02-22 10:20:15 +01:00
Guillermo Bonet	80fc9e4472	fix: refs #6184 Quitadas transacciones en los SELECT en saveSign.js	2024-02-22 10:16:29 +01:00
Juan Ferrer	e071f86995	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-02-22 09:36:50 +01:00
Juan Ferrer	dd3249ea59	ci: HOTFIX Jenkinsfile	2024-02-22 09:36:48 +01:00
Guillermo Bonet	0344a81785	fix: refs #6780 Rollback vn2008.versiones	2024-02-22 09:08:37 +01:00
Alex Moreno	5d195f5d82	Merge pull request 'refs #6915 test_master24_8' (!2067) from test_master24_8 into master ... Reviewed-on: #2067 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-22 07:31:33 +00:00
Alex Moreno	60dfe8ec05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8	2024-02-21 15:12:48 +01:00
Alex Moreno	cbe23d8df5	Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test ... Reviewed-on: #2064 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-21 13:47:38 +00:00
Alex Moreno	01f1bd0088	Revert "Merge branch 'dev' into test" ... This reverts commit c4a64b93cc, reversing changes made to 2ab1cebb31.	2024-02-21 14:44:34 +01:00
Alex Moreno	c4a64b93cc	Merge branch 'dev' into test	2024-02-21 13:32:54 +00:00
Ivan Mas	4a8707e327	Merge pull request '6626-Restricción-en-invoiceInTax' (!2060) from 6626-Restricción-en-invoiceInTax into dev ... Reviewed-on: #2060 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-21 13:14:48 +00:00
Robert Ferrús	2ab1cebb31	Merge pull request 'feat: refs #6371 restore Proveedores_cargueras' (!2061) from 6371-restoreProveedoresCargueras into test ... Reviewed-on: #2061 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-21 13:02:28 +00:00