1055 Commits

Author	SHA1	Message	Date
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
Jorge Penadés	94f6d20bb1	feat: refs #6942 add Insert	2024-03-26 13:41:53 +01:00
Jorge Penadés	634bfc5091	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-26 12:30:07 +01:00
Javi Gallego	57c42b6808	feat: #7117 añado NOT	2024-03-26 12:16:03 +01:00
Javi Gallego	587dd8f4d9	feat: #7013 sin tabular	2024-03-26 12:12:27 +01:00
Javi Gallego	c99de95b33	feat: #7120 con tabla temporal	2024-03-26 12:07:23 +01:00
Javi Gallego	04117d2c27	fix: #7013 quito vn.	2024-03-26 10:13:10 +01:00
Javi Gallego	b978833a64	fix: #6782 with con esquema	2024-03-26 09:46:53 +01:00
Javi Gallego	7f14211b80	feat: #7117 company_getSuppliersDebt devolver el pais del banco	2024-03-26 09:27:30 +01:00
Javi Gallego	e47b8c1056	fix: solo un trabajador por fallo	2024-03-26 08:52:01 +01:00
Alex Moreno	dce0155c00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-26 08:18:47 +01:00
Juanjo Breso	9a628869cd	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-03-26 06:45:27 +00:00
Robert Ferrús	dd977fab83	fix: refs #7141 catalog_calculate	2024-03-25 14:56:12 +01:00
Pako Natek	10a16fccd8	primer prototipo	2024-03-25 13:03:11 +01:00
Guillermo Bonet	bde8742147	fix: refs #7024 entry_checkBooked	2024-03-25 12:51:47 +01:00
Guillermo Bonet	092eaab851	Merge pull request 'feat: refs #7024 Added entry_checkBooked' (!2201) from 7024-entry_checkBooked into dev ... Reviewed-on: #2201 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-25 11:11:51 +00:00
Juanjo Breso	f4b50dec3e	feat: refs#6493 modificar procedimiento balance_create	2024-03-25 09:41:16 +01:00
Guillermo Bonet	df115ec58b	refactor: refs #6880 vn.professionalCategory changes	2024-03-25 09:41:05 +01:00
Guillermo Bonet	17e61b9caa	feat: refs #7024 Minor change	2024-03-25 08:50:18 +01:00
Guillermo Bonet	4005fe9064	feat: refs #7024 Added entry_checkBooked	2024-03-25 08:47:06 +01:00
Jorge Penadés	256ae359ce	Merge branch 'dev' into 6951-ticketCloneAll	2024-03-25 07:46:38 +00:00
Javi Gallego	8d258254d0	feat: #7013 change name procedure	2024-03-25 07:52:40 +01:00
Javi Gallego	3f3ba3c612	Merge branch 'dev' into 7013-solunionRiskRequest	2024-03-25 07:52:01 +01:00
Jorge Penadés	0867f4d501	fix: refs #6951 var names & procedure name	2024-03-22 16:01:22 +01:00
Jorge Penadés	e8d1967e11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-22 15:14:12 +01:00
Ivan Mas	b9bcc5b2cf	refs #6966 changes required	2024-03-22 15:06:57 +01:00
Guillermo Bonet	5070d4d46f	hotfix item_getSimilar	2024-03-22 14:59:39 +01:00
Ivan Mas	3851d967f4	refs #6966 Modify name sale_replaceItem	2024-03-22 13:56:46 +01:00
Ivan Mas	8a51df2fe5	refs #6498 Delete multipleInventoryHistory	2024-03-22 12:28:23 +01:00
Guillermo Bonet	bda80e03ee	Hotfix item_getSimilar	2024-03-22 11:36:26 +01:00
Juanjo Breso	f2a1d401ca	refs#6493 update	2024-03-22 08:32:38 +01:00
Juanjo Breso	84f544dd2b	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-03-22 06:49:21 +00:00
Guillermo Bonet	ee67820c20	refactor: refs #7018 Fix invoiceInTax_recalc	2024-03-21 12:14:48 +01:00
Guillermo Bonet	535dd40625	fix: refs #7018 Fix invoiceInTax_recalc	2024-03-21 12:06:59 +01:00
Sergio De la torre	f1e8f965b3	refs #5890 itemShelving	2024-03-21 11:59:45 +01:00
Ivan Mas	c33c90aefe	Merge branch 'dev' into 6499-procRefactor6	2024-03-21 10:39:05 +00:00
Sergio De la torre	d7d47da3e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-21 11:19:16 +01:00
Javi Gallego	a24d38128b	feat: #7013 muestra solo clientes asegurados	2024-03-21 10:48:43 +01:00
Javi Gallego	c46e7227e7	feat: #7013 solo muestra clientes asegurados	2024-03-21 10:40:30 +01:00
Javi Gallego	20a338f746	feat: #7120 specialPrice with new fiels	2024-03-21 10:25:08 +01:00
Guillermo Bonet	1cd495df06	fix: refs #7018 Fix invoiceInTax_recalc	2024-03-21 09:25:33 +01:00
Alex Moreno	b087c35a36	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-21 08:01:05 +01:00
Alex Moreno	adddcc96aa	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-03-20 15:01:17 +01:00
Guillermo Bonet	cdaa7999d1	Merge branch 'dev' into 6395-buyBuyerFk	2024-03-20 07:55:05 +00:00
Carlos Andrés	913b261f86	Merge branch 'dev' into 6549-ticket_close	2024-03-18 17:55:54 +01:00
Carlos Andrés	c20747434e	feat: previas con sitema de reservas refs #6861	2024-03-18 17:51:35 +01:00
Jorge Penadés	f044809f30	feat: refs #6951 to create back	2024-03-15 15:45:47 +01:00
Carlos Andrés	bafd4456ef	feat: conversion art. A1 a A2 refs #4979	2024-03-15 14:46:43 +01:00
Jorge Penadés	0fd6a6360c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 14:18:02 +01:00
Javier Segarra	bfdbbc0fdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-15 12:22:57 +01:00
Jorge Penadés	c1018d465a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 11:01:59 +01:00
Guillermo Bonet	ea054eafd5	Merge branch 'test' into dev	2024-03-15 10:56:11 +01:00
Jorge Penadés	a38f93b0e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll	2024-03-15 10:44:37 +01:00
Jorge Penadés	690d935429	refactor: refs #6951 cloneAll	2024-03-15 10:00:24 +01:00
Carlos Andrés	160d72e755	hotfix upload invoiceIn_add.sql error	2024-03-14 17:02:07 +01:00
Jorge Penadés	ff130b773d	fix: refs #6492 drop useless insert	2024-03-14 11:49:21 +01:00
Carlos Andrés	3999533707	Merge branch 'test' into 6960-restricciones-AWB	2024-03-14 11:33:14 +01:00
Carlos Andrés	1e29b6c1ed	merge test	2024-03-14 11:30:07 +01:00
Guillermo Bonet	184a3a3c7a	refs #6395 Requested changes	2024-03-14 10:05:25 +01:00
Guillermo Bonet	166b74c70d	Merge branch 'dev' into 6395-buyBuyerFk	2024-03-14 08:59:22 +00:00
Sergio De la torre	06b33fc59d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-14 09:50:07 +01:00
Jorge Penadés	3e458281e6	fix: refs #6492 boxes alias	2024-03-14 09:42:54 +01:00
Guillermo Bonet	fbeb9b058d	hotfix: itemProposal added optimizer_search_depth	2024-03-14 09:34:37 +01:00
Jorge Penadés	7a94ae3551	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-03-14 09:10:44 +01:00
Guillermo Bonet	08359cdfe0	Merge pull request 'refactor: refs #6875 Add restriction on vn.buy.packing field not null and > 0' (!2047) from 6875-packingNotNull into dev ... Reviewed-on: #2047 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 08:05:11 +00:00
Alex Moreno	0ad052c34a	refs #7033 deploy(2412): dev to test	2024-03-14 08:36:19 +01:00
Guillermo Bonet	b4b6b47a9c	hotfix: itemProposal added transaction	2024-03-14 07:53:24 +01:00
Sergio De la torre	bfcfd2245b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-14 07:40:30 +01:00
Robert Ferrús	1d434da539	Merge branch 'dev' into 6500-procRefactor8	2024-03-14 05:59:22 +00:00
Guillermo Bonet	11dcb6e79f	refactor: refs #6875 packing not null, negative or zero	2024-03-13 13:45:57 +01:00
Carlos Andrés	ff459ea3be	fix: closeTicket idem salix refs #6549	2024-03-13 12:18:43 +01:00
Guillermo Bonet	cbaa48a933	Merge branch 'dev' into 6875-packingNotNull	2024-03-13 10:56:17 +00:00
Guillermo Bonet	14571ed10f	Merge branch 'dev' into 7018-procMigration	2024-03-13 09:39:55 +00:00
Guillermo Bonet	b5f3753253	Merge branch 'test' into dev	2024-03-13 07:42:51 +01:00
Guillermo Bonet	319bf314b3	hotfix: itemProposal	2024-03-13 07:38:14 +01:00
Jorge Penadés	9e596e6525	fix: refs #6492 file names	2024-03-12 15:27:09 +01:00
Jorge Penadés	10c2d25cbd	feat: refs #6492 create procedures & grant privileges	2024-03-12 12:57:34 +01:00
Javier Segarra	63a22a50f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-12 09:37:41 +01:00
Jorge Penadés	5531639027	feat: refs #6951 create procedure	2024-03-12 09:34:12 +01:00
Guillermo Bonet	1d398a0acf	refactor: refs #7018 Added comment and minor changes	2024-03-12 08:40:11 +01:00
Guillermo Bonet	e2eddbaef7	refactor: refs #7018 Added comment	2024-03-12 08:35:13 +01:00
Guillermo Bonet	1bcb61a224	refactor: refs #7018 Mirated procs to vn	2024-03-12 08:25:58 +01:00
Guillermo Bonet	516b4b364f	Merge branch 'dev' into 6499-procRefactor6	2024-03-11 13:36:34 +00:00
Guillermo Bonet	adafab5847	refactor: refs #6874 item_getSimilar	2024-03-11 13:27:18 +01:00
Guillermo Bonet	552a1a33c2	hotfix: itemProposal	2024-03-11 12:38:52 +01:00
Guillermo Bonet	a34be6ca02	Merge branch 'test' into dev	2024-03-11 12:21:54 +01:00
Robert Ferrús	9910ae5c64	fix: refs #6610 quitar variable	2024-03-11 12:12:02 +01:00
Jorge Penadés	4e8e7d3f4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-11 08:59:26 +01:00
Sergio De la torre	61de81254a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado	2024-03-11 08:11:00 +01:00
Alex Moreno	dcdad9c469	Merge branch 'dev' into 6925-invoice-transaction	2024-03-11 06:05:50 +00:00
Javier Segarra	18773f34de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-09 11:27:57 +01:00
Robert Ferrús	b1e90fabb2	refs #6610	2024-03-08 12:32:22 +01:00
Robert Ferrús	cdb9f372cf	feat: refs #6610 fixDeleteTickets	2024-03-08 12:19:57 +01:00
Jorge Penadés	76c5595a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-08 11:01:25 +01:00
Guillermo Bonet	37e8518242	feat: refs #6372 Added saleLabel to vn.clean	2024-03-08 10:38:35 +01:00
Alex Moreno	89c55d23a4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-08 08:11:30 +01:00
David Domenech	014914e1d9	refs #6372	2024-03-08 07:36:14 +01:00
Jorge Penadés	1e3967a4fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-07 15:56:02 +01:00
Alex Moreno	2f2aba1cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-07 11:42:35 +01:00
Alex Moreno	ed39ede6cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-03-07 10:35:14 +01:00
Alex Moreno	3bfaa97ddd	fix: refs #6995remove preparation_exception	2024-03-07 10:18:30 +01:00
Alex Moreno	99c9ad77d2	fix: refs #6995 restore vn.exchangeInsuranceInPrevious	2024-03-07 10:07:42 +01:00
Alex Moreno	572a09f704	fix: refs #6995 restore vn.exchangeInsuranceInPrevious	2024-03-07 09:55:29 +01:00
Guillermo Bonet	39b4e5db28	Merge branch 'dev' into 6948-bank	2024-03-07 06:17:26 +00:00
Carlos Andrés	f1654609df	Merge pull request 'test' (!2142) from test into dev ... Reviewed-on: #2142 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-03-06 16:16:16 +00:00