23273 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	a61f68cbc9	Merge pull request 'master' (!2811) from master into test ... Reviewed-on: #2811 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-30 14:49:38 +00:00
Guillermo Bonet	80ad1f30af	fix: refs #7811 Variables pm2	2024-07-30 13:50:47 +02:00
Carlos Andrés	d9151bdf6a	Merge pull request 'hotFix reallocate iss refs #6861' (!2809) from 6861_reallocate_itemShelving into master ... Reviewed-on: #2809 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 11:06:50 +00:00
Sergio De la torre	9e486e4aff	hotFix reallocate iss refs #6861	2024-07-30 13:04:33 +02:00
Carlos Andrés	186fa90ef0	Merge pull request 'hotFix reallocate resfs #6861' (!2808) from 6861_imteShelving_reallocate into master ... Reviewed-on: #2808 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 10:41:18 +00:00
Sergio De la torre	2015256f5d	hotFix reallocate resfs #6861	2024-07-30 12:38:13 +02:00
Carlos Andrés	01562420d4	Actualizar db/routines/vn/procedures/itemShelvingSale_reallocate.sql	2024-07-30 10:14:15 +00:00
Carlos Andrés	4cda233424	Merge pull request '7736-Añadir-parámetro-itemFk-a-buyUltimate' (!2805) from 7736-Añadir-parámetro-itemFk-a-buyUltimate into test ... Reviewed-on: #2805 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-30 09:13:08 +00:00
Carlos Andrés	495bb7e36e	Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-30 10:46:00 +02:00
Guillermo Bonet	e2c3539dfc	Merge branch 'master' into test	2024-07-30 10:26:17 +02:00
Guillermo Bonet	1f80117ff7	fix: refs #6861 Column	2024-07-30 10:24:50 +02:00
Carlos Satorres	d26bc307ed	Merge pull request 'refs #7801 frenchGoLabel' (!2800) from 7801-franceGoLabel into master ... Reviewed-on: #2800 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-30 06:47:49 +00:00
Carlos Satorres	90f7cc0583	Merge branch 'master' into 7801-franceGoLabel	2024-07-30 06:44:17 +00:00
Alex Moreno	79c8ef7d11	Merge pull request '7806_devToTest_2332' (!2801) from 7806_devToTest_2330 into test ... Reviewed-on: #2801 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-30 06:14:08 +00:00
Carlos Satorres	6c1de1d6bd	refs #7801 frenchGoLabel	2024-07-30 07:55:14 +02:00
Carlos Andrés	9fc3516e52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-29 19:12:48 +02:00
Jorge Penadés	a95475ef61	Merge pull request '#7197 filter by correcting & supplierActivity' (!2641) from 7197-fixInvoiceIn into dev ... Reviewed-on: #2641 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-29 07:43:55 +00:00
Jorge Penadés	4f385f16e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-29 09:40:34 +02:00
Guillermo Bonet	f9c58e63e1	Merge branch 'test' into dev	2024-07-29 09:24:57 +02:00
Guillermo Bonet	b013842750	Merge branch 'master' into test	2024-07-29 09:24:20 +02:00
Guillermo Bonet	c713c3a5c0	fix: refs #6861 Unhandled error	2024-07-29 09:21:35 +02:00
Jorge Penadés	ffd8e5e282	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-29 08:05:55 +02:00
Guillermo Bonet	403252ac39	Merge branch 'test' into dev	2024-07-26 14:07:15 +02:00
Guillermo Bonet	5c6df930cf	Merge branch 'master' into test	2024-07-26 14:07:01 +02:00
Guillermo Bonet	a4d3eec1e1	fix: refs #7580 Parking deadlock	2024-07-26 14:05:22 +02:00
Guillermo Bonet	c6bcf6f488	Merge branch 'test' into dev	2024-07-26 13:56:07 +02:00
Guillermo Bonet	ce8c355757	Merge branch 'master' into test	2024-07-26 13:55:47 +02:00
Guillermo Bonet	b876d1c278	feat: refs #7644 Added item reference	2024-07-26 13:52:18 +02:00
Alex Moreno	2505adf87f	hotFix: ticketAdvanced	2024-07-26 13:47:15 +02:00
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