23151 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	1ee0592096	Merge branch 'dev' into 7401-redirectRouteToLilium	2024-07-24 04:36:44 +00:00
Pablo Natek	d16130edc3	feat: refs #7401 redirect to lilium	2024-07-24 06:36:13 +02:00
Alex Moreno	1f9cacedad	Merge pull request 'fix: defaulter filter correct sql' (!2779) from 6943-fix_defaulter_filter into dev ... Reviewed-on: #2779 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-07-23 12:47:51 +00:00
Alex Moreno	1a3ed42bcd	fix: defaulter filter correct sql	2024-07-23 14:37:34 +02:00
Alex Moreno	1c45aef883	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-23 11:46:19 +02:00
Alex Moreno	d8df9bc959	Merge pull request 'build: dump db' (!2775) from 7773-dump into master ... Reviewed-on: #2775 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-23 09:45:24 +00:00
Alex Moreno	85b7254353	Merge branch 'master' into 7773-dump	2024-07-23 09:02:18 +00:00
Alex Moreno	e35ded5e35	hotFix: add summaryId to productionConfigLog & agencyLog	2024-07-23 11:01:57 +02:00
Alex Moreno	4cf52c5e80	Merge branch '7773-dump' of https://gitea.verdnatura.es/verdnatura/salix into 7773-dump	2024-07-23 10:48:13 +02:00
Alex Moreno	eb413af275	hotFix: collection assign	2024-07-23 10:48:12 +02:00
Alex Moreno	6167454097	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7773-dump	2024-07-23 10:39:36 +02:00
Alex Moreno	83fef59686	Merge branch 'master' into 7773-dump	2024-07-23 08:27:01 +00:00
Guillermo Bonet	bc49600e21	Merge branch 'test' into dev	2024-07-23 10:24:47 +02:00
Alex Moreno	71cd805b7e	build: dump db	2024-07-23 10:23:28 +02:00
Guillermo Bonet	fa10376bea	fix: refs #7662 assign	2024-07-23 10:21:09 +02:00
Guillermo Bonet	c6b49e2134	Merge branch 'test' into dev	2024-07-23 09:27:05 +02:00
Guillermo Bonet	04ff3e0cc7	fix: refs #7382 throw	2024-07-23 09:23:42 +02:00
Guillermo Bonet	bfd2b5aebb	fix: refs #7382 invoiceIn_booking change	2024-07-23 09:22:18 +02:00
Alex Moreno	7c4032c859	Merge pull request '7773-testToMaster_2430' (!2774) from 7773-testToMaster_2430 into master ... Reviewed-on: #2774 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-23 06:21:01 +00:00
Sergio De la torre	c777b8dbf1	Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev ... Reviewed-on: #2762 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 20:33:47 +00:00
Pablo Natek	aeb8d4dbea	Merge pull request '7129-fixFilter' (!2766) from 7129-fixFilter into test ... Reviewed-on: #2766 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-22 15:52:22 +00:00
Sergio De la torre	296fe3442d	Merge pull request 'master' (!2773) from master into test ... Reviewed-on: #2773 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 14:48:36 +00:00
Guillermo Bonet	3fc973dcee	Merge pull request 'feat: refs #7740 Ticket before update added restriction' (!2770) from 7740-ticketSignRoute into dev ... Reviewed-on: #2770 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 12:02:18 +00:00
Sergio De la torre	b6ae9a55f7	Merge pull request 'hotFix solve isPicked refs #6861' (!2772) from 6861_itemShelvingSaleReserve into master ... Reviewed-on: #2772 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 11:54:42 +00:00
Sergio De la torre	afbce80303	hotFix solve isPicked refs #6861	2024-07-22 13:42:42 +02:00
Pablo Natek	d152a58dda	Merge branch '7129-fixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7129-fixFilter	2024-07-22 13:33:52 +02:00
Pablo Natek	b73eceb1c8	fix: refs #7129 fix backFilters	2024-07-22 13:33:51 +02:00
Pablo Natek	62ab72d6d5	Merge branch 'test' into 7129-fixFilter	2024-07-22 11:20:04 +00:00
Guillermo Bonet	513b4583b3	fix(deletExpeditions): merge test → dev	2024-07-22 12:49:50 +02:00
Guillermo Bonet	b9c57c2f0e	Fix	2024-07-22 12:45:57 +02:00
Guillermo Bonet	7e125cdba5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-22 12:36:29 +02:00
Guillermo Bonet	169534568e	Merge branch 'test' into dev	2024-07-22 12:36:27 +02:00
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
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	5567359d73	feat: refactor buyUltimate refs #7736	2024-07-19 15:34:32 +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