22758 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	7677ada925	Merge branch 'dev' into 7195_roadmap2	2024-07-03 06:46:10 +00:00
Javier Segarra	5c73a20f43	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 06:17:34 +00:00
Javier Segarra	946d6f553a	perf(salix): refs #7648 #7648 sql conventions	2024-07-03 08:16:55 +02:00
Guillermo Bonet	d1a38ec589	Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev ... Reviewed-on: #2656 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:22:48 +00:00
Guillermo Bonet	1afce8124f	Merge pull request 'refactor: refs #7418 Item type refactor' (!2658) from 7418-itemType into dev ... Reviewed-on: #2658 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:21:19 +00:00
Guillermo Bonet	18b7fb48c7	Merge pull request 'refs #7443 Deleted ekt barcode' (!2665) from 7443-deleteEktBarcode into dev ... Reviewed-on: #2665 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:18:52 +00:00
Carlos Satorres	00b33df802	Merge branch 'dev' into 6952-productorItemPDF	2024-07-03 05:13:52 +00:00
Javier Segarra	adbbe4aef9	fix(salix): refs #7648 #7648 solve big bug	2024-07-03 01:46:01 +02:00
Javier Segarra	cc004a864a	feat(salix): refs #7648 #7648 rename some travel fields	2024-07-02 20:41:53 +02:00
Javier Segarra	0e4db6c3d3	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 20:29:01 +02:00
Javi Gallego	0d70cb8929	fix: informatica no necesita este correo	2024-07-02 17:39:46 +02:00
Guillermo Bonet	0bb4439f85	refs #7443 Deleted ekt barcode	2024-07-02 14:37:22 +02:00
Sergio De la torre	61265a45e3	Merge branch 'dev' into 7195_roadmap2	2024-07-02 11:25:46 +00:00
Robert Ferrús	e8a35764fd	Merge pull request 'feat: refs #5855 drop temporary table' (!2040) from 5855-temporaryTable into dev ... Reviewed-on: #2040 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-02 11:12:29 +00:00
Robert Ferrús	872ab1a758	Merge branch 'dev' into 5855-temporaryTable	2024-07-02 11:08:08 +00:00
Alex Moreno	9708e79e55	build: increase version 2430	2024-07-02 12:41:51 +02:00
Ivan Mas	4ad6c440e0	Merge pull request 'refs #7651 Add editorFk and triggers' (!2661) from 7651-Add_editorFk_mailAliasAccount into dev ... Reviewed-on: #2661 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-02 10:39:54 +00:00
Ivan Mas	99beb21927	Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount	2024-07-02 10:36:40 +00:00
Guillermo Bonet	edff15662c	Merge branch 'master' into test	2024-07-02 12:34:51 +02:00
Carlos Satorres	62bdc13807	Merge branch '6952-productorItemPDF' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF	2024-07-02 12:07:54 +02:00
Sergio De la torre	e1b6ba4276	feat roadmap refs #7195	2024-07-02 12:03:21 +02:00
Carlos Satorres	7f213a7435	refs #6952 fix producer	2024-07-02 12:02:44 +02:00
Guillermo Bonet	028278ebcf	refs #6626 Hotfix	2024-07-02 11:52:25 +02:00
Carlos Satorres	2fe995d3ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF	2024-07-02 11:42:44 +02:00
Javier Segarra	3539b5a33e	test(salix): refs #7648 #7648 remove fdescribe	2024-07-02 10:08:51 +02:00
Javier Segarra	08612fc70c	perf(salix): refs #7648 #7648 fixtures and firstScript	2024-07-02 10:07:23 +02:00
Javier Segarra	30520cbe48	test(salix): refs #7648 #7648 getBuys.filter	2024-07-02 10:06:26 +02:00
Javier Segarra	89a394a10d	test(salix): refs #7648 #7648 entry.filter	2024-07-02 09:52:18 +02:00
Javier Segarra	f41c2489d9	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 09:34:46 +02:00
Alex Moreno	0df6eb5065	Merge pull request '7658-devToTest_2428' (!2663) from 7658-devToTest_2428 into test ... Reviewed-on: #2663 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-02 07:20:12 +00:00
Sergio De la torre	08cf79b09b	feat roadmap refs #7195	2024-07-02 08:39:42 +02:00
Guillermo Bonet	b6b3da0771	Merge branch 'test' into dev	2024-07-02 08:06:54 +02:00
Guillermo Bonet	958322066b	Merge branch 'master' into test	2024-07-02 08:06:29 +02:00
Guillermo Bonet	a7c7c4c2f6	Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master ... Reviewed-on: #2655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-02 05:35:52 +00:00
Javier Segarra	f27bdec758	feat(salix): refs #7648 #7648 changes requested	2024-07-01 21:14:27 +02:00
Javier Segarra	a0185dca04	feat(salix): refs #7648 #7648 new supplier role	2024-07-01 18:39:21 +02:00
Sergio De la torre	68b7f5baf6	Merge pull request 'feat refactor setParking REGEXP refs #7575' (!2654) from 7575_setParking_regExp into dev ... Reviewed-on: #2654 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-01 15:47:28 +00:00
Sergio De la torre	d9742afc9b	feat roadmap refs #7195	2024-07-01 17:45:45 +02:00
Sergio De la torre	4650f1f388	Merge branch 'dev' into 7575_setParking_regExp	2024-07-01 15:27:40 +00:00
Sergio De la torre	97655bf1e3	Merge pull request 'feat front-reservas refs #6861' (!2642) from 6861-Reservas-front into dev ... Reviewed-on: #2642 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-01 15:22:06 +00:00
Sergio De la torre	5992d7f53f	Merge branch 'dev' into 6861-Reservas-front	2024-07-01 14:39:19 +00:00
Sergio De la torre	1ca22dab92	Merge branch 'dev' into 7575_setParking_regExp	2024-07-01 14:36:18 +00:00
Ivan Mas	da9ff6f22c	Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount	2024-07-01 12:55:06 +00:00
Ivan Mas	29aecd62a5	refs #7651 add afterDelete trigger	2024-07-01 14:51:32 +02:00
Javier Segarra	0035967b11	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-01 12:29:27 +00:00
Javier Segarra	f0326860ba	feat(salix): refs #7648 #7648 add new fields	2024-07-01 14:07:46 +02:00
Javier Segarra	f47197cd80	Merge branch '7648_customerEntries' into 7648_dev_customerEntries	2024-07-01 14:06:28 +02:00
Guillermo Bonet	cafa7bce44	Merge branch 'test' into dev	2024-07-01 13:40:31 +02:00
Guillermo Bonet	78a28d0191	Merge branch 'master' into test	2024-07-01 13:40:22 +02:00
Guillermo Bonet	a0ea742f9e	fix: refs #7486 Hotfix	2024-07-01 13:38:25 +02:00