6363 Commits

Author	SHA1	Message	Date
Alex Moreno	61f806b0c9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-30 14:40:35 +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
Carlos Andrés	41af809917	feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets	2024-09-30 14:33:58 +02:00
Pako Natek	54d9125c21	feat(collection_new): refs #8058 urgent state ... Urgent tickets will be priorized as asigned ones Refs: #8058	2024-09-30 13:49:06 +02:00
Pako Natek	2962bd13c7	fix: refs #8030 buyer prefers to add multiple zoneGeoFk ... Instead of choosing the deepest zoneGeo, buyer wants all to be merged Refs: #8030	2024-09-30 11:59:22 +02:00
Sergio De la torre	a0a8a22ab0	fix: refs #5320 withoutHaving	2024-09-30 11:13:12 +02:00
Pako Natek	1e64028b02	Merge branch 'dev' into 8030-newPriceComponent	2024-09-30 08:25:27 +00:00
Pako Natek	25680994dd	feat(previaDelta): refs #8030 new algorithym for coincident records ... when many records target the same zoneGeoFk, the deepest must be chosen Refs: #8030	2024-09-30 10:24:45 +02:00
Sergio De la torre	a9b083a044	fix: refs #5320 withoutHaving	2024-09-30 09:39:35 +02:00
Robert Ferrús	e6d950e33f	Merge branch 'dev' into 7981-showAgencyName	2024-09-30 06:31:27 +00:00
Sergio De la torre	1f5c0d3e94	fix: refs #5320 withoutHaving	2024-09-30 08:25:40 +02:00
Pablo Natek	f7e13e8ac9	Merge branch 'dev' into 8030-newPriceComponent	2024-09-30 06:21:51 +00:00
Pako Natek	95601b139b	feat(priceDelta): refs #8030 new field zoneGeoFk ... Buyers need zone restriction field for the new component bonus Refs: #8030	2024-09-30 08:15:57 +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
Robert Ferrús	a7c858dbba	Merge branch 'dev' into 7981-showAgencyName	2024-09-27 08:13:35 +00:00
Carlos Andrés	5270db2abe	fix: refs #7779 refactor collection	2024-09-26 17:53:54 +02:00
Carlos Andrés	0ad1d838d9	fix: refs #7779 refactor collection	2024-09-26 17:44:29 +02:00
Javi Gallego	c825191823	feat: refs #9722 fixtures	2024-09-26 15:22:40 +02:00
Pako Natek	0edae3c144	Merge branch 'test' into 8030-testPriceDelta	2024-09-26 12:57:29 +00:00
Carlos Andrés	0851c6fb97	fix: refs #7779 refactor collection	2024-09-26 12:48:18 +02:00
Sergio De la torre	08cb1241bf	fix: refs #5890 recovery ItemShelving_afterInsert	2024-09-26 11:53:33 +02:00
Carlos Andrés	eb2a30f0d9	fix: refs #7779 refactor collection	2024-09-26 10:36:19 +02:00
Javi Gallego	6ce4ff1311	Merge branch 'dev' into 6722-thermograph	2024-09-25 13:31:12 +02:00
Javi Gallego	9ef44d8d8d	feat: refs #6722 refactor createThermograph	2024-09-25 13:23:31 +02:00
Alex Moreno	4f97deb0c9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-25 12:08:16 +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
Sergio De la torre	eb85181ea0	feat: refs #7855 delete isChecked	2024-09-25 08:43:38 +02:00
Sergio De la torre	b776788714	feat: refs #7855 delete isChecked	2024-09-25 08:35:15 +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
Robert Ferrús	3f81d624cb	feat: refs #7981 deprecated showAgencyName	2024-09-24 18:52:55 +02:00
Sergio De la torre	98f33807dd	fix: updateAvailable refs #6861	2024-09-24 16:48:48 +02:00
Pako Natek	64376b7503	fix: refs #8030 new table version	2024-09-24 14:04:29 +02:00
Pako Natek	785778e58a	fix: refs #8030 database selected for grant	2024-09-24 13:56:41 +02:00
Pako Natek	e33429f474	fix: refs #8030 grant actions to buyer	2024-09-24 13:53:24 +02:00
Pako Natek	7a343d60e6	feat: refs #8030 new fields for vn.priceDelta	2024-09-24 13:04:03 +02:00
Pako Natek	403637dd8c	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 10:37:44 +00:00
Alex Moreno	63a4cb1847	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-24 12:25:41 +02:00
Pako Natek	ed656836b1	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 10:06:38 +00:00
Pako Natek	f6e1880634	fix: refs #8030 test change	2024-09-24 12:06:08 +02:00
Pako Natek	7e449c5716	fix: refs #8030 bugs	2024-09-24 11:54:12 +02:00
Pablo Natek	d608b3b9c8	Merge pull request '7404-fixStockBought' (!3004) from 7404-fixStockBought into dev ... Reviewed-on: #3004 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 09:32:49 +00: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
Pako Natek	1be5fced3c	fix: refs #8030 little bugs	2024-09-24 10:59:15 +02:00
Pako Natek	5c8f42a3ae	fix: refs #8030 redmine revision updates ... Changes recomended by the reviewer Refs: #8030	2024-09-24 10:38:56 +02:00
Pako Natek	fb7208d898	fix: refs #8030 warehouse filter ... Warehouse is also needed to make the filter Refs: #8030	2024-09-24 09:05:30 +02:00
Pako Natek	acabd3e154	feat(catalog_componentCalculate): refs #8030 new component improved ... The procedure has now the component "bonus", a special price increasing for a group of items Refs: #8030	2024-09-24 08:50:34 +02:00
Pablo Natek	bfd52b8773	Merge branch 'dev' into 7404-fixStockBought	2024-09-24 05:31:34 +00:00
Pablo Natek	166ca42e32	Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought	2024-09-24 07:31:24 +02:00
Pablo Natek	3988eb0d97	fix: refs #7404 back and e2e	2024-09-24 07:31:22 +02:00
Pako Natek	9a0b487d20	feat: refs #8030 new table	2024-09-23 13:12:53 +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	ab89c8f3ba	Merge branch 'dev' into 7404-fixStockBought	2024-09-23 08:16:16 +00:00
Pablo Natek	80985fbd56	fix: refs #7404 round data and fix specs	2024-09-23 10:14:09 +02: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
Pablo Natek	fb1e77f9c4	fix: refs #7404 fix back data source	2024-09-20 11:06:38 +02: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
Alex Moreno	b7e712b738	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-19 12:38:08 +02:00
Robert Ferrús	5456490dcd	feat: refs #8000 poner comentario	2024-09-19 12:09:47 +02:00
Carlos Andrés	e8a203efc7	fix: ticket_splitItemPackingType	2024-09-19 12:09:36 +02:00
Jorge Penadés	22af34c0cb	feat: refs #7323 use scopes	2024-09-19 09:27:05 +02:00
Robert Ferrús	b48c221028	feat: refs #8000 refs #800 catalog_calculate itemMaxLength	2024-09-19 08:33:33 +02:00
Pablo Natek	6f5cb6c70a	Merge branch 'master' into hotFix-productionControl	2024-09-18 15:47:15 +00:00
Pablo Natek	8aad80cbf1	fix(productionControl): refs #7969	2024-09-18 17:45:58 +02:00
Guillermo Bonet	d9f39967ea	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-18 13:43:03 +02:00
Guillermo Bonet	e3c92c3644	fix: refs #6421 worker_getHierarchy infinite loop	2024-09-18 13:43:00 +02:00
Jorge Penadés	d08e2d39fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fixResolver	2024-09-18 12:20:32 +02:00
Jorge Penadés	a6168e61f1	refactor: refs #7323 improve role resolver	2024-09-18 12:19:49 +02:00
Guillermo Bonet	4dd70ccc69	build: dump 2438	2024-09-18 12:01:25 +02:00
Ivan Mas	51981eda06	Merge branch 'dev' into 7934-DeleteVn.MIDNIGHT	2024-09-18 10:01:17 +00:00
Pablo Natek	eb22a77e25	fix: timesstampadd to interval	2024-09-18 11:48:50 +02:00
Pablo Natek	6c4b1cd522	fix(shelving_clean): less time por shelving removal	2024-09-18 11:37:47 +02:00
Carlos Andrés	26a078504f	fix: collection_new	2024-09-18 11:27:57 +02:00
Carlos Andrés	4f9b6030e8	fix: collection_new	2024-09-18 10:30:16 +02:00
Carlos Andrés	d5f18b9187	fix: collection_new	2024-09-18 10:25:21 +02:00