18757 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	c10cb7c051	feat(spec): refs #6403 mrwIntegration	2024-02-16 14:15:13 +01:00
Pablo Natek	85b1391006	fix(sql): refs #6403 merge master	2024-02-16 08:31:41 +01:00
Pablo Natek	94fe0220e5	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6403-mrwIntegration	2024-02-16 08:30:06 +01:00
Pablo Natek	b6be76c38f	feat(test): refs #6403 add spec	2024-02-16 08:28:40 +01:00
Josep Domingo	9182549b47	Merge pull request 'refs #6685' (!2043) from 6685--HotFix-credit into master ... Reviewed-on: #2043 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-16 06:38:43 +00:00
David Domenech	ae0ce91127	refs #6685	2024-02-16 06:10:09 +01:00
Carlos Satorres	bb6861d799	Merge pull request 'hotfix creditClient' (!2041) from hotfix-creditClient into master ... Reviewed-on: #2041 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-15 15:25:46 +00:00
Carlos Satorres	98d2b5a0ff	hotfix creditClient	2024-02-15 12:59:30 +01:00
Juan Ferrer	cc24ecdc7d	build(dump): refs #6859	2024-02-15 11:28:46 +01:00
Alex Moreno	6685a20114	build: refs #6859 myt pull db	2024-02-15 10:04:15 +01:00
Alex Moreno	2703d50cbf	refs #6859 fix(account): changePassword name	2024-02-15 09:39:02 +01:00
Javier Segarra	904692a11f	Merge pull request '#2687 - Fix Travel_cloneWithEntries' (!2021) from 2687_fix_travel_cloneWithEntries into test ... Reviewed-on: #2021 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-15 07:34:49 +00:00
Javier Segarra	234ea26fe2	Merge branch 'test' into 2687_fix_travel_cloneWithEntries	2024-02-15 07:07:44 +00:00
Alex Moreno	fddbf6451b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-15 07:52:08 +01:00
Javier Segarra	0e32814717	Merge branch '2687_fix_travel_cloneWithEntries' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries	2024-02-15 07:50:22 +01:00
Javier Segarra	d9756a0f3f	refs #2687 feat: comments	2024-02-15 07:49:57 +01:00
Javier Segarra	3ff3c812ed	refs #2687 fix: remove bad changes file	2024-02-14 20:15:34 +01:00
Javier Segarra	d1b24125f4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries	2024-02-14 09:33:34 +01:00
Javier Segarra	fb1d11af17	refs #2687 feat: comments	2024-02-14 09:32:44 +01:00
Javier Segarra	b9a624d9cd	refs #2687 feat: create util.procedures	2024-02-14 09:30:31 +01:00
Alex Moreno	8483a29b5e	Merge pull request 'feat: refs #6728 revision triggers test' (!2038) from 6728-revisar-Triggers into test ... Reviewed-on: #2038 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-14 07:48:14 +00:00
Juanjo Breso	8542f1fae5	feat: refs #6728 revision triggers test	2024-02-14 08:34:02 +01:00
Alex Moreno	b89b1271f6	Merge pull request 'refs #6742 fix(invoice_pdf): incotermsFk' (!2023) from 6742-hotFix_incoterm_error into master ... Reviewed-on: #2023 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-02-12 09:14:34 +00:00
Alex Moreno	4d7bc482ec	refs #6742 fix(invoice_pdf): incotermsFk	2024-02-12 10:10:30 +01:00
Pablo Natek	fe79823ce8	refs #6403	2024-02-12 09:24:37 +01:00
Javier Segarra	e79bdb4456	refs #2687 test: fix	2024-02-12 08:45:07 +01:00
Javier Segarra	380e0ef651	refs #2687 fix: clone Travel as user action	2024-02-12 08:44:54 +01:00
Carlos Satorres	5d876deff5	Merge pull request 'refs #6281 vehicles remove where' (!2004) from 6281-routesChanges into test ... Reviewed-on: #2004 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-09 08:27:57 +00:00
Pablo Natek	d2d28889b6	merge(master): refs #6403 merge master fix conflicts	2024-02-07 16:55:09 +01:00
Pablo Natek	6c9215bb51	feat(mrw): refs #6403 big commit	2024-02-07 16:52:43 +01:00
Carlos Satorres	7e18bd0a12	refs #6281 vehicles remove where	2024-02-07 13:03:24 +01:00
Carlos Satorres	fe1ccf98e6	Merge pull request 'hotfix kmMax' (!2003) from hotfix-kmMax into master ... Reviewed-on: #2003 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-07 10:31:20 +00:00
Carlos Satorres	9ee0669903	hotfix kmMax	2024-02-07 11:27:18 +01:00
Guillermo Bonet	8ccaacbc07	fix: refs# 6642 Bug apply version	2024-02-06 08:15:25 +01:00
Juan Ferrer	15ac547280	fix: hotfix disable DEBUG	2024-02-05 14:38:22 +01:00
Javi Gallego	693a39d34a	fix: hotfix puppeteer CONCURRENCY_PAGE	2024-02-05 13:19:44 +01:00
Javi Gallego	759ff45a27	fix: hotfix DEBUG enabled	2024-02-05 13:13:00 +01:00
Javi Gallego	c9785e76da	fix: hotfix puppeteer updated to 21.11.0	2024-02-05 12:56:23 +01:00
Javi Gallego	ff22540076	fix: hotfix puppeteer updated	2024-02-05 12:48:43 +01:00
David Domenech	ab839431db	Merge pull request 'refs #6642' (!1994) from 6642-Refactor-ticketStateToday into test ... Reviewed-on: #1994 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-05 06:43:35 +00:00
David Domenech	d2fec7beee	refs #6642	2024-02-05 07:30:04 +01:00
Juan Ferrer	22575ea80f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:39:55 +01:00
Carlos Satorres	9a224419e5	Merge pull request 'refs #6318 fix code' (!1968) from 6318-removeQuantityCheck into dev ... Reviewed-on: #1968 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-02-01 11:39:47 +00:00
Juan Ferrer	5dec9ff4a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:39:44 +01:00
Juan Ferrer	2aa801bc0f	refs #5483 Unused deps removed	2024-02-01 12:39:43 +01:00
Carlos Satorres	ffbe0e1261	Merge branch 'dev' into 6318-removeQuantityCheck	2024-02-01 11:27:08 +00:00
Alex Moreno	a9a1f97366	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-01 12:17:48 +01:00
Robert Ferrús	af1754c12a	Merge pull request 'feat: refs #6688 delete view vn2008 part5' (!1986) from 6688-deleteView2008Part5 into dev ... Reviewed-on: #1986 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-01 11:12:31 +00:00
Robert Ferrús	8ddf902776	Merge branch 'dev' into 6688-deleteView2008Part5	2024-02-01 11:02:48 +00:00
Juan Ferrer	f454782c26	build: refs #6706 npm install optimized in docker build	2024-02-01 11:23:20 +01:00