9736 Commits

Author	SHA1	Message	Date
Carlos Satorres	eb3ea010a1	Merge branch 'master' into 6898-fixSupplier2	2024-09-20 07:31:15 +00:00
Carlos Satorres	889b86644b	fix: refs #6898 filter fix	2024-09-20 09:14:38 +02:00
Jorge Penadés	22af34c0cb	feat: refs #7323 use scopes	2024-09-19 09:27:05 +02:00
Javi Gallego	da0e735fb2	fix: hotFix limit 5	2024-09-18 23:41:01 +02:00
Jorge Penadés	529be86d84	fix: refs #7524 too records error	2024-09-17 11:44:09 +02:00
Jorge Penadés	4332fccfcc	chore: refs #7524 rollback	2024-09-17 11:43:34 +02:00
Jorge Penadés	3f321e8ee8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-getAmountPaid	2024-09-17 11:40:52 +02:00
Jorge Penadés	8fedfbd090	fix: refs #7524 getAmountPaid wip	2024-09-16 13:32:14 +02:00
Guillermo Bonet	2e34f1bbe6	Merge branch 'master' into test	2024-09-16 07:16:13 +02:00
Guillermo Bonet	635eb405a2	fix: refs #7644 Update in print method	2024-09-13 14:53:44 +02:00
Guillermo Bonet	6f1d962db2	fix: refs #7644 Update in print method	2024-09-13 14:39:47 +02:00
Jon Elias	e5161fe9e2	fix: fixed balanceDialog amount field	2024-09-11 13:26:40 +02:00
Guillermo Bonet	4c6aba96e5	Merge branch 'master' into test	2024-09-11 12:54:16 +02:00
Carlos Satorres	838b8f541f	fix: setDeleted	2024-09-11 08:45:00 +02:00
Carlos Satorres	ccaf56f842	fix: setDeleted	2024-09-11 08:35:19 +02:00
Jorge Penadés	d98f0a2493	chore: refs #7524 rollback	2024-09-10 13:15:58 +02:00
Jorge Penadés	b16c2bed2b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit	2024-09-10 13:09:33 +02:00
Guillermo Bonet	52f368e4f7	fix: refs #7346 Global invoice	2024-09-09 14:25:13 +02:00
Javier Segarra	03d4427bcd	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-09 12:16:15 +00:00
Guillermo Bonet	689315bab8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-09 12:42:21 +02:00
Guillermo Bonet	d9a4b3e6fb	fix: refs #7346 Global invoice	2024-09-09 12:42:19 +02:00
Carlos Satorres	01690ed081	Merge branch 'dev' into 6998-supplierMigration	2024-09-09 09:39:15 +00:00
Guillermo Bonet	daf3dfd2ee	Merge branch 'test' into dev	2024-09-09 11:35:28 +02:00
Guillermo Bonet	3c6b7cd224	Merge branch 'master' into test	2024-09-09 11:35:08 +02:00
Guillermo Bonet	723ec2b453	fix: refs #7844 Filter monitor	2024-09-09 11:34:42 +02:00
Carlos Satorres	44a183785e	Merge branch 'dev' into 6998-supplierMigration	2024-09-09 09:32:43 +00:00
Javier Segarra	7710b87f4a	test(salix): refs #7671 #7671 improve and revert where changes	2024-09-09 10:07:05 +02:00
Javier Segarra	57dbdc6f24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices	2024-09-09 09:58:07 +02:00
Javier Segarra	6012604946	perf(salix): refs #7671 #7671 imrpove and revert where changes	2024-09-09 09:57:38 +02:00
Alex Moreno	d7613767fb	Merge pull request 'feat: refs #7938 remove unnecessary insert in clientLog' (!2934) from 7938-unnecessary_insert_clientLog into dev ... Reviewed-on: #2934 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-09 07:46:12 +00:00
Alex Moreno	632d3190b1	feat: refs #7938 remove unnecessary insert in clientLog	2024-09-09 07:49:22 +02:00
Javier Segarra	5c4a30f2f9	perf: refs #7671 improve showBadDates	2024-09-08 12:50:32 +02:00
Javier Segarra	dbd8f94555	perf: refs #7671 improve showBadDates	2024-09-08 12:49:55 +02:00
Javier Segarra	59cce5d349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices	2024-09-08 12:31:39 +02:00
Jorge Penadés	ba2c5cb209	chore: refs #7323 filter data	2024-09-06 17:49:45 +02:00
Jorge Penadés	0a4bd0f2d5	chore: refs #7323 fix test	2024-09-06 16:09:29 +02:00
Jorge Penadés	6065c056e2	chore: refs #7323 fix test	2024-09-06 16:04:40 +02:00
Jorge Penadés	eb11e18df5	fix: refs #7323 fetch from right source	2024-09-06 16:01:26 +02:00
Jorge Penadés	b277ae2d92	Merge branch 'dev' into 7323-dynamicRole	2024-09-06 12:01:18 +00:00
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	e2c6a45756	fix: refs #7931 Available back test fix	2024-09-06 12:57:57 +02: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	18d93d93a6	chore: refs #7323 worker changes	2024-09-06 10:40:16 +02: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