13608 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	78ba047df0	Merge pull request '4492-item.create-same-as-item.isLaid' (!1125) from 4492-item.create-same-as-item.isLaid into dev ... Reviewed-on: #1125 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-16 08:04:53 +00:00
Pau	2a4af7ac78	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-16 07:29:09 +00:00
Pau	b21d4b698e	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-16 07:29:03 +00:00
Pau	a3f56f1622	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 07:28:39 +00:00
Pau	7b3a1bfb22	requested changes	2022-11-16 08:28:12 +01:00
Pau	66e6a47692	fix(e2e test expected withoutNegatives checkbox to not be checked already)	2022-11-16 08:25:07 +01:00
Alexandre Riera	8d4d6fa94c	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 07:24:58 +00:00
Alex Moreno	080d6aedf4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-16 08:19:39 +01:00
Alex Moreno	e32ddd9f44	Merge pull request 'remove-focus' (!1149) from remove-focus into dev ... Reviewed-on: #1149 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-11-16 07:17:08 +00:00
Alexandre Riera	7c8178b423	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 07:07:20 +00:00
Alex Moreno	925c384622	Actualizar 'e2e/paths/05-ticket/02_expeditions_and_log.spec.js' ... remove focus	2022-11-16 06:36:35 +00:00
Vicent Llopis	0089b821cf	fix: corregido test intermitente	2022-11-16 07:26:30 +01:00
Vicent Llopis	46c7aa24b8	fix: corregidas traducciones	2022-11-16 07:14:45 +01:00
Pau	d7dc7c4329	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 06:08:01 +00:00
Alex Moreno	9085e7fab1	fix: use routes	2022-11-15 15:12:15 +01:00
Vicent Llopis	c200e1af32	refactor: optimizado select	2022-11-15 15:09:41 +01:00
Pau	192d7336a4	change test	2022-11-15 14:22:09 +01:00
Pau	6e58b1de8b	refs #4511 Changed fixtures to fix broken test @30min	2022-11-15 14:17:24 +01:00
Vicent Llopis	dd8117b6a4	feat: añadidas traducciones	2022-11-15 14:02:31 +01:00
Pau	56893ea58b	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-15 13:42:06 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Alexandre Riera	97a6aff499	fix workerFk	2022-11-15 13:08:06 +01:00
Alexandre Riera	01607c71b6	fix rocket message and order table	2022-11-15 13:03:55 +01:00
Vicent Llopis	284837083c	feat: coge el idioma local	2022-11-15 12:34:18 +01:00
Vicent Llopis	fc516d4029	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-15 12:23:59 +01:00
Alex Moreno	b57a64227b	Merge pull request '3569-refactor_isEditable-canEdit' (!1082) from 3569-refactor_isEditable-canEdit into dev ... Reviewed-on: #1082 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-11-15 11:10:08 +00:00
Vicent Llopis	843e5ae736	feat: traducciones en los modelos	2022-11-15 11:41:57 +01:00
Pau	90f69da3ca	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-15 10:30:14 +00:00
Pau	4e2741a9cd	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 11:01:02 +01:00
Pau	31a0aae8e9	Fixed notification not getting inserted	2022-11-15 11:01:00 +01:00
Pau	2b3b2086d9	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 09:39:03 +00:00
Alex Moreno	53fb575fc0	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-15 09:38:52 +00:00
Pau	f1b706d178	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 10:37:13 +01:00
Pau	6339634756	refs #4457 move sql, remove await on front @2h	2022-11-15 10:37:12 +01:00
Joan Sanchez	ffbd565d15	Merge pull request 'feat(invoice): send invoice from stored PDF - closes #4811' (!1144) from 4811-invoice_storage into dev ... Reviewed-on: #1144 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-15 09:35:48 +00:00
Alex Moreno	31eb2c86b5	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-15 09:20:26 +00:00
Joan Sanchez	fdb35850ee	Merge branch 'dev' into 4811-invoice_storage	2022-11-15 09:05:39 +00:00
Joan Sanchez	63d9a9a287	Merge pull request 'jenkins_backTest_solved' (!1142) from jenkins_backTest_solved into dev ... Reviewed-on: #1142 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-15 09:04:40 +00:00
Joan Sanchez	174dd1fe5c	feat(invoice): send invoice from stored PDF - closes #4811	2022-11-15 10:00:21 +01:00
Vicent Llopis	b5f67425ff	Merge branch 'dev' into jenkins_backTest_solved	2022-11-15 08:54:05 +00:00
Vicent Llopis	f4b02dced2	Merge pull request '4090-global_invoincing' (!1135) from 4090-global_invoincing into dev ... Reviewed-on: #1135 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-15 08:48:21 +00:00
Alex Moreno	6fdcb52e2a	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-15 08:43:19 +00:00
Vicent Llopis	a58379579f	Merge branch 'dev' into 4090-global_invoincing	2022-11-15 08:38:53 +00:00
Alexandre Riera	3dd43d21ae	fix test	2022-11-15 09:37:26 +01:00
Alex Moreno	72400ebf02	change folder db	2022-11-15 09:37:14 +01:00
Alexandre Riera	5acbaf036a	refs #3557 back and test done	2022-11-15 09:30:36 +01:00
Pau	60d12826e4	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-15 07:59:53 +00:00
Pau	64bdbfd0b2	Merge pull request 'check default true' (!1132) from 4484-ticket-withOutNegatives-default-true into dev ... Reviewed-on: #1132 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-15 07:56:49 +00:00
Pau	9d0cd36afe	Merge branch 'dev' into 4457'	2022-11-15 08:49:21 +01:00
Pau	4d766646d5	Merge pull request 'Hotfix refactor missing URL's refs #4609' (!1138) from 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es into master ... Reviewed-on: #1138 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-11-15 07:35:43 +00:00