21716 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	cbb7cb18eb	fix: refs #5919 delete locker field	2024-05-10 16:02:50 +02:00
Ivan Mas	dfa2d67642	Merge pull request 'refs #7342 Modify decimal item plastic' (!2440) from 7342-IntToDec-Item-Plastic into dev ... Reviewed-on: #2440 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-10 13:50:51 +00:00
Alex Moreno	a7910d9894	hotFix(invoiceInPdf): fix accessScopes	2024-05-10 14:58:52 +02:00
Carlos Andrés	85aa4fae08	Merge pull request 'Ticket 180571 No se ven las ubicaciones' (!2439) from Hotfix-productionConfig-defaultSectorFk-adelantamos-cambio into master ... Reviewed-on: #2439 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-10 12:52:17 +00:00
Ivan Mas	473f261cf1	refs #7342 Modify decimal item plastic	2024-05-10 14:11:29 +02:00
Jorge Penadés	8943bc7115	fix: refs #5919 back tests	2024-05-10 14:04:34 +02:00
Jorge Penadés	1996a00af1	feat: refs #5919 drop version	2024-05-10 13:31:21 +02:00
Carlos Andrés	349c3d71dd	Ticket 180571 No se ven las ubicaciones	2024-05-10 13:14:23 +02:00
Robert Ferrús	32b339ffdf	Merge branch 'dev' into 7363-item_getBalance	2024-05-10 11:13:09 +00:00
Robert Ferrús	e7df3fefc6	feat: refs #7363	2024-05-10 13:11:41 +02:00
Carlos Andrés	56815e4b1a	Ticket 180571 No se ven las ubicaciones	2024-05-10 13:10:54 +02:00
Robert Ferrús	9163d3db74	feat: refs #7363 changes	2024-05-10 13:05:44 +02:00
Jorge Penadés	8876a7ea8f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-10 13:05:22 +02:00
Jorge Penadés	af11bb8663	feat: refs #5919 hook	2024-05-10 13:04:12 +02:00
Guillermo Bonet	ba72408e84	refactor: refs #7345 Deprecated isFarmer__	2024-05-10 12:45:53 +02:00
Guillermo Bonet	365c3fe588	Merge pull request 'refactor: refs #7345 Renamed column of invoiceInConfig' (!2437) from 7345-byeIsFarmer into dev ... Reviewed-on: #2437 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-10 10:04:25 +00:00
Robert Ferrús	cb9cacc1ea	feat: refs #7363 item_getBalance saleTracking no mostrar duplicados	2024-05-10 11:51:54 +02:00
Guillermo Bonet	6b7a529b55	refactor: refs #7345 Renamed column of invoiceInConfig	2024-05-10 11:39:14 +02:00
Robert Ferrús	35f69b8692	Merge branch 'dev' into 7039-country-country	2024-05-10 07:21:05 +00:00
Jorge Penadés	4e7d0e6469	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-10 08:28:06 +02:00
Robert Ferrús	b03fe4e6d3	Merge branch 'dev' into 7296-expeditionTruck	2024-05-10 05:23:07 +00:00
Pako Natek	c048389412	Merge branch 'dev' into 7362-VIP	2024-05-10 05:13:35 +00:00
Jon Elias	6207d79244	Merge pull request 'feat: refs #6739 transferInvoice new functionality' (!2412) from 6739-transferInvoiceOut into dev ... Reviewed-on: #2412 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-10 04:51:41 +00:00
Pako Natek	6b10f81add	Merge pull request 'done' (!2435) from hotFix-collection_assign into master ... Reviewed-on: #2435 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 17:06:25 +00:00
Pako Natek	ec060209aa	done	2024-05-09 18:53:32 +02:00
Jorge Penadés	7f4965879c	fix: refs #5919 get locker by relation	2024-05-09 15:54:34 +02:00
Guillermo Bonet	f4229284fa	Merge branch 'dev' into 7252-deliveryNoteFarmingFk	2024-05-09 12:56:05 +00:00
Carlos Andrés	cc941de606	feat: conversion art. A1 a A2 refs #4979	2024-05-09 14:24:20 +02:00
Ivan Mas	b060048d5d	Merge pull request 'refs #7161 feat:setVisibleDiscard by itemTrash' (!2424) from 7161-deleteItemTrash into dev ... Reviewed-on: #2424 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-09 11:43:18 +00:00
Ivan Mas	9d1dc6b483	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-09 11:41:04 +00:00
Guillermo Bonet	9c5b46b3e2	Merge pull request 'feat: refs #7247 clientSupplier_add' (!2346) from 7247-monacoVies into dev ... Reviewed-on: #2346 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 11:30:28 +00:00
Robert Ferrús	5460922d12	Merge pull request 'feat: refs #6223 pull master' (!2434) from 6223-ticketCalculateClonMaster into master ... Reviewed-on: #2434 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-09 11:17:16 +00:00
Robert Ferrús	f963923645	feat: refs #6223 pull master	2024-05-09 12:54:57 +02:00
Carlos Satorres	fcd1b5e351	Merge pull request 'refs #6877 add attenderFk' (!2427) from 6877-modPeticionesCompra into dev ... Reviewed-on: #2427 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-09 10:53:10 +00:00
Robert Ferrús	0498b425b3	Merge branch 'dev' into 7039-country-country	2024-05-09 10:51:18 +00:00
Jorge Penadés	03a8dafe47	Merge pull request '#6202 myt watcher' (!2377) from 6202-mytWatcher into dev ... Reviewed-on: #2377 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-05-09 10:50:57 +00:00
Jorge Penadés	035782414f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 12:47:25 +02:00
Jorge Penadés	1450a680ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 12:45:33 +02:00
Ivan Mas	9d7184ed7b	refs #6965 Add Fk vehicleFk firstEditorFk	2024-05-09 12:35:26 +02:00
Jorge Penadés	2c826ed838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 12:14:43 +02:00
Jorge Penadés	bf0db89286	refactor: refs #6202 remove blanks	2024-05-09 12:02:44 +02:00
Jorge Penadés	74399d5ab6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6202-mytWatcher	2024-05-09 11:56:48 +02:00
Pako Natek	2203ac478b	Merge branch 'dev' into 7362-VIP	2024-05-09 09:56:41 +00:00
Pako Natek	42d17aa7f5	done	2024-05-09 11:52:25 +02:00
Guillermo Bonet	faf2d51a43	Merge branch 'test' into dev	2024-05-09 11:36:15 +02:00
Guillermo Bonet	494b46e7ec	fix: refs #6493 Fix buy_recalcPricesByBuy & buy_recalcPricesByEntry	2024-05-09 11:33:57 +02:00
Carlos Satorres	0f52fe65d3	refs #7360 fix error weekly	2024-05-09 09:46:40 +02:00
Pablo Natek	98e28b8d50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers	2024-05-09 09:09:00 +02:00
Jorge Penadés	dc45527e1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 08:45:17 +02:00
Jon Elias	b9e53df218	Merge branch 'dev' into 6739-transferInvoiceOut	2024-05-09 06:06:40 +00:00