21461 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	45082f532f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-createLocker	2024-05-13 15:05:27 +02:00
Guillermo Bonet	bd6ddd681d	Merge pull request 'refactor: refs #7373 Deleted proc packageInvoicing' (!2444) from 7373-packageInvoicing_bye into dev ... Reviewed-on: #2444 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-13 12:16:51 +00:00
Jorge Penadés	b902a1a7f7	Merge branch 'dev' into 5919-locker	2024-05-13 12:02:17 +00:00
Jorge Penadés	1f39330041	fix: refs #5919 drop focus	2024-05-13 14:00:19 +02:00
Carlos Satorres	585a0c68a8	Merge pull request 'refs #7360 fix error weekly' (!2431) from 7360-errorWeeklyHourEmail into dev ... Reviewed-on: #2431 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-13 12:00:18 +00:00
Guillermo Bonet	6c325fccef	refactor: refs #7373 Deleted proc packageInvoicing	2024-05-13 13:41:47 +02:00
Jorge Penadés	5d5f1ef7c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-13 13:20:32 +02:00
Jorge Penadés	e16e5e3db3	feat: refs #5919 back test	2024-05-13 13:19:28 +02:00
Carlos Satorres	ac4cc1506b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail	2024-05-13 12:18:03 +02:00
Guillermo Bonet	799108f041	fix: refs #7345 Fixed e2e	2024-05-13 11:23:29 +02:00
Jorge Penadés	29e3f934af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-13 09:35:08 +02:00
Alex Moreno	6ac664a139	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-13 09:06:57 +02:00
Pablo Natek	7301657a3a	Merge pull request 'fix: duplicate version' (!2441) from fixTestDeploy into test ... Reviewed-on: #2441 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-13 07:03:30 +00:00
Jorge Penadés	562aefecdd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-13 08:56:54 +02:00
Pablo Natek	1e956bb0f8	fix: duplicate version	2024-05-13 08:53:25 +02:00
Robert Ferrús	c706f1cc2b	Merge pull request 'feat: refs #7363 item_getBalance saleTracking no mostrar duplicados' (!2438) from 7363-item_getBalance into dev ... Reviewed-on: #2438 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-13 05:05:37 +00:00
Robert Ferrús	56906963de	Merge branch 'dev' into 7363-item_getBalance	2024-05-13 05:03:45 +00:00
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
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
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
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
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
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
Jorge Penadés	7f4965879c	fix: refs #5919 get locker by relation	2024-05-09 15:54:34 +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
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
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
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
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
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
Jon Elias	620dd3d836	Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut	2024-05-09 08:05:24 +02:00