6095 Commits

Author	SHA1	Message	Date
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	4fc43df11b	feat: refs #6650 new itemShelvingLog	2024-08-09 11:28:30 +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	0451e4bb2a	feat: refs #7650 Fix tests	2024-07-30 10:20:04 +02:00
Guillermo Bonet	b6abcbe090	feat: refs #6453 Requested changes	2024-07-30 10:14:20 +02:00
Guillermo Bonet	18dc3873b8	feat: refs #7650 Added no transfer lines to inventory entry and fixtures	2024-07-30 09:54:43 +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	e0b9100de1	fix	2024-07-29 07:20:05 +02:00
Guillermo Bonet	6de9ea4b16	Merge branch 'dev' into 7759-newDefiner	2024-07-29 07:18:23 +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
Robert Ferrús	bb40e6cbf3	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-24 04:54:00 +00:00
Guillermo Bonet	abfbf13440	fix: refs #7505 fix	2024-07-23 14:18:52 +02:00
Guillermo Bonet	a9aa47fef1	fix: refs #7505 visible_refresh support warehouse null and added isComparative	2024-07-23 14:17:01 +02:00
Guillermo Bonet	5d2e9c6210	fix: refs #7505 visible_refresh support warehouse null and added isComparative	2024-07-23 13:59:36 +02:00
Guillermo Bonet	88724d6d8c	fix: refs #7505 visible_refresh support warehouse null	2024-07-23 13:08:49 +02:00
Robert Ferrús	91db2dc0e0	Merge branch 'master' into 7716-travel_setDeliveredMaster	2024-07-23 09:55:44 +00:00
Alex Moreno	1c45aef883	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-23 11:46:19 +02:00
Robert Ferrús	bfc2d6f734	feat: refs #7716 travel_setDelivered	2024-07-23 11:38:05 +02: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	71cd805b7e	build: dump db	2024-07-23 10:23:28 +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
Robert Ferrús	2a70df151a	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-23 07:16:28 +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
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	afbce80303	hotFix solve isPicked refs #6861	2024-07-22 13:42:42 +02:00
Carlos Andrés	33a71867bd	feat: refactor buyUltimate refs #7736	2024-07-22 13:39:48 +02:00
Carlos Andrés	b086cc7658	feat: refactor buyUltimate refs #7736	2024-07-22 13:34:04 +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	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
Carlos Andrés	d7b9a3ffd0	feat: refactor buyUltimate refs #7736	2024-07-22 11:58:51 +02:00
Guillermo Bonet	219740f669	feat: refs #7759 Changed definer root to vn-admin	2024-07-22 11:52:42 +02:00
Guillermo Bonet	ab45b988c8	feat: refs #7704 Added itemMinimumQuantity_check	2024-07-22 10:27:24 +02:00
Javi Gallego	8f623bd51e	feat: refs #7346 mas intuitivo	2024-07-22 10:26:40 +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	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
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
Carlos Andrés	bf0f95f661	Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-19 15:57:16 +02:00
Carlos Andrés	5567359d73	feat: refactor buyUltimate refs #7736	2024-07-19 15:34:32 +02:00
Carlos Andrés	55ea761af4	eat: refactor buyUltimate refs #7736	2024-07-19 15:11:14 +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
Guillermo Bonet	ca48c64163	Merge branch 'dev' into 7126-improvedWaste	2024-07-19 13:19:02 +02:00
Guillermo Bonet	b72923f160	Merge pull request 'feat: refs #7681 Optimization and refactor' (!2707) from 7681-routeUpdateM3 into dev ... Reviewed-on: #2707 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 11:12:21 +00:00
Guillermo Bonet	6aab5fa9ef	fix: refs #7546 Deleted insert util.binlogQueue	2024-07-19 12:47:05 +02:00
Carlos Andrés	b2a8326170	feat: refactor buyUltimate refs #7736	2024-07-19 12:44:45 +02:00
Javier Segarra	287f9edc83	fix(salix): refs #7648 #7648 improve update ACL	2024-07-19 11:54:21 +02:00
Javier Segarra	376ddebdcd	Merge branch 'master' into 7648_myEntries	2024-07-19 11:42:53 +02:00
Guillermo Bonet	578de51f7e	feat: #6453 Refactor	2024-07-19 10:54:40 +02:00
Guillermo Bonet	5f29384389	feat: #6453 Rollback always split by itemPackingType	2024-07-19 10:49:45 +02:00
Pablo Natek	d0a635e86a	Merge pull request 'fix: refs #7752 add new state after scan' (!2760) from 7752-insertExpeditionState into master ... Reviewed-on: #2760 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 08:35:39 +00:00
Guillermo Bonet	e61210fd17	feat: #3199 Requested changes	2024-07-19 09:09:45 +02:00
Alex Moreno	b8244b48e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-07-19 09:08:47 +02:00
Sergio De la torre	f19f107971	feat checkExpeditionPrintOut refs #7751	2024-07-19 08:27:22 +02:00
Guillermo Bonet	3525c878b6	Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev ... Reviewed-on: #2711 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 05:46:42 +00:00
Guillermo Bonet	3449aeb673	refactor: refs #7511 Minor change	2024-07-19 07:45:17 +02:00
Sergio De la torre	dbf91293f8	Merge pull request 'master' (!2761) from master into test ... Reviewed-on: #2761 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 04:31:34 +00:00
Sergio De la torre	2d2eafd4ed	Merge branch 'master' into 6861_hotFix_resevas	2024-07-18 15:17:26 +00:00
Ivan Mas	c44bf909b2	Merge branch 'dev' into 7531-Modify-zone_getAddresses	2024-07-18 13:23:38 +00:00
Ivan Mas	a6e6f435f7	refs #7531 No assigned department	2024-07-18 15:21:59 +02:00
Pablo Natek	3b529440ba	fix: refs #7752 refactor insert	2024-07-18 15:16:25 +02:00
Pablo Natek	684983ee42	fix: refs #7752 add new state after scan	2024-07-18 15:14:18 +02:00
Guillermo Bonet	f687994a7f	refactor: refs #7681 Requested changes	2024-07-18 14:27:10 +02:00
Guillermo Bonet	625b3a5608	refactor: refs #7567 Minor change	2024-07-18 14:12:37 +02:00
Guillermo Bonet	f18b165e4a	Merge branch 'master' into test	2024-07-18 13:45:23 +02:00
Guillermo Bonet	ba5c44994d	feat: refs #7686 Added cascade on update vn.state.alertLevel	2024-07-18 13:45:06 +02:00
Sergio De la torre	bd10741311	hotFix reservas refs #6861	2024-07-18 12:42:00 +02:00
Robert Ferrús	57efba8601	Merge branch '7683-productionControlDeadlock' of https://gitea.verdnatura.es/verdnatura/salix into 7683-productionControlDeadlock	2024-07-18 12:04:19 +02:00
Robert Ferrús	15adc59ec5	feat: refs #7683 drop temporary table	2024-07-18 12:04:17 +02:00
Robert Ferrús	e878615983	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 09:53:38 +00:00
Robert Ferrús	c17214ce05	feat: refs #7683 drop temporary table	2024-07-18 11:50:01 +02:00
Sergio De la torre	fa07d03b8c	Merge pull request 'master' (!2753) from master into test ... Reviewed-on: #2753 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-07-18 05:05:01 +00:00
Carlos Andrés	f7429f3927	Hotfix itemShelvingSale_doReserve Ticket #204044	2024-07-17 18:24:27 +02:00
Sergio De la torre	0181764744	Merge pull request 'master' (!2750) from master into test ... Reviewed-on: #2750 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 15:09:35 +00:00
Sergio De la torre	a35ec4a42c	hotFix reservas refs #6861	2024-07-17 16:48:52 +02:00
Sergio De la torre	8ff3e8acb0	hotFix reservas refs #6861	2024-07-17 16:21:37 +02:00
Sergio De la torre	3aea6fdd46	hotFix reservas refs #6861	2024-07-17 16:13:31 +02:00
Pablo Natek	075f2b7ba4	Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev ... Reviewed-on: #2740 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 12:58:40 +00:00
Alex Moreno	e5bfb4af23	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 12:20:22 +02:00
Robert Ferrús	762989557f	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-17 05:18:01 +00:00
Carlos Andrés	4ee0bd687f	feat: refactor buyUltimate refs #7736	2024-07-16 19:01:02 +02:00
Carlos Andrés	5ca2a432da	feat: refactor buyUltimate refs #7736	2024-07-16 18:58:26 +02:00
Ivan Mas	350e4b4c53	Merge branch 'dev' into 7531-Modify-zone_getAddresses	2024-07-16 16:57:50 +00:00
Ivan Mas	50e2c03d3e	refs #7531 Requested modifications in redmine	2024-07-16 18:56:00 +02:00
Carlos Andrés	d6a949a9f3	feat: refactor buyUltimate refs #7736	2024-07-16 18:55:58 +02:00
Carlos Andrés	38d863aac6	feat: refactor buyUltimate refs #7736	2024-07-16 18:44:24 +02:00
Carlos Andrés	2181664c25	fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213	2024-07-16 15:14:10 +02:00
Javier Segarra	5293becb6d	Merge branch 'master' into 7648_myEntries	2024-07-16 11:52:54 +00:00
Sergio De la torre	3f297acbd3	hotFix itemShelvingSale refs #6861	2024-07-16 13:06:04 +02:00
Javier Segarra	6856ab0501	feat(salix): refs #7648 #7648 myEntries	2024-07-16 12:45:14 +02:00
Sergio De la torre	c086de2644	hotFix itemShelvingSale refs #6861	2024-07-16 11:38:44 +02:00
Sergio De la torre	dbb893c723	Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test ... Reviewed-on: #2737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-16 08:19:38 +00:00
Robert Ferrús	b1a401444e	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-16 08:19:34 +00:00
Pablo Natek	99bbb55c37	feat: refs #7297 add new columns	2024-07-16 10:02:57 +02:00
Javi Gallego	63763f2b22	Merge branch 'dev' into 7346	2024-07-16 09:32:16 +02:00
Alex Moreno	4fa9f057de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 07:41:21 +02:00
Carlos Andrés	8d61cb762b	feat: tabla config dias margen vctos. refs #7728	2024-07-15 17:53:23 +02:00
Sergio De la torre	87b0d3e8d1	refs newStatePartial refs #7642	2024-07-15 16:18:30 +02:00
Robert Ferrús	0fb882e688	feat: refs #7722 changes required	2024-07-15 14:55:11 +02:00
Robert Ferrús	8f41546829	feat: refs #7222	2024-07-15 14:25:42 +02:00
Javi Gallego	3698651306	Merge pull request 'feat: refs #7348 hasDailyInvoice field' (!2670) from 7348-client-hasDailyInvoice into dev ... Reviewed-on: #2670 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-15 12:16:31 +00:00
Javi Gallego	f25d5c3bb5	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 10:37:53 +00:00
Robert Ferrús	200a6714bb	fix: refs #7722 delete sms	2024-07-15 12:02:00 +02:00
Carlos Andrés	31f537ae28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7213-problemas-columnas	2024-07-15 11:52:57 +02:00
Alex Moreno	eca89c1c4e	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 08:19:26 +00:00
Javier Segarra	fb8b31b397	perf: refs #7648 #7648 clean fixtures and SQL filter	2024-07-15 09:59:52 +02:00
Carlos Andrés	67b19ee4ca	hotfix: packaging ticket 199070	2024-07-14 09:08:14 +02:00
Javier Segarra	c70824535a	feat(ssalix): refs #7648 clean fixtures	2024-07-12 20:52:00 +02:00
Javier Segarra	bedff9f290	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 20:24:25 +02:00
Carlos Andrés	49183c79f1	feat: Turn issues into calculated columns refs#7213	2024-07-12 16:47:24 +02:00
Guillermo Bonet	1e264c2102	fix: refs #7704 Warehouse priority	2024-07-12 14:04:49 +02:00
Carlos Andrés	d2e482d7cd	hotfix: packaging ticket 199070	2024-07-12 12:13:21 +02:00
Carlos Andrés	66959dd388	hotfix: packaging ticket 199070	2024-07-12 12:10:43 +02:00
Guillermo Bonet	323d26f226	Fix	2024-07-12 10:37:39 +02:00
Carlos Andrés	b93601d6d8	Actualizar db/routines/vn/procedures/itemShelvingSale_addBySale.sql	2024-07-12 08:27:24 +00:00
Guillermo Bonet	f8f6950de1	Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev ... Reviewed-on: #2683 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 08:13:27 +00:00
Guillermo Bonet	9b8e2e1279	Merge pull request 'feat: refs #7704 Major changes' (!2717) from 7704-itemMinimalQuantity into dev ... Reviewed-on: #2717 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 07:43:44 +00:00
Guillermo Bonet	f3612c7ee3	fix: refs #7580	2024-07-12 09:42:10 +02:00
Guillermo Bonet	5ed8b33cef	Merge pull request 'refactor: refs #7580 Fix and improvement' (!2700) from 7580-setParkingfIX into dev ... Reviewed-on: #2700 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-12 07:34:45 +00:00
Guillermo Bonet	186cd4c7dd	refactor: refs #6769 Requested changes	2024-07-12 09:29:33 +02:00
Sergio De la torre	21987011b6	feat itemShelvingSale refs #6861	2024-07-12 09:06:05 +02:00
Guillermo Bonet	bb787b1581	refactor: refs #7704 Requested changes	2024-07-12 09:03:37 +02:00
Javier Segarra	5a8634356a	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 08:51:56 +02:00
Guillermo Bonet	05202e0b76	refactor: refs #7680 Added cursors	2024-07-12 08:15:09 +02:00
Guillermo Bonet	5c80a99543	feat: refs #7704 Requested changes	2024-07-12 07:58:59 +02:00
Guillermo Bonet	28b6dc901f	feat: refs #6769 Requested changes	2024-07-12 07:18:37 +02:00
Robert Ferrús	1c675ca43f	Merge branch 'dev' into 7685-delivery_beforeDeadlock	2024-07-12 05:16:13 +00:00
Javier Segarra	1c5ab395e6	Merge branch 'dev' into 7648_myEntries_filter	2024-07-11 19:55:52 +02:00
Javier Segarra	ca48ad9777	feat(salix): refs #7648 #7648 add new entries and travels	2024-07-11 19:55:19 +02:00
Sergio De la torre	69bcad9ce0	feat itemShelvingSale refs #6861	2024-07-11 18:09:00 +02:00
Guillermo Bonet	96a157d2f7	Merge branch 'dev' into 7580-setParkingfIX	2024-07-11 12:50:44 +00:00
Guillermo Bonet	6702ff8616	feat: refs #7580 Requested changes	2024-07-11 14:50:21 +02:00
Guillermo Bonet	dab386326f	feat: refs #6769 Requested changes	2024-07-11 14:44:46 +02:00
Guillermo Bonet	0fd0302545	Merge pull request 'feat: refs #7378 Added productionConfigLog' (!2671) from 7378-productionLogConfig into dev ... Reviewed-on: #2671 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-11 12:36:05 +00:00
Guillermo Bonet	443a752cfe	feat: refs #7704 Added check	2024-07-11 13:45:24 +02:00
Guillermo Bonet	d9bd7ad84e	feat: refs #7704 Fix	2024-07-11 13:32:34 +02:00
Guillermo Bonet	0d30331c9a	feat: refs #7704 Fixtures hedera	2024-07-11 13:25:26 +02:00
Guillermo Bonet	ca1933cb83	feat: refs #7704 Fixtures hedera	2024-07-11 13:04:19 +02:00
Robert Ferrús	c770d17c25	feat: refs #7685	2024-07-11 11:57:48 +02:00
Robert Ferrús	fb1c66633c	feat: refs #7685	2024-07-11 11:55:10 +02:00
Robert Ferrús	9b2ebe7bd9	feat: refs #7685	2024-07-11 11:52:27 +02:00
Robert Ferrús	cb0461b241	feat: refs #7685 changes required	2024-07-11 11:43:19 +02:00
Guillermo Bonet	7bdc242fc7	feat: refs #7704 Added minQuantity to tmp.ticketCalculateItem	2024-07-11 11:40:06 +02:00
Guillermo Bonet	90802bd330	feat: refs #7704 Minor changes	2024-07-11 11:28:00 +02:00
Guillermo Bonet	823756d71a	feat: refs #7704 Optimization	2024-07-11 10:29:26 +02:00
Robert Ferrús	1669944286	Merge branch 'dev' into 7685-delivery_beforeDeadlock	2024-07-11 08:26:46 +00:00
Robert Ferrús	b3a98226c0	feat: refs #7685 chages required	2024-07-11 10:23:31 +02:00
Guillermo Bonet	0416ebedb5	feat: refs #7704 Added grant	2024-07-11 09:54:49 +02:00
Guillermo Bonet	7ba2e8d4c5	feat: refs #7704 Fix tests	2024-07-11 09:48:31 +02:00
Guillermo Bonet	61a746c2d8	feat: refs #7704 Fixes	2024-07-11 09:00:07 +02:00
Guillermo Bonet	02bcfd9be3	feat: refs #7704 Major changes	2024-07-11 08:57:45 +02:00
Javi Gallego	c45c920dbb	Merge branch '7348-client-hasDailyInvoice' of https://gitea.verdnatura.es/verdnatura/salix into 7348-client-hasDailyInvoice	2024-07-11 08:52:15 +02:00
Javi Gallego	5304929f57	feat: #refs 7348 schema	2024-07-11 08:52:07 +02:00