17642 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	bbc26d8ba4	WIP refs #5216 addExpeditionState	2023-07-26 12:36:30 +02:00
Jorge Penadés	0b88194f09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-07-26 10:27:01 +02:00
Jorge Penadés	fca03e5b7c	Merge pull request '5929-editTicketPrice' (!1688) from 5929-editTicketPrice into dev ... Reviewed-on: #1688 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-26 08:24:04 +00:00
Jorge Penadés	05eff94217	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd	2023-07-26 10:22:32 +02:00
Jorge Penadés	a0fee6ad50	refs #5929 removed useless vars	2023-07-26 09:20:54 +02:00
Jorge Penadés	0b6fb70f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5929-editTicketPrice	2023-07-26 08:36:29 +02:00
Jorge Penadés	b10d774c11	Merge pull request 'refs #6047 added editable-td component' (!1686) from 6047-addEditableTd into dev ... Reviewed-on: #1686 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-07-26 06:05:46 +00:00
Alex Moreno	af28cfe6df	Merge branch 'dev' into 6047-addEditableTd	2023-07-26 05:22:44 +00:00
Alex Moreno	47b2aa0ee7	Merge branch 'dev' into 5941-send-to-support	2023-07-26 05:10:30 +00:00
Jorge Penadés	fa9dfdf411	refs #5216 try ACL updateExpeditionState	2023-07-25 16:32:38 +02:00
Jorge Penadés	96483a827f	Merge branch 'dev' into 5929-editTicketPrice	2023-07-25 13:40:08 +00:00
Jorge Penadés	543fbf3c0a	refs #5929 isEditableOrThrow created, tests passed	2023-07-25 15:35:08 +02:00
Alex Moreno	bf92c5d482	refs #6059 validateLogin sync user	2023-07-25 15:00:08 +02:00
Jorge Penadés	9978db9d52	refs #5929 WIP test created	2023-07-25 11:33:01 +02:00
Alex Moreno	44ceeac9c4	refs #5983 feat(itemShelving): add userFk field	2023-07-25 10:21:54 +02:00
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	ea4190f15c	refs #5216 update expedition state added	2023-07-24 13:32:28 +02: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
Vicent Llopis	8267daef3a	refs #5918 fix: permite reenviar el correo si ha dado fallo	2023-07-21 12:58:44 +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	2f27f32c45	refs #5244 fix: e2e	2023-07-20 11:26:48 +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
Vicent Llopis	7312ed9cc4	refs #5244 fix back test	2023-07-20 09:56:07 +02:00
Vicent Llopis	d6a27741b5	a	2023-07-20 09:50:56 +02:00
Vicent Llopis	a6b8f4ddf8	refs #5244 fix: tfront	2023-07-20 09:46:25 +02:00
Vicent Llopis	04ca5743a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-20 09:40:41 +02: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