23865 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	3d985d10d3	Merge pull request 'feat: refs #7277 test with warehouse' (!2931) from 7277-refunding into dev ... Reviewed-on: #2931 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-06 11:52:32 +00:00
Guillermo Bonet	a718b6e81f	Merge branch 'test' into dev	2024-09-06 13:52:10 +02:00
Guillermo Bonet	5a82ce4aae	Merge branch 'master' into test	2024-09-06 13:51:13 +02:00
Guillermo Bonet	0ad4d3a959	feat: refs #7905 getBuysCsv	2024-09-06 13:50:49 +02:00
Juan Ferrer	5700b95e22	Merge pull request 'fix: refs #7931 Immediately discount order lines from available' (!2925) from 7931-availableFix into test ... Reviewed-on: #2925 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-06 11:11:35 +00:00
Juan Ferrer	e2c6a45756	fix: refs #7931 Available back test fix	2024-09-06 12:57:57 +02:00
Carlos Andrés	d10db686e5	fix: refs #7346 ticket_close serial	2024-09-06 12:52:24 +02:00
Ivan Mas	9eb2da621b	Merge pull request 'feat: refs #7898 Add column "floor" in vn.parking' (!2912) from 7898-New_column_floor_parking into dev ... Reviewed-on: #2912 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-06 09:56:18 +00:00
Ivan Mas	762975ed14	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 09:54:34 +00:00
Ivan Mas	0d6ae2fecd	Merge pull request 'feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval' (!2929) from 7747-DeleteBuyUltimateAndBuyUltimateFromInterval into dev ... Reviewed-on: #2929 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-06 09:50:43 +00:00
Ivan Mas	d9c860c44a	Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval	2024-09-06 09:48:58 +00:00
Juan Ferrer	382e54b572	fix: refs #7931 Back test fix	2024-09-06 11:30:43 +02:00
Juan Ferrer	d44dec3703	fix: refs #7931 Back test fix	2024-09-06 11:25:49 +02:00
Jorge Penadés	87d23b327a	Merge pull request 'chore: refs #7524 add select limit' (!2923) from 7524-addFixture into dev ... Reviewed-on: #2923 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-06 08:44:35 +00:00
Ivan Mas	8e87b7e6ba	Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval	2024-09-06 08:44:00 +00:00
Jorge Penadés	2df9bb9bdb	Merge branch 'dev' into 7524-addFixture	2024-09-06 08:42:53 +00:00
Guillermo Bonet	b0abe829b1	fix: refs ##7905 Handle error	2024-09-06 10:10:41 +02:00
Javi Gallego	46a4b577ce	feat: refs #7277 test with warehouse	2024-09-06 10:07:46 +02:00
Juan Ferrer	a06e9a98ca	Merge branch '7931-availableFix' of https://gitea.verdnatura.es/verdnatura/salix into 7931-availableFix	2024-09-06 09:16:23 +02:00
Juan Ferrer	48f94140e2	fix: refs #7931 Back test fix	2024-09-06 09:16:22 +02:00
Juan Ferrer	93330db88f	Merge branch 'test' into 7931-availableFix	2024-09-06 07:14:08 +00:00
Juan Ferrer	640b45ed99	fix: refs #7931 Apply PR change requests	2024-09-06 09:06:00 +02:00
Ivan Mas	26db88b344	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 07:00:19 +00:00
Ivan Mas	0626b83370	Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval	2024-09-06 06:56:15 +00:00
Ivan Mas	747e6a562a	feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval	2024-09-06 08:51:41 +02:00
Guillermo Bonet	1b8583a19d	feat: refs #7759 Revoke routine grants vn	2024-09-06 08:50:50 +02:00
Guillermo Bonet	671dc0342a	Revert commit	2024-09-06 08:24:17 +02:00
Guillermo Bonet	718c37e057	feat: refs #7532 Requested changes	2024-09-06 08:22:07 +02:00
Ivan Mas	f193938264	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 06:02:01 +00:00
Robert Ferrús	3c6920a094	Merge pull request 'feat: refs #7929 create table material' (!2920) from 7929-createTableMaterial into master ... Reviewed-on: #2920 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-06 04:30:07 +00:00
Robert Ferrús	75146f930a	Merge branch 'master' into 7929-createTableMaterial	2024-09-06 04:28:11 +00:00
Guillermo Bonet	72024fb854	fix: refs #7759 Added user 'vn'@'localhost' & grants	2024-09-06 06:12:48 +02:00
Ivan Mas	ac8b101455	feat: refs #7898 Modify default	2024-09-05 17:05:48 +02:00
Jorge Penadés	ca882dbac9	Merge pull request 'master to test' (!2928) from master into test ... Reviewed-on: #2928 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 14:35:21 +00:00
Jorge Penadés	de591864d1	Merge pull request 'fix: refs #7524 add fixture orm config' (!2927) from 7524-hotfix-addFixture into master ... Reviewed-on: #2927 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 13:57:58 +00:00
Jorge Penadés	cff5bef54b	fix: refs #7524 add fixture orm config	2024-09-05 15:47:45 +02:00
Jorge Penadés	c7be8f0b27	Merge pull request 'fix: refs #7524 load after get client' (!2926) from 7524-hotfix-loadAfterGetClient into master ... Reviewed-on: #2926 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 13:31:13 +00:00
Jorge Penadés	c1e086072b	fix: refs #7524 load after get client	2024-09-05 14:50:36 +02:00
Juan Ferrer	a7bc58a5bc	fix: refs #7931 Immediately discount order lines from available	2024-09-05 14:45:17 +02:00
Robert Ferrús	5e456a32fb	Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial	2024-09-05 14:38:58 +02:00
Robert Ferrús	3e4caa8edf	feat: refs #7929 autoincrement 1	2024-09-05 14:38:55 +02:00
Robert Ferrús	fa34c4328e	Merge branch 'master' into 7929-createTableMaterial	2024-09-05 12:27:41 +00:00
Robert Ferrús	0cdf2af807	Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial	2024-09-05 14:26:19 +02:00
Robert Ferrús	684658bb96	feat: refs #7929 quitar codigo	2024-09-05 14:25:50 +02:00
Jorge Penadés	4869322476	Merge branch 'dev' into 7524-addFixture	2024-09-05 09:57:26 +00:00
Guillermo Bonet	620ce5d45e	Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev ... Reviewed-on: #2900 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:44:38 +00:00
Guillermo Bonet	5a51d5c07b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-05 11:19:02 +02:00
Guillermo Bonet	ac01da5eed	feat: refs #7759 Deleted version 11163-maroonEucalyptus	2024-09-05 11:19:00 +02:00
Javi Gallego	40a1b24403	Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev ... Reviewed-on: #2904 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:07:24 +00:00
Javier Segarra	bb401af086	Merge branch 'dev' into 7524-addFixture	2024-09-05 09:00:14 +00:00