23300 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	a49c36e179	Merge pull request 'feat: refs #7401 redirect lilium' (!2794) from 7401-routeToLilium into dev ... Reviewed-on: #2794 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 08:34:58 +00:00
Pablo Natek	cf84ce1337	feat: refs #7401 redirect lilium	2024-07-26 09:38:49 +02:00
Javier Segarra	0ab40dbfb2	Merge pull request '#7648 - HOTFIX: Add args to filter shipped value' (!2791) from hotfix_myEntries into master ... Reviewed-on: #2791 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 05:50:31 +00:00
Javier Segarra	6d2a64f47d	Merge branch 'master' into hotfix_myEntries	2024-07-26 05:45:23 +00:00
Guillermo Bonet	95b61ae86a	Merge branch 'test' into dev	2024-07-25 13:29:42 +02:00
Guillermo Bonet	1bc50112fa	Merge branch 'master' into test	2024-07-25 13:29:28 +02:00
Guillermo Bonet	9e18a208b2	fix: refs #7662 get value for proc with select for updates	2024-07-25 13:26:45 +02:00
Javier Segarra	7254abea40	feat(salix): #7648 Add args to filter shipped value	2024-07-25 12:49:23 +02:00
Robert Ferrús	12c34db12c	Merge pull request 'fix: refs #7654 itemShelving' (!2790) from 7654-hotFixEntry_splitByShelving into master ... Reviewed-on: #2790 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-25 10:37:00 +00:00
Robert Ferrús	6661cb4c2a	fix: refs #7654 itemShelving	2024-07-25 12:30:18 +02:00
Pablo Natek	f02c7a5ada	Merge pull request 'feat: refs #6403 default mobile' (!2789) from 6403-defaultMobile into master ... Reviewed-on: #2789 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-25 10:07:06 +00:00
Pablo Natek	81120df4e4	feat: refs #6403 default mobile	2024-07-25 09:57:56 +02:00
Guillermo Bonet	ff8f340978	Merge branch 'test' into dev	2024-07-25 09:40:45 +02:00
Guillermo Bonet	10dbc53acc	Merge branch 'master' into test	2024-07-25 09:40:33 +02:00
Guillermo Bonet	25464f8a96	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-07-25 08:57:19 +02:00
Guillermo Bonet	af62c2e807	fix: refs #7664 No insert editorFk	2024-07-25 08:57:18 +02:00
Sergio De la torre	8059ae3e23	Merge pull request 'hotFix itemShelvingSale_addBySale refs #6861' (!2788) from 6861_itemShelvingSale into master ... Reviewed-on: #2788 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-07-25 06:39:37 +00:00
Sergio De la torre	2374711a88	hotFix itemShelvingSale_addBySale refs #6861	2024-07-25 08:36:14 +02:00
Guillermo Bonet	70142c43db	Merge branch 'test' into dev	2024-07-25 07:25:04 +02:00
Guillermo Bonet	3e0e43da2f	Merge branch 'master' into test	2024-07-25 07:24:46 +02:00
Guillermo Bonet	1639f7155e	fix: refs #7640 multipleInventory	2024-07-25 07:21:01 +02:00
Guillermo Bonet	de850e62c9	Merge pull request 'feat: refs #7728 Added throw due date' (!2787) from 7728-dueDateThrow into dev ... Reviewed-on: #2787 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-25 05:03:29 +00:00
Robert Ferrús	5d11f0cd0a	Merge pull request 'feat: refs #7683 productionControl' (!2705) from 7683-productionControlDeadlock into dev ... Reviewed-on: #2705 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-24 12:46:30 +00:00
Robert Ferrús	cb7d6f25e9	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-24 12:45:03 +00:00
Guillermo Bonet	983d66a681	feat: refs #7728 Added throw due date	2024-07-24 14:24:06 +02:00
Guillermo Bonet	920f1a53b1	Merge pull request 'feat: refs #7728 tabla config dias margen vctos.' (!2784) from 7728-Vctos-DUA into dev ... Reviewed-on: #2784 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-24 11:35:17 +00:00
Alex Moreno	df737c784d	Merge pull request 'fix: refs #6403 remove console log' (!2786) from 6403-remove-console-log into master ... Reviewed-on: #2786 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-24 10:57:06 +00:00
Pablo Natek	bc9fe220d5	fix: refs #6403 remove console log	2024-07-24 12:38:27 +02:00
Javier Segarra	d2cc6a77fe	Merge pull request 'HOTFIX: Missing fields whe request getBuys' (!2785) from hotfix_entry_getBuys_fields into master ... Reviewed-on: #2785 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-24 10:36:07 +00:00
Javier Segarra	de7b4dc9d6	fix: missing fields	2024-07-24 10:08:01 +00:00
Alex Moreno	4db8e9b048	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-24 12:05:59 +02:00
Alex Moreno	b92165cf76	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-24 12:05:40 +02:00
Alex Moreno	808c09643f	remove console.log	2024-07-24 12:05:26 +02:00
Alex Moreno	ebac416034	remove console.log	2024-07-24 12:03:47 +02:00
Guillermo Bonet	3d1d5841fd	Merge branch 'dev' into 7728-Vctos-DUA	2024-07-24 08:25:33 +00:00
Alex Moreno	e3f4cd293f	hotFix: liliumRedirection	2024-07-24 10:07:44 +02:00
Alex Moreno	c0664fd1af	hotFix_liliumRedirection	2024-07-24 10:05:29 +02:00
Alex Moreno	e8d4a72315	Merge pull request 'feat: redirect to lilium page not found' (!2731) from hotFix_liliumRedirection into dev ... Reviewed-on: #2731 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-24 07:56:51 +00:00
Guillermo Bonet	e214da164a	Merge branch 'test' into dev	2024-07-24 09:40:06 +02:00
Guillermo Bonet	db31ac3b60	fix: refs #7662 ticket_splitItemPackingType	2024-07-24 09:39:33 +02:00
Guillermo Bonet	0c51a97a17	refactor: refs #7640 Multipleinventory available	2024-07-24 09:13:47 +02:00
Robert Ferrús	f74a9c3500	Merge pull request 'feat: refs #7716 travel_setDelivered' (!2776) from 7716-travel_setDeliveredMaster into master ... Reviewed-on: #2776 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-24 05:49:14 +00:00
Robert Ferrús	65ac02e468	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-24 05:47:35 +00:00
Guillermo Bonet	23732ab20a	Merge branch 'test' into dev	2024-07-24 07:42:08 +02:00
Guillermo Bonet	2086746eb0	fix: refs #7505 Visible COM	2024-07-24 07:34:52 +02:00
Guillermo Bonet	fdef84f78d	Merge branch 'test' into dev	2024-07-24 07:11:56 +02:00
Robert Ferrús	bb40e6cbf3	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-24 04:54:00 +00:00
Pablo Natek	8a9fa58823	Merge pull request 'fix: refs #6403 take observation from ticket' (!2777) from 6403-fixObservation into master ... Reviewed-on: #2777 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-24 04:49:58 +00:00
Pablo Natek	795ca14def	Merge branch 'master' into 6403-fixObservation	2024-07-24 04:41:51 +00: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