21735 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	dcc943e82d	hotFix(env): refs #7388 disable webpack nodeEnv	2024-05-15 12:19:01 +02:00
Alex Moreno	f442f0dafb	hotFix(env): refs #7388 install gettext-base	2024-05-15 11:52:50 +02:00
Sergio De la torre	9288f08b91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-15 11:30:05 +02:00
Robert Ferrús	23eea27268	Merge pull request 'feat: refs #7296 expeditionTruck to roadmapStop' (!2386) from 7296-expeditionTruck into dev ... Reviewed-on: #2386 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-15 09:06:47 +00:00
Robert Ferrús	1ee29036f4	Merge branch 'dev' into 7296-expeditionTruck	2024-05-15 08:22:00 +00:00
Guillermo Bonet	778f368300	Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev ... Reviewed-on: #2429 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-15 08:19:34 +00:00
Alex Moreno	1c3c5e1423	Merge pull request 'hotFix: fix env' (!2454) from 7388_fix_front_env into test ... Reviewed-on: #2454 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-05-15 08:18:12 +00:00
Alex Moreno	a64d41fedb	Merge branch 'test' into 7388_fix_front_env	2024-05-15 07:02:48 +00:00
Alex Moreno	f368e00677	hotFix: fix env	2024-05-15 09:02:23 +02:00
Juan Ferrer	e469fb2da4	Merge pull request 'test' (!2456) from test into dev ... Reviewed-on: #2456	2024-05-15 06:57:05 +00:00
Juan Ferrer	af198e2832	Merge pull request 'master' (!2455) from master into test ... Reviewed-on: #2455	2024-05-15 06:56:48 +00:00
Alex Moreno	022d78e76c	hotFix: fix env	2024-05-15 07:53:42 +02:00
Carlos Andrés	df15e44442	Merge pull request '6974-sale_add' (!2452) from 6974-sale_add into master ... Reviewed-on: #2452 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-14 15:06:35 +00:00
Javi Gallego	0894cbd38c	Merge pull request 'feat: #7333 ticket with refund' (!2422) from 7333-ClaimRefund into dev ... Reviewed-on: #2422 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-14 13:45:11 +00:00
Carlos Andrés	adaba6ecfb	refs #6974 refactor: optimize sale_add	2024-05-14 15:39:28 +02:00
Carlos Andrés	d0d710f023	refs #6974 refactorLoop	2024-05-14 15:36:09 +02:00
David Domenech	33ce0f2291	Merge pull request 'fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit' (!2450) from 7389-sipConf_callLimit into master ... Reviewed-on: #2450 Reviewed-by: David Domenech <davidd@verdnatura.es>	2024-05-14 12:29:59 +00:00
Juan Ferrer	b6f788a8db	fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit	2024-05-14 14:21:16 +02:00
Pako Natek	5fd2ef3cff	Merge pull request 'done' (!2432) from 7362-VIP into dev ... Reviewed-on: #2432 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-14 10:52:11 +00:00
Pako Natek	0adf6bfc45	Merge branch 'dev' into 7362-VIP	2024-05-14 10:50:59 +00:00
Juan Ferrer	eadf13b663	fix: Jenkinsfile display BRANCH_NAME	2024-05-14 12:20:39 +02:00
Carlos Andrés	4254fac6c2	Merge pull request '7213-Pasar-problemas-a-columnas-calculadas' (!2396) from 7213-Pasar-problemas-a-columnas-calculadas into dev ... Reviewed-on: #2396 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-14 09:35:51 +00:00
Alex Moreno	d487d13cdb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-14 11:26:11 +02:00
Sergio De la torre	b3170245d1	Merge pull request 'refs #6106 hotFix: getTickets' (!2449) from 6106_getTickets into master ... Reviewed-on: #2449 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-14 09:25:54 +00:00
Sergio De la torre	edb024a1f9	refs #6106 hotFix: getTickets	2024-05-14 10:14:53 +02:00
Robert Ferrús	6ae48790f3	Merge pull request 'feat: refs #7039 country' (!2361) from 7039-country-country into dev ... Reviewed-on: #2361 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-14 08:12:13 +00:00
Alex Moreno	43cd0c2ff2	Merge pull request 'deploy: dump' (!2448) from 7383-dump into master ... Reviewed-on: #2448 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-14 07:44:39 +00:00
Alex Moreno	2ddadcd8a4	deploy: dump	2024-05-14 09:38:03 +02:00
Pako Natek	53f49531b7	VIP now is Vip	2024-05-14 09:07:43 +02:00
Robert Ferrús	eeb36a6810	Merge branch 'dev' into 7039-country-country	2024-05-14 06:32:45 +00:00
Carlos Satorres	ebcf8e2927	refs #6428 change file	2024-05-14 08:30:22 +02:00
Alex Moreno	12f36dc825	hotFix: refs #6731 remove CodCOMPRADOR	2024-05-14 08:24:40 +02:00
Alex Moreno	3798509206	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-14 07:51:04 +02:00
Robert Ferrús	c6f7a0768a	Merge branch 'dev' into 7039-country-country	2024-05-14 05:49:39 +00:00
Robert Ferrús	b0da193b4a	feat: refs #7039 añadir colum virtual country	2024-05-14 07:48:03 +02:00
Alex Moreno	7b1d931747	Merge pull request '7383-testToMaster' (!2445) from 7383-testToMaster into master ... Reviewed-on: #2445 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-14 05:44:12 +00:00
Carlos Satorres	a8299383b9	refs #6428 remove sh	2024-05-13 16:28:29 +02:00
Jorge Penadés	b13c7c0db6	Merge pull request '#5919 createLocker' (!2446) from 5919-createLocker into dev ... Reviewed-on: #2446 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-13 13:10:39 +00:00
Jorge Penadés	45082f532f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-createLocker	2024-05-13 15:05:27 +02:00
Alex Moreno	6251493adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-05-13 14:24:31 +02:00
Carlos Andrés	3ce43909e2	feat: Turn issues into calculated columns refs#7213	2024-05-13 14:21:01 +02:00
Guillermo Bonet	bd6ddd681d	Merge pull request 'refactor: refs #7373 Deleted proc packageInvoicing' (!2444) from 7373-packageInvoicing_bye into dev ... Reviewed-on: #2444 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-13 12:16:51 +00:00
Jorge Penadés	b902a1a7f7	Merge branch 'dev' into 5919-locker	2024-05-13 12:02:17 +00:00
Jorge Penadés	1f39330041	fix: refs #5919 drop focus	2024-05-13 14:00:19 +02:00
Carlos Satorres	585a0c68a8	Merge pull request 'refs #7360 fix error weekly' (!2431) from 7360-errorWeeklyHourEmail into dev ... Reviewed-on: #2431 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-13 12:00:18 +00:00
Guillermo Bonet	6c325fccef	refactor: refs #7373 Deleted proc packageInvoicing	2024-05-13 13:41:47 +02:00
Carlos Andrés	f89ca786df	eat: Turn issues into calculated columns refs#7213	2024-05-13 13:31:58 +02:00
Jorge Penadés	5d5f1ef7c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-13 13:20:32 +02:00
Jorge Penadés	e16e5e3db3	feat: refs #5919 back test	2024-05-13 13:19:28 +02:00
Robert Ferrús	5e3fa1be8b	Merge branch 'dev' into 7296-expeditionTruck	2024-05-13 10:33:37 +00:00