1061 Commits

Author	SHA1	Message	Date
Carlos Andrés	b9d1c3228b	feat: previas con sitema de reservas refs #6861	2024-06-11 18:43:26 +02:00
Carlos Andrés	d75e008a23	feat: previas con sitema de reservas refs #6861	2024-06-11 12:49:33 +02:00
Carlos Andrés	ed7218c133	feat: previas con sitema de reservas refs #6861	2024-06-11 12:44:25 +02:00
Sergio De la torre	32aafc3545	feat: refs #6861 trigger	2024-05-27 12:21:22 +02:00
Sergio De la torre	e133dec514	refs #6861 feat: trigger	2024-05-27 11:55:42 +02:00
Sergio De la torre	74b71079f2	refs #6861 feat: obsrevation	2024-05-27 11:33:04 +02:00
Sergio De la torre	64f71e0f9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-27 07:46:21 +02:00
Sergio De la torre	d770cd8d48	refs #6861 feat: getLock	2024-05-27 07:33:33 +02:00
Robert Ferrús	846ba9ef66	Merge branch 'dev' into 6281_buyFk	2024-05-27 05:30:33 +00:00
Pako Natek	4550d3719c	Merge branch 'dev' into 6021-floranet_beta	2024-05-27 05:17:27 +00:00
Robert Ferrús	b02995918e	Merge branch 'dev' into 6281_buyFk	2024-05-27 05:04:40 +00:00
Pako Natek	49a2e6fc84	tickets y email	2024-05-24 11:44:58 +02:00
Guillermo Bonet	2c87730dba	Merge pull request 'feat: refs #7438 Added volume to item_valuateInventory' (!2505) from 7438-item_ValuateInventory into dev ... Reviewed-on: #2505 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-24 09:30:54 +00:00
Pako Natek	257de96743	Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta	2024-05-24 07:44:12 +02:00
Pako Natek	0a1e09be41	Merge branch 'dev' into 6021-add-observations-to-json	2024-05-24 05:31:10 +00:00
Guillermo Bonet	2fe279ed47	feat: refs #7438 Requested changes and little changes	2024-05-24 07:20:27 +02:00
Pablo Natek	ee17ea4842	feat: refs #6021 add new field	2024-05-23 21:38:02 +02:00
Sergio De la torre	ea4f70f460	refs #6861 feat: previas a reservas	2024-05-23 16:35:36 +02:00
Jorge Penadés	2cd3002d06	Merge pull request 'test' (!2506) from test into dev ... Reviewed-on: #2506 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-23 14:07:21 +00:00
Carlos Andrés	14f243f251	Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test ... Reviewed-on: #2495 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-23 14:03:22 +00:00
Guillermo Bonet	35ce259e5a	feat: refs #7438 Added volume to item_valuateInventory	2024-05-23 14:26:11 +02:00
Carlos Andrés	35a583d6d8	Merge pull request 'test' (!2504) from test into dev ... Reviewed-on: #2504 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-23 11:42:23 +00:00
Guillermo Bonet	bbd948c654	refs #7440 Minor change	2024-05-23 09:47:14 +02:00
Guillermo Bonet	56aec1c781	refs #7440 Optimized item_comparative	2024-05-23 09:44:18 +02:00
Robert Ferrús	974e327077	Merge branch 'dev' into 6281_buyFk	2024-05-23 06:29:16 +00:00
Carlos Andrés	22a6c3695c	feat:concurrency issue refs #6861	2024-05-22 18:05:16 +02:00
Carlos Andrés	bc6af32962	fix: problems in colums ticket and sale refs #7213	2024-05-22 14:50:45 +02:00
Guillermo Bonet	a52b9b6d2e	Merge pull request 'refactor: refs #7398 Refactor and change ekt_scan' (!2494) from 7398-ektScan into dev ... Reviewed-on: #2494 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-22 06:31:06 +00:00
Guillermo Bonet	0d620c6f33	feat: refs #7398 Change	2024-05-22 08:11:27 +02:00
Jorge Penadés	365e5a3ba3	fix: refs # 7400 ledger_next	2024-05-21 17:31:29 +02:00
Guillermo Bonet	2ffdce3c64	refactor: refs #7398 Refactor and change ekt_scan	2024-05-21 14:40:42 +02:00
Pako Natek	ba478d5358	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-05-21 11:31:41 +00:00
Pako Natek	dfde2f6846	evita facturacion proveedores	2024-05-21 13:28:05 +02:00
Robert Ferrús	0ef93bd98a	Merge branch 'dev' into 6281_buyFk	2024-05-21 08:00:50 +00:00
Alex Moreno	f803f5a57d	Merge branch 'dev' into 7431_itemPlacements	2024-05-21 07:49:00 +00:00
Guillermo Bonet	6f9826421d	refactor: refs #7422 Fix e2e	2024-05-21 09:39:09 +02:00
Sergio De la torre	6dad3d8af4	refs #7431 feat: itemPlacementSupplyStockGetTargetList	2024-05-21 09:37:29 +02:00
Sergio De la torre	cb866b4ab7	refs #7431 feat: itemPlacementSupplyStockGetTargetList	2024-05-21 09:16:47 +02:00
Guillermo Bonet	c4b8cef4f8	refactor: refs #7422 Deleted column of Compres	2024-05-21 08:17:37 +02:00
Guillermo Bonet	b33d4ce319	Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev ... Reviewed-on: #2471 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-21 06:11:24 +00:00
Robert Ferrús	623aa8d537	Merge branch 'dev' into 6281_buyFk	2024-05-20 09:38:11 +00:00
Pako Natek	abdacb3627	casting values	2024-05-20 10:33:01 +02:00
Sergio De la torre	598a7eefbc	6281 feat:buyFk in itemShelving	2024-05-20 09:39:23 +02:00
Sergio De la torre	2b2406ae52	6281 feat:buyFk in itemShelving	2024-05-20 09:32:12 +02:00
Sergio De la torre	20bf2b73b6	6281 feat:buyFk in itemShelving	2024-05-20 09:27:20 +02:00
Sergio De la torre	dd76168bc3	6281 feat:buyFk in itemShekving	2024-05-20 09:15:24 +02:00
Sergio De la torre	b71984c53f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6281_buyFk	2024-05-20 09:13:44 +02:00
Pako Natek	9a5acedd38	improved proc	2024-05-20 08:21:54 +02:00
Sergio De la torre	df08f7a8de	Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-17 15:10:26 +00:00
Sergio De la torre	c822a64dc7	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-17 16:38:11 +02:00