20624 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	552a1a33c2	hotfix: itemProposal	2024-03-11 12:38:52 +01:00
Guillermo Bonet	a34be6ca02	Merge branch 'test' into dev	2024-03-11 12:21:54 +01:00
Guillermo Bonet	03e9f167a6	Merge branch 'master' into test	2024-03-11 12:18:23 +01:00
Robert Ferrús	4d1b02b793	Merge pull request 'feat: refs #6610 fixDeleteTickets' (!2154) from 6610-hotFixDeleteTicketsWeekly into master ... Reviewed-on: #2154 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-03-11 11:15:04 +00:00
Robert Ferrús	9910ae5c64	fix: refs #6610 quitar variable	2024-03-11 12:12:02 +01:00
Jorge Penadés	47c7985233	Merge pull request '#5186 create parkingLog' (!2116) from 5186-createParkingLog into dev ... Reviewed-on: #2116 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-11 09:06:24 +00:00
Carlos Satorres	35c5e127d4	Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod	2024-03-11 09:48:36 +01:00
Carlos Satorres	b051b0512f	refs #6842 fix fixtures	2024-03-11 09:48:29 +01:00
Jorge Penadés	e5387b0b65	fix: refs #5186 use date function	2024-03-11 09:14:05 +01:00
Jorge Penadés	4e8e7d3f4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-11 08:59:26 +01:00
Alex Moreno	51fa0e1a75	fix: refs #6925 refund invoice transaltions	2024-03-11 08:12:29 +01:00
Alex Moreno	99fccd1cd2	Merge pull request '#6925 - inctorems-check' (!2150) from 6925-invoice-transaction into dev ... Reviewed-on: #2150 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-11 06:28:02 +00:00
Alex Moreno	dcdad9c469	Merge branch 'dev' into 6925-invoice-transaction	2024-03-11 06:05:50 +00:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00
Javier Segarra	4994a836c7	refs #5858 feat: alter table util.notification	2024-03-09 11:27:29 +01:00
Carlos Satorres	879adfaac8	refs #6755 restore fix	2024-03-08 14:59:33 +01:00
Robert Ferrús	e7a6d0109c	Merge branch 'master' into 6610-hotFixDeleteTicketsWeekly	2024-03-08 11:36:35 +00:00
Robert Ferrús	b6af349d89	Merge branch '6610-hotFixDeleteTicketsWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 6610-hotFixDeleteTicketsWeekly	2024-03-08 12:32:25 +01:00
Robert Ferrús	b1e90fabb2	refs #6610	2024-03-08 12:32:22 +01:00
Guillermo Bonet	1027ef6479	Merge branch 'dev' into 6495-procRefactor4	2024-03-08 11:31:54 +00:00
Carlos Satorres	8a16c24245	refs #6755 fix ticket	2024-03-08 12:27:47 +01:00
Javier Segarra	82c9bd4ea7	Merge pull request '#7004 - hotfix_updateFiscalData' (!2153) from 7004_hotfix_updateFiscalData into master ... Reviewed-on: #2153 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-08 11:21:42 +00:00
Robert Ferrús	05b60150a0	Merge branch 'master' into 6610-hotFixDeleteTicketsWeekly	2024-03-08 11:20:07 +00:00
Robert Ferrús	cdb9f372cf	feat: refs #6610 fixDeleteTickets	2024-03-08 12:19:57 +01:00
Jorge Penadés	76c5595a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-08 11:01:25 +01:00
Javier Segarra	faeba92548	Merge branch 'master' into 7004_hotfix_updateFiscalData	2024-03-08 09:59:45 +00:00
Guillermo Bonet	825818fc85	Merge branch 'master' into test	2024-03-08 10:43:31 +01:00
Guillermo Bonet	74c199384c	fix: refs #6372 vn2008.clean	2024-03-08 10:42:07 +01:00
Guillermo Bonet	2be79a708f	Merge pull request 'feat: refs #6372 Added saleLabel to vn.clean' (!2152) from 6372-cleanSaleLabel into dev ... Reviewed-on: #2152 Reviewed-by: David Domenech <davidd@verdnatura.es>	2024-03-08 09:40:01 +00:00
Javier Segarra	a8420cd650	refs #7004 feat: translate label newSupplier	2024-03-08 10:39:54 +01:00
Javier Segarra	238099311b	refs #7004 fix: bug	2024-03-08 10:39:34 +01:00
Guillermo Bonet	37e8518242	feat: refs #6372 Added saleLabel to vn.clean	2024-03-08 10:38:35 +01:00
Jorge Penadés	ea18d3ef6f	feat: refs #5186 add locale	2024-03-08 09:25:07 +01:00
Alex Moreno	89c55d23a4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-08 08:11:30 +01:00
Alex Moreno	3df4d3c86b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-08 08:10:46 +01:00
David Domenech	b3115d2efd	Merge pull request '6372-Fix-tables-vn2008' (!2149) from 6372-Fix-tables-vn2008 into master ... Reviewed-on: #2149 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-08 06:55:06 +00:00
Alex Moreno	8cda12a9da	feat: refs #6925 check incoterms in closure and makeInvoice	2024-03-08 07:49:00 +01:00
Alex Moreno	c2ecedca71	feat: refs #6925 check incoterms in closure and makeInvoice	2024-03-08 07:48:55 +01:00
David Domenech	60c50337ff	refs #6372	2024-03-08 07:43:13 +01:00
David Domenech	014914e1d9	refs #6372	2024-03-08 07:36:14 +01:00
Jorge Penadés	1e3967a4fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-07 15:56:02 +01:00
Carlos Satorres	557f1ec2d9	Merge branch 'dev' into 6842-sageMod	2024-03-07 13:40:37 +00:00
Pako Natek	b588b9807c	fixtures local	2024-03-07 13:45:53 +01:00
Alex Moreno	2f2aba1cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-07 11:42:35 +01:00
Alex Moreno	dbbebbe73c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-07 11:39:03 +01:00
Alex Moreno	951e0a7798	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-07 11:38:46 +01:00
Alex Moreno	01cd2709cc	deploy: refs #6995 skip test	2024-03-07 11:38:30 +01:00
Carlos Satorres	d4d3fdceb5	refs #6755 fix canRestoreTicket	2024-03-07 11:36:30 +01:00
Alex Moreno	ed39ede6cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-07 10:35:14 +01:00
Alex Moreno	a7662194b3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-07 10:34:54 +01:00