5900 Commits

Author	SHA1	Message	Date
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
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
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
Javi Gallego	618baaf604	usa campo factura multipe	2024-07-11 08:37:08 +02:00
Guillermo Bonet	6dc464d26b	refactor: refs #6453 Minor changes	2024-07-11 07:14:02 +02:00
Guillermo Bonet	a2f2ed743d	refactor: refs #7681 Changes	2024-07-10 13:31:48 +02:00
Robert Ferrús	3de57b776b	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-10 11:02:32 +00:00
Guillermo Bonet	a82f7bc025	Merge branch 'dev' into 6769-itemDiary	2024-07-10 10:04:27 +00:00
Guillermo Bonet	889982dd82	refactor: refs #7126 Requested changes	2024-07-10 12:00:54 +02:00
Guillermo Bonet	27f9001e34	refactor: refs #7378 Requested changes	2024-07-10 11:35:05 +02:00
Guillermo Bonet	3c975aa9c4	refactor: refs #7580 Requested changes	2024-07-10 11:32:41 +02:00
Guillermo Bonet	15f580508b	refactor: refs #6453 Minor changes	2024-07-10 11:29:14 +02:00
Guillermo Bonet	7e415181c2	refactor: refs #6453 Major changes	2024-07-10 11:26:45 +02:00
Alex Moreno	c7d9fae17b	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-10 08:39:35 +00:00
Guillermo Bonet	a1d3d2f2f8	refactor: refs #6453 Major changes	2024-07-10 10:30:24 +02:00
Guillermo Bonet	a003cd24f6	Merge pull request 'refactor: refs #7684 vehicle warehouseFk fix' (!2697) from 7684-vehicleFixFk into dev ... Reviewed-on: #2697 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-10 08:22:45 +00:00
Guillermo Bonet	0e760ba505	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:23:43 +02:00
Guillermo Bonet	a8d0345073	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:18:33 +02:00
Guillermo Bonet	b75bdc07c2	refactor: refs #6453 order_confirmWithUser	2024-07-10 08:10:34 +02:00
Guillermo Bonet	46e8f5b811	feat: refs #7511 Rename to multiConfig tables	2024-07-10 07:46:18 +02:00
Robert Ferrús	5264888f06	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7116-agencyIncoming	2024-07-10 07:26:09 +02:00
Robert Ferrús	4f4d12c76a	Merge branch 'dev' into 7544-claimChangeState	2024-07-10 05:22:19 +00:00
Robert Ferrús	5bfabee6e3	Merge branch 'dev' into 7116-agencyIncoming	2024-07-10 05:19:02 +00:00
Robert Ferrús	004dcb67ff	feat: refs #7116 insert into agencyIncoming	2024-07-10 07:13:57 +02:00
Guillermo Bonet	9d4db0d408	Merge pull request 'refactor: refs #7505 item_getVisible refactor' (!2573) from 7505-item_calcVisible into dev ... Reviewed-on: #2573 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-10 05:03:18 +00:00
Guillermo Bonet	1ca95678df	Fix	2024-07-09 14:53:09 +02:00
Guillermo Bonet	0b61a175ef	Merge branch 'test' into dev	2024-07-09 14:49:51 +02:00
Guillermo Bonet	64ed96c8ae	feat: refs #7486 More debug	2024-07-09 14:47:12 +02:00
Guillermo Bonet	daec922c5c	Merge branch 'dev' into 7505-item_calcVisible	2024-07-09 12:25:11 +00:00
Guillermo Bonet	e2b6473831	feat: refs #7505 Minor changes	2024-07-09 14:24:35 +02:00
Guillermo Bonet	470c9bc872	feat: refs #7505 Minor changes	2024-07-09 14:24:17 +02:00
Guillermo Bonet	c2e9095ccd	feat: refs #7505 Requested changes	2024-07-09 14:22:32 +02:00
Robert Ferrús	f8efecd7c4	Merge branch 'dev' into 7544-claimChangeState	2024-07-09 10:47:02 +00:00
Robert Ferrús	f8169b3034	feat: refs #7544 chages required	2024-07-09 12:46:50 +02:00
Guillermo Bonet	b28ef09f3d	Merge branch 'dev' into 7126-improvedWaste	2024-07-09 12:04:02 +02:00
Guillermo Bonet	1f2c0190d0	Merge branch 'dev' into 7126-improvedWaste	2024-07-09 12:02:15 +02:00
Guillermo Bonet	bb7002b702	fix: refs #7126 Minor change	2024-07-09 12:00:55 +02:00
Guillermo Bonet	f4e5f0205d	fix: refs #7126 Fix	2024-07-09 11:56:32 +02:00
Robert Ferrús	8f86ffbc38	fix: refs #6738	2024-07-09 11:47:02 +02:00
Robert Ferrús	d8f3a04553	fix: refs #6738 restore column grupotarifa	2024-07-09 11:45:58 +02:00
Guillermo Bonet	c3051ebcfb	fix: refs #7126 Fix	2024-07-09 11:43:15 +02:00
Guillermo Bonet	769ee33ab2	fix: refs #7126 Added addressWaste type	2024-07-09 11:40:24 +02:00
Guillermo Bonet	5b9e6f0e59	Merge pull request 'feat: refs #7622 Added type column addressWaste' (!2688) from 7622-addressWaste into dev ... Reviewed-on: #2688 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 09:33:53 +00:00
Robert Ferrús	775ceabe77	Merge branch 'dev' into 7544-claimChangeState	2024-07-09 09:20:45 +00:00
Guillermo Bonet	35ca968d88	Merge branch 'test' into dev	2024-07-09 11:03:37 +02:00
Guillermo Bonet	3e4bf55eed	fix: refs #7490 Correction	2024-07-09 11:03:17 +02:00
Alex Moreno	248000bdcd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-09 11:00:36 +02:00
Robert Ferrús	928dc977b0	Merge branch 'dev' into 7544-claimChangeState	2024-07-09 09:00:05 +00:00
Guillermo Bonet	96d2bacb3d	feat: refs #7681 Changes	2024-07-09 10:22:42 +02:00
Guillermo Bonet	376adebe9d	feat: refs #7681 Changes	2024-07-09 10:19:18 +02:00
Guillermo Bonet	a725cd2840	feat: refs #7681 Changes	2024-07-09 10:19:04 +02:00
Guillermo Bonet	042ea84055	feat: refs #7681 Changes	2024-07-09 10:14:55 +02:00
Guillermo Bonet	2078bf58ff	feat: refs #7681 Optimization and refactor	2024-07-09 10:09:00 +02:00
Robert Ferrús	85a8009034	Merge branch 'dev' into 7685-delivery_beforeDeadlock	2024-07-09 08:02:59 +00:00
Robert Ferrús	4dcc8b02a5	feat: refs #7685 delivery coordinates	2024-07-09 10:01:32 +02:00
Guillermo Bonet	40461fb89e	Merge pull request 'refactor: refs #7662 Added transaction' (!2702) from 7662-ticketSplitPackingType into dev ... Reviewed-on: #2702 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 07:49:09 +00:00
Javier Segarra	725cbb5aa4	Merge pull request '#7380 - Substitution field' (!2677) from 7380_substitutionCondition into dev ... Reviewed-on: #2677 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-09 07:46:50 +00:00
Guillermo Bonet	29f9fa0ce3	feat: refs #7505 Optimization	2024-07-09 09:45:55 +02:00
Guillermo Bonet	86acc644fe	feat: refs #7505 Changes	2024-07-09 09:38:07 +02:00
Guillermo Bonet	7279feab12	feat: refs #7505 Changes	2024-07-09 09:33:31 +02:00
Guillermo Bonet	c9e9d95cff	Merge branch 'dev' into 7505-item_calcVisible	2024-07-09 09:06:27 +02:00
Guillermo Bonet	6430fb5b51	refactor: refs #7662 Requested changes	2024-07-09 08:43:02 +02:00
Robert Ferrús	8469b2ac3f	feat: refs #7683 productionControl	2024-07-09 08:24:50 +02:00
Javier Segarra	4d52e32718	Merge branch 'dev' into 7380_substitutionCondition	2024-07-09 06:24:27 +00:00
Robert Ferrús	9892b37ed0	Merge branch 'dev' into 7116-agencyIncoming	2024-07-09 06:24:05 +00:00
Alex Moreno	213524edb5	deploy: dump db	2024-07-09 07:52:18 +02:00
Alex Moreno	1866c16727	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-08 14:33:12 +02:00
Alex Moreno	30d118f9df	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-08 14:32:43 +02:00
Guillermo Bonet	eaca342777	refactor: refs #7662 Minor change	2024-07-08 14:11:55 +02:00
Javier Segarra	f009e8f8ad	Merge branch 'dev' into 7380_substitutionCondition	2024-07-08 12:11:53 +00:00
Guillermo Bonet	32793990ec	refactor: refs #7662 Minor change	2024-07-08 14:01:18 +02:00
Guillermo Bonet	86859c98e3	refactor: refs #7662 Added transaction	2024-07-08 13:57:17 +02:00
Guillermo Bonet	73b43aa254	refactor: refs #7580 Fixes	2024-07-08 13:22:10 +02:00
Guillermo Bonet	f57ab72482	refactor: refs #7580 Fix and improvement	2024-07-08 13:17:29 +02:00
Javi Gallego	938037d67a	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-08 12:40:00 +02:00
Guillermo Bonet	4757ce11a3	refactor: refs #7567 Fix and improvement	2024-07-08 12:35:29 +02:00
Guillermo Bonet	f79b2378af	Merge branch 'dev' into 7622-addressWaste	2024-07-08 10:05:35 +00:00
Guillermo Bonet	eb60a1ed77	Merge branch 'dev' into 7378-productionLogConfig	2024-07-08 10:00:32 +00:00
Guillermo Bonet	098bda0f9c	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-07-08 09:59:32 +00:00
Robert Ferrús	0722a97c60	feat: refs #7582	2024-07-08 11:28:33 +02:00
Robert Ferrús	a796787cb5	feat: refs #7582	2024-07-08 11:04:35 +02:00
Robert Ferrús	3fa0823d93	feat: refs #7582 quitar vn	2024-07-08 11:01:35 +02:00
Guillermo Bonet	4b0a08d965	refactor: refs #7684 vehicle warehouseFk fix	2024-07-08 10:57:46 +02:00
Pablo Natek	62045756e6	fix: refs #6403 extend length to 6 digits for mrw clientType	2024-07-08 10:50:15 +02:00
Guillermo Bonet	b068327352	refactor: refs #6453 order_confirmWithUser	2024-07-08 10:49:39 +02:00
Guillermo Bonet	460723bd7a	refactor: refs #6453 order_confirmWithUser	2024-07-08 10:08:04 +02:00
Javier Segarra	a9b4b3ee16	Merge branch 'dev' into 7380_substitutionCondition	2024-07-08 08:03:35 +00:00
Javier Segarra	8355d544c3	Merge branch '7380_substitutionCondition' of https://gitea.verdnatura.es/verdnatura/salix into 7380_substitutionCondition	2024-07-08 09:54:56 +02:00
Javier Segarra	9f4680325b	feat(salix): refs #7380 #7380 rename extension file	2024-07-08 09:54:52 +02:00
Javier Segarra	9f57e50f89	feat(salix): refs #7380 #7380 add value to fixtures	2024-07-08 09:54:40 +02:00
Robert Ferrús	e9d2ff1476	feat: refs #7582 claimDestination addColumn code	2024-07-08 09:43:59 +02:00