19833 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Ivan Mas	bf85aa1e9d	Merge pull request '6784-delete-clientTypeFk' (!2059) from 6784-delete-clientTypeFk into dev ... Reviewed-on: #2059 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-23 08:25:41 +00:00
Ivan Mas	03fc7cfb4e	Merge branch 'dev' into 6784-delete-clientTypeFk	2024-02-23 08:24:12 +00:00
Alex Moreno	0ad3abcea3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-23 08:39:54 +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
Guillermo Bonet	6345d1ae42	fix refs #6780 XDiario	2024-02-23 08:14:58 +01:00
Alex Moreno	489432b4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-23 07:51:26 +01:00
Alex Moreno	201e70175d	Merge pull request 'refs #6414 fix(newWorker): back test' (!2075) from 6414-fix_backTest_newWorker into dev ... Reviewed-on: #2075 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-23 06:47:31 +00:00
Alex Moreno	607b908814	Merge branch 'dev' into 6414-fix_backTest_newWorker	2024-02-23 06:41:36 +00:00
Alex Moreno	4a2032b9cd	refs #5509 fix(EntryDms): sql	2024-02-23 07:39:56 +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
Alex Moreno	1f48245223	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-23 07:13:54 +01:00
Alex Moreno	2b19004783	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-23 07:13:05 +01:00
Alex Moreno	c7dd81e53d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 07:12:24 +01:00
David Domenech	ba167d52ef	Merge pull request '6372-ExpenseManual-Error' (!2072) from 6372-ExpenseManual-Error into dev ... Reviewed-on: #2072 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-23 06:11:30 +00:00
David Domenech	f2b1418419	Merge branch 'dev' into 6372-ExpenseManual-Error	2024-02-23 06:03:14 +00: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
Alex Moreno	a0593804ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-22 14:56:53 +01:00
Guillermo Bonet	df5e9bc830	fix: refs #6184 Rollback saveSign.js	2024-02-22 14:46:10 +01:00
Carlos Satorres	4c7d7f2ab7	Merge pull request 'refs #6922 change order' (!2071) from 6922-invoiceOutOrder into dev ... Reviewed-on: #2071 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-22 13:40:46 +00:00
Carlos Satorres	fac7071bae	refs #6414 fix(newWorker): back test	2024-02-22 14:38:26 +01:00
Ivan Mas	a0cb32ea10	refs #6784 Delete unnecessary JOINs	2024-02-22 14:01:19 +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
Carlos Andrés	ae58c2219b	Merge branch 'dev' into test	2024-02-22 10:16:09 +00:00
Carlos Satorres	8a2cff5308	Merge branch 'dev' into 6922-invoiceOutOrder	2024-02-22 10:01:01 +00:00
David Domenech	c348900c80	Merge branch 'dev' into 6372-ExpenseManual-Error	2024-02-22 09:50:24 +00:00
David Domenech	d9119f9ab7	Merge branch '6372-ExpenseManual-Error' of https://gitea.verdnatura.es/verdnatura/salix into 6372-ExpenseManual-Error	2024-02-22 10:47:28 +01:00
David Domenech	13249fae08	refs #6372	2024-02-22 10:47:27 +01:00
Carlos Satorres	b6086e74c1	refs #6922 change order	2024-02-22 10:39:34 +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
Juan Ferrer	3132475d9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-22 09:36:24 +01:00
Juan Ferrer	03ebac78fc	ci: HOTFIX Jenkinsfile	2024-02-22 09:36:14 +01:00
Guillermo Bonet	0344a81785	fix: refs #6780 Rollback vn2008.versiones	2024-02-22 09:08:37 +01:00
Alex Moreno	033b176e72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-22 09:06:03 +01:00
David Domenech	e833a30eb9	Merge pull request 'refs #6372' (!2070) from 6372-ExpenseManual-Error into dev ... Reviewed-on: #2070 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-22 07:56:17 +00:00
Pablo Natek	f4f6eeb6fe	fix(version): refs #6372 add semicolon	2024-02-22 08:36:14 +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
David Domenech	d48fd77f48	refs #6372	2024-02-22 08:25:38 +01:00
David Domenech	0384f7d83d	Merge pull request 'refs #6372 DeleteTablesFromVn2008' (!2055) from 6372-Delete-views-from-vn2008 into dev ... Reviewed-on: #2055 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-22 06:14:25 +00:00
David Domenech	5110d6e71d	fix error refs #6372	2024-02-22 07:09:35 +01:00
David Domenech	e4d60d20c5	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-22 05:59:00 +00:00