19689 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	346557ed69	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-14 08:20:15 +01:00
Guillermo Bonet	b4b6b47a9c	hotfix: itemProposal added transaction	2024-03-14 07:53:24 +01:00
Guillermo Bonet	2a38249131	Merge branch 'master' into test	2024-03-13 07:40:39 +01:00
Guillermo Bonet	319bf314b3	hotfix: itemProposal	2024-03-13 07:38:14 +01:00
Guillermo Bonet	552a1a33c2	hotfix: itemProposal	2024-03-11 12:38:52 +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
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
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
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
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
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
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
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
Alex Moreno	a7662194b3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-07 10:34:54 +01:00
Alex Moreno	f29212cb65	deploy: refs #6995 production dump	2024-03-07 10:34:24 +01:00
Alex Moreno	fbdebad12c	fix: refs #6995 desdeprecar unary_scan, unary_scan_line, unary_scan_line_buy, unary_scan_line_expedition	2024-03-07 10:29:31 +01:00
Alex Moreno	00355aba3a	fix: refs #6995 desdeprecar unary y unary_scan	2024-03-07 10:24:18 +01:00
Alex Moreno	3bfaa97ddd	fix: refs #6995remove preparation_exception	2024-03-07 10:18:30 +01:00
Alex Moreno	62de03e630	Merge pull request 'fix: refs #6995 restore vn.exchangeInsuranceInPrevious' (!2145) from 6995-hotFix_restoreExchangeInsuranceInPrevious into master ... Reviewed-on: #2145 Reviewed-by: Robert Ferrús <robert@verdnatura.es> Reviewed-by: David Domenech <davidd@verdnatura.es>	2024-03-07 09:10:09 +00:00
Alex Moreno	463714de14	Merge branch 'master' into 6995-hotFix_restoreExchangeInsuranceInPrevious	2024-03-07 09:08:49 +00:00
Alex Moreno	99c9ad77d2	fix: refs #6995 restore vn.exchangeInsuranceInPrevious	2024-03-07 10:07:42 +01:00
Alex Moreno	06e4477a52	Merge pull request 'fix: refs #6995 restore vn.exchangeInsuranceInPrevious' (!2144) from 6995-hotFix_restoreExchangeInsuranceInPrevious into master ... Reviewed-on: #2144 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-03-07 08:57:41 +00:00
Alex Moreno	572a09f704	fix: refs #6995 restore vn.exchangeInsuranceInPrevious	2024-03-07 09:55:29 +01:00
Alex Moreno	625abbb804	Merge pull request 'fix: refs #6995 restore vn2008.jerarquia' (!2143) from 6995-hotFix_restoreJerarquia into master ... Reviewed-on: #2143 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-03-07 08:35:50 +00:00
Alex Moreno	b8f09f363f	fix: refs #6995 restore vn2008.jerarquia	2024-03-07 09:33:32 +01:00
Robert Ferrús	1d684d171e	Merge pull request 'fix: rutasAnalyzeHotFix' (!2119) from rutasAnalyzeHotFix into master ... Reviewed-on: #2119 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-07 07:21:45 +00:00
Alex Moreno	24d1f63003	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-07 08:16:11 +01:00
Robert Ferrús	bf9842d5fd	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-07 07:16:11 +00:00
Alex Moreno	4f68b336bc	Merge pull request '6995-testToMaster_2410' (!2139) from 6995-testToMaster_2410 into master ... Reviewed-on: #2139 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-03-07 07:09:07 +00:00
Alex Moreno	702792ace0	refs #6990 hotFix: puppeteer cluster	2024-03-07 07:28:55 +01:00
Alex Moreno	e127457ed6	refs #6990 hotFix: puppeteer cluster	2024-03-07 07:27:18 +01:00
Alex Moreno	a59d45b28c	refs #6990 hotFix: puppeteer cluster	2024-03-07 07:26:31 +01:00
Alex Moreno	a8c2779ee7	Merge branch 'master' into 6995-testToMaster_2410	2024-03-07 06:22:04 +00:00
Robert Ferrús	29926db45f	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-07 06:01:37 +00:00
Carlos Andrés	fc3c9332b3	Merge pull request 'master' (!2141) from master into test ... Reviewed-on: #2141 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-03-06 16:10:42 +00:00
Juan Ferrer	f63dfb9a46	Merge pull request 'feat: add column department.pbxQueue refs #6987' (!2140) from 6387-add-department.pbxQueue into master ... Reviewed-on: #2140 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-03-06 15:47:05 +00:00
Carlos Andrés	c81749da78	feat: add column department.pbxQueue refs #6387	2024-03-06 16:38:34 +01:00
Ivan Mas	19cba0e72a	Merge pull request 'refs #6969 Error packaging' (!2124) from 6969-Error_packaging-buyUltimateFromInterval into test ... Reviewed-on: #2124 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-06 11:54:44 +00:00