23651 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	ccfb53891f	Merge branch 'dev' into 7346	2024-08-19 09:10:06 +02:00
Javi Gallego	575577d29b	feat: refs #7346 add multiple feature	2024-08-16 10:08:58 +02:00
Alex Moreno	00dc58221e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-16 09:23:43 +02:00
Jorge Penadés	0d583e6351	Merge pull request '#7524 add limit on GET with filter param' (!2802) from 7524-limitSelect into dev ... Reviewed-on: #2802 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-08-16 06:59:47 +00:00
Jorge Penadés	2aaad4316b	Merge branch 'dev' into 7524-limitSelect	2024-08-16 06:54:35 +00:00
Jorge Penadés	527028ee07	Merge pull request 'feat: refs #6900 drop section' (!2863) from 6900-dropInvoiceIn into test ... Reviewed-on: #2863 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-14 14:22:10 +00:00
Jorge Penadés	b2f4b54654	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6900-dropInvoiceIn	2024-08-14 14:41:18 +02:00
Alex Moreno	b81f9bb32e	Merge pull request 'fix: refs #7355 remove and tests accounts' (!2850) from 7355-accountMigration2 into dev ... Reviewed-on: #2850 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-14 12:22:12 +00:00
Carlos Satorres	c26bfffada	Merge branch 'dev' into 7355-accountMigration2	2024-08-14 11:04:24 +00:00
Guillermo Bonet	8d35e95731	Merge branch 'test' into dev	2024-08-14 12:48:52 +02:00
Guillermo Bonet	5e0bf4c739	Merge branch 'master' into test	2024-08-14 12:48:22 +02:00
Guillermo Bonet	b268bf5eb7	feat: refs #7811 Added autorestart param pm2	2024-08-14 12:47:44 +02:00
Carlos Satorres	834f62a724	Merge branch '7355-accountMigration2' of https://gitea.verdnatura.es/verdnatura/salix into 7355-accountMigration2	2024-08-14 12:38:41 +02:00
Carlos Satorres	3ee377156b	fix: refs #7355 remove and tests accounts	2024-08-14 12:38:38 +02:00
Jorge Penadés	79923cc1d3	feat: refs #6900 drop section	2024-08-14 12:20:02 +02:00
Javi Gallego	f21c292e20	Merge branch 'dev' into 7346	2024-08-14 12:19:40 +02:00
Alex Moreno	9625a87abb	Merge pull request '#7323 redirect to lilium' (!2862) from 7323-warmfix-fixErrors into test ... Reviewed-on: #2862 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-14 10:07:58 +00:00
Guillermo Bonet	912cfd3721	Merge pull request 'fix: refs #7800 tpvMerchantEnable PRIMARY KEY' (!2861) from 7800-tpvMerchantEnable into dev ... Reviewed-on: #2861 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-14 10:02:43 +00:00
Jorge Penadés	cf39e944f0	feat: refs #7323 redirect to lilium	2024-08-14 11:00:17 +02:00
Javi Gallego	7f543e8d3a	Merge branch 'dev' into 7346	2024-08-14 10:32:32 +02:00
Alex Moreno	f5fd85771f	Merge branch 'dev' into 7355-accountMigration2	2024-08-14 07:51:30 +00:00
Javier Segarra	0d931b2ab9	Merge pull request '#7867 - avoid deactivate user when is supplier' (!2860) from hotfix_nightTask_supplierDisable into master ... Reviewed-on: #2860 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-14 05:52:13 +00:00
Alex Moreno	bad6447b72	Merge pull request '7848-recoveryPassword' (!2858) from 7848-recoveryPassword into dev ... Reviewed-on: #2858 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-13 14:08:24 +00:00
Javier Segarra	befcf89534	fix(salix): #7867 apply SQL conventions	2024-08-13 11:18:23 +00:00
Guillermo Bonet	68ee5e3549	fix: refs #7800 tpvMerchantEnable PRIMARY KEY	2024-08-13 12:52:39 +02:00
Guillermo Bonet	dd5845abae	fix: refs #7800 tpvMerchantEnable PRIMARY KEY	2024-08-13 12:49:56 +02:00
Javier Segarra	a178c285c0	fix(salix): #7867 avoid deactivate user when is supplier	2024-08-13 10:44:54 +00:00
Alex Moreno	6b2499909b	Merge branch 'dev' into 7848-recoveryPassword	2024-08-13 10:43:08 +00:00
Alex Moreno	ef1b4ef0a4	feat(update-user): refs #7848 add twoFactor	2024-08-13 12:30:37 +02:00
Alex Moreno	22ee4f1853	refactor: refs #7848 adapt to lilium	2024-08-13 12:30:12 +02:00
Guillermo Bonet	360e20545a	feat: refs #7799 Added Fk in vn.item.itemPackingTypeFk	2024-08-13 12:26:01 +02:00
Guillermo Bonet	38cf5af23e	feat: refs #7842 Added editorFk in vn.host	2024-08-13 12:21:03 +02:00
Guillermo Bonet	e4dc86c685	Merge branch 'test' into dev	2024-08-13 12:16:01 +02:00
Guillermo Bonet	d9f64dea08	fix: refs #7713 ACL Log	2024-08-13 12:15:30 +02:00
Sergio De la torre	3340ddeccd	Merge pull request 'fix: refs #6861 refs#6861 bySectorCollection' (!2856) from 6861_bySectorCollection into master ... Reviewed-on: #2856 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-13 09:39:31 +00:00
Sergio De la torre	32d5ca0d5c	fix: refs #6861 refs#6861 bySectorCollection	2024-08-13 11:37:08 +02:00
Jorge Penadés	459254a652	Merge pull request 'test to dev' (!2855) from test into dev ... Reviewed-on: #2855 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-08-13 09:28:57 +00:00
Guillermo Bonet	f421ae5ec6	Merge pull request 'refactor: refs #7798 Drop bi.Greuges_comercial_detail' (!2853) from 7798-greugesComercialDetail into dev ... Reviewed-on: #2853 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-13 08:56:45 +00:00
Alex Moreno	7551c911fe	Merge pull request '#7323 add locale' (!2854) from 7323-addWorkerLocale into test ... Reviewed-on: #2854 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-13 08:33:06 +00:00
Jorge Penadés	a733560649	feat: refs #7323 add locale	2024-08-13 10:26:36 +02:00
Guillermo Bonet	61d6efaea7	refactor: refs #7798 Drop bi.Greuges_comercial_detail	2024-08-13 09:53:05 +02:00
Alex Moreno	f28631c376	Merge pull request 'fix(defaulter_filter): recovery subquery' (!2849) from hotFix_defaulterFilter_recovery into master ... Reviewed-on: #2849 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-13 06:54:59 +00:00
Alex Moreno	25b3e36b18	Merge pull request '7863-devToTest_2434' (!2852) from 7863-devToTest_2434 into test ... Reviewed-on: #2852 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-13 06:50:23 +00:00
Jorge Penadés	bbe5306088	feat: refs #7524 add default limit	2024-08-12 16:36:43 +02:00
Jorge Penadés	3adb73cddf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-12 15:38:40 +02:00
Jorge Penadés	462f9a95b7	Merge pull request '#7283 item subsections migration' (!2830) from 7283-itemSectionsMigration into dev ... Reviewed-on: #2830 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-12 12:06:24 +00:00
Carlos Satorres	3ee9833a70	fix: refs #7355 remove and tests accounts	2024-08-12 14:06:02 +02:00
Jorge Penadés	82da7bff9b	Merge branch 'dev' into 7283-itemSectionsMigration	2024-08-12 09:28:11 +00:00
Guillermo Bonet	ece8bee45c	Merge pull request 'feat: refs #7774 ticket_cloneWeekly' (!2781) from 7774-ticket_cloneWeekly into dev ... Reviewed-on: #2781 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-12 08:32:32 +00:00
Alex Moreno	46abf2f57b	fix(defaulter_filter): recovery subquery	2024-08-12 10:27:26 +02:00