1148 Commits

Author	SHA1	Message	Date
Robert Ferrús	4f4d12c76a	Merge branch 'dev' into 7544-claimChangeState	2024-07-10 05:22:19 +00: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	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
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
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	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
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	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	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