1759 Commits

Author	SHA1	Message	Date
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	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
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	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
Guillermo Bonet	eaca342777	refactor: refs #7662 Minor change	2024-07-08 14:11:55 +02: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
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
Guillermo Bonet	e64f56cff1	Merge branch 'test' into dev	2024-07-08 07:55:00 +02:00
Guillermo Bonet	5213fd4feb	Merge branch 'master' into test	2024-07-08 07:54:42 +02:00
Guillermo Bonet	6eef7876d9	Merge pull request 'refactor: refs #7640 multipleInventoryFix' (!2689) from 7640-multipleInventoryFix into master ... Reviewed-on: #2689 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-08 05:52:51 +00:00
Guillermo Bonet	3a2acfb7f8	feat: refs #7640 Optimization	2024-07-08 07:21:53 +02:00
Guillermo Bonet	fb07cdccc3	Merge branch 'test' into dev	2024-07-05 13:51:09 +02:00
Guillermo Bonet	5712fbd782	Merge branch 'master' into test	2024-07-05 13:50:43 +02:00
Guillermo Bonet	592738c7a0	refs #7024 & ticket 198125 Hotfix	2024-07-05 13:48:03 +02:00
Guillermo Bonet	55f0e90771	feat: refs #7640 Minor change	2024-07-05 13:36:38 +02:00
Guillermo Bonet	3ddf49da0a	feat: refs #7640 Fix	2024-07-05 13:21:07 +02:00
Guillermo Bonet	8ac26c7281	refactor: refs #7640 Refactor multipleInventory	2024-07-05 12:50:31 +02:00
Guillermo Bonet	1799b52f8b	feat: refs #7622 Added type column addressWaste	2024-07-05 12:37:59 +02:00
Guillermo Bonet	481d57042f	Merge pull request 'feat: refs #7382 Added unique key' (!2667) from 7382-triggerInvoiceInTax into dev ... Reviewed-on: #2667 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-05 10:26:25 +00:00
Guillermo Bonet	182273d3b3	refs #7450 Modified msg throw	2024-07-05 09:59:15 +02:00
Guillermo Bonet	aa46d7a536	refs #6769 item_getBalance optimization	2024-07-05 09:46:09 +02:00
Guillermo Bonet	50c9ded103	refs #6769 Fix	2024-07-05 08:38:40 +02:00
Guillermo Bonet	6f0196d656	refs #6769 Changes	2024-07-05 07:06:40 +02:00
Carlos Andrés	d6f6df48f2	Merge pull request 'feat: Avisar cuando no hay posibilidad de fichar refs #7669' (!2676) from 7669-Avisor-cuando-no-se-puede-fichar into dev ... Reviewed-on: #2676 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-04 11:30:11 +00:00
Guillermo Bonet	cf7de14de6	refs #6769 Changes, with error no database selected	2024-07-04 11:34:55 +02:00
Robert Ferrús	9819744caf	Merge branch 'dev' into 7654-entry_splitByShelvingCreateColumn	2024-07-04 07:34:31 +00:00
Guillermo Bonet	c2d899cd6a	Merge branch 'test' into dev	2024-07-04 09:33:08 +02:00
Guillermo Bonet	108a62f738	refs #7486 Fix tests	2024-07-04 09:32:56 +02:00
Guillermo Bonet	a7895ab0a4	refs #6769 First commit	2024-07-04 09:17:22 +02:00
Robert Ferrús	897da1e48a	feat: refs #7654	2024-07-04 08:59:22 +02:00
Robert Ferrús	68871e6345	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7654-entry_splitByShelvingCreateColumn	2024-07-04 08:21:11 +02:00
Guillermo Bonet	5f7c7ae5dd	Merge branch 'test' into dev	2024-07-04 07:44:11 +02:00
Guillermo Bonet	af6422cf05	Merge branch 'master' into test	2024-07-04 07:43:58 +02:00
Guillermo Bonet	a7b653c42a	refs #7486 Fix collection_new	2024-07-04 07:34:41 +02:00
Carlos Andrés	989fa5ac5a	feat: Avisar cuando no hay posibilidad de fichar refs #7669	2024-07-03 18:10:02 +02:00
Carlos Andrés	d65af6aaaa	feat: Avisar cuando no hay posibilidad de fichar refs #7669	2024-07-03 18:00:28 +02:00
Ivan Mas	4bef3e9107	refs #7531 Modify zone_getAddresses	2024-07-03 17:09:10 +02:00
Carlos Andrés	097350adb6	Hotfix sale_getProblems	2024-07-03 17:07:25 +02:00
Carlos Andrés	1ec7cd9540	Hotfix sale_getProblems	2024-07-03 16:59:01 +02:00
Guillermo Bonet	246b34571d	feat: refs #7382 Fix	2024-07-03 14:24:26 +02:00
Guillermo Bonet	2278b9a05a	feat: refs #7382 Changes	2024-07-03 14:20:43 +02:00
Robert Ferrús	4f9552379e	feat: refs #7654 entry_splitByShelving	2024-07-03 13:46:19 +02:00
Guillermo Bonet	cf63d6e71c	feat: refs #7378 Added productionConfigLog	2024-07-03 11:17:33 +02:00
Javi Gallego	a8d663bee4	feat: refs #7348 hasDailyInvoice field	2024-07-03 10:49:51 +02:00
Guillermo Bonet	2f8df96ba7	feat: refs #7564 Added ticket_setVolumeItemCost	2024-07-03 09:29:12 +02:00
Guillermo Bonet	d1a38ec589	Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev ... Reviewed-on: #2656 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:22:48 +00:00
Javi Gallego	0d70cb8929	fix: informatica no necesita este correo	2024-07-02 17:39:46 +02:00
Robert Ferrús	872ab1a758	Merge branch 'dev' into 5855-temporaryTable	2024-07-02 11:08:08 +00:00
Guillermo Bonet	edff15662c	Merge branch 'master' into test	2024-07-02 12:34:51 +02:00
Guillermo Bonet	028278ebcf	refs #6626 Hotfix	2024-07-02 11:52:25 +02:00
Guillermo Bonet	1e5fd8002c	feat: refs #7564 Added proc	2024-07-02 09:36:23 +02:00
Guillermo Bonet	b6b3da0771	Merge branch 'test' into dev	2024-07-02 08:06:54 +02:00
Guillermo Bonet	a7c7c4c2f6	Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master ... Reviewed-on: #2655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-02 05:35:52 +00:00
Sergio De la torre	1ca22dab92	Merge branch 'dev' into 7575_setParking_regExp	2024-07-01 14:36:18 +00:00
Guillermo Bonet	cafa7bce44	Merge branch 'test' into dev	2024-07-01 13:40:31 +02:00
Guillermo Bonet	a0ea742f9e	fix: refs #7486 Hotfix	2024-07-01 13:38:25 +02:00
Guillermo Bonet	a23f485296	refactor: refs #7424 Component type refactor	2024-07-01 11:11:16 +02:00
Guillermo Bonet	8409ffa950	fix: refs #7552 Hotfix	2024-07-01 10:26:46 +02:00
Guillermo Bonet	2bf06d8add	fix: refs #7552 Hotfix	2024-07-01 10:06:34 +02:00
Sergio De la torre	3ad2346504	feat refactor setParking REGEXP refs #7575	2024-07-01 09:25:00 +02:00
Guillermo Bonet	57a879723e	Merge branch 'test' into dev	2024-07-01 07:39:19 +02:00
Guillermo Bonet	f73176375b	Merge pull request 'hotfix: refs #7640 multiple inventory' (!2645) from 7640-multipleInventory into master ... Reviewed-on: #2645 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-01 05:30:31 +00:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Guillermo Bonet	08c9d43b17	refs #7486 Declare exit handler fix collection_assign error	2024-06-28 13:30:08 +02:00
Guillermo Bonet	9164901eac	refs #7640 Requested changes	2024-06-27 13:26:59 +02:00
Sergio De la torre	746fa82f2a	feat expeditionPalletPrint refs #5210	2024-06-27 13:20:52 +02:00
Carlos Andrés	cbd46330b3	feat: Turn issues into calculated columns refs#7213	2024-06-27 13:01:42 +02:00
Guillermo Bonet	e8dc6eafdc	refs #7640 multiple inventory	2024-06-27 10:18:43 +02:00
Robert Ferrús	0379142fb5	Merge branch 'dev' into 5855-temporaryTable	2024-06-26 11:30:38 +00:00
Guillermo Bonet	ad4dd088a3	Merge branch 'test' into dev	2024-06-26 11:58:43 +02:00
Guillermo Bonet	220f402f4e	Merge pull request 'horfix: ticket 197676' (!2640) from ticket197676-hotfix into master ... Reviewed-on: #2640 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-26 09:53:25 +00:00
Guillermo Bonet	c4af92e9ba	horfix: ticket 197676	2024-06-26 09:54:51 +02:00
Carlos Andrés	75486ae743	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:47:22 +02:00
Carlos Andrés	5bcdc57978	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:33:54 +02:00
Carlos Andrés	82118ae933	Hotfix ticketStateUpdate to ticket_setState	2024-06-25 19:30:59 +02:00
Robert Ferrús	c4eb7670fe	Merge branch 'dev' into 5855-temporaryTable	2024-06-25 12:59:48 +00:00
Guillermo Bonet	b9278f3b3a	Merge branch 'test' into dev	2024-06-25 14:02:16 +02:00
Guillermo Bonet	2e1ab3af20	refs #7486 Fix same assign collection	2024-06-25 14:00:46 +02:00
Carlos Andrés	ff1918ef06	Merge pull request 'feat: previas con sitema de reservas refs #6861' (!2176) from 6861-Pasar-modo-trabajo-de-previa-a-reservas into dev ... Reviewed-on: #2176 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-25 11:21:02 +00:00
Alex Moreno	85854e0713	warmFix: use vn	2024-06-25 13:14:44 +02:00
Alex Moreno	45e8674087	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 11:34:35 +02:00
Alex Moreno	cf0f80142f	hotFix: create view vn.expeditionTruck	2024-06-25 09:24:34 +02:00
Robert Ferrús	205d79f0a6	Merge branch 'dev' into 5855-temporaryTable	2024-06-25 06:13:16 +00:00
Alex Moreno	0284f3b1ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 07:30:20 +02:00
Alex Moreno	f2ee1df8ac	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-25 07:29:56 +02:00
Carlos Andrés	cf79711f6a	feat: previas con sitema de reservas refs #6861	2024-06-24 13:30:03 +02:00
Pako Natek	c32a87126c	Merge branch 'master' into supplierPackaging_ReportSource_masterHotFix	2024-06-24 10:50:31 +00:00
Pako Natek	5f329fde38	or replace	2024-06-24 10:32:51 +02:00
Pako Natek	f999010c6c	tested proc	2024-06-24 10:32:12 +02:00
Pako Natek	8c5f468087	tested proc	2024-06-24 10:30:25 +02:00
Robert Ferrús	a170edcdef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable	2024-06-24 08:09:52 +02:00
Pablo Natek	ea0b0dc779	fix: business overlapping	2024-06-24 08:08:39 +02:00
Robert Ferrús	9022f62116	feat: refs #5855 changes required	2024-06-24 08:03:43 +02:00
Sergio De la torre	429149d4e0	Merge branch 'dev' into 7023_itemShelving_filterBuyer	2024-06-24 05:05:27 +00:00
Sergio De la torre	4131653700	feat itemShelving_filterBuyer refs #7023	2024-06-21 13:02:36 +02:00
Sergio De la torre	3fa7eb1d2a	feat itemShelving_filterBuyer refs #7023	2024-06-21 13:01:19 +02:00
Pako Natek	7347c50f8e	Merge branch 'dev' into 7420-supplierPackaging_reportSource_update	2024-06-21 06:33:15 +00:00
Pako Natek	fe154b9ee8	sref	2024-06-21 08:32:22 +02:00
Guillermo Bonet	6874474207	Merge pull request 'refactor: refs #7519 Refactor claim_ratio_routine' (!2394) from 6701-claimRatioRoutine into dev ... Reviewed-on: #2394 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-21 05:05:20 +00:00
Guillermo Bonet	a899ecaab7	Merge pull request 'refactor: refs #7490 Deleted update duaInvoiceInBooking' (!2561) from 7490-duaInvoiceInBooking into dev ... Reviewed-on: #2561 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-21 05:04:32 +00:00
Carlos Andrés	f7b8bd2df6	Merge branch '6861-Pasar-modo-trabajo-de-previa-a-reservas' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-20 18:18:05 +02:00
Carlos Andrés	ed49c98c1c	fnpmeat: previas con sitema de reservas refs #6861	2024-06-20 18:18:03 +02:00
Sergio De la torre	9b0913e439	Merge branch 'dev' into 7023_itemShelving_filterBuyer	2024-06-20 14:36:25 +00:00
Carlos Andrés	b5cd57e660	Merge pull request 'test' (!2621) from test into dev ... Reviewed-on: #2621 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:47:11 +00:00
Carlos Andrés	691413a854	Merge pull request 'master' (!2620) from master into test ... Reviewed-on: #2620 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:44:37 +00:00
Carlos Andrés	11675c2e35	Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master ... Reviewed-on: #2618 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-20 13:34:55 +00:00
Carlos Andrés	e0d105313d	feat: sincro client supplier sage refs #7595	2024-06-20 14:27:11 +02:00
Sergio De la torre	c1c01df3c3	feat itemShelving_filterBuyer refs #7023	2024-06-20 09:37:22 +02:00
Javi Gallego	018972b948	Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev ... Reviewed-on: #2609 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-20 05:50:14 +00:00
Javi Gallego	1a8df4d87c	feat: refs #7216 triggers	2024-06-19 13:41:37 +02:00
Robert Ferrús	0128dfd967	feat: refs #5855 changes required	2024-06-19 11:30:50 +02:00
Pako Natek	49e01218e9	Warehouse name	2024-06-19 10:45:37 +02:00
Robert Ferrús	1e3376f908	Merge branch 'dev' into 5855-temporaryTable	2024-06-19 08:05:01 +00:00
Pako Natek	1fa0a841da	TP previous	2024-06-19 07:26:30 +02:00
Pako Natek	bf62f40c87	actualizada la rama	2024-06-19 07:17:25 +02:00
Pako Natek	66ed958c72	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 09:07:24 +00:00
Guillermo Bonet	b7fadddbb1	Merge branch 'master' into dev	2024-06-18 11:03:56 +02:00
Guillermo Bonet	4d5f3e43ed	Merge branch 'master' into test	2024-06-18 11:03:49 +02:00
Guillermo Bonet	2b1de271a9	refs #7552 Added force vShowType true	2024-06-18 11:03:30 +02:00
Pako Natek	3711f26b5f	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 06:24:59 +00:00
Pako Natek	9fc027a3c6	tickets deleted excluded	2024-06-18 08:24:06 +02:00
Guillermo Bonet	a84badff87	Merge branch 'test' into dev	2024-06-17 14:52:55 +02:00
Guillermo Bonet	ce709798b4	hotfix: refs #7486 collection_new debug error	2024-06-17 14:51:04 +02:00
Guillermo Bonet	664f4299b3	Merge branch 'test' into dev	2024-06-17 13:42:51 +02:00
Guillermo Bonet	131b44305d	hotfix: refs #7552 item_getSimilar	2024-06-17 13:38:40 +02:00
Guillermo Bonet	b4377e36e2	Merge branch 'test' into dev	2024-06-17 11:45:19 +02:00
Guillermo Bonet	4c345ffa93	hotfix: refs #7552 item_getSimilar	2024-06-17 10:57:23 +02:00
Guillermo Bonet	43df0ef55d	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-17 07:42:33 +00:00
Guillermo Bonet	1d0b89ed52	refs #7519 Requested changes	2024-06-17 09:42:16 +02:00
Carlos Andrés	51078c804b	Ticket #194195 Recupero vn.item_getAtp	2024-06-14 16:32:13 +02:00
Carlos Andrés	5473f7a308	Hotfix Ticket #194195 Error radar negativos	2024-06-14 16:01:27 +02:00
Robert Ferrús	df6de7e74c	fix: refs #194195 item_getAtp	2024-06-14 14:55:03 +02:00
Robert Ferrús	8dea9598e8	fix: refs #194195 item_getAtp	2024-06-14 13:54:43 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Guillermo Bonet	798bf6d028	hotfix: refs #6281 itemShelving_add buy is required	2024-06-14 12:41:46 +02:00
Robert Ferrús	828908a522	Merge branch 'dev' into 5855-temporaryTable	2024-06-14 06:07:39 +00:00
Robert Ferrús	831b2c39f6	Merge branch 'dev' into 5855-temporaryTable	2024-06-14 06:06:54 +00:00
Ivan Mas	615fd3e97b	refs #7530 delete trigger deviceProductionConfig_afterUpdate	2024-06-13 15:10:04 +02:00
Sergio De la torre	c2e4e187d6	feat itemShelvingSale refs #6861	2024-06-13 14:21:59 +02:00
Guillermo Bonet	cfc5e32715	feat: refs #6701 Fix error	2024-06-13 13:11:50 +02:00
Guillermo Bonet	cb056ff789	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-13 11:14:00 +02:00
Sergio De la torre	5340729ead	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-13 11:07:57 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Guillermo Bonet	d7317e4067	hotfix: refs #7024 Modify booked entries	2024-06-13 07:09:48 +02:00
Carlos Andrés	30caf79490	feat: previas con sitema de reservas refs #6861	2024-06-12 16:12:06 +02:00
Guillermo Bonet	d0b926b2c5	feat: refs #7490 Changes	2024-06-12 14:26:26 +02:00
Alex Moreno	671978ec02	Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-12 10:21:36 +00:00
Guillermo Bonet	17fa1e10f6	feat: refs #6701 Added claimRatio_afterInsert	2024-06-12 07:33:10 +02:00
Carlos Andrés	b9d1c3228b	feat: previas con sitema de reservas refs #6861	2024-06-11 18:43:26 +02:00
Guillermo Bonet	aa0e06cfec	refactor: refs #7505 Changed name	2024-06-11 14:00:59 +02:00
Guillermo Bonet	3bd596e5fd	refactor: refs #7505 Added description	2024-06-11 13:53:41 +02:00
Guillermo Bonet	4f10a93584	refactor: refs #7505 Minor change	2024-06-11 13:36:46 +02:00
Guillermo Bonet	a9aad7406a	refactor: refs #7505 Minor change	2024-06-11 12:51:36 +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
Guillermo Bonet	9f9063567a	refactor: refs #7505 item_getVisible refactor	2024-06-11 12:40:07 +02:00
Guillermo Bonet	76f76b8304	feat: refs #7568 Added freelancer exception	2024-06-11 10:48:24 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-11 09:59:09 +02:00
Guillermo Bonet	bd13ecd464	refactor: refs #7486 engine memory and primary key sales_merge	2024-06-11 07:59:53 +02:00
Alex Moreno	c241189508	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-10 14:22:12 +02:00
Guillermo Bonet	75a529830c	Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test ... Reviewed-on: #2564 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 11:33:10 +00:00
Guillermo Bonet	9d82f0ff7c	Merge branch 'test' into dev	2024-06-10 12:48:53 +02:00
Guillermo Bonet	37fa92aca8	Merge branch 'master' into test	2024-06-10 12:48:38 +02:00
Guillermo Bonet	272a34c5f9	refactor: refs #7486 Added userFk debug	2024-06-10 12:46:26 +02:00
Guillermo Bonet	7579e15fcc	refactor: refs #7486 Optimized procs	2024-06-10 11:55:40 +02:00
Guillermo Bonet	b4820858c9	hotfix: ticket 192672 ticketPreviousPreparingList	2024-06-10 11:32:44 +02:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Guillermo Bonet	ca7d67451b	refactor: refs #7517 Minor changes	2024-06-10 09:09:11 +02:00
Guillermo Bonet	2e8d28d795	refactor: refs #7517 Added throw	2024-06-10 09:08:26 +02:00
Guillermo Bonet	317f898c2e	refactor: refs #7490 Minor changes	2024-06-10 08:48:56 +02:00
Guillermo Bonet	a4f8c0df80	Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking	2024-06-10 08:47:03 +02:00
Guillermo Bonet	fb4be69cf1	refactor: refs #7490 Added final update	2024-06-10 08:47:02 +02:00
Guillermo Bonet	e043badc19	Merge branch 'dev' into 7490-duaInvoiceInBooking	2024-06-10 06:39:15 +00:00
Guillermo Bonet	9b21cd5eb1	refactor: refs #7490 Deleted update duaInvoiceInBooking	2024-06-10 08:38:58 +02:00
Sergio De la torre	4cf5c0775c	feat isScannedExpedition refs #7276	2024-06-10 07:30:33 +02:00
Carlos Andrés	1497146940	Merge branch 'master' into Hotfix-midnight-determinist	2024-06-07 16:17:11 +02:00
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Javi Gallego	0c068ed126	Merge branch 'dev' into 4560-GastosReparto	2024-06-07 09:03:24 +00:00
Sergio De la torre	7c0fa6dbb9	feat isScannedExpedition refs #7276	2024-06-07 09:18:52 +02:00
Guillermo Bonet	aff0de23eb	Merge branch 'test' into dev	2024-06-07 08:29:28 +02:00
Guillermo Bonet	b6fb7650cd	Merge branch 'master' into test	2024-06-07 08:29:04 +02:00
Robert Ferrús	d8e6a94797	Merge branch 'dev' into 7544-claimChangeState	2024-06-06 12:31:08 +00:00
Ivan Mas	a8f5993c21	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-06 10:12:45 +00:00
Robert Ferrús	ef50d493f1	feat: refs #7544	2024-06-06 11:54:39 +02:00
Javi Gallego	e77bc87a2a	Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev ... Reviewed-on: #2546 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-06 09:48:29 +00:00
Robert Ferrús	1c6e881273	feat: refs #7544 crear evento claim_changeState	2024-06-06 11:45:09 +02:00
Robert Ferrús	7f23c81756	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable	2024-06-06 07:28:40 +02:00
Carlos Andrés	b78ef97813	Hotfix modificar entradas contabilizadas Ticket 191417	2024-06-05 15:50:16 +02:00
Carlos Andrés	638a5e9a1e	Hotfix modificar entradas contabilizadas Ticket 191417	2024-06-05 15:44:11 +02:00
Ivan Mas	8458651ce0	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-05 12:57:47 +00:00
Ivan Mas	71ea1d1467	refs #7536 modify itemShelvingRadar	2024-06-05 14:53:59 +02:00
Guillermo Bonet	feda14a21b	Merge branch 'test' into dev	2024-06-05 14:23:09 +02:00
Guillermo Bonet	c2fecde1b8	Merge branch 'master' into test	2024-06-05 14:22:59 +02:00
Robert Ferrús	40d40bd0bb	fix: refs #7335 hotFix cmrTicket	2024-06-05 13:42:21 +02:00
Javi Gallego	1fa22e71a9	feat: refs #7203 nombre variables	2024-06-05 12:42:55 +02:00
Guillermo Bonet	e4e7ae1699	Merge branch 'test' into dev	2024-06-05 11:16:15 +02:00
Guillermo Bonet	ceda2718d5	Merge branch 'master' into test	2024-06-05 11:15:56 +02:00
Guillermo Bonet	82954ed299	hotfix: ticket #176792	2024-06-05 11:13:40 +02:00
Carlos Andrés	8b584a08dc	Hotfix: midnight deterministic refs #7213	2024-06-05 10:11:04 +02:00
Carlos Andrés	f2b443021f	hotfix: midnight deterministis refs #7213	2024-06-05 10:03:37 +02:00
Guillermo Bonet	3dab181bff	Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev ... Reviewed-on: #2536 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-05 06:17:10 +00:00
Javi Gallego	130d2b6b47	feat: refs #7203 remove numbres alertLevel	2024-06-05 08:05:46 +02:00
Juan Ferrer	feaf5f8f5a	Merge pull request 'test' (!2545) from test into dev ... Reviewed-on: #2545	2024-06-04 21:05:47 +00:00
Juan Ferrer	f903d7cd2a	Merge pull request 'master' (!2538) from master into test ... Reviewed-on: #2538	2024-06-04 21:05:27 +00:00
Carlos Andrés	35b4255505	Hotfix: ledger_next transacciones refs #7523	2024-06-04 16:45:42 +02:00
Carlos Andrés	e4969f7061	Hotfix: ledger_next transacciones refs #7523	2024-06-04 16:43:09 +02:00
Carlos Andrés	1927fbce45	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:39:02 +02:00
Javi Gallego	8f7b034aa7	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 14:24:55 +02:00
Javi Gallego	4230d46fe5	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 09:47:58 +02:00
Robert Ferrús	3720f7acfe	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-06-04 06:57:29 +00:00
Carlos Andrés	9a7074d600	hotfix: ledger_next transacciones refs #7523	2024-06-03 20:16:27 +02:00
Guillermo Bonet	d3584691fa	refactor: refs #6701 Minor change	2024-06-03 12:16:33 +02:00
Guillermo Bonet	85d68890b8	refactor: refs #6701 New table clientRate	2024-06-03 12:11:26 +02:00
Guillermo Bonet	b8e95c0284	refactor: refs #7519 Minor change	2024-06-03 11:46:52 +02:00
Guillermo Bonet	8cef8eace7	refactor: refs #7519 Minor change	2024-06-03 11:41:09 +02:00
Guillermo Bonet	fd237b6d35	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-03 11:40:50 +02:00
Guillermo Bonet	7dc17cd4f6	Merge branch 'test' into dev	2024-05-31 12:29:32 +02:00
Guillermo Bonet	d27bbd9a8f	hotfix: ticket 189567	2024-05-31 12:28:47 +02:00
Robert Ferrús	fd233a5e51	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-31 05:09:16 +00:00
Javi Gallego	7186686548	Merge branch 'dev' into 4560-GastosReparto	2024-05-30 09:44:06 +02:00
Guillermo Bonet	f87ee5cb91	Merge branch 'test' into dev	2024-05-29 08:09:53 +02:00
Guillermo Bonet	f770bce54c	fix: refs #7486 Deleted get_lock collection_assign	2024-05-29 07:55:33 +02:00
Carlos Andrés	a022ed0854	Hotfix payments ticket 188787	2024-05-28 14:50:58 +02:00
Carlos Andrés	cf84aa7256	Hotfix contabilizar DUA Ticket #188682	2024-05-28 13:01:27 +02:00
Carlos Andrés	6e5b41a886	Hotfix contabilizar DUA Ticket #188682	2024-05-28 12:30:17 +02:00
Guillermo Bonet	55fd94a12a	Merge branch 'test' into dev	2024-05-27 13:51:16 +02:00
Guillermo Bonet	086c2291d1	Merge branch 'master' into test	2024-05-27 13:50:59 +02:00
Guillermo Bonet	2498849ed0	hotfix: refs #7486 Added tmp debug insert	2024-05-27 13:43:55 +02:00
Ivan Mas	6222d2657b	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-27 10:33:02 +00: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
Robert Ferrús	0b648d09af	feat: refs #7296 roadmapStopFk	2024-05-27 11:45:22 +02:00
Sergio De la torre	74b71079f2	refs #6861 feat: obsrevation	2024-05-27 11:33:04 +02:00
Robert Ferrús	941438efd0	Merge branch '7296-expeditionTruckToRoadmapStop' of https://gitea.verdnatura.es/verdnatura/salix into 7296-expeditionTruckToRoadmapStop	2024-05-27 09:41:30 +02:00
Robert Ferrús	aaea0c95f7	feat: refs #7296 roadmapStopFk	2024-05-27 09:41:28 +02:00
Robert Ferrús	cf5d520692	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-27 07:09:34 +00:00
Robert Ferrús	eb503238d7	feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk	2024-05-27 09:07:23 +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	b02995918e	Merge branch 'dev' into 6281_buyFk	2024-05-27 05:04:40 +00:00
Javi Gallego	0e5a15dd4e	con addressFk	2024-05-24 15:14:20 +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
Ivan Mas	4d79dabb69	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-24 08:23:05 +00:00
Ivan Mas	7e22e19e62	refs #7217 Reduce error message	2024-05-24 10:21:35 +02:00
Guillermo Bonet	2fe279ed47	feat: refs #7438 Requested changes and little changes	2024-05-24 07:20:27 +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	774e92e639	hotfix: Eliminar restricciones ticketRefund Ticket #187137	2024-05-22 16:43:45 +02:00
Carlos Andrés	bc6af32962	fix: problems in colums ticket and sale refs #7213	2024-05-22 14:50:45 +02:00
Jorge Penadés	365e5a3ba3	fix: refs # 7400 ledger_next	2024-05-21 17:31:29 +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	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
Ivan Mas	8b6844b9f0	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-17 14:13:38 +00:00
Pablo Natek	4790ae94d1	Merge branch 'dev' into 7187-addPdaFreelancers	2024-05-17 11:33:57 +00:00
Carlos Andrés	c8db0a3aa8	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-17 12:48:16 +02:00
Guillermo Bonet	0b5f05cbed	refactor: refs #7375 Refactor clientsDisable	2024-05-17 12:36:54 +02:00
Sergio De la torre	135526e513	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-17 11:20:26 +02:00
Guillermo Bonet	1154e484e5	Merge branch 'test' into dev	2024-05-17 09:57:35 +02:00
Ivan Mas	68425bd41f	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-17 07:55:27 +00:00
Ivan Mas	db28bf335e	refs #7217 Modify error message	2024-05-17 09:53:17 +02:00
Guillermo Bonet	a99554c773	fix: Occasionally saleVolume bad index	2024-05-17 09:50:53 +02:00
Ivan Mas	4bf36f2655	refs #7217 Modify proc name	2024-05-17 08:16:50 +02:00
Guillermo Bonet	bddc9a8386	Deleted insert into util.debug (deletedState)	2024-05-17 07:51:51 +02:00
Sergio De la torre	27110c2abe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-17 06:27:09 +02:00
Carlos Andrés	08ea0d2693	Merge pull request 'refs #7400 feat: book ledger with counters' (!2467) from 7400-Contador-para-los-asientos-contables into dev ... Reviewed-on: #2467 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 18:13:39 +00:00
Carlos Andrés	dab90633db	Merge pull request 'test' (!2466) from test into dev ... Reviewed-on: #2466 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 17:21:54 +00:00
Carlos Andrés	8d8cfa24de	refs #7400 feat: book ledger with counters	2024-05-16 19:16:25 +02:00
Carlos Andrés	01d1a2391d	refs #7400 feat: book ledger with counters	2024-05-16 18:48:59 +02:00
Ivan Mas	b2db076c2f	refs #7217 create travel_throwAWBError	2024-05-16 15:34:45 +02:00
Carlos Andrés	2f4f199fad	fix: invoiceInTax_getFromEntries (referenceRate)	2024-05-16 14:40:02 +02:00
Pablo Natek	b41104432c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers	2024-05-16 13:57:55 +02:00
Sergio De la torre	75bb08a0c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-16 07:08:47 +02:00
Sergio De la torre	9b73cdfa6f	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-15 17:03:33 +02:00
Guillermo Bonet	7e3861a02f	Merge branch 'test' into dev	2024-05-15 14:32:48 +02:00
Guillermo Bonet	049e8931ab	hotfix: Tmp fix item_getSimilar	2024-05-15 14:30:04 +02:00
Guillermo Bonet	9134e0ff65	feat: refs #7264 Minor change	2024-05-15 14:05:35 +02:00
Guillermo Bonet	53fa78894c	feat: refs #7264 Refactor proc itemShelvingRadar and added columns	2024-05-15 13:54:22 +02:00
Sergio De la torre	9288f08b91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-15 11:30:05 +02:00
Robert Ferrús	1ee29036f4	Merge branch 'dev' into 7296-expeditionTruck	2024-05-15 08:22:00 +00:00
Guillermo Bonet	778f368300	Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev ... Reviewed-on: #2429 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-15 08:19:34 +00:00
Pako Natek	0adf6bfc45	Merge branch 'dev' into 7362-VIP	2024-05-14 10:50:59 +00:00
Carlos Andrés	4254fac6c2	Merge pull request '7213-Pasar-problemas-a-columnas-calculadas' (!2396) from 7213-Pasar-problemas-a-columnas-calculadas into dev ... Reviewed-on: #2396 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-14 09:35:51 +00:00
Pako Natek	53f49531b7	VIP now is Vip	2024-05-14 09:07:43 +02:00
Guillermo Bonet	9b09bc4efb	feat: refs #3199 Added one more scope ticket_recalcByScope	2024-05-14 08:59:11 +02:00
Guillermo Bonet	2cee9c9c01	feat: refs #3199 Added one more scope ticket_recalcByScope	2024-05-14 08:58:44 +02:00
Robert Ferrús	eeb36a6810	Merge branch 'dev' into 7039-country-country	2024-05-14 06:32:45 +00:00
Guillermo Bonet	9112d4bfcc	Merge branch '3199-ticket_recalc_itemTaxCountry' of https://gitea.verdnatura.es/verdnatura/salix into 3199-ticket_recalc_itemTaxCountry	2024-05-14 08:24:11 +02:00
Guillermo Bonet	7d47a986bf	feat: refs #3199 Created ticket_recalcItemTaxCountryByScope	2024-05-14 08:24:11 +02:00
Guillermo Bonet	5fe88faabd	Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry	2024-05-14 05:55:02 +00:00
Guillermo Bonet	1ba6bf9a9c	feat: refs #3199 Added more scopes ticket_recalcByScope	2024-05-14 07:54:52 +02:00
Guillermo Bonet	4d7ac901c6	feat: refs #3199 Added more scopes ticket_recalcByScope	2024-05-14 07:52:21 +02:00
Alex Moreno	3798509206	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-14 07:51:04 +02:00
Robert Ferrús	c6f7a0768a	Merge branch 'dev' into 7039-country-country	2024-05-14 05:49:39 +00:00
Sergio De la torre	8656c16165	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-14 07:11:18 +02:00
Jorge Penadés	45082f532f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-createLocker	2024-05-13 15:05:27 +02:00
Alex Moreno	6251493adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-05-13 14:24:31 +02:00
Carlos Andrés	3ce43909e2	feat: Turn issues into calculated columns refs#7213	2024-05-13 14:21:01 +02:00
Guillermo Bonet	6c325fccef	refactor: refs #7373 Deleted proc packageInvoicing	2024-05-13 13:41:47 +02:00
Carlos Andrés	f89ca786df	eat: Turn issues into calculated columns refs#7213	2024-05-13 13:31:58 +02:00
Robert Ferrús	5e3fa1be8b	Merge branch 'dev' into 7296-expeditionTruck	2024-05-13 10:33:37 +00:00
Carlos Andrés	b1af625937	feat: Turn issues into calculated columns refs#7213	2024-05-13 12:32:46 +02:00
Carlos Andrés	057121582e	feat: Turn issues into calculated columns refs#7213	2024-05-13 10:06:00 +02:00
Carlos Andrés	6d3f00ec95	feat: Turn issues into calculated columns refs#7213	2024-05-13 09:54:27 +02:00
Jorge Penadés	562aefecdd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-13 08:56:54 +02:00
Robert Ferrús	e7df3fefc6	feat: refs #7363	2024-05-10 13:11:41 +02:00
Robert Ferrús	9163d3db74	feat: refs #7363 changes	2024-05-10 13:05:44 +02:00
Robert Ferrús	cb9cacc1ea	feat: refs #7363 item_getBalance saleTracking no mostrar duplicados	2024-05-10 11:51:54 +02:00
Robert Ferrús	35f69b8692	Merge branch 'dev' into 7039-country-country	2024-05-10 07:21:05 +00:00
Jorge Penadés	4e7d0e6469	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-10 08:28:06 +02:00
Robert Ferrús	b03fe4e6d3	Merge branch 'dev' into 7296-expeditionTruck	2024-05-10 05:23:07 +00:00
Pako Natek	c048389412	Merge branch 'dev' into 7362-VIP	2024-05-10 05:13:35 +00:00
Pako Natek	ec060209aa	done	2024-05-09 18:53:32 +02:00
Guillermo Bonet	f4229284fa	Merge branch 'dev' into 7252-deliveryNoteFarmingFk	2024-05-09 12:56:05 +00:00
Carlos Andrés	cc941de606	feat: conversion art. A1 a A2 refs #4979	2024-05-09 14:24:20 +02:00
Ivan Mas	9d1dc6b483	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-09 11:41:04 +00:00
Robert Ferrús	f963923645	feat: refs #6223 pull master	2024-05-09 12:54:57 +02:00
Robert Ferrús	0498b425b3	Merge branch 'dev' into 7039-country-country	2024-05-09 10:51:18 +00:00
Jorge Penadés	2c826ed838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 12:14:43 +02:00
Pako Natek	2203ac478b	Merge branch 'dev' into 7362-VIP	2024-05-09 09:56:41 +00:00
Pako Natek	42d17aa7f5	done	2024-05-09 11:52:25 +02:00
Guillermo Bonet	faf2d51a43	Merge branch 'test' into dev	2024-05-09 11:36:15 +02:00
Guillermo Bonet	494b46e7ec	fix: refs #6493 Fix buy_recalcPricesByBuy & buy_recalcPricesByEntry	2024-05-09 11:33:57 +02:00
Pablo Natek	98e28b8d50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers	2024-05-09 09:09:00 +02:00
Jorge Penadés	dc45527e1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 08:45:17 +02:00
Javi Gallego	abd692cbd3	Merge pull request 'fix: #7344 getSupplierDebt agrupa por pago' (!2426) from 7344-getSupplierDebt into dev ... Reviewed-on: #2426 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 05:49:28 +00:00
Robert Ferrús	833994bd27	Merge branch 'dev' into 7291-sale_getProblems	2024-05-09 05:23:33 +00:00
Robert Ferrús	0fce8c755b	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-09 05:14:38 +00:00
Sergio De la torre	094b15fe8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-09 07:08:31 +02:00
Sergio De la torre	679f9a1b9b	refs #6861 feat:sectoCollection reserve	2024-05-09 07:07:10 +02:00
Sergio De la torre	10513d1991	Merge branch 'master' into 6276_itemShelving_Add	2024-05-09 05:00:07 +00:00
Carlos Andrés	d6451a94e3	feat: conversion art. A1 a A2 refs #4979	2024-05-08 17:38:52 +02:00
Carlos Andrés	710841ba4a	Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-08 16:31:25 +02:00
Guillermo Bonet	1a375c0e88	refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk	2024-05-08 14:45:37 +02:00
Sergio De la torre	f7e6901ef6	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-08 11:32:00 +00:00
Guillermo Bonet	4df13d900a	Merge branch 'dev' into 7335-modifyCmr	2024-05-08 10:55:47 +00:00
Robert Ferrús	b0848edff8	feat: refs #5699 quittar de client_afterUpdate desactivar cliente	2024-05-08 12:52:11 +02:00
Guillermo Bonet	82ac54f0b3	Merge branch 'test' into dev	2024-05-08 12:52:02 +02:00
Guillermo Bonet	90107936b7	Merge branch 'master' into test	2024-05-08 12:51:36 +02:00
Robert Ferrús	ce42cbf287	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-08 10:44:15 +00:00
Guillermo Bonet	84e90bb91b	hotfix: rollback tmp item_getSimilar	2024-05-08 12:43:46 +02:00
Robert Ferrús	50157c932e	Merge branch 'dev' into 7296-expeditionTruck	2024-05-08 10:42:54 +00:00
Sergio De la torre	5a0882c2ac	refs #6861 feat:sectoCollection reserve	2024-05-08 10:59:19 +02:00
Sergio De la torre	a3e9c91bdb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-08 10:58:20 +02:00
Javi Gallego	393d57f078	fix: #7344 getSupplierDebt agrupa por pago	2024-05-08 10:51:35 +02:00
Jorge Penadés	d0c9e83504	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-08 10:35:07 +02:00
Guillermo Bonet	16e7fb9662	Merge branch 'dev' into 7335-modifyCmr	2024-05-08 08:29:00 +00:00
Sergio De la torre	5207f07c80	refs #6276 hotFix:itemShelving_add	2024-05-08 10:03:11 +02:00
Sergio De la torre	9a235838d8	refs #7161 feat:setVisibleDiscard by itemTrash	2024-05-08 09:04:08 +02:00
Guillermo Bonet	6cde2e8170	fix: refs #6585 Requested changes	2024-05-08 08:48:08 +02:00
Robert Ferrús	43c742938c	feat: refs #179881	2024-05-07 14:37:24 +02:00
Robert Ferrús	9bd8369469	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5699-hoFixClientsDisable	2024-05-07 13:23:49 +02:00
Guillermo Bonet	0d7d4917a7	Merge branch 'master' into test	2024-05-07 13:18:28 +02:00
Robert Ferrús	2dcc959488	fix: refs #5699 clientsDisable	2024-05-07 13:17:56 +02:00
Guillermo Bonet	cc8873f48a	hotfix: #7173 Rollback	2024-05-07 13:08:44 +02:00
Guillermo Bonet	2adf96cb37	refactor: #6585 Deleted transaction ticket_doCmr	2024-05-07 13:03:50 +02:00
Guillermo Bonet	da8378d422	hotfix: refs #7173 Deleted restriction invoiceInDueDay_beforeUpdate	2024-05-07 12:15:28 +02:00
Guillermo Bonet	3ed1c8f6fd	hotfix: ticket #181890 duaInvoiceInBooking	2024-05-07 11:35:07 +02:00
Guillermo Bonet	ef567bb167	fix: ticket #181920 catalog_componentCalculate	2024-05-07 10:03:33 +02:00
Guillermo Bonet	e44568ff4b	feat: refs #6585 Added call ticket_afterUpdate	2024-05-07 08:00:26 +02:00
Sergio De la torre	7368561bad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-07 07:21:59 +02:00
Robert Ferrús	1610b9bd0a	Merge branch 'dev' into 7039-country-country	2024-05-07 05:11:02 +00:00
Alex Moreno	f23924e792	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-06 14:31:41 +02:00
Carlos Andrés	14a1c5cbbb	Merge pull request 'master' (!2408) from master into test ... Reviewed-on: #2408 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 12:22:04 +00:00
Javi Gallego	69766bbfeb	Merge pull request 'feat: #7109 inventoryType' (!2409) from 7109-inventoryType into dev ... Reviewed-on: #2409 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-06 12:00:14 +00:00
Javi Gallego	f9348b41ea	feat: #7109 inventoryType	2024-05-06 13:42:19 +02:00
Carlos Andrés	0b4ac51749	fix: Error workerTimeControl_direction Salix	2024-05-06 13:34:46 +02:00
Robert Ferrús	1eb75599d8	Merge branch 'dev' into 7296-expeditionTruck	2024-05-06 09:38:14 +00:00
Sergio De la torre	e8a30c1df8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-06 10:30:19 +02:00
Robert Ferrús	b57be129e3	Merge branch 'dev' into 7039-country-country	2024-05-06 08:27:21 +00:00
Javi Gallego	633a3c481c	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-05-06 07:42:38 +00:00
Robert Ferrús	87e85e4a4e	Merge branch 'dev' into 7039-country-country	2024-05-06 05:08:07 +00:00
Ivan Mas	5d3235977f	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-05-03 12:57:26 +00:00
Guillermo Bonet	710564bed2	Merge branch '6701-claimRatioRoutine' of https://gitea.verdnatura.es/verdnatura/salix into 6701-claimRatioRoutine	2024-05-03 14:15:56 +02:00
Guillermo Bonet	f0b814c79b	refactor: refs #6701 Refactor claim_ratio_routine	2024-05-03 14:15:55 +02:00
Carlos Andrés	2659e3b259	feat: Turn issues into calculated columns refs#7213	2024-05-03 14:03:26 +02:00
Guillermo Bonet	b0801f428d	Merge branch 'dev' into 6701-claimRatioRoutine	2024-05-03 11:48:25 +00:00
Guillermo Bonet	883f6f18a3	refactor: refs #6701 Refactor claim_ratio_routine	2024-05-03 13:47:55 +02:00
Robert Ferrús	82ee8d2209	Merge branch 'dev' into 7039-country-country	2024-05-03 09:25:06 +00:00
Carlos Andrés	7659a39b42	feat: Turn issues into calculated columns refs#7213	2024-05-03 10:19:05 +02:00
Robert Ferrús	b6e4130184	feat: refs #7325 item_getBalance	2024-05-03 07:51:04 +02:00
Robert Ferrús	523735e4fc	Merge branch 'dev' into 7296-expeditionTruck	2024-05-03 04:59:01 +00:00
Carlos Andrés	9905d7254d	Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas	2024-05-02 18:17:31 +02:00
Carlos Andrés	e28a5eb478	feat: Turn issues into calculated columns refs#7213	2024-05-02 18:13:12 +02:00
Carlos Andrés	27e3ae897a	feat: Turn issues into calculated columns refs#7213	2024-05-02 17:05:10 +02:00
Guillermo Bonet	3146f4f5b6	refactor: refs #6701 Refactor claim_ratio_routine	2024-05-02 14:59:30 +02:00
Robert Ferrús	00eae3920b	feat: refs 179918 clean	2024-05-02 13:33:25 +02:00
Robert Ferrús	145a477a80	feat: refs #179918 entry delete isBooked	2024-05-02 12:39:12 +02:00
Jorge Penadés	7cb728432a	fix refs #6889 set originalQuantity to 0	2024-05-02 10:15:01 +02:00
Jorge Penadés	63655a4dd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-02 08:58:51 +02:00
Guillermo Bonet	0ab79728b5	Merge branch 'test' into dev	2024-05-02 08:10:20 +02:00
Guillermo Bonet	7eb2e8f218	Merge branch 'master' into test	2024-05-02 08:09:59 +02:00
Guillermo Bonet	b926725021	hotfix: ticket#179915 Fix no worker exists	2024-05-02 08:04:44 +02:00
Carlos Andrés	a67f603990	Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas	2024-04-30 15:50:13 +02:00
Ivan Mas	de5e43fb05	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-30 12:41:54 +00:00
Ivan Mas	3167bdcdd0	refs #7191 message modification	2024-04-30 14:37:06 +02:00
Jon Elias	2b9bfb5d85	Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ... Reviewed-on: #2364 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-30 10:19:29 +00:00
Robert Ferrús	5ea57ce728	Merge branch 'dev' into 7296-expeditionTruck	2024-04-30 10:04:40 +00:00
Robert Ferrús	83e9756692	fear: refs #7296 expeditionTruck	2024-04-30 12:02:19 +02:00
Robert Ferrús	e7be1e2efe	feat: refs #7296 expeditionTruck to roadmapStop	2024-04-30 11:48:18 +02:00
Guillermo Bonet	f10ecf4f00	Merge branch 'test' into dev	2024-04-30 11:47:55 +02:00
Guillermo Bonet	c987bb6e66	Merge branch 'master' into test	2024-04-30 11:47:35 +02:00
Guillermo Bonet	d44b8f7c9a	hotfix: ticket #179514 ticket_close packaging fix	2024-04-30 11:44:16 +02:00
Guillermo Bonet	80b44ccace	Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev ... Reviewed-on: #2362 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 05:37:33 +00:00
Ivan Mas	a33cbb0a7c	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-29 17:46:26 +00:00
Ivan Mas	30f6a9324d	refs #7191 SQL conventions mod	2024-04-29 19:40:43 +02:00
Carlos Andrés	21a1e1eed3	Hotfix feat: new function to kill connections	2024-04-29 16:59:56 +02:00
Jorge Penadés	9802f0066c	fix: refs #5919 unique key & unassigned locker	2024-04-29 16:05:36 +02:00
Carlos Andrés	7b7afb05c5	hotfix collection_assign	2024-04-29 15:01:20 +02:00
Carlos Andrés	51c8736da2	hotFix collection_assign	2024-04-29 14:54:15 +02:00
Carlos Andrés	dcb6f90ab3	hotfix collection_assign elimino vLockTime	2024-04-29 14:42:16 +02:00
Robert Ferrús	9af3c17a1f	feat: refs #7291 sale_getProblems	2024-04-29 09:58:58 +02:00
Pako Natek	9aa6e3f80a	hotfix	2024-04-27 13:09:15 +02:00
Pako Natek	3440bb1725	hotFix	2024-04-27 12:43:15 +02:00
Pako Natek	9e87b055b7	hotFix	2024-04-27 12:36:21 +02:00
Robert Ferrús	d2c3034ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country	2024-04-26 12:07:53 +02:00
Robert Ferrús	c819b92141	fix: refs #177968 restore restriction	2024-04-26 09:09:22 +02:00
Robert Ferrús	2d0d4b5643	Merge branch 'dev' into 7039-country-country	2024-04-26 06:48:01 +00:00
Pablo Natek	4693ba13fa	Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-26 08:37:51 +02:00
Robert Ferrús	30a905f40b	Merge branch 'dev' into 6223-ticketCalculateClon	2024-04-26 05:08:26 +00:00
Sergio De la torre	611f907ef0	refs #6861 feat:reserveWithReservation	2024-04-25 16:15:53 +02:00
Jorge Penadés	f7cdbd39f0	fix: refs #7211 tests	2024-04-25 16:08:52 +02:00
Javi Gallego	4f20224acc	Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking	2024-04-25 14:28:53 +02:00
Javi Gallego	7d3870e4a1	feat: refs#6382 test fixed	2024-04-25 14:28:47 +02:00
Pablo Natek	c5b02dc239	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 09:46:53 +02:00
Jorge Penadés	88b06ebef5	feat: refs #7211 check if there's available clockIn	2024-04-25 08:49:22 +02:00
Sergio De la torre	d4d31c6d9e	refs #6312 hotFix fix:replaceItem	2024-04-25 08:35:59 +02:00
Sergio De la torre	46f2d790db	refs #6312 hotFix fix:replaceItem	2024-04-25 08:01:32 +02:00
Guillermo Bonet	60a3ec99d0	Merge branch 'dev' into 7258-lastChangesMigrationVn2008	2024-04-25 05:02:17 +00:00
Sergio De la torre	8bb2fa93a7	Merge branch 'dev' into 6574_itemGetBalance	2024-04-24 13:46:53 +00:00
Alex Moreno	917592cdad	Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev ... Reviewed-on: #2366 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 12:34:46 +00:00
Pablo Natek	f2d4283304	fix: refs #7187 number on de code	2024-04-24 14:29:57 +02:00
Alex Moreno	2638b93299	Merge branch '7225-hotFix_ticket_advanced_movable' of https://gitea.verdnatura.es/verdnatura/salix into 7225-hotFix_ticket_advanced_movable	2024-04-24 11:40:25 +02:00
Alex Moreno	eced03f69b	fix(ticket_getMovable): refs #7225 stock add ifnull	2024-04-24 11:40:24 +02:00
Pablo Natek	a15970c95f	fix: refs #7187 sql for pdaFreelancer	2024-04-24 11:08:57 +02:00
Guillermo Bonet	71e1e53ccd	refactor: #7258 Fixes	2024-04-24 10:57:35 +02:00
Alex Moreno	2e1ad0c000	Merge branch 'master' into 7225-hotFix_ticket_advanced_movable	2024-04-24 08:42:26 +00:00
Jon Elias	6706974784	fix: refs #6731 fix ticketRequest	2024-04-24 10:31:26 +02:00
Guillermo Bonet	f7ebd071bf	refactor: #7258 Deleted all dependences of vn2008 schema	2024-04-24 09:53:31 +02:00
Robert Ferrús	ffe56edc9c	feat: refs #7039 country	2024-04-24 09:24:42 +02:00
Robert Ferrús	7899cf230e	feat: refs #7039 country	2024-04-24 09:05:29 +02:00
Robert Ferrús	ec7dc390b9	Merge branch 'dev' into 6223-ticketCalculateClon	2024-04-24 06:05:03 +00:00
Robert Ferrús	e36e997844	feat: refs #6223 ticketCalculateClon	2024-04-24 08:04:28 +02:00
Alex Moreno	cc06698214	hotFix(ticket): refs #7225 fix advanced and movable	2024-04-23 15:37:04 +02:00
Juanjo Breso	9c306d4cc2	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 12:55:02 +00:00
Juanjo Breso	5efb6acafe	feat: refs#6493 Cambios solicitados procedimientos	2024-04-23 14:55:05 +02:00
Guillermo Bonet	e0393a6e72	Merge branch 'test' into dev	2024-04-23 14:43:19 +02:00
Guillermo Bonet	f5844ff426	Merge branch 'master' into test	2024-04-23 14:42:57 +02:00
Guillermo Bonet	ec23cc7619	hotfix: entry_checkBooked	2024-04-23 14:41:43 +02:00
Juanjo Breso	022264ffff	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 14:05:51 +02:00
Juanjo Breso	d1c72a0be3	feat: refs#6493 Cambios solicitados procedimientos	2024-04-23 14:05:48 +02:00
Juanjo Breso	9b2bb4be0e	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 12:04:19 +00:00
Guillermo Bonet	afe2669b27	Merge branch 'test' into dev	2024-04-23 13:57:42 +02:00
Guillermo Bonet	36c8a8db0f	Merge branch 'master' into test	2024-04-23 13:57:18 +02:00
Ivan Mas	e7055e2428	Merge branch 'dev' into 7032-Delete-vn.recipeCook	2024-04-23 10:26:42 +00:00
Guillermo Bonet	8dd4ac9119	hotfix: Throw msg and entry_updateComission start transaction	2024-04-23 11:50:48 +02:00
Juanjo Breso	d7e4dd4fc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 08:03:17 +02:00
Juan Ferrer	d58607f26e	Merge branch 'dev' into 4409-binlog	2024-04-22 19:43:48 +00:00
Pablo Natek	71a9aed1bb	fix: refs #7187 check for multiple device on freelancer	2024-04-22 18:03:17 +02:00
Ivan Mas	9899efab97	refs #7032 Delete vn.recipe_Cook	2024-04-22 17:55:49 +02:00
Ivan Mas	f03a431ea2	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-22 13:08:06 +00:00
Ivan Mas	0284b138d7	refs #7191 requested modifications	2024-04-22 15:03:08 +02:00
Guillermo Bonet	eb9f81c81d	feat #7181 Rollback creditInsurance_getRisk	2024-04-22 13:05:16 +02:00
Robert Ferrús	debd163b3f	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 10:16:01 +00:00
Robert Ferrús	b0289d2e18	Merge pull request 'test' (!2344) from test into dev ... Reviewed-on: #2344 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-22 09:34:45 +00:00
Robert Ferrús	b88dff0d99	feat: refs #6777	2024-04-22 10:48:37 +02:00
Robert Ferrús	e8d7f20221	Merge branch 'master' into 174903-item_getSimilar	2024-04-22 07:43:39 +00:00
Robert Ferrús	a1a3470df4	feat: refs #174903	2024-04-22 09:43:13 +02:00
Juan Ferrer	739ae82ace	fix(binlog): refs #4409 Fix cursor name	2024-04-22 09:02:43 +02:00
Juan Ferrer	bc45cafb40	Merge branch 'dev' into 4409-binlog	2024-04-22 08:54:14 +02:00
Robert Ferrús	e09b828d88	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 05:49:53 +00:00
Sergio De la torre	081c97828c	Merge branch 'master' into hotFix_Ubicador	2024-04-22 05:08:59 +00:00
Guillermo Bonet	e7f81e99bc	Merge branch 'test' into dev	2024-04-19 14:40:26 +02:00
Guillermo Bonet	65892625d5	feat: #7231 Collection_assing more time and throw	2024-04-19 14:17:49 +02:00
Sergio De la torre	e6258dc9e5	refs #6413 hotFix fix:ubicadorChecking	2024-04-19 13:03:57 +02:00
Robert Ferrús	28c08d8b18	feat: refs #7237 company_getSuppliersDebt	2024-04-19 10:58:19 +02:00
Robert Ferrús	c375223ae5	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-19 05:23:23 +00:00
Ivan Mas	7e488ee601	refs #7191 check isBooked in entry_BeforeUpdate	2024-04-18 16:09:05 +02:00
Robert Ferrús	f269d41596	Merge branch 'master' into 174903-item_getSimilar	2024-04-18 12:52:52 +00:00
Guillermo Bonet	bb8379f8db	refactor: refs #6724 Minor change	2024-04-18 14:42:29 +02:00
Robert Ferrús	4f7d315719	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-04-18 14:07:23 +02:00
Guillermo Bonet	8f9adbb37c	Merge branch 'test' into dev	2024-04-18 13:55:22 +02:00
Guillermo Bonet	5c5d0ec9dc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-04-18 13:52:31 +02:00
Guillermo Bonet	d5dc057c36	hotfix: changes	2024-04-18 13:52:30 +02:00
Robert Ferrús	9295bddaa8	feat: refs #174903 item_getSimilar	2024-04-18 13:06:45 +02:00
Carlos Andrés	0ebdd032e5	Merge pull request 'testToMaster fix' (!2325) from test into master ... Reviewed-on: #2325 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-18 10:39:19 +00:00
Guillermo Bonet	d6ec84e1fe	hotfix	2024-04-18 12:07:00 +02:00
Alex Moreno	9143447eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-18 09:27:46 +02:00
Alex Moreno	51d09b4f2a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-18 09:27:15 +02:00
Sergio De la torre	ad13ad856b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-18 09:13:48 +02:00
Alex Moreno	7a021c9ac6	fix(payrollCenter): refs #6738	2024-04-18 09:13:15 +02:00
Pablo Natek	eee7062e3f	Merge pull request 'test' (!2319) from test into dev ... Reviewed-on: #2319 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-18 05:05:40 +00:00
Jorge Penadés	b83e0a4ae2	fix: refs #6492 castToInt	2024-04-17 16:43:17 +02:00
Carlos Andrés	9ca1b9f104	feat: Turn issues into calculated columns refs#7213	2024-04-17 15:02:58 +02:00
Robert Ferrús	edc6e4a5e3	Merge branch 'dev' into 6500-procRefactor8	2024-04-17 11:30:45 +00:00
Juan Ferrer	7cda14c424	Merge branch 'dev' into 4409-binlog	2024-04-17 13:24:32 +02:00
Juan Ferrer	ae326e6e2e	feat(binlog): refs #4409 Old recalc code removed ... Queues: orderTotal, ticketTotal and travelEntries	2024-04-17 13:21:27 +02:00
Robert Ferrús	e769081a74	feat: refs #6500	2024-04-17 13:11:28 +02:00
Robert Ferrús	998466f6eb	Merge pull request 'test' (!2316) from test into dev ... Reviewed-on: #2316 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 10:28:45 +00:00
Guillermo Bonet	0d50f5b405	Merge pull request 'master' (!2315) from master into test ... Reviewed-on: #2315 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 10:20:20 +00:00
Robert Ferrús	3e5b6a9ad1	Merge branch 'dev' into 6500-procRefactor8	2024-04-17 09:01:39 +00:00
Robert Ferrús	8ca278b5a9	feat: refs #6500 cambios solicitados	2024-04-17 11:00:00 +02:00
Robert Ferrús	0a4cd4d4d0	feat: company_getSuppliersDebtHotFix	2024-04-17 09:58:27 +02:00
Guillermo Bonet	9f9662924d	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev ... Reviewed-on: #2306 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 06:48:43 +00:00
Juanjo Breso	3950d60387	feat: refs#6493 Cambios solicitados procedimientos	2024-04-17 07:37:58 +02:00
Juanjo Breso	97c0db62ac	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 07:33:11 +02:00
Juanjo Breso	187c918a21	feat: refs#6493 Cambios solicitados procedimientos	2024-04-17 07:33:08 +02:00
Juanjo Breso	81b2e89fd8	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 05:30:39 +00:00
Guillermo Bonet	36bf770ed4	Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev ... Reviewed-on: #2258 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 05:17:36 +00:00
Guillermo Bonet	d92d373db4	Merge branch 'dev' into 6968-groupingModeRefactor	2024-04-17 05:15:37 +00:00
Guillermo Bonet	c8e7706652	feat: refs #6968 Requested changes	2024-04-17 07:15:24 +02:00
Carlos Andrés	c262805d33	feat: Turn issues into calculated columns refs#7213	2024-04-16 18:29:14 +02:00
Carlos Andrés	7bbf113ffa	feat: Turn issues into calculated columns refs#7213	2024-04-16 18:26:57 +02:00
Carlos Andrés	d53f19b47d	feat: Turn problems into calculated columns	2024-04-16 17:01:14 +02:00
Pablo Natek	d0dfdc668b	feat(agency): refs #4988 add new agency	2024-04-16 16:25:27 +02:00
Robert Ferrús	01d959f6f4	feat: refs #7219	2024-04-16 12:46:50 +02:00
Guillermo Bonet	7a557be09a	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:07:57 +02:00
Jorge Penadés	976b18203e	feat: refs #7187 check if is freelancer on insert & update	2024-04-16 10:49:17 +02:00
Guillermo Bonet	45fac06c6b	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:58:26 +02:00
Guillermo Bonet	91d5f51e73	Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 08:44:51 +02:00
Guillermo Bonet	93abfdd8a1	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:44:50 +02:00
Guillermo Bonet	0c24e67af1	Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 05:42:59 +00:00
Pablo Natek	0418540ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-16 07:39:13 +02:00
Pablo Natek	336c3274ea	feat(agency): refs #4988 add summary	2024-04-16 07:38:48 +02:00
Ivan Mas	5bb3dccd19	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-15 14:03:42 +00:00
Ivan Mas	6e183b7426	refs #7161 change vAddress to vAddressShortage	2024-04-15 15:59:05 +02:00
Sergio De la torre	0f1a086bca	refs #6861 feat:reserve previos	2024-04-15 13:03:27 +02:00
Robert Ferrús	9ee3e76594	Merge branch 'dev' into 5855-temporaryTable	2024-04-15 10:11:35 +00:00
Juan Ferrer	133d45eecf	Merge branch 'dev' into 4409-binlog	2024-04-15 10:22:04 +02:00
Robert Ferrús	f30f907d8e	feat: refs #6500 cambios solicitados	2024-04-12 12:13:07 +02:00
Sergio De la torre	13415b1ef0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-12 09:49:18 +02:00
Robert Ferrús	adadf70f1e	feat: refs #6500	2024-04-12 08:44:06 +02:00
Robert Ferrús	800fa36d04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-04-12 08:40:50 +02:00
Robert Ferrús	f545a57c9f	feat: refs #6500	2024-04-12 07:58:18 +02:00
Guillermo Bonet	d86bb6b004	Merge pull request 'refactor: refs #7181 vn2008.Deleted risk_vs_client_list' (!2283) from 7181-risk_vs_client_list into dev ... Reviewed-on: #2283 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-12 05:18:06 +00:00
Guillermo Bonet	2226922366	Merge branch 'master' into test	2024-04-11 14:52:16 +02:00
Robert Ferrús	04c5a9a004	Merge branch 'dev' into 6500-procRefactor8	2024-04-11 12:21:32 +00:00
Sergio De la torre	3a8dcbfd29	refs #6861 feat:reserve previos	2024-04-11 13:45:43 +02:00
Juanjo Breso	aee638c3a9	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-11 11:43:07 +00:00
Sergio De la torre	9a98c872d4	Merge branch '5890-itemShelving_asignado' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-11 12:34:49 +02:00
Sergio De la torre	b4776727df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-11 12:32:30 +02:00
Sergio De la torre	bc1397d916	refs #6861 feat: reservePrevious	2024-04-11 12:27:16 +02:00
Sergio De la torre	68fa64a937	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-04-11 12:24:00 +02:00
Carlos Andrés	5967bd545c	feat: previas con reserva refs #6861	2024-04-11 12:16:00 +02:00
Guillermo Bonet	c190d2bef1	Merge branch 'master' into ticket168996-hotfix	2024-04-11 07:31:31 +00:00
Guillermo Bonet	c9b2bb5b5e	Merge branch 'dev' into 7181-risk_vs_client_list	2024-04-11 07:29:32 +00:00
Guillermo Bonet	b1dc5efc8b	refactor: refs #7181 Requested changes	2024-04-11 09:29:25 +02:00
Alex Moreno	3635a4b6d0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-11 07:46:16 +02:00
Pablo Natek	b2c3442c12	Merge branch 'master' into 7024-fixInventorryError	2024-04-11 05:33:44 +00:00
Pablo Natek	68ca5d369c	fix: refs #7024 fix error on setting local variable	2024-04-11 07:33:31 +02:00
Sergio De la torre	d998b650da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-11 07:06:40 +02:00
Guillermo Bonet	7b3472aa0b	refactor: refs #7181 Minor change	2024-04-10 14:23:24 +02:00
Pablo Natek	2c5c2ca5a7	fix: refs #7024 fix condition sintax	2024-04-10 14:17:08 +02:00
Guillermo Bonet	5044cd454d	refactor: refs #7181 vn2008.Deleted risk_vs_client_list	2024-04-10 14:17:03 +02:00
Robert Ferrús	e2eff4df54	Merge branch 'dev' into 6500-procRefactor8	2024-04-10 12:04:40 +00:00
Pablo Natek	2e15b35fd1	fix: refs #7024 create exception for inventory	2024-04-10 14:01:03 +02:00
Robert Ferrús	7c550f1dbc	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-10 11:06:32 +00:00
Guillermo Bonet	1fe783cf0e	hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod	2024-04-10 12:00:52 +02:00
Juanjo Breso	2d4524a34c	feat: refs#6493 Cambios solicitados procedimientos	2024-04-10 09:00:41 +02:00
Jorge Penadés	a3c1bceb7e	refactor: refs #6492 use enum	2024-04-09 15:57:34 +02:00
Jorge Penadés	dca75437f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 15:20:30 +02:00
Robert Ferrús	d151d57613	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-04-09 14:25:48 +02:00
Ivan Mas	90c26959af	refs #7161 change longName to name	2024-04-09 13:39:33 +02:00
Ivan Mas	b75af7b192	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-09 11:22:32 +00:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Robert Ferrús	c6ece4619f	feat: refs #6500	2024-04-09 11:40:12 +02:00
Jorge Penadés	9a28a59d00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 11:11:30 +02:00
Robert Ferrús	4574f1afcd	Merge branch 'dev' into 5855-temporaryTable	2024-04-09 05:42:59 +00:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Robert Ferrús	1743f7501a	Merge branch 'dev' into 6500-procRefactor8	2024-04-09 05:37:18 +00:00
Robert Ferrús	2c0c346a7b	feat: refs #6500	2024-04-09 07:34:43 +02:00
Sergio De la torre	590bcd9088	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-09 06:58:53 +02:00
Sergio De la torre	9da7cdfa39	Merge branch 'dev' into 6574_itemGetBalance	2024-04-08 13:32:15 +00:00
Juanjo Breso	1534402640	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 13:28:56 +02:00
Sergio De la torre	2f7f237422	refs #6574 feat: add order	2024-04-08 13:28:38 +02:00
Juan Ferrer	9da9478daf	Merge branch 'dev' into 4409-binlog	2024-04-08 13:11:59 +02:00
Juanjo Breso	351d5b5ba3	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-08 12:57:03 +02:00
Juanjo Breso	d3df3e3376	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 12:57:01 +02:00
Juanjo Breso	eab1bfe6ab	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-08 10:43:39 +00:00
Carlos Andrés	5558e92b1e	Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev ... Reviewed-on: #2163 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 10:36:21 +00:00
Robert Ferrús	2d18f01a15	feat: refs #6500	2024-04-08 12:18:13 +02:00
Robert Ferrús	dddcacee7a	feat: refs #6500	2024-04-08 12:01:27 +02:00
Robert Ferrús	2037b17f4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-04-08 11:57:00 +02:00
Sergio De la torre	a29dcdd33b	Merge branch 'dev' into 6574_itemGetBalance	2024-04-08 09:38:32 +00:00
Sergio De la torre	42b033dde2	refs #6574 feat: add order	2024-04-08 11:35:10 +02:00
Sergio De la torre	957b0c71ca	refs #6574 feat: add order	2024-04-08 10:06:33 +02:00
Juanjo Breso	92cd61460e	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 09:56:36 +02:00
Sergio De la torre	09812c24dd	refs #5890 feat: triggers	2024-04-08 09:54:23 +02:00
Guillermo Bonet	0b96471c7d	feat: refs #6714 Added businessType zone_getAddresses	2024-04-08 09:27:07 +02:00
Juan Ferrer	283d8b1241	feat: refs #4409 Disable old available triggers	2024-04-08 09:11:40 +02:00
Juanjo Breso	55949d0979	feat: refs#6493 Cambios solicitados procedimientos	2024-04-08 07:44:45 +02:00
Sergio De la torre	2770919db9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-08 07:09:47 +02:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Juanjo Breso	07b45748f0	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-05 12:58:36 +02:00
Juanjo Breso	c74aea74bc	feat: refs#6493 modificaciones solicitadas.	2024-04-05 12:58:31 +02:00
Juanjo Breso	f316ca6974	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-05 10:55:20 +00:00
Robert Ferrús	6fab793184	Merge branch 'dev' into 5855-temporaryTable	2024-04-05 06:21:36 +00:00
Guillermo Bonet	0cd4013f5e	Merge branch 'test' into dev	2024-04-05 07:51:19 +02:00
Guillermo Bonet	7ea917dc4d	hotfix: #6875 packing DEFAULT 1	2024-04-05 07:49:37 +02:00
Carlos Andrés	d18721f50d	feat: bloquear facturas recibidas contabilizadas refs #7173	2024-04-04 18:05:45 +02:00
Carlos Andrés	bd661befb6	feat: bloquear facturas recibidas contabilizadas refs #7173	2024-04-04 15:04:23 +02:00
Robert Ferrús	9801279370	refs #169673 item_getSimilar	2024-04-04 13:28:29 +02:00
Sergio De la torre	b742f8a13c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-04 12:26:01 +02:00
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev	2024-04-04 11:30:03 +02:00
Guillermo Bonet	8702a6808c	hotfix: #7024 Modified duaInvoiceInBooking	2024-04-04 11:25:03 +02:00
Sergio De la torre	78f5586136	refs #5890 feat:itemShelving_add	2024-04-04 09:37:34 +02:00
Sergio De la torre	c066462c10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-04-04 07:09:16 +02:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-03 16:24:45 +02:00
Ivan Mas	b9520b53ab	hotfix_clientsDisable	2024-04-03 10:03:59 +02:00
Javi Gallego	d71f3e0818	test	2024-04-03 09:02:34 +02:00
Javi Gallego	52457b9642	feat: sin concatenar en el nombre	2024-04-03 07:09:07 +02:00
Sergio De la torre	6db1696094	refs #5890 feat:trigger	2024-04-03 07:04:12 +02:00
Juanjo Breso	4767b98442	Merge branch '6493--refactorizar-procedimientos-vn2008-parte2' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-02 10:59:25 +02:00
Juanjo Breso	4389cd5d74	feat: refs#6493 modificar procedimiento available_traslate	2024-04-02 09:56:46 +02:00
Pako Natek	cb745b0f4d	release_lock	2024-04-01 14:21:34 +02:00
Pako Natek	bfa59bdcea	release_lock	2024-04-01 14:20:25 +02:00
Pako Natek	3a1f5109d9	lines and volume	2024-04-01 11:58:16 +02:00
Pako Natek	7c4fc31b50	version productionConfig	2024-04-01 08:55:21 +02:00
Pako Natek	df911b9b75	fora comentaris	2024-04-01 08:47:47 +02:00
Pako Natek	547df47049	delete old proc	2024-04-01 08:47:16 +02:00
Pako Natek	98b1e933f7	prova	2024-04-01 08:46:07 +02:00
Pako Natek	9aae9677e6	modificaciones	2024-04-01 08:43:26 +02:00
Jorge Penadés	df271a242d	fix: refs #6492 procedure	2024-03-28 15:03:33 +01:00
Pako Natek	c942786783	pruebas	2024-03-28 14:54:30 +01:00
Juanjo Breso	a911d7fc88	Merge branch '6493-refactorizar-procedimientos-vn2008-parte2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte2	2024-03-28 14:27:38 +01:00
Juanjo Breso	46f60615bd	feat: refs#6493 modificar procedimiento available_traslate	2024-03-28 14:27:29 +01:00
Jorge Penadés	e851c3b481	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-28 14:15:31 +01:00
Robert Ferrús	9a7bcdf104	fix: company_getSuppliersDebt	2024-03-28 13:26:09 +01:00
Pako Natek	d031fef1a0	Merge branch 'dev' into 6358-boxPicking_blueMammut	2024-03-28 11:47:40 +00:00
Pako Natek	1d906c993b	portes	2024-03-28 12:43:13 +01:00
Pako Natek	b445d745a5	cambios	2024-03-28 11:40:18 +01:00
Robert Ferrús	1c18b09531	fix: company_getSuppliersDebt	2024-03-28 10:47:47 +01:00
Robert Ferrús	063745167e	fix: modificar company_getSuppliersDebt	2024-03-28 10:30:41 +01:00
Javi Gallego	585dd70a60	Merge pull request 'feat: #7117 company_getSuppliersDebt devolver el pais del banco' (!2211) from 7117 into dev ... Reviewed-on: #2211	2024-03-28 08:02:30 +00:00
Javi Gallego	699883182c	Merge pull request '7120-specialPrice' (!2213) from 7120-specialPrice into dev ... Reviewed-on: #2213 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 08:01:45 +00:00
Javi Gallego	6596efdc91	Merge pull request '7013-solunionRiskRequest' (!2190) from 7013-solunionRiskRequest into dev ... Reviewed-on: #2190 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 08:01:28 +00:00
Pako Natek	8396b8cd64	Merge branch 'dev' into 6358-boxPicking_YellowZebra	2024-03-28 07:19:12 +00:00
Alex Moreno	f1931fce69	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-28 08:19:26 +01:00
Sergio De la torre	9698c049fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-28 07:35:37 +01:00
Robert Ferrús	1f819ab16a	fix: riesgos	2024-03-27 19:02:05 +01:00
Carlos Andrés	4ac418111b	fix: TRIGGER incorrecto en travel refs #7148	2024-03-27 14:12:34 +01:00
Pako Natek	09c9a3d7ef	vRest	2024-03-27 12:25:57 +01:00
Pako Natek	8f872b4bbb	Merge branch '6358-boxPicking_YellowZebra' of https://gitea.verdnatura.es/verdnatura/salix into 6358-boxPicking_YellowZebra	2024-03-27 12:22:26 +01:00
Pako Natek	c9431e605e	second proposals	2024-03-27 12:22:22 +01:00
Robert Ferrús	c3e3d72182	Merge branch 'master' into 7141-sale_replaceItem	2024-03-27 10:53:31 +00:00
Alex Moreno	b532ce3f77	hotFix: recreate addressTaxArea	2024-03-27 08:30:45 +01:00
Javi Gallego	fe0a1ad7be	feat: #7013 purge productionError	2024-03-27 08:12:05 +01:00
Javi Gallego	4b41ac68aa	feat: #7013 en mayusculas y con espacio en comentarios	2024-03-27 08:05:33 +01:00
Pako Natek	b1a91ab7d3	Merge branch 'dev' into 6358-boxPicking_YellowZebra	2024-03-27 06:55:41 +00:00
Javi Gallego	c3aa4c9355	Merge branch 'dev' into 6782-productionError_add	2024-03-27 06:22:48 +00:00
Juan Ferrer	2604fb28f8	Merge pull request 'test' (!2217) from test into dev ... Reviewed-on: #2217	2024-03-26 16:04:28 +00:00
Juan Ferrer	9aa46c3a90	fix: HOTFIX PROC vn.collection_new release lock on error	2024-03-26 16:50:15 +01:00
Robert Ferrús	8e2770aa56	feat: refs #7141	2024-03-26 16:27:49 +01:00
Pako Natek	861d9b3135	javi's proposals	2024-03-26 14:59:06 +01:00
Pako Natek	5d813784b4	Merge branch 'dev' into 6358-boxPicking_YellowZebra	2024-03-26 14:17:34 +01:00
Javi Gallego	1472fc6fc2	feat: #6782 sin as	2024-03-26 14:02:47 +01:00