23566 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	16039b0ccc	Merge pull request 'feat: refs #7784 Changes in entry-order-pdf' (!2872) from 7784-entryOrderPdf into dev ... Reviewed-on: #2872 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 12:36:16 +00:00
Guillermo Bonet	32ae8282f1	Merge branch 'dev' into 7784-entryOrderPdf	2024-08-21 12:34:36 +00:00
Guillermo Bonet	35c49b4708	Merge pull request 'feat: refs #3199 Added one more scope ticketTotal' (!2447) from 3199-ticket_recalc_itemTaxCountry into dev ... Reviewed-on: #2447 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 12:32:27 +00:00
Guillermo Bonet	73fedfabea	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-08-21 12:28:22 +00:00
Guillermo Bonet	ae985312a9	Merge pull request 'feat: refs #7514 Changes to put srt log' (!2873) from 7514-srtLog into dev ... Reviewed-on: #2873 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 11:23:28 +00:00
Guillermo Bonet	9c4f4ad5a9	Merge branch 'dev' into 7514-srtLog	2024-08-21 11:21:21 +00:00
Guillermo Bonet	ed5b012d3f	Merge pull request 'feat: refs #7882 Added quadMindsConfig table' (!2874) from 7882-quadMindsConfig into dev ... Reviewed-on: #2874 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 11:21:04 +00:00
Guillermo Bonet	d63a1c5497	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:28:14 +02:00
Guillermo Bonet	c641b47a9b	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:26:34 +02:00
Guillermo Bonet	29b779d6ab	feat: refs #7882 Added quadMindsConfig table	2024-08-21 12:03:49 +02:00
Guillermo Bonet	d2709a871c	feat: refs #7514 Changes to put srt log	2024-08-21 08:29:32 +02:00
Guillermo Bonet	04235e85e6	Merge branch 'dev' into 7784-entryOrderPdf	2024-08-21 06:05:54 +00:00
Guillermo Bonet	cf7ee3d990	feat: refs #7784 Requested changes	2024-08-21 08:05:45 +02:00
Guillermo Bonet	83f44e5a1d	Merge pull request 'feat: refs #7800 Added company Fk' (!2871) from 7800-tpvMerchantEnableFk into dev ... Reviewed-on: #2871 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 05:11:08 +00:00
Guillermo Bonet	2d4acd0f00	feat: refs #7784 Changes in entry-order-pdf	2024-08-20 15:03:34 +02:00
Guillermo Bonet	92f01f79d3	feat: refs #7800 Added company Fk	2024-08-20 13:11:04 +02:00
Guillermo Bonet	a967be51e2	Merge branch '3199-ticket_recalc_itemTaxCountry' of https://gitea.verdnatura.es/verdnatura/salix into 3199-ticket_recalc_itemTaxCountry	2024-08-20 12:59:31 +02:00
Guillermo Bonet	d2bd408e31	feat: refs #3199 Requested changes	2024-08-20 12:59:28 +02:00
Guillermo Bonet	1db68c08ed	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-08-20 08:59:42 +00:00
Guillermo Bonet	d0f1362f85	feat: refs #3199 Requested changes	2024-08-20 10:59:05 +02:00
Guillermo Bonet	a995d80b46	feat: refs #3199 Requested changes	2024-08-20 10:58:26 +02:00
Guillermo Bonet	c1810eaccf	Merge pull request 'feat: refs #7712 sizeLimit' (!2797) from 7712-sizeLimit into dev ... Reviewed-on: #2797 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-08-20 08:30:46 +00:00
Guillermo Bonet	45fa615daf	Merge branch 'dev' into 7712-sizeLimit	2024-08-20 08:28:19 +00:00
Guillermo Bonet	1f5145ba9e	feat: refs #7712 Unify	2024-08-20 09:34:02 +02:00
Guillermo Bonet	f9d0afa5da	feat: refs #7712 Fix	2024-08-20 09:30:25 +02:00
Guillermo Bonet	0fcff01433	refactor: refs #7756 Fix tests	2024-08-20 09:11:30 +02:00
Guillermo Bonet	3412e919c4	Merge pull request 'fix: refs #7756 Foreign keys invoiceOut' (!2799) from 7756-fixRefFk into dev ... Reviewed-on: #2799 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-20 06:49:53 +00:00
Guillermo Bonet	fc1767cab4	refactor: refs #7756 Fix tests	2024-08-20 08:45:04 +02:00
Guillermo Bonet	b1ef037272	Merge branch 'dev' into 7756-fixRefFk	2024-08-20 08:05:51 +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
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
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