1637 Commits

Author	SHA1	Message	Date
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
Jorge Penadés	c6a3004d12	feat: refs #7207 allocate new queue on dept change	2024-09-24 10:15:01 +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	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
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
Carlos Andrés	e25415f820	fix: refs#8011 previousSticker_get	2024-09-20 13:54:22 +02:00
Carlos Andrés	190c964ec2	fix: refs#8011 previousSticker_get	2024-09-20 13:50:08 +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
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
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
Carlos Andrés	e8a203efc7	fix: ticket_splitItemPackingType	2024-09-19 12:09:36 +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	e3c92c3644	fix: refs #6421 worker_getHierarchy infinite loop	2024-09-18 13:43:00 +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
Carlos Andrés	dcd7237d67	Merge branch 'master' into solve_merge_problems	2024-09-18 10:17:57 +02:00
Carlos Andrés	ba6b6572c3	fix: collection_new	2024-09-18 09:45:12 +02:00
Robert Ferrús	168e2e3e25	Merge branch 'dev' into 7964-entry_getCommission	2024-09-18 05:19:46 +00:00
Ivan Mas	7cd8e535f0	refactor: refs #7934 Delete vn.MIDNIGHT function	2024-09-17 16:19:09 +02:00
Carlos Andrés	8f9a7802ab	fix: refs #7760 tmp.ticketIPT	2024-09-17 15:50:51 +02:00
Sergio De la torre	974827443c	fix: refs #6861 itemShelvingSale transaction	2024-09-17 13:11:27 +02:00
Pako Natek	8b8c64ed65	Merge branch 'master' into 7969-plantTray	2024-09-17 10:53:44 +00:00
Guillermo Bonet	be30e5ae1f	Merge branch 'dev' into 7817-isChecked	2024-09-17 10:30:29 +00:00
Guillermo Bonet	acdaa96211	refactor: refs #7817 Requested changes	2024-09-17 12:30:11 +02:00
Guillermo Bonet	4a102d315d	fix: refs #7564 Ticket volume item cost	2024-09-17 12:10:47 +02:00
Pako Natek	829475b49b	feat(collection_new): refs #7969 new restriction hasPlantTray for pickers ... Refs: #7969	2024-09-17 11:57:00 +02:00
Pako Natek	019d855fbf	fix: refs #7969 new plantTray restriction	2024-09-17 11:22:07 +02:00
Pablo Natek	d308f185bc	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 08:11:17 +00:00
Guillermo Bonet	55df919076	fix: refs #7760 collection_new	2024-09-17 09:37:25 +02:00
Guillermo Bonet	267ce3167c	fix: refs #7760 collection_new	2024-09-17 09:30:40 +02:00
Guillermo Bonet	3fe1724e84	fix: refs #7760 ticket_splitItemPackingType	2024-09-17 09:12:25 +02:00
Guillermo Bonet	88f434435b	Merge branch 'test' into dev	2024-09-17 08:42:34 +02:00
Pablo Natek	9896ac2361	fix: refs #7760 remove throw on ticket split	2024-09-17 08:21:29 +02:00
Javi Gallego	361d60a8a8	Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev ... Reviewed-on: #2945 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-17 05:28:48 +00:00
Carlos Andrés	faf963ba52	fix: refs #7760 tmp.ticketIPT	2024-09-16 15:11:51 +02:00
Carlos Andrés	1d42f58c39	fix: refs #7760 tmp.ticketIPT	2024-09-16 15:09:34 +02:00
Carlos Andrés	2e03fe8193	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:41:29 +02:00
Alex Moreno	cabc9660d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-16 14:27:08 +02:00
Alex Moreno	8803ae0534	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-16 14:25:27 +02:00
Carlos Andrés	33540063f4	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:17:51 +02:00
Carlos Andrés	e7343b7e25	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:16:48 +02:00
Robert Ferrús	10fcbffd37	feat: refs #7964 entry_beforeUpdate not	2024-09-16 13:37:35 +02:00
Sergio De la torre	c33740e36e	fix: refs #6861 itemShelvingSale debug	2024-09-16 13:00:20 +02:00
Robert Ferrús	7540526b9b	feat: refs #7964 entry_beforeUpdate	2024-09-16 12:26:29 +02:00
Pablo Natek	88962b051f	Merge branch 'dev' into 7404-stockBuyed	2024-09-16 10:13:13 +00:00
Guillermo Bonet	738a390ef7	refactor: refs #7886 Deleted proc buy_getVolumeByAgency	2024-09-16 10:08:23 +02:00
Guillermo Bonet	d7e7647b52	Merge branch 'dev' into 7817-isChecked	2024-09-16 09:17:20 +02:00
Pablo Natek	8f4f2d2d15	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-16 09:06:04 +02:00
Javi Gallego	d7679fcb50	feat: refs #7977 muestra las facturas sin vencimientos tambien	2024-09-16 09:01:47 +02:00
Pako Natek	6983a2fbd9	fix: refs #7969 no agency restriction removed	2024-09-16 08:38:06 +02:00
Pako Natek	390b8271c2	fix: root instead of vn	2024-09-16 08:20:17 +02:00
Pako Natek	6cbf25dee5	fix: refs #7969 fix on collectionNew	2024-09-16 08:10:58 +02:00
Ivan Mas	d7336b93df	Merge branch 'dev' into 7923-DeleteLogifloraFunctions	2024-09-13 08:49:11 +00:00
Sergio De la torre	630e9cec1e	Merge pull request 'test' (!2958) from test into dev ... Reviewed-on: #2958 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-09-13 05:41:50 +00:00
Sergio De la torre	1ef9cc0458	Merge pull request 'master' (!2957) from master into test ... Reviewed-on: #2957 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-09-13 05:39:45 +00:00
Pako Natek	a0bfc20595	revision	2024-09-12 14:34:19 +02:00
Pako Natek	b1027f454b	locallyTested	2024-09-12 14:13:17 +02:00
Ivan Mas	8a1677f4e9	Merge branch 'dev' into 7923-DeleteLogifloraFunctions	2024-09-12 11:25:45 +00:00
Ivan Mas	4f9eb865d0	Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification	2024-09-12 10:27:27 +00:00
Ivan Mas	37900daf9e	Merge branch 'dev' into 7923-DeleteLogifloraFunctions	2024-09-12 10:19:51 +00:00
Guillermo Bonet	fcfef2a970	Merge pull request 'refactor: refs #7900 Deleted sectorProdPriority column' (!2941) from 7900-sectorProdPriority into dev ... Reviewed-on: #2941 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-12 08:21:32 +00:00
Pablo Natek	09031822a6	feat: refs #7781 only print when no expedition form other pallets	2024-09-12 08:24:33 +02:00
Javier Segarra	504e2f0ed2	Merge branch 'dev' into 7956-itemGetSimilar	2024-09-11 17:42:05 +00:00
Ivan Mas	0feb44e404	refactor: refs #7923 Delete Logiflora functions	2024-09-11 15:07:37 +02:00
Guillermo Bonet	728c40916c	refactor: refs #7895 workerDocument to workerDms	2024-09-11 14:38:58 +02:00
Sergio De la torre	99761c97e8	Merge pull request '6861-availableReserve' (!2952) from 6861-availableReserve into master ... Reviewed-on: #2952 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-11 12:38:14 +00:00
Guillermo Bonet	956058c10c	Merge branch 'test' into dev	2024-09-11 14:19:51 +02:00
Guillermo Bonet	8518351790	Merge branch 'master' into test	2024-09-11 14:19:37 +02:00
Guillermo Bonet	889f3bdab4	fix: refs #7213 risk F11	2024-09-11 14:12:07 +02:00
Sergio De la torre	7e06c2ab37	fix: available refs #6861	2024-09-11 13:57:03 +02:00
Ivan Mas	d15be5100d	refactor: refs #7952 Deprecate creditInsurance.creditClassification	2024-09-11 13:42:04 +02:00
Sergio De la torre	db7d5c5e52	fix: available refs #6861	2024-09-11 13:18:09 +02:00
Guillermo Bonet	6b5f59a09b	Merge branch 'test' into dev	2024-09-11 12:54:27 +02:00
Guillermo Bonet	4c6aba96e5	Merge branch 'master' into test	2024-09-11 12:54:16 +02:00
Sergio De la torre	87182abf7e	fix: available refs #6861	2024-09-11 12:47:51 +02:00
Guillermo Bonet	07f7f87c28	Merge pull request 'fix: refs #7213 change rounding problems' (!2943) from 7213-changeRoundingProblem into master ... Reviewed-on: #2943 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-11 10:32:59 +00:00
Guillermo Bonet	011c16180d	fix: refs #7213 buyUltimate	2024-09-11 12:31:16 +02:00
Javi Gallego	10f7583587	feat: refs #7956 sin AS	2024-09-11 11:22:22 +02:00
Pablo Natek	842c98edfc	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 08:22:24 +00:00
Pablo Natek	92f305b9fd	fix: refs #6156 proc and version	2024-09-11 10:19:55 +02:00
Carlos Andrés	ad8f27ea81	fix: refs #7213 change rounding problems	2024-09-11 10:15:37 +02:00
Javi Gallego	ed8cf628a5	feat: refs #7956 tabulaciones	2024-09-11 08:15:32 +02:00
Javi Gallego	6ae15a8e64	feat: refs #7956 definer	2024-09-11 08:13:28 +02:00
Javi Gallego	56e6a7e6aa	feat: refs #7956 parametro daysInForward	2024-09-11 08:10:21 +02:00
Pablo Natek	8607a60ca7	feat: refs #7404 format date before select	2024-09-11 07:56:08 +02:00
Sergio De la torre	bebd49f08a	fix: debugAdd refs #6861	2024-09-11 07:08:36 +02:00
Javier Segarra	f487aed336	Merge branch 'dev' into 5938_fine_ticketAdvance	2024-09-10 14:16:56 +00:00
Carlos Andrés	8fd7c1a8dd	fix: refs #7213 change rounding problems	2024-09-10 13:16:15 +02:00
Carlos Andrés	0bbf10ca4f	fix: refs #7213 change rounding problems	2024-09-10 12:59:07 +02:00
Pablo Natek	fd1370f2e0	Merge branch 'master' into 7781-fixPalletMerge	2024-09-10 06:35:06 +00:00
Javier Segarra	c407dde7a0	feat(salix): refs #6156 #6156 remove redundant condition	2024-09-09 15:14:01 +02:00
Javier Segarra	615f57b2e6	feat(salix): refs #6156 #6156 simplify CONCAT_WS	2024-09-09 15:13:32 +02:00
Javier Segarra	f9a25617f0	feat(salix): refs #6156 #6156 add missing values	2024-09-09 15:13:08 +02:00
Javier Segarra	f70f475223	feat(salix): refs #6156 #6156 change user definer	2024-09-09 15:12:44 +02:00
Javier Segarra	a5f6fe95ea	feat(salix): refs #5938 #5938 add futureAlertLevel	2024-09-09 14:58:02 +02:00
Guillermo Bonet	bf1a43a23e	refactor: refs #7900 Deleted sectorProdPriority column	2024-09-09 14:43:16 +02:00
Guillermo Bonet	946806c98e	Merge branch 'test' into dev	2024-09-09 14:25:51 +02:00
Carlos Andrés	88a8b4975b	fix: ticket 218504 ticket_close	2024-09-09 12:37:49 +02:00
Javier Segarra	31b04cba75	feat(salix): refs #6156 #6156 Move to myt version	2024-09-09 12:08:12 +02:00
Guillermo Bonet	c4527cc5c5	feat: refs #4515 New throw buy_checkItem	2024-09-09 08:28:27 +02:00
Pablo Natek	25ff498a0b	Merge branch 'master' into 7781-fixPalletMerge	2024-09-09 05:54:07 +00:00
Guillermo Bonet	a718b6e81f	Merge branch 'test' into dev	2024-09-06 13:52:10 +02:00
Carlos Andrés	d10db686e5	fix: refs #7346 ticket_close serial	2024-09-06 12:52:24 +02:00
Ivan Mas	747e6a562a	feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval	2024-09-06 08:51:41 +02:00
Guillermo Bonet	8ca491b8de	Merge branch 'dev' into 7759-newDefiner	2024-09-05 09:40:42 +02:00
Guillermo Bonet	6df817ea5d	Merge branch 'test' into dev	2024-09-05 09:25:00 +02:00
Robert Ferrús	777eba8c53	Merge branch 'master' into ticket216260-buy_recalcPrices	2024-09-05 05:22:02 +00:00
Guillermo Bonet	2bb73af47d	Merge branch 'test' into dev	2024-09-04 14:12:50 +02:00
Guillermo Bonet	80839100c7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-04 14:10:33 +02:00
Guillermo Bonet	212e8d1a03	fix: refs #7346 invoiceSerial	2024-09-04 14:09:31 +02:00
Pako Natek	e574f0060a	hotfix	2024-09-04 13:37:13 +02:00
Guillermo Bonet	afcb590a9e	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:45:33 +02:00
Guillermo Bonet	297eb30395	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:41:44 +02:00
Guillermo Bonet	74a5d1f217	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:23:01 +02:00
Guillermo Bonet	c5521ea021	Merge branch 'test' into dev	2024-09-04 07:06:22 +02:00
Guillermo Bonet	3cc19549e4	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 15:03:09 +02:00
Guillermo Bonet	790a44c62a	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 13:29:01 +02:00
Guillermo Bonet	0c3349dc03	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 12:06:31 +02:00
Guillermo Bonet	6f97d1b83a	fix: refs #7844 salesFilter and isTooLittle condition	2024-09-03 09:57:18 +02:00
Guillermo Bonet	7632f33322	fix: refs #7712 sizeLimit	2024-09-03 09:22:55 +02:00
Guillermo Bonet	6b53c24f20	feat: refs #6650 Added saleGroupLog	2024-09-03 08:17:27 +02:00
Guillermo Bonet	5468049b26	Merge branch 'dev' into 6650-shelvingLog	2024-09-03 07:59:22 +02:00