18582 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	37043beb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-03 07:44:31 +01:00
Alexandre Riera	8679aefb48	refs #4713 procs deprecated, originalQuantity deleted	2023-03-03 07:36:04 +01:00
Alexandre Riera	ed5208c9e4	refs #5206 implemented general search, missing tests	2023-03-02 15:10:17 +01:00
Vicent Llopis	7c24b940b3	feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes	2023-03-02 14:55:18 +01:00
Alexandre Riera	dbe42e3bf4	refs #5206 version with plane added, needs to implement general search	2023-03-02 13:55:47 +01:00
Javi Gallego	e01fa40531	Merge branch 'dev' into 5187-error-permisos	2023-03-02 11:51:41 +01:00
Carlos Satorres	79d15d930e	Updated package-lock	2023-03-02 11:50:36 +01:00
Carlos Satorres	a1d4dff7d8	Merge branch '5090-renameGoLabel' of https://gitea.verdnatura.es/verdnatura/salix into 5090-renameGoLabel	2023-03-02 11:48:50 +01:00
Carlos Satorres	6509a79b02	Deleted package-lock	2023-03-02 11:48:45 +01:00
Carlos Satorres	ea9a15ece1	Merge branch 'dev' into 5090-renameGoLabel	2023-03-02 10:44:24 +00:00
Alexandre Riera	be1993cf8b	refs #5206 version with top-searcher and two fields for reference and id	2023-03-02 11:33:55 +01:00
Carlos Satorres	1ef78ce8be	refs #5090 ultimo commit	2023-03-02 10:58:01 +01:00
Alexandre Riera	d836874b7c	Merge pull request 'fix(field): prevent input size changes when showing clear icon' (!1361) from 5338-clear_displacement into dev ... Reviewed-on: #1361 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-02 09:45:29 +00:00
Carlos Satorres	ab14cfde21	refs #5090 solucion final yml tab	2023-03-02 10:26:52 +01:00
Carlos Satorres	3df45c77e5	refs #5090 error linea26 solve	2023-03-02 10:04:14 +01:00
Carlos Satorres	9843b06e6e	refs #5090 correction error multiline	2023-03-02 10:01:15 +01:00
Carlos Satorres	892e3319b0	refs #5090 solucion error yml2	2023-03-02 09:57:09 +01:00
Carlos Satorres	7b7dcddce0	refs #5090 solucion de error yml	2023-03-02 09:51:15 +01:00
Joan Sanchez	57e36cebde	fix(field): prevent input size changes when showing clear icon ... Refs: #5338	2023-03-02 09:44:45 +01:00
Joan Sanchez	e785c34d90	Added next version	2023-03-02 07:52:07 +01:00
Joan Sanchez	b8881a050c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-02 07:41:16 +01:00
Joan Sanchez	a1a95aa4e9	Merge pull request 'master → test (Wait to pr 1352)' (!1351) from master into test ... Reviewed-on: #1351	2023-03-02 06:37:49 +00:00
Joan Sanchez	7a03029168	Merge pull request 'refs #4975 Traduction no branch' (!1352) from 4975-noBranchTraduction into master ... Reviewed-on: #1352	2023-03-02 06:35:27 +00:00
Joan Sanchez	ee6d292d6a	Merge pull request 'fixes #5063 Añadir campo doPhoto en la ficha de Item' (!1264) from 5063-item-module-doPhoto into dev ... Reviewed-on: #1264 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:34:45 +00:00
Joan Sanchez	8834d4d0a4	Merge pull request 'fixes #5070 route-tickets city is now a link to buscaman' (!1282) from 5070-route-tickets-link-maps into dev ... Reviewed-on: #1282 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:33:03 +00:00
Joan Sanchez	baedb5b6ca	Merge pull request 'fixes #5202 item waste abrir en otra pestaña' (!1354) from 5202-itemWaste-openOtherTab into dev ... Reviewed-on: #1354 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:31:39 +00:00
Joan Sanchez	32b3284e40	Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev ... Reviewed-on: #1344 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:31:20 +00:00
Joan Sanchez	84dc95621d	Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev ... Reviewed-on: #1348 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:30:17 +00:00
Joan Sanchez	d819a13597	Merge pull request '5240-ticket.sale-tracking' (!1353) from 5240-ticket.sale-tracking into dev ... Reviewed-on: #1353 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:28:01 +00:00
Joan Sanchez	bc30fffc2d	Merge pull request 'refs #5193 ticketCreateWithUser to ticket_add' (!1358) from 5193-ticketCreateWithUser__ into dev ... Reviewed-on: #1358 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:25:02 +00:00
Joan Sanchez	cbb8908af6	Merge pull request 'refs #4965 Hotfix' (!1360) from 4965-hotfix into master ... Reviewed-on: #1360	2023-03-02 06:22:38 +00:00
Vicent Llopis	3051768781	WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros	2023-03-01 14:50:23 +01:00
Alexandre Riera	d62fbab3f1	refs #5070 refactor and added tests	2023-03-01 14:22:25 +01:00
Vicent Llopis	bc542d8a40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-01 14:11:12 +01:00
Guillermo Bonet	a5d236257b	refs #4965 Hotfix	2023-03-01 14:03:47 +01:00
Guillermo Bonet	8e79ad2f50	Merge pull request 'refs #4965 Hotfix collection-label' (!1359) from hotfixCollectionLabel into master ... Reviewed-on: #1359	2023-03-01 12:07:16 +00:00
Guillermo Bonet	fdf97b1fc7	refs #4965 Hotfix collection-label	2023-03-01 12:59:46 +01:00
Alexandre Riera	ab8c3b3f67	Merge pull request 'hotFix itemDiary reload card conditional' (!1357) from hotFix-itemDiary-reloadCardConditional into master ... Reviewed-on: #1357	2023-03-01 11:38:42 +00:00
Guillermo Bonet	707ae232a7	refs #5193 ticketCreateWithUser to ticket_add	2023-03-01 12:24:36 +01:00
Alexandre Riera	cd026d79c3	Merge branch 'master' into hotFix-itemDiary-reloadCardConditional	2023-03-01 11:22:41 +00:00
Alexandre Riera	d744cbb1a3	hotFix itemDiary reload card conditional	2023-03-01 12:22:01 +01:00
Vicent Llopis	2f9e9ada43	Merge branch 'dev' into 5240-ticket.sale-tracking	2023-03-01 10:58:49 +00:00
Carlos Satorres	1c3aa29642	refs #5090 model.ezp nuevo	2023-03-01 11:56:41 +01:00
Carlos Satorres	968f422054	refs #5090 Renamed QLabel to GoLabel	2023-03-01 11:43:07 +01:00
Alexandre Riera	48da6403fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5070-route-tickets-link-maps	2023-03-01 11:20:24 +01:00
Carlos Andrés	6f5e25493d	invoicing test	2023-03-01 10:36:38 +01:00
Alexandre Riera	c47f64519d	Merge pull request 'fixes #5160 Error Test Back Jenkins' (!1355) from 5160-testsBack-jenkins into dev ... Reviewed-on: #1355 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-03-01 09:31:11 +00:00
Alexandre Riera	680d0ba0a1	Merge branch 'dev' into 5160-testsBack-jenkins	2023-03-01 09:18:24 +00:00
Vicent Llopis	01519ec0fb	Merge pull request '4849-supplier-isVies' (!1329) from 4849-supplier-isVies into dev ... Reviewed-on: #1329 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-03-01 09:17:45 +00:00
Guillermo Bonet	e231b0e12b	refs #5237 Added greuge notify	2023-03-01 10:11:22 +01:00