19476 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	fa53dcbf9d	feat:Agrupar DUA en función del transitario y país #6937	2024-02-26 13:57:56 +01:00
Carlos Andrés	27beefe1ef	feat:Agrupar DUA en función del transitario y país #6937	2024-02-26 13:43:32 +01:00
Jorge Penadés	9a61b2958e	Merge pull request '#6878 fix time entry' (!2083) from 6878-fixTimeEntry into dev ... Reviewed-on: #2083 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-26 12:11:37 +00:00
Jorge Penadés	41c44e6f59	Merge branch 'dev' into 6878-fixTimeEntry	2024-02-26 12:05:31 +00:00
Alex Moreno	41cc56f9ed	Merge pull request '5509-entryDmsBack' (!2079) from 5509-entryDmsBack into dev ... Reviewed-on: #2079 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-02-26 10:16:40 +00:00
Alex Moreno	9f8e448562	refs #5509 fix(EntryDms): some issues	2024-02-26 07:22:51 +01:00
Alex Moreno	d37802fda8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-26 07:21:47 +01:00
Juan Ferrer	e6d789ea13	Merge pull request 'refs #6915 test into dev' (!2093) from test into dev ... Reviewed-on: #2093	2024-02-23 18:05:45 +00: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
Carlos Andrés	e54d2d1162	Merge pull request 'feat: validar caracteres invocieIn.supplierref #6931' (!2090) from 6931-Líneas-en-referencias-de-invoiceIn.supplierRef into dev ... Reviewed-on: #2090 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-23 15:45:01 +00:00
Carlos Andrés	c18b42a717	feat: validar caracteres invocieIn.supplierref #6931	2024-02-23 16:01:55 +01:00
Carlos Andrés	29a96ede56	feat: validar caracteres invocieIn.supplierref #6931	2024-02-23 15:58:00 +01:00
Carlos Andrés	a731e94c34	Merge branch '6931-Líneas-en-referencias-de-invoiceIn.supplierRef' of https://gitea.verdnatura.es/verdnatura/salix into 6931-Líneas-en-referencias-de-invoiceIn.supplierRef	2024-02-23 15:46:31 +01:00
Carlos Andrés	b9a2cad1f1	feat: validar caracteres invocieIn.supplierref #6931	2024-02-23 15:46:30 +01:00
Carlos Andrés	6f599cbe4a	Merge branch 'dev' into 6931-Líneas-en-referencias-de-invoiceIn.supplierRef	2024-02-23 15:45:37 +01:00
Carlos Andrés	2df334e5a5	Merge branch 'dev' into 6931-Líneas-en-referencias-de-invoiceIn.supplierRef	2024-02-23 14:42:26 +00:00
Carlos Andrés	e0cee8f559	feat: validar caracteres invocieIn.supplierref #6931	2024-02-23 15:41:30 +01:00
Guillermo Bonet	34b5312266	Merge branch 'test' into dev	2024-02-23 15:04:59 +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
Jorge Penadés	6e161dfee8	fix: refs #6878 column name	2024-02-23 12:45:58 +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
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