21366 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
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	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
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
Juan Ferrer	eadf13b663	fix: Jenkinsfile display BRANCH_NAME	2024-05-14 12:20:39 +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
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
Alex Moreno	12f36dc825	hotFix: refs #6731 remove CodCOMPRADOR	2024-05-14 08:24:40 +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
Alex Moreno	6251493adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-05-13 14:24:31 +02:00
Pablo Natek	db9c20fb22	Merge pull request 'fix: refs #4988 insert into agencyWorkCenter' (!2442) from 4988-fixInsert-into-agencyWorkCenter into test ... Reviewed-on: #2442 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-13 10:31:55 +00:00
Pablo Natek	bde7fc9972	fix: refs #4988 no task id on table comment	2024-05-13 12:30:17 +02:00
Pablo Natek	c7eeaf238a	fix: refs #4988 add schema	2024-05-13 11:04:50 +02:00
Pablo Natek	48392879cb	fix: refs #4988 insert into agencyWorkCenter	2024-05-13 10:59:22 +02:00
Pablo Natek	7301657a3a	Merge pull request 'fix: duplicate version' (!2441) from fixTestDeploy into test ... Reviewed-on: #2441 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-13 07:03:30 +00:00
Pablo Natek	1e956bb0f8	fix: duplicate version	2024-05-13 08:53:25 +02:00
Alex Moreno	a7910d9894	hotFix(invoiceInPdf): fix accessScopes	2024-05-10 14:58:52 +02:00
Carlos Andrés	85aa4fae08	Merge pull request 'Ticket 180571 No se ven las ubicaciones' (!2439) from Hotfix-productionConfig-defaultSectorFk-adelantamos-cambio into master ... Reviewed-on: #2439 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-10 12:52:17 +00:00
Carlos Andrés	349c3d71dd	Ticket 180571 No se ven las ubicaciones	2024-05-10 13:14:23 +02:00
Carlos Andrés	56815e4b1a	Ticket 180571 No se ven las ubicaciones	2024-05-10 13:10:54 +02:00
Pako Natek	6b10f81add	Merge pull request 'done' (!2435) from hotFix-collection_assign into master ... Reviewed-on: #2435 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 17:06:25 +00:00
Pako Natek	ec060209aa	done	2024-05-09 18:53:32 +02:00
Robert Ferrús	5460922d12	Merge pull request 'feat: refs #6223 pull master' (!2434) from 6223-ticketCalculateClonMaster into master ... Reviewed-on: #2434 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-09 11:17:16 +00:00
Robert Ferrús	f963923645	feat: refs #6223 pull master	2024-05-09 12:54:57 +02:00
Guillermo Bonet	494b46e7ec	fix: refs #6493 Fix buy_recalcPricesByBuy & buy_recalcPricesByEntry	2024-05-09 11:33:57 +02:00
Robert Ferrús	3fca9f243d	Merge pull request 'fix: refs #5699 clientsDisable' (!2419) from 5699-hoFixClientsDisable into master ... Reviewed-on: #2419 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-09 05:16:01 +00:00
Robert Ferrús	0fce8c755b	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-09 05:14:38 +00:00
Sergio De la torre	7bcabbf51c	Merge pull request 'refs #6276 hotFix:itemShelving_add' (!2425) from 6276_itemShelving_Add into master ... Reviewed-on: #2425 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-09 05:12:57 +00:00
Sergio De la torre	10513d1991	Merge branch 'master' into 6276_itemShelving_Add	2024-05-09 05:00:07 +00:00
Robert Ferrús	b0848edff8	feat: refs #5699 quittar de client_afterUpdate desactivar cliente	2024-05-08 12:52:11 +02:00
Guillermo Bonet	90107936b7	Merge branch 'master' into test	2024-05-08 12:51:36 +02:00
Robert Ferrús	ce42cbf287	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-08 10:44:15 +00:00
Guillermo Bonet	84e90bb91b	hotfix: rollback tmp item_getSimilar	2024-05-08 12:43:46 +02:00
Sergio De la torre	5207f07c80	refs #6276 hotFix:itemShelving_add	2024-05-08 10:03:11 +02:00
Guillermo Bonet	854604368a	Merge branch 'master' into test	2024-05-08 09:50:37 +02:00
Robert Ferrús	f66942ba08	Merge pull request 'hotfix: refs #6777 manaCustomerUpdate' (!2423) from 6777-hotfixManaCustomerUpdate into master ... Reviewed-on: #2423 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-05-08 06:35:00 +00:00
Guillermo Bonet	e070906ea6	hotfix: refs #6777 manaCustomerUpdate	2024-05-08 07:49:32 +02:00
Robert Ferrús	9bd8369469	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5699-hoFixClientsDisable	2024-05-07 13:23:49 +02:00
Guillermo Bonet	6e9ea9665d	Merge branch 'master' into test	2024-05-07 13:18:46 +02:00
Guillermo Bonet	0d7d4917a7	Merge branch 'master' into test	2024-05-07 13:18:28 +02:00