6274 Commits

Author	SHA1	Message	Date
Pako Natek	d87f940fff	Merge branch 'test' into 8030-testPriceDelta	2024-10-02 05:40:48 +00:00
Pako Natek	7d3c2a4a1c	fix: refs #8030 schema missing in zoneGeo table	2024-10-02 07:36:04 +02:00
Pako Natek	3c89d1e5e0	fix: refs #8030 foreign key zoneGeo	2024-10-02 07:34:57 +02:00
Pako Natek	a48843a5cf	feat: refs #8030 new field vn.priceDelta.zoneGeoFk	2024-10-02 07:30:49 +02:00
Javi Gallego	d31340ff25	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-01 12:22:36 +02:00
Javi Gallego	fe741fa7e1	fix: getSimilar daysInForward	2024-10-01 12:22:33 +02:00
Alex Moreno	f916509b86	fix(StockBought): revert bad merge master to test	2024-10-01 11:30:34 +02:00
Guillermo Bonet	2b4504c954	Merge branch 'master' into test	2024-10-01 08:52:41 +02:00
Guillermo Bonet	452324191c	fix: refs #7759 Changed definer	2024-10-01 08:51:03 +02:00
Sergio De la torre	b4a2be660d	fix: refs #6868 handleUser addIsOnReservationMode	2024-10-01 07:08:11 +02:00
Alex Moreno	75d0c298a1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-30 14:38:17 +02:00
Sergio De la torre	a0a8a22ab0	fix: refs #5320 withoutHaving	2024-09-30 11:13:12 +02:00
Sergio De la torre	a9b083a044	fix: refs #5320 withoutHaving	2024-09-30 09:39:35 +02:00
Sergio De la torre	1f5c0d3e94	fix: refs #5320 withoutHaving	2024-09-30 08:25:40 +02:00
Javier Segarra	35e4c0e76b	Merge branch 'test' into 7404-revert-commit	2024-09-27 11:01:40 +00:00
Pako Natek	bc2ed26fc3	Merge branch 'master' into 8030-master-HotFix-PriceDelta	2024-09-27 10:02:20 +00:00
Pablo Natek	f858674c8a	Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev" ... This reverts commit f6c5f41d44, reversing changes made to 5ee5da24e1.	2024-09-27 12:01:54 +02:00
Pako Natek	0edae3c144	Merge branch 'test' into 8030-testPriceDelta	2024-09-26 12:57:29 +00:00
Sergio De la torre	08cb1241bf	fix: refs #5890 recovery ItemShelving_afterInsert	2024-09-26 11:53:33 +02:00
Alex Moreno	326c1755d6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-25 12:07:57 +02:00
Pako Natek	beb66cce1f	feat(components): refs #8030 new component bonus ... With table vn.priceDelta, buyers set a range of items to be affected for a price increasing Refs: #8030	2024-09-25 07:43:29 +02:00
Pako Natek	2b6c604fcd	feat(components): refs #8030 new component bonus ... With table vn.priceDelta, buyers set a range of items to be affected for a price increasing Refs: #8030	2024-09-25 07:37:52 +02:00
Pako Natek	8c18bcd776	feat(components): refs #8030 new component bonus ... With table vn.priceDelta, buyers set a range of items to be affected for a price increasing Refs: #8030	2024-09-25 07:36:48 +02:00
Sergio De la torre	98f33807dd	fix: updateAvailable refs #6861	2024-09-24 16:48:48 +02:00
Alex Moreno	afbf084535	Merge branch 'test' into 8032-devToTest_2440	2024-09-24 09:29:38 +00:00
Alex Moreno	ae97c8a035	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-24 11:29:09 +02:00
Javier Segarra	4689681618	fix(salix): add administrative ACLs	2024-09-23 12:07:06 +02:00
Robert Ferrús	b34e8a7b7e	Merge branch 'master' into 8000-catalog_calculate	2024-09-23 08:18:49 +00:00
Pablo Natek	cd545c0001	Merge pull request 'fix(shelving_clean): less time por shelving removal' (!2988) from fixShelvingClean into master ... Reviewed-on: #2988 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-23 08:05:09 +00:00
Robert Ferrús	e0e3201f78	Merge branch 'master' into 8000-catalog_calculate	2024-09-23 05:37:43 +00:00
Ivan Mas	06f8f8e95e	refactor: refs #7725 deprecate worker.isF11Allowed	2024-09-22 08:39:19 +02:00
Javier Segarra	8523ec1b8a	Merge branch 'master' into hotfix-postCodeACLS	2024-09-20 12:38:35 +00:00
Carlos Andrés	e25415f820	fix: refs#8011 previousSticker_get	2024-09-20 13:54:22 +02:00
Javier Segarra	6f78a7470c	Merge branch 'master' into hotfix-postCodeACLS	2024-09-20 11:51:11 +00:00
Carlos Andrés	190c964ec2	fix: refs#8011 previousSticker_get	2024-09-20 13:50:08 +02:00
Carlos Satorres	346893455f	fix: remove comment	2024-09-20 13:38:53 +02:00
Carlos Satorres	564d23653c	fix: acls	2024-09-20 13:24:00 +02:00
Carlos Andrés	7dce536f43	Merge pull request 'fix: refs #8011 Previas compo F' (!2995) from 8011-previas-campo-F into master ... Reviewed-on: #2995 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-09-20 10:23:04 +00:00
Robert Ferrús	3bdd196fcc	Merge branch 'master' into 8000-catalog_calculate	2024-09-20 08:38:12 +00:00
Robert Ferrús	a65700abed	feat: refs #8000 modificar comentario	2024-09-20 10:37:36 +02:00
Pako Natek	e9b93ff99b	Merge branch 'dev' into 7999-longTermStorage	2024-09-20 08:13:52 +00:00
Pako Natek	e8add6e614	feat(TPV): refs #7999 new frmLongTermStorage ... Parking table foreign key updated Old proc removed Refs: #7999	2024-09-20 10:12:24 +02:00
Carlos Andrés	633766e58b	fix: recupero version anterior	2024-09-20 10:06:10 +02:00
Carlos Andrés	1a44d23239	Merge branch 'master' into solve_merge_problems	2024-09-20 08:59:58 +02:00
Robert Ferrús	1b4a324c3c	feat: refs #8000 modificar comentarios	2024-09-20 07:58:15 +02:00
Robert Ferrús	f50b8326ba	Merge branch '8000-catalog_calculate' of https://gitea.verdnatura.es/verdnatura/salix into 8000-catalog_calculate	2024-09-20 07:33:08 +02:00
Robert Ferrús	0c35e1fa9c	feat: refs #8000 modificar comentario	2024-09-20 07:33:05 +02:00
Robert Ferrús	e75ac1bb8d	Merge branch 'master' into 8000-catalog_calculate	2024-09-20 04:58:51 +00:00
Carlos Andrés	4c0e05fdab	fix: refs #8011 Previas compo F	2024-09-19 18:03:59 +02:00
Alex Moreno	ccb60eee87	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-19 12:42:12 +02:00