23522 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	41f0c8dc7f	Merge pull request 'fix: refs #7213 problem rounding' (!2903) from 7213-Sale_setProblemRoundingByBuy into master ... Reviewed-on: #2903 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-02 15:48:25 +00:00
Carlos Andrés	c88b069ac3	fix: refs #7213 problem rounding	2024-08-30 14:16:03 +02:00
Carlos Andrés	4ed5811042	fix: refs #7213 problem rounding	2024-08-30 14:14:06 +02:00
Carlos Andrés	beb54aedf8	fix: refs #7213 problem rounding	2024-08-30 13:14:45 +02:00
Carlos Andrés	3da6a700ae	fix: refs #7213 problem rounding	2024-08-30 13:08:15 +02:00
Carlos Andrés	88246174dc	Merge pull request 'fix: refs #7213 Hotfix-ticket_isTooLittle-group-by-addressFk' (!2895) from Hotfix-ticket_isTooLittle-group-by-addressFk into master ... Reviewed-on: #2895 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 14:41:48 +00:00
Carlos Andrés	423ba8c218	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-28 11:59:46 +02:00
Carlos Satorres	35009fdd6f	Merge pull request 'fix(salix): rollback updateClaim' (!2897) from hotfix_claimLink into master ... Reviewed-on: #2897 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 09:35:22 +00:00
Carlos Satorres	49394b9b16	fix: change claim	2024-08-28 09:42:59 +02:00
Javier Segarra	27e30c0051	fix(salix): redirect with params	2024-08-28 09:22:31 +02:00
Javier Segarra	5b49e7cf45	fix(salix): rollback updateClaim	2024-08-28 06:51:32 +00:00
Carlos Andrés	1ec9e5bf09	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-27 17:39:54 +02:00
Carlos Andrés	9a2351b958	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-27 17:12:41 +02:00
Pako Natek	4a3f884173	Merge pull request 'version' (!2889) from saleGroup_State into master ... Reviewed-on: #2889 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 11:03:06 +00:00
Pako Natek	a4cc36eed1	version	2024-08-27 11:41:34 +02:00
Guillermo Bonet	2dc095e828	fix: refs #7811 Renew token crash	2024-08-27 10:07:09 +02:00
Guillermo Bonet	83f3a05721	fix: refs #7811 Tests	2024-08-27 07:24:10 +02:00
Guillermo Bonet	1fac261682	Merge pull request 'fix: refs #7811 Renew token crash' (!2881) from 7811-renewTokenFix into master ... Reviewed-on: #2881 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-26 10:12:04 +00:00
Guillermo Bonet	b6c0ff01bf	fix: refs #7811 Renew token crash	2024-08-26 12:04:03 +02:00
Guillermo Bonet	5b964aec1e	Merge pull request 'fix: refs #212295 ticket 212295 Fixed claim link' (!2870) from 212295-liliumUrl into master ... Reviewed-on: #2870 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-20 08:22:36 +00:00
Guillermo Bonet	09f1637064	fix: refs #212295 ticket 212295 Fixed claim link	2024-08-20 10:19:46 +02:00
Jorge Penadés	169f47c0f8	Merge pull request '#7831 hotfix sql' (!2868) from 7831-hotfix-correctOrder into master ... Reviewed-on: #2868 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-20 08:03:27 +00:00
Jorge Penadés	81c79967f1	Merge branch 'master' into 7831-hotfix-correctOrder	2024-08-20 08:00:34 +00:00
Guillermo Bonet	0d8d5d8b3d	build: dump 2434	2024-08-20 09:57:33 +02:00
Jorge Penadés	cf977ce06d	fix: refs #7831 sql	2024-08-20 09:12:10 +02:00
Javier Segarra	2a5588f013	Merge pull request '#7864 - 7864_testToMaster_2434' (!2867) from 7864_testToMaster_2434 into master ... Reviewed-on: #2867 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-20 06:33:21 +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
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
Jorge Penadés	79923cc1d3	feat: refs #6900 drop section	2024-08-14 12:20:02 +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
Jorge Penadés	cf39e944f0	feat: refs #7323 redirect to lilium	2024-08-14 11:00:17 +02: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
Javier Segarra	befcf89534	fix(salix): #7867 apply SQL conventions	2024-08-13 11:18:23 +00:00
Javier Segarra	a178c285c0	fix(salix): #7867 avoid deactivate user when is supplier	2024-08-13 10:44:54 +00: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
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
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	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
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
Jorge Penadés	1602c12200	fix: refs #7283 sql	2024-08-12 09:13:30 +02:00
Jorge Penadés	6f26dc4990	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-12 09:06:28 +02:00
Guillermo Bonet	931c13d8ab	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:06:24 +02:00