22988 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	e64f56cff1	Merge branch 'test' into dev	2024-07-08 07:55:00 +02:00
Guillermo Bonet	5213fd4feb	Merge branch 'master' into test	2024-07-08 07:54:42 +02:00
Guillermo Bonet	6eef7876d9	Merge pull request 'refactor: refs #7640 multipleInventoryFix' (!2689) from 7640-multipleInventoryFix into master ... Reviewed-on: #2689 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-08 05:52:51 +00:00
Guillermo Bonet	3a2acfb7f8	feat: refs #7640 Optimization	2024-07-08 07:21:53 +02:00
Javier Segarra	3c2a44eb53	feat(salix): refs #7380 #7380 add value to fixtures	2024-07-07 23:47:00 +02:00
Javier Segarra	570b06bd18	Merge branch 'dev' into 7380_substitutionCondition	2024-07-07 21:27:04 +00:00
Javier Segarra	2f10066290	feat(salix): refs #7380 #7380 remove new field	2024-07-07 23:23:30 +02:00
Sergio De la torre	41fab962d9	Merge pull request '6964_itemNewer' (!2682) from 6964_itemNewer into master ... Reviewed-on: #2682 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-05 15:04:04 +00:00
Sergio De la torre	f7ea560723	Merge branch 'master' into 6964_itemNewer	2024-07-05 15:02:34 +00:00
Javier Segarra	0e0d07c4fe	Merge pull request 'WARMFIX #7648 entryFilter and getBuys by fi' (!2691) from 7648_warmFix_filterByFI into dev ... Reviewed-on: #2691 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-05 13:02:06 +00:00
Javier Segarra	5192bfd8ea	fix(salix): refs #7648 #7648 entryFilter and getBuys by fi	2024-07-05 14:58:34 +02:00
Ivan Mas	f07964be20	Merge pull request 'refs #7561 add fk en userFk' (!2690) from 7561-userFk-expeditionState into dev ... Reviewed-on: #2690 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-05 12:11:01 +00:00
Ivan Mas	3508cf3a9e	refs #7561 add fk en userFk	2024-07-05 14:01:09 +02:00
Guillermo Bonet	fb07cdccc3	Merge branch 'test' into dev	2024-07-05 13:51:09 +02:00
Guillermo Bonet	5712fbd782	Merge branch 'master' into test	2024-07-05 13:50:43 +02:00
Guillermo Bonet	592738c7a0	refs #7024 & ticket 198125 Hotfix	2024-07-05 13:48:03 +02:00
Guillermo Bonet	55f0e90771	feat: refs #7640 Minor change	2024-07-05 13:36:38 +02:00
Guillermo Bonet	3ddf49da0a	feat: refs #7640 Fix	2024-07-05 13:21:07 +02:00
Guillermo Bonet	1d59883d19	feat: refs #7644 Minor change	2024-07-05 13:14:16 +02:00
Guillermo Bonet	8ac26c7281	refactor: refs #7640 Refactor multipleInventory	2024-07-05 12:50:31 +02:00
Guillermo Bonet	b9e986c962	feat: refs #7622 Fix	2024-07-05 12:39:54 +02:00
Guillermo Bonet	1799b52f8b	feat: refs #7622 Added type column addressWaste	2024-07-05 12:37:59 +02:00
Guillermo Bonet	481d57042f	Merge pull request 'feat: refs #7382 Added unique key' (!2667) from 7382-triggerInvoiceInTax into dev ... Reviewed-on: #2667 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-05 10:26:25 +00:00
Sergio De la torre	573efbf4bd	Merge branch 'master' into 6964_itemNewer	2024-07-05 10:01:28 +00:00
Guillermo Bonet	03854a42c9	Merge pull request 'refs #7450 Modified msg throw' (!2684) from 7450-entryIsEditableMsg into dev ... Reviewed-on: #2684 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-05 09:28:12 +00:00
Robert Ferrús	0d1573973e	Merge pull request '6371-restoreSeries' (!2685) from 6371-restoreSeries into master ... Reviewed-on: #2685 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-05 09:00:57 +00:00
Alex Moreno	706288f227	Merge pull request 'test' (!2687) from test into dev ... Reviewed-on: #2687 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-05 08:59:39 +00:00
Robert Ferrús	6bb3f1e4ff	Merge branch 'dev' into 7116-agencyIncoming	2024-07-05 08:58:35 +00:00
Sergio De la torre	40eb5f1a31	Merge pull request 'warmFix getSales refs #6861' (!2686) from 6861_reservas into test ... Reviewed-on: #2686 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-05 08:57:37 +00:00
Sergio De la torre	f3f450463b	warmFix getSales refs #6861	2024-07-05 10:47:26 +02:00
Robert Ferrús	3051e4ed25	Merge branch '6371-restoreSeries' of https://gitea.verdnatura.es/verdnatura/salix into 6371-restoreSeries	2024-07-05 10:35:32 +02:00
Guillermo Bonet	182273d3b3	refs #7450 Modified msg throw	2024-07-05 09:59:15 +02:00
Guillermo Bonet	aa46d7a536	refs #6769 item_getBalance optimization	2024-07-05 09:46:09 +02:00
Alex Moreno	aafe764d9d	Merge pull request 'fix: send rocket after commit cau 199307' (!2680) from warmFix_deleteSales_rocket into dev ... Reviewed-on: #2680 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-05 07:17:00 +00:00
Robert Ferrús	53a48735e8	Merge branch '6371-restoreSeries' of https://gitea.verdnatura.es/verdnatura/salix into 6371-restoreSeries	2024-07-05 09:05:41 +02:00
Robert Ferrús	27a4b747b5	fix: refs #6371 restore table Series	2024-07-05 09:05:39 +02:00
Javi Gallego	d4b4c0fafe	feat: refs #7348 campos a modificar	2024-07-05 09:04:38 +02:00
Robert Ferrús	923efadf6a	fix: refs #6371 restore table Series	2024-07-05 09:00:40 +02:00
Javi Gallego	e3db143b44	feat: refs #7348 campo en json	2024-07-05 08:55:24 +02:00
Sergio De la torre	159f2f5f1c	hotFix itemNewer refs #6964	2024-07-05 08:44:09 +02:00
Sergio De la torre	859f610f43	hotFix itemNewer refs #6964	2024-07-05 08:43:45 +02:00
Guillermo Bonet	50c9ded103	refs #6769 Fix	2024-07-05 08:38:40 +02:00
Carlos Satorres	69b30b1d42	Merge pull request 'hotfix-sepaCore' (!2678) from hotfix-sepaCore into master ... Reviewed-on: #2678 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-05 05:52:15 +00:00
Robert Ferrús	1e109a493d	Merge branch 'dev' into 7116-agencyIncoming	2024-07-05 05:40:14 +00:00
Guillermo Bonet	6f0196d656	refs #6769 Changes	2024-07-05 07:06:40 +02:00
Carlos Satorres	64f5ad0e19	refs #5525 remove AS	2024-07-04 16:54:57 +02:00
Carlos Satorres	f3dcc7dd99	Merge branch 'hotfix-sepaCore' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-sepaCore	2024-07-04 16:50:57 +02:00
Carlos Satorres	cf621071d0	refs #5525 fixear sql, fixtures, js	2024-07-04 16:50:54 +02:00
Carlos Andrés	d6f6df48f2	Merge pull request 'feat: Avisar cuando no hay posibilidad de fichar refs #7669' (!2676) from 7669-Avisor-cuando-no-se-puede-fichar into dev ... Reviewed-on: #2676 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-04 11:30:11 +00:00
Alex Moreno	776fd05648	fix: send rocket after commit cau 199307	2024-07-04 12:45:52 +02:00