16992 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	26ea39cacc	Merge pull request '5712-workerDms_integrateDocuware' (!1577) from 5712-workerDms_integrateDocuware into dev ... Reviewed-on: #1577 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-07-25 05:18:03 +00:00
Jorge Penadés	4f80221101	refs #5929 added ACL and accurate errors	2023-07-24 10:34:44 +02:00
Jorge Penadés	55f32397c5	removed unnecesary comments	2023-07-21 13:13:44 +02:00
Jorge Penadés	ade7303a6f	refs #6047 added editable-td component	2023-07-21 13:05:55 +02:00
Alex Moreno	b400e1983a	Merge pull request 'refs #5769 fix(web-access): email rule' (!1684) from 5769-hotFix_client_web-access_email2 into master ... Reviewed-on: #1684 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-07-21 10:43:32 +00:00
Alex Moreno	203f6a5659	refs #5712 correct sql folder	2023-07-21 12:41:16 +02:00
Alex Moreno	23308d7ae3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-21 12:40:59 +02:00
Alex Moreno	985e258529	refs #5769 fix(web-access): email rule	2023-07-21 12:33:14 +02:00
Vicent Llopis	9bf891fcec	refs #5561 fixed	2023-07-21 12:20:06 +02:00
Vicent Llopis	f926c60017	remove file	2023-07-21 12:02:02 +02:00
Vicent Llopis	51f9055d23	remove file	2023-07-21 12:01:57 +02:00
Vicent Llopis	cf0b6f8c6e	refs #5561 fix: saleGroupDetail.saleFk UNIQUE	2023-07-21 12:01:01 +02:00
Vicent Llopis	f52b398596	refs #5561 refactor: sustituidos sql por loopback	2023-07-21 09:50:27 +02:00
Alex Moreno	eb963ff993	refs #5866 fix(transferClient): correct variable name	2023-07-21 08:28:19 +02:00
Jorge Penadés	cd377c4790	Merge pull request 'refs #5866 addBackTransferClient' (!1682) from 5866-addTicketTransfer into dev ... Reviewed-on: #1682 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-20 13:28:01 +00:00
Jorge Penadés	618989052a	refs #5866 fix transferClient and test added	2023-07-20 15:15:33 +02:00
Vicent Llopis	7d2e98267f	refs #5561 eliminados valores a piñon	2023-07-20 15:09:31 +02:00
Jorge Penadés	8281dbacd1	Merge branch 'dev' into 5866-addTicketTransfer	2023-07-20 12:34:16 +00:00
Vicent Llopis	8f7caa1183	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel	2023-07-20 11:42:10 +02: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
Carlos Satorres	6efda27f0c	Merge branch 'dev' into 5690-redondeo_ticketProblems	2023-07-20 04:06:29 +00: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
Alex Moreno	b188ae6f57	refs #5976 fix: e2e	2023-07-19 14:14:35 +02:00
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