23351 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	c7b2d6714d	Merge pull request 'feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)' (!2765) from 7589-itemValuateInventory into dev ... Reviewed-on: #2765 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 10:27:04 +00:00
Guillermo Bonet	b58cdcc590	Merge branch 'master' into test	2024-07-22 12:24:39 +02:00
Guillermo Bonet	24c85608eb	feat: refs #7740 Ticket before update added restriction	2024-07-22 12:09:24 +02:00
Carlos Andrés	d7b9a3ffd0	feat: refactor buyUltimate refs #7736	2024-07-22 11:58:51 +02:00
Guillermo Bonet	ab45b988c8	feat: refs #7704 Added itemMinimumQuantity_check	2024-07-22 10:27:24 +02:00
Guillermo Bonet	32e88532f9	fix: refs #7752 fix table name (change pablo)	2024-07-22 10:07:21 +02:00
Guillermo Bonet	a0abc29167	Revert "Merge pull request 'fix: refs #7752 fix table name' (!2767) from 7752-fixproc into master" ... This reverts commit d41262798c, reversing changes made to 3d20908a42.	2024-07-22 10:04:03 +02:00
Pablo Natek	d41262798c	Merge pull request 'fix: refs #7752 fix table name' (!2767) from 7752-fixproc into master ... Reviewed-on: #2767 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-22 07:52:29 +00:00
Pablo Natek	7b44e9f866	fix: refs #7752 fix format	2024-07-22 09:49:54 +02:00
Pablo Natek	2ba4ca088d	fix: refs #7752 fix table name	2024-07-22 09:46:20 +02:00
Pablo Natek	c18765f22f	fix: refs #7129 fix return	2024-07-22 09:18:37 +02:00
Pablo Natek	c3d3a21b23	feat: refs #7129 add fields	2024-07-22 09:12:24 +02:00
Guillermo Bonet	ce59a2bbbf	fix: refs #6769 Item diary redirection to Lilium	2024-07-22 08:40:12 +02:00
Guillermo Bonet	a2799e1e61	feat: refs #7589 Added display (item_valuateInventory)	2024-07-22 08:01:23 +02:00
Guillermo Bonet	ccc02d57b7	feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)	2024-07-22 07:59:15 +02:00
Pablo Natek	ae18a52a89	fix: refs #7129 fix filter	2024-07-22 06:41:02 +02:00
Carlos Andrés	bf0f95f661	Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-19 15:57:16 +02:00
Carlos Andrés	5567359d73	feat: refactor buyUltimate refs #7736	2024-07-19 15:34:32 +02:00
Carlos Andrés	55ea761af4	eat: refactor buyUltimate refs #7736	2024-07-19 15:11:14 +02:00
Guillermo Bonet	fe363fd4db	fix: refs #7126 Primary key no unique data	2024-07-19 15:00:13 +02:00
Guillermo Bonet	05598b3371	fix: refs #7126 Slow update	2024-07-19 14:29:20 +02:00
Guillermo Bonet	ca48c64163	Merge branch 'dev' into 7126-improvedWaste	2024-07-19 13:19:02 +02:00
Guillermo Bonet	b72923f160	Merge pull request 'feat: refs #7681 Optimization and refactor' (!2707) from 7681-routeUpdateM3 into dev ... Reviewed-on: #2707 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 11:12:21 +00:00
Guillermo Bonet	6aab5fa9ef	fix: refs #7546 Deleted insert util.binlogQueue	2024-07-19 12:47:05 +02:00
Carlos Andrés	b2a8326170	feat: refactor buyUltimate refs #7736	2024-07-19 12:44:45 +02:00
Javier Segarra	3d20908a42	Merge pull request '7648_myEntries' (!2744) from 7648_myEntries into master ... Reviewed-on: #2744 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 10:27:39 +00:00
Javier Segarra	2a044dd90b	Merge branch 'master' into 7648_myEntries	2024-07-19 09:59:35 +00:00
Javier Segarra	287f9edc83	fix(salix): refs #7648 #7648 improve update ACL	2024-07-19 11:54:21 +02:00
Carlos Andrés	d4bbd3530c	Merge pull request 'fix: refs#7748 solicitud de domiciliación bancaria' (!2752) from 7748-Modificar-solicitud-de-domiciliación-bancaria into master ... Reviewed-on: #2752 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 09:43:15 +00:00
Javier Segarra	376ddebdcd	Merge branch 'master' into 7648_myEntries	2024-07-19 11:42:53 +02:00
Carlos Andrés	2b85e44fd5	Merge branch '7748-Modificar-solicitud-de-domiciliación-bancaria' of https://gitea.verdnatura.es/verdnatura/salix into 7748-Modificar-solicitud-de-domiciliación-bancaria	2024-07-19 11:27:16 +02:00
Carlos Andrés	64b127d73c	fix: refs #7748 solicitud de domiciliación bancaria	2024-07-19 11:27:14 +02:00
Pablo Natek	d0a635e86a	Merge pull request 'fix: refs #7752 add new state after scan' (!2760) from 7752-insertExpeditionState into master ... Reviewed-on: #2760 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 08:35:39 +00:00
Ivan Mas	f810c9ffa8	Merge pull request 'refs #7393 Modify night ticket closing report' (!2487) from 7393-Night_tcket_closing_report into dev ... Reviewed-on: #2487 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 07:13:34 +00:00
Ivan Mas	58ee4f1b75	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-19 07:08:48 +00:00
Guillermo Bonet	69a8b8ef49	fix: refs #7511 Minor change	2024-07-19 08:34:25 +02:00
Sergio De la torre	f19f107971	feat checkExpeditionPrintOut refs #7751	2024-07-19 08:27:22 +02:00
Guillermo Bonet	3525c878b6	Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev ... Reviewed-on: #2711 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 05:46:42 +00:00
Guillermo Bonet	3449aeb673	refactor: refs #7511 Minor change	2024-07-19 07:45:17 +02:00
Guillermo Bonet	fd2bac713d	fix: #6184 Deleted unused params	2024-07-19 07:16:24 +02:00
Alex Moreno	ed1b0ff53d	Merge branch 'master' into 7748-Modificar-solicitud-de-domiciliación-bancaria	2024-07-19 05:05:15 +00:00
Sergio De la torre	dbf91293f8	Merge pull request 'master' (!2761) from master into test ... Reviewed-on: #2761 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 04:31:34 +00:00
Carlos Andrés	9d17a9e827	fix: refs #7748 solicitud de domiciliación bancaria	2024-07-18 19:48:35 +02:00
Carlos Andrés	9003f2db91	fix: refs #7748 solicitud de domiciliación bancaria	2024-07-18 19:37:03 +02:00
Sergio De la torre	117da914f7	Merge pull request 'hotFix reservas refs #6861' (!2759) from 6861_hotFix_resevas into master ... Reviewed-on: #2759 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-18 15:22:22 +00:00
Sergio De la torre	2d2eafd4ed	Merge branch 'master' into 6861_hotFix_resevas	2024-07-18 15:17:26 +00:00
Carlos Andrés	29e7d97878	fix: refs#7748 solicitud de domiciliación bancaria	2024-07-18 16:58:20 +02:00
Pablo Natek	3b529440ba	fix: refs #7752 refactor insert	2024-07-18 15:16:25 +02:00
Pablo Natek	684983ee42	fix: refs #7752 add new state after scan	2024-07-18 15:14:18 +02:00
Robert Ferrús	b9e9d9aad3	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 12:55:09 +00:00