16754 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	8281dbacd1	Merge branch 'dev' into 5866-addTicketTransfer	2023-07-20 12:34:16 +00:00
Vicent Llopis	c3a897b8c3	Merge pull request '5849-makeInvoice_solved' (!1676) from 5849-makeInvoice_solved into dev ... Reviewed-on: #1676 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-20 08:45:38 +00:00
Jorge Penadés	2fa1c4b6ca	Merge branch 'dev' into 5866-addTicketTransfer	2023-07-20 08:23:07 +00:00
Jorge Penadés	9db8ae237f	refs #5866 addBackTransferClient	2023-07-20 10:19:03 +02:00
Vicent Llopis	1215b8cd57	Merge branch 'dev' into 5849-makeInvoice_solved	2023-07-20 08:15:57 +00:00
Alex Moreno	75ea594272	refs #6011 deploy(2332): init version	2023-07-20 09:32:52 +02:00
Alex Moreno	071a891d30	refs #6011 add changelog	2023-07-20 09:30:18 +02:00
Alex Moreno	0585080303	refs #6011 deploy 2330 version	2023-07-20 09:26:40 +02:00
Alex Moreno	484bcd3fde	Merge pull request '5934-clientSms' (!1675) from 5934-clientSms into dev ... Reviewed-on: #1675 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-20 07:00:59 +00:00
Alex Moreno	5771ccb488	Merge branch 'dev' into 5934-clientSms	2023-07-20 06:50:56 +00:00
Alex Moreno	c1e578a456	Merge pull request 'refs #5837 fix filter existingClient France' (!1668) from 5837-quitRestrictionFrance into dev ... Reviewed-on: #1668 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-20 06:49:46 +00:00
Alex Moreno	aefcb8c49a	Merge branch 'dev' into 5837-quitRestrictionFrance	2023-07-20 06:40:23 +00:00
Alex Moreno	60e75d7825	refs #5837 fix client condition	2023-07-20 08:23:43 +02:00
Vicent Llopis	4755c50cd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved	2023-07-20 07:22:30 +02:00
Vicent Llopis	b13618529a	refs #5849 delete: traducción erronea	2023-07-20 07:21:38 +02:00
Vicent Llopis	6df1ef9d4c	Merge branch 'dev' into 5934-clientSms	2023-07-20 05:16:54 +00:00
Vicent Llopis	ab95ef74a9	refs #5934 refactor: nombres variables	2023-07-20 07:17:35 +02:00
Alex Moreno	8c84f006b0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-20 07:15:30 +02:00
Sergio De la torre	b23dfaeeb1	Merge pull request '5983_inventory_parking' (!1677) from 5983_inventory_parking into dev ... Reviewed-on: #1677 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-19 14:39:00 +00:00
Sergio De la torre	6344c11d1e	Merge branch 'dev' into 5983_inventory_parking	2023-07-19 14:29:18 +00:00
Sergio De la torre	7cff014988	refs #5983 fix(itemShelving): vn	2023-07-19 13:27:31 +02:00
Jorge Penadés	1f7f903ec6	Merge pull request 'refs #6043 add ACL' (!1680) from 6043-fixe2eError into dev ... Reviewed-on: #1680 Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>	2023-07-19 11:25:00 +00:00
Carlos Satorres	579d6d53d8	Merge branch 'dev' into 5837-quitRestrictionFrance	2023-07-19 10:46:17 +00:00
Jorge Penadés	dbebd80a68	Merge branch 'dev' into 6043-fixe2eError	2023-07-19 10:19:22 +00:00
Jorge Penadés	b17de86fb1	refs #6043 add ACL	2023-07-19 12:15:52 +02:00
Alex Moreno	4150bdc6c8	Merge pull request 'refs #5824 mod ng' (!1678) from 5824-fixUpsertFixedPrice into dev ... Reviewed-on: #1678 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-19 08:17:36 +00:00
Carlos Satorres	3d83b7b46d	Merge pull request 'pop vehicle error' (!1672) from hotfix-vehicleError into master ... Reviewed-on: #1672 Reviewed-by: Vicent Llopis <vicent@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-19 05:50:38 +00:00
Sergio De la torre	e2f50d63f6	Merge branch 'dev' into 5983_inventory_parking	2023-07-19 05:02:39 +00:00
Sergio De la torre	85c017431c	refs #5983 fix(itemShelving): fixtures	2023-07-19 07:01:43 +02:00
Carlos Satorres	25ce685116	Merge branch 'dev' into 5824-fixUpsertFixedPrice	2023-07-19 04:36:51 +00:00
Carlos Satorres	9c746dd6c2	Merge pull request '5066-vehicleSorted' (!1467) from 5066-vehicleSorted into dev ... Reviewed-on: #1467 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-07-18 15:21:54 +00:00
Carlos Satorres	36db2ee883	Merge branch 'dev' into 5066-vehicleSorted	2023-07-18 15:05:56 +00:00
Alex Moreno	2f6c988005	Merge branch 'dev' into 5983_inventory_parking	2023-07-18 13:53:17 +00:00
Sergio De la torre	49c656928e	refs #5983 feat(itemShelving): add visible	2023-07-18 15:43:11 +02:00
Carlos Satorres	bd723bb7ba	refs #5824 mod ng	2023-07-18 15:01:58 +02:00
Vicent Llopis	d3165fcdc7	refs #5849 fix: tback	2023-07-18 14:25:53 +02:00
Vicent Llopis	4c7f42acb5	a	2023-07-18 14:17:07 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Sergio De la torre	9076553070	refs #5983 test(itemShelving): add getInventory	2023-07-18 14:11:50 +02:00
Vicent Llopis	3e8775149a	refs #5934 feat: change icon	2023-07-18 13:02:42 +02:00
Vicent Llopis	b3a7a170f0	refs #5934 feat: añadido clientSms log	2023-07-18 11:54:43 +02:00
Sergio De la torre	93da129239	refs #5983 feat(itemShelving): add getInventory	2023-07-18 08:54:45 +02:00
Guillermo Bonet	b285c3e37a	Merge pull request 'refs #5819 Added param to call zone_getLeaves' (!1667) from 5819-zone_getLeaves into dev ... Reviewed-on: #1667 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-18 06:40:50 +00:00
Guillermo Bonet	3c013110d3	refs #5819 Changed structure sql	2023-07-18 07:32:45 +02:00
Carlos Satorres	47e8fab8d9	refs remove	2023-07-17 19:51:46 +02:00
Carlos Satorres	52f58a92c8	refs err.sqlMessage	2023-07-17 14:11:05 +02:00
Carlos Satorres	a5d1c68511	change err and traduction	2023-07-17 14:07:45 +02:00
Carlos Satorres	10e726c486	move vehicleInvoice	2023-07-17 13:51:16 +02:00
Carlos Satorres	f24aa2c801	pop vehicle error	2023-07-17 13:27:27 +02:00
Carlos Satorres	b2b335326e	Merge branch 'dev' into 5066-vehicleSorted	2023-07-14 11:49:26 +00:00