5937 Commits

Author	SHA1	Message	Date
Javi Gallego	575577d29b	feat: refs #7346 add multiple feature	2024-08-16 10:08:58 +02:00
Jorge Penadés	2aaad4316b	Merge branch 'dev' into 7524-limitSelect	2024-08-16 06:54:35 +00:00
Guillermo Bonet	8d35e95731	Merge branch 'test' into dev	2024-08-14 12:48:52 +02:00
Guillermo Bonet	5e0bf4c739	Merge branch 'master' into test	2024-08-14 12:48:22 +02:00
Javi Gallego	f21c292e20	Merge branch 'dev' into 7346	2024-08-14 12:19:40 +02:00
Javi Gallego	7f543e8d3a	Merge branch 'dev' into 7346	2024-08-14 10:32:32 +02:00
Javier Segarra	befcf89534	fix(salix): #7867 apply SQL conventions	2024-08-13 11:18:23 +00:00
Guillermo Bonet	68ee5e3549	fix: refs #7800 tpvMerchantEnable PRIMARY KEY	2024-08-13 12:52:39 +02:00
Guillermo Bonet	dd5845abae	fix: refs #7800 tpvMerchantEnable PRIMARY KEY	2024-08-13 12:49:56 +02:00
Javier Segarra	a178c285c0	fix(salix): #7867 avoid deactivate user when is supplier	2024-08-13 10:44:54 +00:00
Guillermo Bonet	360e20545a	feat: refs #7799 Added Fk in vn.item.itemPackingTypeFk	2024-08-13 12:26:01 +02:00
Guillermo Bonet	38cf5af23e	feat: refs #7842 Added editorFk in vn.host	2024-08-13 12:21:03 +02:00
Guillermo Bonet	e4dc86c685	Merge branch 'test' into dev	2024-08-13 12:16:01 +02:00
Guillermo Bonet	d9f64dea08	fix: refs #7713 ACL Log	2024-08-13 12:15:30 +02:00
Sergio De la torre	32d5ca0d5c	fix: refs #6861 refs#6861 bySectorCollection	2024-08-13 11:37:08 +02:00
Guillermo Bonet	61d6efaea7	refactor: refs #7798 Drop bi.Greuges_comercial_detail	2024-08-13 09:53:05 +02:00
Jorge Penadés	3adb73cddf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-12 15:38:40 +02:00
Jorge Penadés	82da7bff9b	Merge branch 'dev' into 7283-itemSectionsMigration	2024-08-12 09:28:11 +00:00
Jorge Penadés	1602c12200	fix: refs #7283 sql	2024-08-12 09:13:30 +02:00
Jorge Penadés	6f26dc4990	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-12 09:06:28 +02:00
Guillermo Bonet	931c13d8ab	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:06:24 +02:00
Guillermo Bonet	3cf2cec946	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 09:02:38 +02:00
Guillermo Bonet	c4e8202261	feat: refs #7774 #7774 Changes ticket_cloneWeekly	2024-08-12 08:53:24 +02:00
Guillermo Bonet	5b2200a134	Merge branch 'dev' into 7774-ticket_cloneWeekly	2024-08-12 08:53:02 +02:00
Guillermo Bonet	8655ca0a21	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-08-12 06:04:06 +00:00
Guillermo Bonet	00845c0534	refactor: refs #7646 #7646 Deleted scannable* variables productionConfig	2024-08-12 08:03:49 +02:00
Jorge Penadés	9ece46ee46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 15:29:21 +02:00
Guillermo Bonet	5339dcbf19	Merge branch 'test' into dev	2024-08-09 13:53:56 +02:00
Guillermo Bonet	38dbe6e966	fix: #7126 waste_addSales	2024-08-09 13:53:28 +02:00
Jorge Penadés	a512fe75ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-09 12:12:25 +02:00
Guillermo Bonet	d60f8a5319	Merge branch 'test' into dev	2024-08-09 08:26:22 +02:00
Guillermo Bonet	cf13aa917e	feat: refs #7126 saleQuantity to saleWasteQuantity	2024-08-09 08:18:30 +02:00
Pako Natek	cd1eec7e29	Merge branch 'dev' into 7836-futureEntries	2024-08-09 06:14:15 +00:00
Pako Natek	98f4cb1de5	dropping proc	2024-08-09 08:04:36 +02:00
Pablo Natek	e028bc1ddb	Merge pull request 'feat: refs #6403 packingSite to productionConfig' (!2793) from 6403-from-packingSite-to-productionConfig into master ... Reviewed-on: #2793 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-09 05:11:34 +00:00
Alex Moreno	17d05ecfe2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-08 10:07:26 +02:00
Pako Natek	a01794f9cd	Merge branch '7836-futureEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7836-futureEntries	2024-08-08 08:27:52 +02:00
Pako Natek	41942783aa	dropOldProc	2024-08-08 08:27:50 +02:00
Pako Natek	a9cdbb1255	Merge branch 'dev' into 7836-futureEntries	2024-08-08 06:01:35 +00:00
Guillermo Bonet	4cbea3bf7b	refs #7844 Fix tests part 2/2	2024-08-07 13:51:00 +02:00
Guillermo Bonet	8aa06e12b3	refs #7844 Fix tests part 1/2	2024-08-07 12:39:18 +02:00
Robert Ferrús	03cc32a525	Merge branch 'master' into 7818-entry_splitByShelvingFix	2024-08-07 10:01:32 +00:00
Pako Natek	9b2cbcd5cc	reviewed	2024-08-07 10:42:14 +02:00
Guillermo Bonet	4f2e343d0c	refs #7844 Fix	2024-08-07 10:40:10 +02:00
Guillermo Bonet	ea75446982	refs #7844 Change in problems calc	2024-08-07 10:32:47 +02:00
Jorge Penadés	4b8b7e3a18	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-07 10:16:53 +02:00
Robert Ferrús	41e44b747a	fix: refs #7685 hotFixAddress_updateCoordinates	2024-08-07 10:12:39 +02:00
Robert Ferrús	f385b9a8a3	feat: refs #7818 entry_splitByShelving	2024-08-07 07:12:29 +02:00
Pablo Natek	eaf7730394	Merge branch 'master' into 6403-from-packingSite-to-productionConfig	2024-08-06 14:58:54 +00:00
Jorge Penadés	c31e33535d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect	2024-08-06 15:23:59 +02:00
Guillermo Bonet	fc102eff7b	Merge branch 'test' into dev	2024-08-06 14:12:32 +02:00
Guillermo Bonet	03358170d3	fix: refs #7740 ticket route throw	2024-08-06 14:10:16 +02:00
Pako Natek	fc7c7beef7	Merge branch 'dev' into 7836-futureEntries	2024-08-06 11:23:56 +00:00
Guillermo Bonet	184cbb2800	Merge branch 'test' into dev	2024-08-06 12:58:08 +02:00
Guillermo Bonet	ffa775a8a5	Merge pull request 'fix: refs #7834 expeditionScan_Put' (!2832) from 7834-fixExpeditionScanPut into master ... Reviewed-on: #2832 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-08-06 10:56:10 +00:00
Guillermo Bonet	d1bb77d6ed	fix: refs #7834 expeditionScan_Put	2024-08-06 12:51:55 +02:00
Guillermo Bonet	28b848930e	Merge branch 'test' into dev	2024-08-06 12:45:55 +02:00
Guillermo Bonet	c7c711ac1a	fix: refs #7728 duaInvoiceInBooking	2024-08-06 12:43:51 +02:00
Jorge Penadés	b1b7f6639c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-06 09:52:43 +02:00
Alex Moreno	afbba83969	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:17:16 +02:00
Alex Moreno	89ba79053a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-06 09:17:11 +02:00
Guillermo Bonet	58677dca56	Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev ... Reviewed-on: #2833 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-06 07:15:20 +00:00
Jorge Penadés	eaea1f3559	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-06 08:47:23 +02:00
Alex Moreno	70a91da0ff	build: dump 2432	2024-08-06 08:27:40 +02:00
Guillermo Bonet	54e6c63b8b	fix: refs #7834 SELECT	2024-08-06 07:29:32 +02:00
Guillermo Bonet	e03a1914d9	fix: refs #7834 Throw	2024-08-06 07:27:36 +02:00
Guillermo Bonet	1e41f5d533	Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev ... Reviewed-on: #2783 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-06 05:05:19 +00:00
Pako Natek	dcdbb0bf93	Merge branch 'dev' into 7836-futureEntries	2024-08-05 12:29:30 +00:00
Pako Natek	be5859b8cf	prototipo	2024-08-05 14:28:29 +02:00
Guillermo Bonet	fa3a7aa931	refactor: refs #7820 Deprecated silexACL	2024-08-05 12:49:04 +02:00
Guillermo Bonet	967443b427	fix: refs #7834 expeditionScan_Put	2024-08-05 12:26:16 +02:00
Guillermo Bonet	21423d3b48	Merge branch 'test' into dev	2024-08-05 12:00:01 +02:00
Guillermo Bonet	d5a8e32b52	Merge branch 'master' into test	2024-08-05 11:59:46 +02:00
Jorge Penadés	09783ae576	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration	2024-08-02 15:38:49 +02:00
Jorge Penadés	bf7cd1530c	feat: refs #7283 order by desc date	2024-08-02 15:36:02 +02:00
Carlos Andrés	f431d6c37f	Hotfix changes whit conficts merged incorrectly	2024-08-02 13:45:58 +02:00
Guillermo Bonet	abd8bc9639	fix: refs #6453 order_confirmWithUser	2024-08-02 12:20:50 +02:00
Guillermo Bonet	ae9472e092	Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev ... Reviewed-on: #2694 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-02 10:14:58 +00:00
Guillermo Bonet	6acba08a91	Merge branch 'test' into dev	2024-08-02 12:08:40 +02:00
Guillermo Bonet	f6db62945d	Merge branch 'master' into test	2024-08-02 12:08:22 +02:00
Guillermo Bonet	dead585a1b	Merge pull request 'fix: refs #7812 Added orders in item_getMinacum' (!2810) from 7812-radarOrder into master ... Reviewed-on: #2810 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-02 10:01:55 +00:00
Guillermo Bonet	afb2f8d111	Merge branch 'test' into dev	2024-08-02 11:50:26 +02:00
Guillermo Bonet	4c67daedec	Merge branch 'master' into test	2024-08-02 11:50:16 +02:00
Carlos Andrés	69d4c8bd6e	Merge pull request 'fix: refs #7829 Error al calcular problemas de componentes' (!2828) from 7829-Error-calcular-problemas-componentes into master ... Reviewed-on: #2828 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-02 09:45:06 +00:00
Carlos Andrés	29a50caaca	fix: refs #7829 Error al calcular problemas de componentes	2024-08-02 11:43:30 +02:00
Carlos Andrés	ddd5e4ffa4	fix: refs #7829 Error al calcular problemas de componentes	2024-08-02 10:28:50 +02:00
Guillermo Bonet	879d48eb27	Merge branch 'test' into dev	2024-08-02 10:00:35 +02:00
Guillermo Bonet	01df29b47c	Merge branch 'master' into test	2024-08-02 10:00:12 +02:00
Guillermo Bonet	d852d16ae4	feat: refs #7382 Changes	2024-08-02 08:11:38 +02:00
Guillermo Bonet	b56260af36	feat: refs #6453 Requested changes	2024-08-02 07:58:45 +02:00
Alex Moreno	20caa5d9a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-01 14:11:00 +02:00
Robert Ferrús	619dd2fbe8	Merge pull request 'master' (!2823) from master into test ... Reviewed-on: #2823 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-08-01 05:05:14 +00:00
Sergio De la torre	94d89f9c99	Merge branch 'master' into 6861_triggerItemShelving	2024-07-31 19:51:36 +00:00
Carlos Andrés	77f6e80066	Actualizar db/routines/vn/procedures/ticket_setRisk.sql	2024-07-31 17:38:50 +00:00
Sergio De la torre	65e9ed301f	hotFix itemShelving refs #6861	2024-07-31 18:11:03 +02:00
Carlos Andrés	6c0aae04c0	fix: refs #7213 componentLack y setRisk	2024-07-31 14:59:12 +02:00
Carlos Andrés	77fa4dd497	fix: refs #7213 componentLack y setRisk	2024-07-31 14:38:12 +02:00
Robert Ferrús	dca7900ab2	fix: refs #7818 entry_splitByShelving	2024-07-31 11:31:02 +02:00
Guillermo Bonet	cc78355aad	fix: refs #7821 Requested changes	2024-07-31 09:26:55 +02:00
Robert Ferrús	1d22dc46f0	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-07-31 06:20:10 +00:00
Sergio De la torre	eec7790a02	Merge pull request 'test' (!2815) from test into dev ... Reviewed-on: #2815 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 16:13:13 +00:00
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	961d05ab35	fix: refs #7821 Added orders in item_getMinacum	2024-07-30 14:19:04 +02:00
Guillermo Bonet	4ef57e6869	fix: refs #7821 Added orders in item_getMinacum	2024-07-30 14:17:41 +02:00
Guillermo Bonet	057174ae6a	Merge branch 'test' into dev	2024-07-30 13:53:58 +02:00
Sergio De la torre	9e486e4aff	hotFix reallocate iss refs #6861	2024-07-30 13:04:33 +02: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
Guillermo Bonet	bcf08db6d6	Merge pull request 'refs #7531 Modify zone_getAddresses' (!2675) from 7531-Modify-zone_getAddresses into dev ... Reviewed-on: #2675 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-30 10:02:10 +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	857b1e9939	Merge branch 'test' into dev	2024-07-30 10:26:33 +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
Guillermo Bonet	b6abcbe090	feat: refs #6453 Requested changes	2024-07-30 10:14:20 +02:00
Jorge Penadés	766da06c2f	feat: refs #7524 add mock limit on find query	2024-07-30 09:40:34 +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
Guillermo Bonet	a01ae9b7b8	fix: refs #7756 Foreign keys invoiceOut	2024-07-29 14:09:55 +02:00
Jorge Penadés	254cced550	chore: refs #6989 add config model	2024-07-29 13:40:30 +02:00
Guillermo Bonet	baa1498923	feat: refs #7712 sizeLimit	2024-07-29 13:29:26 +02:00
Guillermo Bonet	6ad3d5a5eb	feat: refs #6453 Minor changes	2024-07-29 12:36:08 +02:00
Guillermo Bonet	e53b12d51b	feat: refs #6453 Fixes	2024-07-29 12:31:44 +02:00
Guillermo Bonet	4c602800ea	feat: refs #6453 Added new ticket search	2024-07-29 11:46:59 +02:00
Guillermo Bonet	403252ac39	Merge branch 'test' into dev	2024-07-26 14:07:15 +02:00
Guillermo Bonet	a4d3eec1e1	fix: refs #7580 Parking deadlock	2024-07-26 14:05:22 +02:00
Pablo Natek	000a967a03	feat: refs #6403 packingSite to productionConfig	2024-07-26 07:12:51 +02:00
Guillermo Bonet	95b61ae86a	Merge branch 'test' into dev	2024-07-25 13:29:42 +02:00
Robert Ferrús	6661cb4c2a	fix: refs #7654 itemShelving	2024-07-25 12:30:18 +02:00
Guillermo Bonet	ff8f340978	Merge branch 'test' into dev	2024-07-25 09:40:45 +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	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	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	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
Robert Ferrús	d0dfb95718	feat: refs #7774	2024-07-24 13:56:21 +02:00
Guillermo Bonet	3d1d5841fd	Merge branch 'dev' into 7728-Vctos-DUA	2024-07-24 08:25:33 +00:00
Guillermo Bonet	cf3ee07dd2	feat: refs #7713 Created ACLLog	2024-07-24 10:03:51 +02: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
Robert Ferrús	896e76016d	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-07-24 07:14:52 +00:00
Robert Ferrús	5a9ab84356	feat: refs #7646 delete scannableCodeType	2024-07-24 09:14:28 +02:00
Guillermo Bonet	0c51a97a17	refactor: refs #7640 Multipleinventory available	2024-07-24 09:13:47 +02: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
Robert Ferrús	49888cc3b9	Merge branch 'dev' into 7774-ticket_cloneWeekly	2024-07-24 05:27:34 +00:00
Robert Ferrús	a7f725a194	feat: refs #7774 ticket_cloneWeekly	2024-07-24 07:25:43 +02:00
Guillermo Bonet	fdef84f78d	Merge branch 'test' into dev	2024-07-24 07:11:56 +02:00