5817 Commits

Author	SHA1	Message	Date
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	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
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	ab45b988c8	feat: refs #7704 Added itemMinimumQuantity_check	2024-07-22 10:27:24 +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
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	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
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