1310 Commits

Author	SHA1	Message	Date
Guillermo Bonet	a8d0345073	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:18:33 +02:00
Guillermo Bonet	b75bdc07c2	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:10:34 +02:00
Guillermo Bonet	b068327352	refactor: refs #6453 order_confirmWithUser	2024-07-08 10:49:39 +02:00
Guillermo Bonet	460723bd7a	refactor: refs #6453 order_confirmWithUser	2024-07-08 10:08:04 +02:00
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
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	8ac26c7281	refactor: refs #7640 Refactor multipleInventory	2024-07-05 12:50:31 +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
Guillermo Bonet	182273d3b3	refs #7450 Modified msg throw	2024-07-05 09:59:15 +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
Robert Ferrús	9819744caf	Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn	2024-07-04 07:34:31 +00:00
Guillermo Bonet	c2d899cd6a	Merge branch 'test' into dev	2024-07-04 09:33:08 +02:00
Guillermo Bonet	108a62f738	refs #7486 Fix tests	2024-07-04 09:32:56 +02:00
Robert Ferrús	897da1e48a	feat: refs #7654	2024-07-04 08:59:22 +02:00
Robert Ferrús	68871e6345	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn	2024-07-04 08:21:11 +02:00
Guillermo Bonet	5f7c7ae5dd	Merge branch 'test' into dev	2024-07-04 07:44:11 +02:00
Guillermo Bonet	af6422cf05	Merge branch 'master' into test	2024-07-04 07:43:58 +02:00
Guillermo Bonet	a7b653c42a	refs #7486 Fix collection_new	2024-07-04 07:34:41 +02:00
Carlos Andrés	989fa5ac5a	feat: Avisar cuando no hay posibilidad de fichar refs #7669	2024-07-03 18:10:02 +02:00
Carlos Andrés	d65af6aaaa	feat: Avisar cuando no hay posibilidad de fichar refs #7669	2024-07-03 18:00:28 +02:00
Carlos Andrés	097350adb6	Hotfix sale_getProblems	2024-07-03 17:07:25 +02:00
Carlos Andrés	1ec7cd9540	Hotfix sale_getProblems	2024-07-03 16:59:01 +02:00
Guillermo Bonet	246b34571d	feat: refs #7382 Fix	2024-07-03 14:24:26 +02:00
Guillermo Bonet	2278b9a05a	feat: refs #7382 Changes	2024-07-03 14:20:43 +02:00
Robert Ferrús	4f9552379e	feat: refs #7654 entry_splitByShelving	2024-07-03 13:46:19 +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
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
Robert Ferrús	872ab1a758	Merge branch 'dev' into 5855-temporaryTable	2024-07-02 11:08:08 +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
Guillermo Bonet	028278ebcf	refs #6626 Hotfix	2024-07-02 11:52:25 +02:00
Guillermo Bonet	b6b3da0771	Merge branch 'test' into dev	2024-07-02 08:06:54 +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
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
Guillermo Bonet	cafa7bce44	Merge branch 'test' into dev	2024-07-01 13:40:31 +02:00
Guillermo Bonet	a0ea742f9e	fix: refs #7486 Hotfix	2024-07-01 13:38:25 +02:00
Ivan Mas	2ed31ee1d3	refs #7651 Add editorFk and triggers	2024-07-01 13:26:59 +02:00
Guillermo Bonet	9e5f416d55	refactor: refs #7418 Item type refactor	2024-07-01 12:06:30 +02:00