2160 Commits

Author	SHA1	Message	Date
Alex Moreno	c2f4648b5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send	2023-01-12 07:54:09 +01:00
Alex Moreno	9f324483d6	refactor(docuware): only use axios and refactor all	2023-01-11 15:19:09 +01:00
Vicent Llopis	b801ac676c	feat: updated production db	2023-01-11 12:41:02 +01:00
Vicent Llopis	1df6ce170d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-11 12:38:47 +01:00
Vicent Llopis	9042eaaf9f	add fixtures	2023-01-11 12:38:37 +01:00
Vicent Llopis	caff537f2e	feat: imprime las facturas	2023-01-11 12:29:03 +01:00
Alexandre Riera	a42723210f	refs #4951 delete function	2023-01-11 09:13:18 +01:00
Alexandre Riera	14ca5cc599	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4951-longitud-cuentaContables	2023-01-11 08:48:46 +01:00
Vicent Llopis	6f94987392	Merge branch 'dev' into 2952-ticket.sale-checked	2023-01-10 13:11:06 +00:00
Vicent Llopis	984a3294f9	Merge branch 'dev' into 4846-claim.search-panel	2023-01-10 11:58:00 +00:00
Alex Moreno	382aad2622	feat(docuware): upload and send pdf	2023-01-09 15:11:53 +01:00
Pau	24b8b172b9	use notification id	2023-01-05 14:13:42 +01:00
Pau	4ae903191a	Merge branch 'dev' into 4732-previa-label	2023-01-05 12:48:03 +00:00
Vicent Llopis	810a1afcd9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2023-01-05 11:40:25 +01:00
Joan Sanchez	030c474e06	Fixed update module	2023-01-04 13:18:55 +01:00
Alexandre Riera	e82035606f	refs #4984 autoincrement added	2023-01-04 11:31:09 +01:00
Alexandre Riera	a4e591c5f5	refs #4951 triggers modified	2023-01-04 10:37:59 +01:00
Alex Moreno	8184749626	change db version folder	2023-01-04 09:40:27 +01:00
Alex Moreno	021c475de7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2023-01-04 09:39:26 +01:00
Alex Moreno	9b98249398	test: front test and e2e	2023-01-04 09:23:18 +01:00
Alexandre Riera	f499311a16	refs #4951 changed triggers and added checkLength	2023-01-04 08:36:55 +01:00
Alexandre Riera	6ff17f0af0	Merge branch 'dev' into 4588-campo-nota-ultimo-usuario	2023-01-03 13:51:28 +00:00
Alex Moreno	ef437f2fee	test: e2e and backTest	2023-01-03 14:50:29 +01:00
Pau	1653439c44	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-03 12:33:21 +00:00
Vicent Llopis	ddfee57470	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-03 13:09:02 +01:00
Vicent Llopis	25dad4b358	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 13:03:36 +01:00
Alex Moreno	29483bcc1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-03 12:28:55 +01:00
Alexandre Riera	6185b2f055	refs #5051 changed fixture	2023-01-03 12:04:38 +01:00
Vicent Llopis	fa58ac2462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 09:13:47 +01:00
Vicent Llopis	fe7f388f3d	Merge branch 'dev' into 4846-claim.search-panel	2023-01-03 08:07:31 +00:00
Pau	a55d007655	requested changes	2023-01-03 08:12:46 +01:00
Alex Moreno	aa5cfde1ae	test(worker_new): add back tests	2023-01-02 14:52:03 +01:00
Alexandre Riera	96f2e4b542	refs #5051 skipped tests and changed fixtures	2023-01-02 13:35:33 +01:00
Alexandre Riera	7d61933a3c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-02 07:07:09 +01:00
Vicent Llopis	3792a80ad5	refs #4925 feat: añadido back para editar tags	2022-12-29 14:24:32 +01:00
Pau	21cd2e2a63	Merge branch 'dev' into 4732-previa-label	2022-12-29 09:03:05 +00:00
Pau	45d4ab80d5	Merge branch 'dev' into 4797-lilium-worker-notifications	2022-12-29 06:37:21 +00:00
Alex Moreno	2c5e42d408	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-28 11:49:16 +01:00
Alex Moreno	bee65f9c69	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-28 07:24:08 +01:00
Pau	ee0cd2174f	requested changes refs #4797 @2h	2022-12-27 14:32:19 +01:00
Alexandre Riera	c06c3dc6a7	refs #4957 saleChecked deleted	2022-12-27 11:50:58 +01:00
Pau	ea7f4b7c02	remove broken fixture	2022-12-27 10:34:12 +01:00
Pau	3ca1d1f4ee	remove error in fixtures	2022-12-27 10:29:15 +01:00
Alexandre Riera	5eda1388ef	refs #4927 unique key added	2022-12-27 10:26:56 +01:00
Pau	ada3e6f175	update sql folder	2022-12-27 10:10:37 +01:00
Pau	c9468990b7	Merge branch 'dev' into 4797-lilium-worker-notifications	2022-12-27 10:08:39 +01:00
Pau	deb730aae7	solve fixture error	2022-12-27 09:21:02 +01:00
Pau	7aeeddcf18	removed the sql	2022-12-27 07:23:15 +01:00
Pau	8696d554d6	Change SQL folder	2022-12-26 07:22:59 +01:00
Pau	7a5993b4fe	Merge branch 'dev' into 4732-previa-label	2022-12-26 07:12:13 +01:00
Vicent Llopis	fb325d5e65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-12-23 12:34:51 +01:00
Vicent Llopis	16c20e4700	feat: add itemShelvingSale popup	2022-12-23 12:08:16 +01:00
Joan Sanchez	c13b49c7cd	Added next version & changelog	2022-12-23 10:07:19 +01:00
Vicent Llopis	9468f604ff	move sql changes	2022-12-23 10:02:21 +01:00
Vicent Llopis	906d8c5df7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_4825-intrastat	2022-12-23 10:01:44 +01:00
Joan Sanchez	39699114e3	Changed version	2022-12-23 10:01:08 +01:00
Joan Sanchez	ff0243db8f	Fixed SQL files	2022-12-23 09:55:15 +01:00
Alexandre Riera	cf527dd8be	refs #4588 hook added	2022-12-23 09:37:19 +01:00
Vicent Llopis	c98b5a969d	feat: actualizada consulta intrastat	2022-12-23 09:16:26 +01:00
Pau	fc86e913c4	Merge branch 'dev' into #288-traducir-state-i18n	2022-12-23 08:09:38 +00:00
Alexandre Riera	eefc5ab80d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-23 08:01:52 +01:00
Joan Sanchez	e15d724db5	Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev ... Reviewed-on: #1151 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 12:44:01 +00:00
Joan Sanchez	7c33cd2691	Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev ... Reviewed-on: #1188 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 10:43:20 +00:00
Pau	a8ca163321	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 10:49:41 +01:00
Pau	fce0352986	add fixtures	2022-12-22 10:41:07 +01:00
Vicent Llopis	7f80c7ed2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-22 09:30:35 +01:00
Pau	aa716634db	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-12-22 08:30:36 +01:00
Pau	ea6d399cf1	Merge branch 'dev' into #288-traducir-state-i18n	2022-12-22 07:25:38 +00:00
Pau	c0d285856b	move sql files	2022-12-22 08:24:54 +01:00
Pau	f57201c8c3	add requested changes	2022-12-22 08:20:59 +01:00
Pau	fed4cc8534	Merge branch 'dev' into #288-traducir-state-i18n	2022-12-22 08:07:25 +01:00
Pau	a713cf92cf	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 08:00:33 +01:00
Pau	f6f6d0866d	requested changes refs #4732 @1h	2022-12-22 08:00:18 +01:00
Pau	05f4db7924	Add requested changes to the fixtures	2022-12-22 07:16:22 +01:00
Alex Moreno	7e6cdc9152	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-21 13:47:54 +01:00
Alex Moreno	502a692521	test(item_fixedPrice_rate2): backTest and e2e	2022-12-21 12:55:11 +01:00
Vicent Llopis	a45ef27e3f	move changes sql	2022-12-21 12:15:33 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	e4f4e70cc6	Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification	2022-12-21 08:26:53 +00:00
Vicent Llopis	6634ebcec5	fix: id duplicado en util.notification	2022-12-21 09:25:52 +01:00
Alex Moreno	b4b7b8e204	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-21 09:08:39 +01:00
Vicent Llopis	b0595dd0da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-21 08:12:59 +01:00
Vicent Llopis	1d7145d74b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-21 08:05:19 +01:00
Pau	1430749892	Merge branch 'dev' into 4732-previa-label	2022-12-21 07:02:02 +00:00
Alexandre Riera	5b87514501	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-20 12:15:50 +01:00
Alexandre Riera	9291f4a380	refs #3963 sql moved	2022-12-20 12:10:02 +01:00
Alexandre Riera	721123381c	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 11:54:22 +01:00
Alexandre Riera	4c6a735235	refs #4962 moved sql and methods to ticket	2022-12-20 11:53:54 +01:00
Alexandre Riera	8403af7db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-20 11:37:40 +01:00
Alexandre Riera	342eec1e41	refs #3963 autoload fixed	2022-12-20 11:36:58 +01:00
Alexandre Riera	b356839148	refs #3963 autoload fixed	2022-12-20 11:36:37 +01:00
Vicent Llopis	d178800c14	movidos change sql	2022-12-20 10:53:13 +01:00
Vicent Llopis	1ddaf7ff08	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-20 10:52:23 +01:00
Joan Sanchez	73ea928b33	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-20 10:40:23 +01:00
Joan Sanchez	47e1c05e47	Renamed version	2022-12-20 10:39:39 +01:00
Joan Sanchez	70b1854cc5	Added version	2022-12-20 10:20:31 +01:00
Alexandre Riera	284f9f418b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 09:54:47 +01:00
Alexandre Riera	6ef282feda	refs #4962 updated merge, changed autoload, changed tf->Future	2022-12-20 09:54:28 +01:00
Alexandre Riera	cd71a59dfe	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-20 07:01:45 +00:00
Alex Moreno	f82870bec6	feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item	2022-12-19 14:39:38 +01:00
Pau	6b3876b200	Merge branch 'dev' into 4732-previa-label	2022-12-19 12:26:52 +00:00
Pau	f652e86c78	Merge branch 'dev' into 4732-previa-label	2022-12-19 07:47:08 +01:00
Pau	d356e5352b	delete old files	2022-12-19 07:41:15 +01:00
Pau	055a479aba	Merge branch 'dev' into #288-traducir-state-i18n	2022-12-19 07:40:56 +01:00
Alexandre Riera	45b02c3bc6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-16 13:45:25 +01:00
Alexandre Riera	fb4432b088	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-16 13:06:06 +01:00
Alex Moreno	0a18c855e7	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-16 10:43:40 +00:00
Alex Moreno	2a8a928ac5	feat: create invoiceIn	2022-12-16 10:36:18 +01:00
Alexandre Riera	855f00b1c9	Merge branch '4700-split-tour' into 3963-ticket-advance	2022-12-16 09:51:40 +01:00
Vicent Llopis	85148ab929	refactor: movidos changes sql	2022-12-16 08:59:06 +01:00
Vicent Llopis	3642b295b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-16 08:50:51 +01:00
Joan Sanchez	dac6b4cb22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-16 08:41:43 +01:00
Joan Sanchez	e7883d1c59	Removed deprecated foreign key	2022-12-16 08:39:59 +01:00
Joan Sanchez	5b23ee6d5a	Removed deprecated fields	2022-12-16 08:10:39 +01:00
Alex Moreno	b8a0d179f1	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-16 07:08:39 +00:00
Vicent Llopis	1b30ee9d2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-15 14:32:51 +01:00
Alexandre Riera	45317c0850	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-15 14:26:10 +01:00
Alexandre Riera	0af4f337e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-15 14:23:44 +01:00
Alexandre Riera	522000cd04	refs #4928 fix fixtures	2022-12-15 09:52:34 +01:00
Alexandre Riera	5a975d0b05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-15 09:22:36 +01:00
Alex Moreno	279456b377	Merge branch 'dev' into 4919-module_code	2022-12-15 07:58:18 +00:00
Alexandre Riera	33196acac6	refs #4928 fixture notification, fix test supplier	2022-12-15 08:31:47 +01:00
Vicent Llopis	859c084430	refactor: movidos changes sql	2022-12-15 07:17:13 +01:00
Vicent Llopis	6793b8e9a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-15 07:13:09 +01:00
Joan Sanchez	a86636bee4	Use proper module codes	2022-12-14 13:49:49 +01:00
Alexandre Riera	2baa4a1954	refs #4962 ticket tour future refactor	2022-12-14 12:26:18 +01:00
Alexandre Riera	f00fdcff7c	refactor sql	2022-12-14 08:06:02 +01:00
Alexandre Riera	dce48a8a93	refs #4700 corrections	2022-12-13 14:00:46 +01:00
Alex Moreno	1e0b0028f2	fix: only edit structure	2022-12-13 13:37:25 +01:00
Alexandre Riera	72c27f7176	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-13 12:37:56 +01:00
Alexandre Riera	95967a29db	refs #4928 email template added and proc modified	2022-12-13 11:50:17 +01:00
Vicent Llopis	91f955ccf5	refactor: move sql changes	2022-12-13 09:56:05 +01:00
Vicent Llopis	e4dbeb0b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-13 09:54:56 +01:00
Joan Sanchez	dc777ea69f	Added version after merging to test	2022-12-12 14:23:40 +01:00
Joan Sanchez	e000103ca4	Deleted version	2022-12-12 14:22:32 +01:00
Vicent Llopis	3d47ee1cd9	feat: inseet in notificationSubscription	2022-12-12 13:53:21 +01:00
Alex Moreno	7822a6cac8	change folder	2022-12-12 13:48:20 +01:00
Alex Moreno	09edb99a1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-12 13:48:06 +01:00
Alex Moreno	158a71a326	restrictions	2022-12-12 13:37:14 +01:00
Alex Moreno	4cb8d8c763	test: enable one test and skip another	2022-12-12 13:11:45 +01:00
Vicent Llopis	2e14e04ed0	Merge branch 'dev' into 4846-claim.search-panel	2022-12-12 11:17:15 +00:00
Alexandre Riera	569a0e8cc9	refs #3302 log modified and fixed e2e tests	2022-12-05 15:30:41 +01:00
Alex Moreno	995fb6a5c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-02 13:13:53 +01:00
Joan Sanchez	ac447d4981	Updated SQL version nomenclature	2022-12-02 12:48:12 +01:00
Pau	5235ed5499	Merge branch 'dev' into 4732-previa-label	2022-12-02 08:05:04 +00:00
Vicent Llopis	ba8fe7dfa8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-01 07:11:00 +01:00
Alex Moreno	8df7b91127	fix: entry ref	2022-11-30 15:24:33 +01:00
Vicent Llopis	68855add59	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-11-30 10:53:54 +01:00
Alex Moreno	67cf4ebbea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-30 10:28:21 +01:00
Vicent Llopis	5c1b88fa44	detele: fixtures en español	2022-11-30 08:21:53 +01:00
Vicent Llopis	89e9722027	refactor: cambiados varchar por text, para q no falle en local	2022-11-30 08:14:38 +01:00
Vicent Llopis	f056c26b0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-11-30 08:03:16 +01:00
Pau	a676351e5b	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-30 07:24:26 +01:00
Vicent Llopis	c258587e02	feat: plantilla email para asientos contables importados incorrectamente	2022-11-29 15:06:21 +01:00
Pau	cc87565190	Merge branch 'dev' into 4732-previa-label	2022-11-29 14:16:15 +01:00
Alexandre Riera	cd8d5efa88	corrections	2022-11-29 10:29:18 +01:00
Alexandre Riera	acbd0474a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-29 08:50:48 +01:00
Carlos Andrés	8a0c810a84	refs #4613	2022-11-28 17:45:19 +01:00
Alex Moreno	7f1478f2e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-28 14:48:37 +01:00
Carlos Andrés	2a4e8cdde9	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 12:19:58 +00:00
Carlos Andrés	bc83b9fd1f	Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:07:21 +01:00
Carlos Andrés	2b0e6ab5ed	test	2022-11-28 10:07:18 +01:00
Alex Moreno	e4bbb6e83a	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 08:43:55 +00:00
Pau	aee7cd113e	add template strings to sql	2022-11-28 09:33:14 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Alex Moreno	6db1a9e8ae	refs #4859 fix: fixtures db exportation	2022-11-28 07:19:30 +01:00
Vicent Llopis	7f3265be55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-11-25 12:24:00 +01:00
Vicent Llopis	5415338f55	refactor: movidos changes sql	2022-11-25 12:17:16 +01:00
Vicent Llopis	4ef2e3dfcd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-25 12:16:40 +01:00
Pau	074763f633	rename files	2022-11-25 11:47:23 +01:00
Alexandre Riera	9f10129152	sql moved to 10510	2022-11-25 10:27:45 +01:00
Alexandre Riera	8fec0670ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-25 10:25:46 +01:00
Vicent Llopis	e540bf7b31	feat: inserta en la nueva tabla ticketSms	2022-11-25 09:38:34 +01:00
Carlos Andrés	8d2e532167	#4613 eliminar uso de portfolio	2022-11-25 09:32:54 +01:00
Alex Moreno	c9347a929a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-25 08:52:11 +01:00
Vicent Llopis	d023ec0a13	update fixtures	2022-11-25 08:24:25 +01:00
Joan Sanchez	92557ea22d	Added version 10510	2022-11-25 07:43:34 +01:00
Vicent Llopis	dbbce77cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-25 07:41:43 +01:00
Joan Sanchez	4e7ef47b88	SQL fixes	2022-11-25 07:41:08 +01:00
Pau	02f2724f2b	Merge branch 'dev' into 4732-previa-label	2022-11-25 06:35:15 +00:00
Pau	9252fc896f	Merge branch '#288-traducir-state-i18n' of https://gitea.verdnatura.es/verdnatura/salix into #288-traducir-state-i18n	2022-11-25 07:08:57 +01:00
Pau	724c1e6e8a	remove unnecessary index	2022-11-25 07:08:54 +01:00
Pau	3e08650b6f	acls for the notifications	2022-11-25 07:06:04 +01:00
Vicent Llopis	84c6604dd9	feat: enviar sms con cambios en el pedido	2022-11-24 15:04:15 +01:00
Pau	0b15236129	Merge branch 'dev' into #288-traducir-state-i18n	2022-11-24 13:18:40 +00:00
Pau	15f14062ca	Requested changes	2022-11-24 14:06:52 +01:00
Vicent Llopis	d233286a3f	Merge branch 'dev' into DEV_fix_closeTicket	2022-11-24 12:44:37 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Pau	f74b257d75	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-24 09:27:49 +00:00
Vicent Llopis	927b5a63ec	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:14:01 +00:00
Alexandre Riera	32e4a7273c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-24 09:59:59 +01:00
Alexandre Riera	5124b3b681	Merge branch 'dev' into 4547-fix-compensation	2022-11-24 08:42:09 +00:00
Vicent Llopis	7ccf37c079	Merge branch 'dev' into 4793-models_translation	2022-11-24 08:08:56 +00:00
Vicent Llopis	6f2a7a5cef	feat: enviar sms con cambios en las líneas	2022-11-23 15:15:40 +01:00
Alex Moreno	cbdffc98a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-23 14:16:42 +01:00
Vicent Llopis	7f89899d6c	fix: closeTicket	2022-11-23 12:54:52 +01:00
Vicent Llopis	f313a53cde	refactor: cambiadas fixtures, backTest y traducciones	2022-11-23 10:56:55 +01:00
Vicent Llopis	6a2af344aa	feat: antes de bloquear comprobar que no existe un bloqueo previo	2022-11-23 10:41:32 +01:00
Vicent Llopis	9cfab2b3f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-23 10:23:17 +01:00
Pau	a8520f851c	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:28:07 +00:00
Pau	ad38f50ae3	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:55:46 +01:00
Pau	ade2e777d6	refs #4457 @30min requested changes	2022-11-23 08:55:44 +01:00
Pau	51d3091a40	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-22 13:45:03 +00:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Vicent Llopis	32f28e91b5	feat: sistema de bloque para ficheros mdb	2022-11-22 14:29:42 +01:00
Alexandre Riera	5552cd654e	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 10:48:11 +00:00
Vicent Llopis	e148284332	jenkins test	2022-11-22 11:02:19 +01:00
Alexandre Riera	6656ea4f54	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-22 10:20:42 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Vicent Llopis	8876bc2b68	Merge branch 'dev' into 4793-models_translation	2022-11-22 08:12:07 +00:00
Alexandre Riera	8e1505d5ee	Merge branch 'dev' into 3557-back-missingTrash	2022-11-22 07:02:56 +00:00
Pau	cb6ae41c13	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-21 13:45:28 +00:00
Pau	3003290e61	refs #4551 @20min requested changes	2022-11-21 14:38:51 +01:00
Pau	52630f0a25	add collections with sectorFk	2022-11-21 13:38:53 +01:00
Alex Moreno	26be27c2ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-21 13:13:25 +01:00
Alexandre Riera	6ddd2d95a5	insert acl	2022-11-21 11:48:18 +01:00
Alexandre Riera	4c21ffac3b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-21 11:44:53 +01:00
Alexandre Riera	463e56b631	corrections	2022-11-21 11:41:17 +01:00
Alexandre Riera	40ea9805cf	fixes #4547 check compensation and tests	2022-11-21 10:49:19 +01:00
Pau	cb0735d136	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-21 08:34:18 +00:00
Pau	7475aa8389	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-21 08:33:51 +00:00
Vicent Llopis	3fde11c3ed	Merge branch 'dev' into 4793-models_translation	2022-11-21 08:06:39 +00:00
Alex Moreno	7e98a255b8	refs #4849 SQL	2022-11-21 08:11:01 +01:00
Joan Sanchez	1f857d5b10	4859 - Export production database	2022-11-21 08:01:21 +01:00
Pau	d41269bbbe	Change fixtures so the provider is present in the label	2022-11-18 11:58:46 +01:00
Alexandre Riera	a952fc0330	space fixtures	2022-11-18 09:38:22 +01:00
Alexandre Riera	67f0346980	space fixtures	2022-11-18 09:37:38 +01:00
Alexandre Riera	fd58eaf838	drop procedure	2022-11-18 09:36:38 +01:00
Alex Moreno	ef6af87d89	feat: add supplier.isVies funcionality	2022-11-18 09:21:21 +01:00
Alexandre Riera	153cb48ff0	fix test	2022-11-17 08:55:35 +01:00
Pau	8059e54a26	Merge branch 'dev' into #288-traducir-state-i18n	2022-11-16 12:54:47 +00:00
Alexandre Riera	566d384483	Merge branch '3557-back-missingTrash' of https://gitea.verdnatura.es/verdnatura/salix into 3557-back-missingTrash	2022-11-16 13:46:20 +01:00
Alexandre Riera	e4a6585b6a	fix test back	2022-11-16 13:46:16 +01:00
Pau	5b4c1ad4e6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-16 12:26:59 +01:00
Pau	6ab28678c5	Removed unused require and insert statement	2022-11-16 11:56:03 +01:00
Pau	0f0c4c0554	feat(save-sign implemented in salix back, refs 3681 @2h	2022-11-16 10:28:13 +01:00
Alexandre Riera	294f806bd9	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 09:52:13 +01:00
Alexandre Riera	78dc7db7a7	correcciones	2022-11-16 09:46:35 +01:00
Pau	7b3a1bfb22	requested changes	2022-11-16 08:28:12 +01:00
Pau	8e7e7901af	Implement needed functions refs #3681 @1h	2022-11-16 08:11:29 +01:00
Alexandre Riera	7c8178b423	Merge branch 'dev' into 3557-back-missingTrash	2022-11-16 07:07:20 +00:00
Pau	d7dc7c4329	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 06:08:01 +00:00
Alexandre Riera	b7c9d6ea50	refs #3963 front and back tests fixed	2022-11-15 15:30:00 +01:00
Vicent Llopis	c200e1af32	refactor: optimizado select	2022-11-15 15:09:41 +01:00
Pau	6e58b1de8b	refs #4511 Changed fixtures to fix broken test @30min	2022-11-15 14:17:24 +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
Alex Moreno	cba3c38ba6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-15 12:55:07 +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
Vicent Llopis	843e5ae736	feat: traducciones en los modelos	2022-11-15 11:41:57 +01:00