16940 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	2c79056f34	refs #5976 error extended	2023-07-19 13:44:04 +02:00
Carlos Satorres	138b8e1912	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-07-19 11:43:00 +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
Carlos Satorres	36c31af455	refs #5690 rounding translate	2023-07-19 12:38:13 +02: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
Carlos Satorres	aaba4e74b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5690-redondeo_ticketProblems	2023-07-19 12:00:59 +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
Alex Moreno	f07ac89cb6	refs #5976 add custom error	2023-07-18 15:01:04 +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
Vicent Llopis	09b00401ec	Merge branch 'dev' into 4734-addViaexpress	2023-07-18 05:56:35 +00:00
Vicent Llopis	834e4b3723	refs #4734 refactor: variables definindas	2023-07-18 07:56:44 +02: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
Alex Moreno	15dee8bef4	refs #5976 refactor: transaferSale call setDeleted	2023-07-17 15:19:36 +02:00
Alex Moreno	125d908c5d	refs #5762 uncomment	2023-07-17 14:41:15 +02:00
Alex Moreno	d2120cdc3d	refs #5762 feat: multiplatform recover-password and change-password	2023-07-17 14:24:50 +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	6f3cdd3508	refs #5640 fix e2e back	2023-07-17 12:30:48 +02:00
Alex Moreno	ad5c021832	refs #5941 duplicate code	2023-07-17 07:10:26 +02:00
Alex Moreno	858a3a3a45	refs #5941 typo	2023-07-17 07:09:31 +02:00
Alex Moreno	9097a1dc28	refs #5941 feat: sendToSuppor component and fix CSS and JSON format	2023-07-14 14:30:08 +02:00
Carlos Satorres	b2b335326e	Merge branch 'dev' into 5066-vehicleSorted	2023-07-14 11:49:26 +00:00
Carlos Satorres	b113052b5c	refs #5640 fixtures and test fix	2023-07-14 13:48:36 +02:00
Carlos Satorres	96da32edec	Merge branch '5640-mayusFiscalDate' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-07-14 13:35:16 +02:00
Carlos Satorres	87f125453d	refs #5640 fix mayus quit function	2023-07-14 13:35:13 +02:00
Vicent Llopis	06690ca71e	Merge pull request 'hotfix_workCenter2' (!1669) from hotfix_workCenter2 into master ... Reviewed-on: #1669 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-14 11:34:49 +00:00
Carlos Satorres	fa3745820d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-07-14 13:20:19 +02:00
Vicent Llopis	6980392ba1	fix: tabulacion	2023-07-14 13:11:09 +02:00