24001 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
Jon Elias	58aedf160b	refactor: refs #6739 changed translations' keys	2024-05-09 08:05:23 +02:00
Javi Gallego	abd692cbd3	Merge pull request 'fix: #7344 getSupplierDebt agrupa por pago' (!2426) from 7344-getSupplierDebt into dev ... Reviewed-on: #2426 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 05:49:28 +00:00
Robert Ferrús	7ccd219629	Merge pull request 'feat: refs #7291 sale_getProblems' (!2382) from 7291-sale_getProblems into dev ... Reviewed-on: #2382 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-09 05:35:37 +00:00
Robert Ferrús	833994bd27	Merge branch 'dev' into 7291-sale_getProblems	2024-05-09 05:23:33 +00:00
Robert Ferrús	ec89e93adc	Merge pull request 'feat: refs #182001 packaging' (!2420) from 182001-packaging into dev ... Reviewed-on: #2420 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 05:20:12 +00:00
Robert Ferrús	e02dfc0456	Merge branch 'dev' into 182001-packaging	2024-05-09 05:18:08 +00:00
Robert Ferrús	3fca9f243d	Merge pull request 'fix: refs #5699 clientsDisable' (!2419) from 5699-hoFixClientsDisable into master ... Reviewed-on: #2419 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-09 05:16:01 +00:00
Robert Ferrús	0fce8c755b	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-09 05:14:38 +00:00
Sergio De la torre	7bcabbf51c	Merge pull request 'refs #6276 hotFix:itemShelving_add' (!2425) from 6276_itemShelving_Add into master ... Reviewed-on: #2425 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-09 05:12:57 +00:00
Sergio De la torre	094b15fe8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-09 07:08:31 +02:00
Sergio De la torre	679f9a1b9b	refs #6861 feat:sectoCollection reserve	2024-05-09 07:07:10 +02:00
Sergio De la torre	10513d1991	Merge branch 'master' into 6276_itemShelving_Add	2024-05-09 05:00:07 +00:00
Carlos Andrés	d6451a94e3	feat: conversion art. A1 a A2 refs #4979	2024-05-08 17:38:52 +02:00
Carlos Andrés	710841ba4a	Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-08 16:31:25 +02:00
Guillermo Bonet	c4a66b42bb	feat: refs #7247 Minor changes	2024-05-08 14:56:51 +02:00
Guillermo Bonet	3a7d93759c	Merge branch 'dev' into 7247-monacoVies	2024-05-08 12:52:32 +00:00
Guillermo Bonet	1a375c0e88	refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk	2024-05-08 14:45:37 +02:00
Jon Elias	0f973baa65	Merge branch 'dev' into 6739-transferInvoiceOut	2024-05-08 12:31:32 +00:00
Jon Elias	77c2f61f47	refs #6739 move petitions	2024-05-08 14:30:20 +02:00
Jon Elias	72da046ead	Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut	2024-05-08 14:12:11 +02:00
Jon Elias	9d75ba0bc5	refactor: refs #6739 default params	2024-05-08 14:12:10 +02:00
Guillermo Bonet	feb36eb911	Merge pull request 'refactor: refs #6230 Revoke item: `size`, longName, name' (!2428) from 6230-revoke into dev ... Reviewed-on: #2428 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-08 12:00:25 +00:00
Guillermo Bonet	162c78e392	Merge branch '6230-revoke' of https://gitea.verdnatura.es/verdnatura/salix into 6230-revoke	2024-05-08 13:59:38 +02:00
Guillermo Bonet	7d92b514c5	refactor: refs #6230 Revoke item: `size`, longName, name	2024-05-08 13:59:37 +02:00
Guillermo Bonet	a90e83e9e0	Merge branch 'dev' into 6230-revoke	2024-05-08 11:56:31 +00:00
Guillermo Bonet	f86d1ded72	Merge pull request 'feat: refs #7335 Added call ticket_afterUpdate' (!2415) from 7335-modifyCmr into dev ... Reviewed-on: #2415 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-08 11:54:02 +00:00
Guillermo Bonet	53b58104c7	refactor: refs #6230 Revoke item: `size`, longName, name	2024-05-08 13:52:52 +02:00
Sergio De la torre	f7e6901ef6	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-08 11:32:00 +00:00
Carlos Satorres	0d43d9a982	refs #6877 remove restriction	2024-05-08 13:20:45 +02:00
Guillermo Bonet	4df13d900a	Merge branch 'dev' into 7335-modifyCmr	2024-05-08 10:55:47 +00:00
Robert Ferrús	b0848edff8	feat: refs #5699 quittar de client_afterUpdate desactivar cliente	2024-05-08 12:52:11 +02:00
Guillermo Bonet	82ac54f0b3	Merge branch 'test' into dev	2024-05-08 12:52:02 +02:00
Guillermo Bonet	90107936b7	Merge branch 'master' into test	2024-05-08 12:51:36 +02:00
Sergio De la torre	0d42b32611	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-08 10:47:22 +00:00
Robert Ferrús	ce42cbf287	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-08 10:44:15 +00:00
Guillermo Bonet	84e90bb91b	hotfix: rollback tmp item_getSimilar	2024-05-08 12:43:46 +02:00
Robert Ferrús	50157c932e	Merge branch 'dev' into 7296-expeditionTruck	2024-05-08 10:42:54 +00:00
Carlos Satorres	f64e899061	Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev ... Reviewed-on: #2271 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 10:27:20 +00:00
Robert Ferrús	cc89100d08	Merge branch 'dev' into 182001-packaging	2024-05-08 10:26:53 +00:00