513 Commits

Author	SHA1	Message	Date
Carlos Satorres	7895f12e3d	Merge branch 'dev' into 6842-sageMod	2024-03-14 07:28:12 +00:00
Carlos Satorres	2d8f5f5f50	Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod	2024-03-14 08:26:52 +01:00
Carlos Satorres	e24eed16c1	refs #6842 fix companyCode	2024-03-14 08:26:50 +01:00
Robert Ferrús	2d7110f05c	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-14 06:08:00 +00:00
Carlos Andrés	77d1a38a87	fix: closeTicket idem salix refs #6549	2024-03-13 18:51:11 +01:00
Javier Segarra	4012b1756d	refs #5858 add comment	2024-03-13 15:00:12 +01:00
Robert Ferrús	6163cad8a5	refs #6738	2024-03-13 14:17:10 +01:00
Robert Ferrús	fad30eb56d	feat: refs #6738	2024-03-13 14:08:14 +01:00
Guillermo Bonet	11dcb6e79f	refactor: refs #6875 packing not null, negative or zero	2024-03-13 13:45:57 +01:00
Robert Ferrús	052acdcc08	feat: refs #7029 packaging	2024-03-13 13:20:14 +01:00
Robert Ferrús	2d9a106fab	feat: refs #6738 premisos	2024-03-13 12:59:45 +01:00
Robert Ferrús	0413707061	feat: refs #6738	2024-03-13 12:50:27 +01:00
Carlos Andrés	ff459ea3be	fix: closeTicket idem salix refs #6549	2024-03-13 12:18:43 +01:00
Javier Segarra	172e7566b5	refs #5858 perf: improve insert	2024-03-13 11:58:25 +01:00
Guillermo Bonet	cbaa48a933	Merge branch 'dev' into 6875-packingNotNull	2024-03-13 10:56:17 +00:00
Javier Segarra	8276765225	refs #5858 perf: destinationFk to pepe	2024-03-13 11:54:02 +01:00
Carlos Satorres	f79d1320d8	Merge branch 'dev' into 6842-sageMod	2024-03-13 10:29:07 +00:00
Alex Moreno	bce82881f3	Merge branch 'dev' into 6005-backupLabeler	2024-03-13 07:03:56 +00:00
Robert Ferrús	a6de9fd370	feat: refs #6738 modificar a nombres propuestos	2024-03-13 07:19:06 +01:00
Jorge Penadés	9e596e6525	fix: refs #6492 file names	2024-03-12 15:27:09 +01:00
Javier Segarra	ff6a1a9111	refs #6930 perf: remove logoutMultimedia acl	2024-03-12 13:39:01 +01:00
Jorge Penadés	10c2d25cbd	feat: refs #6492 create procedures & grant privileges	2024-03-12 12:57:34 +01:00
Javier Segarra	486b51bcfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-03-12 12:46:46 +01:00
Robert Ferrús	9624cdce60	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-12 11:25:56 +00:00
Sergio De la torre	9d94259d67	refs #6078 feat: workerActivity	2024-03-12 12:21:46 +01:00
Javier Segarra	e7f6e61ea1	refs #5858: change notification owner	2024-03-12 10:20:43 +01:00
Sergio De la torre	375b690063	Merge branch 'dev' into 6078_workerActivty	2024-03-12 09:12:45 +00: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
Guillermo Bonet	819bc7a56d	Merge pull request 'refactor: refs #6495 Migrated procs to vn' (!2108) from 6495-procRefactor4 into dev ... Reviewed-on: #2108 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-12 06:04:19 +00:00
Guillermo Bonet	516b4b364f	Merge branch 'dev' into 6499-procRefactor6	2024-03-11 13:36:34 +00:00
Pablo Natek	8529bed895	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-11 12:01:13 +01: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
Javier Segarra	4994a836c7	refs #5858 feat: alter table util.notification	2024-03-09 11:27:29 +01:00
Guillermo Bonet	1027ef6479	Merge branch 'dev' into 6495-procRefactor4	2024-03-08 11:31:54 +00: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
Pablo Natek	2421cc7c68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-08 08:23:08 +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	60c50337ff	refs #6372	2024-03-08 07:43:13 +01:00
David Domenech	014914e1d9	refs #6372	2024-03-08 07:36:14 +01:00
Carlos Andrés	45bcf8043f	feat: permissions to vn.entry.isBooked refs#6724	2024-03-07 19:03:57 +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
Carlos Satorres	557f1ec2d9	Merge branch 'dev' into 6842-sageMod	2024-03-07 13:40:37 +00: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	fbdebad12c	fix: refs #6995 desdeprecar unary_scan, unary_scan_line, unary_scan_line_buy, unary_scan_line_expedition	2024-03-07 10:29:31 +01:00
Alex Moreno	00355aba3a	fix: refs #6995 desdeprecar unary y unary_scan	2024-03-07 10:24:18 +01:00
Alex Moreno	b8f09f363f	fix: refs #6995 restore vn2008.jerarquia	2024-03-07 09:33:32 +01:00
Alex Moreno	a8c2779ee7	Merge branch 'master' into 6995-testToMaster_2410	2024-03-07 06:22:04 +00:00
Sergio De la torre	69ad44c0bd	Merge branch 'dev' into 6078_workerActivty	2024-03-07 07:18:16 +01:00
Guillermo Bonet	39b4e5db28	Merge branch 'dev' into 6948-bank	2024-03-07 06:17:26 +00:00
Guillermo Bonet	ee08502f33	Merge branch 'dev' into 6495-procRefactor4	2024-03-07 06:07:54 +00:00
Guillermo Bonet	cd40bd47e5	refactor: refs #6495 Deleted procs	2024-03-07 07:08:40 +01:00
Javier Segarra	6c06f70121	Merge branch 'dev' into 6930_scopedToken_Multimedia	2024-03-06 18:18:34 +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
Carlos Andrés	fc3c9332b3	Merge pull request 'master' (!2141) from master into test ... Reviewed-on: #2141 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-03-06 16:10:42 +00:00
Carlos Andrés	c81749da78	feat: add column department.pbxQueue refs #6387	2024-03-06 16:38:34 +01:00
Carlos Satorres	58a239708d	refs #6842 remove sage	2024-03-06 13:11:41 +01:00
Carlos Satorres	59a0cb3f4a	refs #6842 deprecated and move	2024-03-06 13:08:20 +01:00
Javier Segarra	7999a9bf93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-06 11:42:09 +01:00
Javier Segarra	eb5fdd1940	refs 5858 feat: replace with code	2024-03-06 11:41:48 +01:00
Guillermo Bonet	094c00aabd	Merge branch 'dev' into 6495-procRefactor4	2024-03-06 10:17:45 +00:00
Jorge Penadés	f600a99708	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-06 10:55:05 +01:00
Alex Moreno	31dc2db838	Merge branch 'dev' into 6336-claimState_removeSome	2024-03-06 08:08:25 +00:00
Ivan Mas	354ecfaa16	refs #6498 Arreglar grant y tabs	2024-03-06 09:00:21 +01:00
Robert Ferrús	b353924034	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-05 13:49:57 +00:00
Ivan Mas	f215ce5f05	refs #6498 Delete procedures vn2008 and grant vn procs	2024-03-05 14:33:16 +01:00
Robert Ferrús	5f16a9827c	feat: refs #6738 move file version	2024-03-05 14:17:58 +01:00
Robert Ferrús	1580914567	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-05 12:23:23 +00:00
Pako Natek	9c14836bc7	BlueMonkey	2024-03-05 13:18:13 +01:00
Guillermo Bonet	00d5d06c6a	Merge branch 'test' into dev	2024-03-05 12:38:15 +01:00
Guillermo Bonet	85d3508848	Merge branch 'master' into test	2024-03-05 12:37:06 +01:00
Sergio De la torre	cf181521d6	refs #6078 feat:add workeractivity	2024-03-05 11:53:57 +01:00
Guillermo Bonet	55ba315858	refactor: refs #6948 Bank to Accouting	2024-03-05 10:30:25 +01:00
Guillermo Bonet	e0732835d0	refactor: refs #6948 Bank to Accouting	2024-03-05 10:25:23 +01:00
Jorge Penadés	0aa4add71b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-05 10:11:41 +01:00
Robert Ferrús	d668ae9904	refs #6738	2024-03-05 09:34:30 +01:00
Robert Ferrús	dc343a7e3b	feat: refs #6738 delete vn2008.dock	2024-03-05 09:33:48 +01:00
Guillermo Bonet	ab4d1a0437	Merge branch 'dev' into 6495-procRefactor4	2024-03-05 07:54:40 +00:00
Guillermo Bonet	619ac4e053	refactor: refs #6495 Requested changes	2024-03-05 08:55:40 +01:00
Robert Ferrús	0c9e11c0b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2	2024-03-05 08:40:34 +01:00
Robert Ferrús	9a0b4ef674	feat: refs #6738 change table vn2008 to vn	2024-03-05 08:36:19 +01:00
Guillermo Bonet	489d126f79	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 13:44:47 +00:00
Alex Moreno	5e794a7791	Merge branch 'dev' into 6336-claimState_removeSome	2024-03-04 13:15:50 +00:00
Alex Moreno	b761c258a1	refs #6336 feat(claimState): delete without using	2024-03-04 14:12:56 +01:00
Guillermo Bonet	2c7913a3be	Merge branch 'dev' into 6499-procRefactor7	2024-03-04 12:41:50 +00:00
Guillermo Bonet	fa70eeb75c	refactor: refs #6499 Requested changes	2024-03-04 13:42:11 +01:00
Guillermo Bonet	e65fc06a30	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 12:33:49 +00:00
Javier Segarra	753525d0ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-03-04 11:57:16 +01:00
Javier Segarra	78c92af02f	refs #5858 feat: fix vn file	2024-03-04 11:57:10 +01:00
Jorge Penadés	9cff06ae3d	feat: refs #6276 acl itemBarcode delete	2024-03-04 09:30:07 +01:00
Guillermo Bonet	df7427d83c	Merge branch 'dev' into 6499-procRefactor7	2024-03-04 06:07:56 +00:00
Guillermo Bonet	b29a001c7f	Merge branch 'dev' into 6496-cleanVn2008	2024-03-04 06:07:53 +00:00
Guillermo Bonet	216f6f1db3	Merge branch 'dev' into 6495-procRefactor4	2024-03-04 06:07:30 +00:00
Jorge Penadés	7d8d31022b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-01 12:29:55 +01:00
Jorge Penadés	657430d28b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog	2024-03-01 12:15:49 +01:00
Guillermo Bonet	941e7da767	Merge branch 'dev' into 6494-procRefactor3	2024-03-01 10:23:08 +00:00
Guillermo Bonet	1f9f10323b	refactor: refs #6494 Migrated and deleted residual procs	2024-03-01 11:21:04 +01:00
Pablo Natek	6aa68afd8f	Merge pull request 'remove(claimRma): refs #6349 remove' (!2100) from 6349-deleteClaimRma into dev ... Reviewed-on: #2100 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-01 07:39:06 +00:00
Guillermo Bonet	f4aa5cea91	refactor: refs #6499 Grants	2024-03-01 07:32:45 +01:00
Jorge Penadés	7b0bed209e	feat: refs #5186 add acl & model	2024-02-29 16:27:42 +01:00
Jorge Penadés	1927878184	fix: refs #5186 drop SaleGroup from ticketLog	2024-02-29 16:04:16 +01:00
Jorge Penadés	c54c9ce913	fix: refs #5186 create parkingLog & add sector relation	2024-02-29 14:43:37 +01:00
Javier Segarra	95fa776e41	refs 5858 feat: sql files	2024-02-29 12:49:50 +00:00
Guillermo Bonet	625d19e88c	hotfix: Autoincrement warehouse	2024-02-29 13:44:58 +01:00
Juanjo Breso	ecd7e8eb98	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-02-29 11:59:13 +01:00
Javier Segarra	8e976d2e4f	refs #5858 feat: remove Schedule system	2024-02-29 09:28:27 +01:00
Javier Segarra	becd2e6f48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-29 07:49:24 +01:00
Ivan Mas	10a89cb790	refs #6827 Check usernames special characters	2024-02-28 13:32:17 +01:00
Guillermo Bonet	f5f2179ac6	refactor: refs #6495 Migrated procs to vn	2024-02-28 12:32:28 +01:00
Javier Segarra	1d1d950e4b	refs 6930 feat: ACL	2024-02-28 11:57:00 +01:00
Javier Segarra	9cad2de9fb	Merge branch '6930_scopedToken_Multimedia' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia	2024-02-28 10:55:39 +01:00
Javier Segarra	a06a593412	refs 6930 feat: ACL	2024-02-28 10:55:36 +01:00
Jorge Penadés	cbb7bd0028	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-27 15:50:47 +01:00
Guillermo Bonet	fefc193ec0	refactor: refs #6496 Deleted clean vn2008	2024-02-27 13:59:21 +01:00
Robert Ferrús	12fbae83c3	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-02-27 12:55:55 +00:00
Robert Ferrús	2fe0d5f5dd	fix: refs #6371 restore tables dock y Tramos	2024-02-27 13:02:15 +01:00
Robert Ferrús	9c6c514056	feat: refs #6738	2024-02-27 11:48:49 +01:00
Jorge Penadés	2795c39442	Merge branch 'dev' into 6513-deleteWrongRecords	2024-02-27 09:07:20 +00:00
Carlos Andrés	7795c949b1	Merge pull request '6937-Agrupar-los-DUA-en-funcion-del-transitario-y-pais' (!2097) from 6937-Agrupar-los-DUA-en-funcion-del-transitario-y-pais into dev ... Reviewed-on: #2097 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-27 09:03:12 +00:00
Robert Ferrús	415b6109b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2	2024-02-27 09:54:21 +01:00
Jorge Penadés	c875abf5e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-27 09:42:14 +01:00
Jorge Penadés	5f20a66ad7	fix: refs #6513 use vn	2024-02-27 08:50:23 +01:00
Pablo Natek	8263b203a7	remove(claimRma): refs #6349 remove	2024-02-26 18:38:50 +01:00
Jorge Penadés	eba7ef31a2	fix: refs #6513 delete wrong records	2024-02-26 15:11:02 +01:00
Guillermo Bonet	554f6c4695	Merge branch 'test' into dev	2024-02-26 14:28:46 +01:00
Guillermo Bonet	57dd1a4e56	Merge branch 'master' into test	2024-02-26 14:28:08 +01:00
Carlos Andrés	2932e53389	feat:Agrupar DUA en función del transitario y país #6937	2024-02-26 14:00:27 +01:00
Carlos Andrés	fa53dcbf9d	feat:Agrupar DUA en función del transitario y país #6937	2024-02-26 13:57:56 +01:00
Carlos Andrés	27beefe1ef	feat:Agrupar DUA en función del transitario y país #6937	2024-02-26 13:43:32 +01:00
Jorge Penadés	085e231142	Merge branch 'dev' into 6513-createSupplierDms	2024-02-26 12:29:44 +00:00
Jorge Penadés	41c44e6f59	Merge branch 'dev' into 6878-fixTimeEntry	2024-02-26 12:05:31 +00:00
Sergio De la torre	96abdd4630	refs #6078 feat:add workeractivity	2024-02-26 12:52:34 +01:00
Guillermo Bonet	89a9cc26d3	fix: ticket #158883	2024-02-26 09:50:03 +01:00
Jorge Penadés	910cc41beb	fix: refs #6513 trigger & alter table	2024-02-26 09:35:06 +01:00
Jorge Penadés	9df91a33b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6513-createSupplierDms	2024-02-26 08:26:17 +01:00
Alex Moreno	d37802fda8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-26 07:21:47 +01:00
Juan Ferrer	e6d789ea13	Merge pull request 'refs #6915 test into dev' (!2093) from test into dev ... Reviewed-on: #2093	2024-02-23 18:05:45 +00:00
Juan Ferrer	3f0d301870	Merge pull request 'refs #6915 master into test' (!2092) from master into test ... Reviewed-on: #2092	2024-02-23 18:02:07 +00:00
Jorge Penadés	3c038a060c	feat: refs #6513 WIP triggers & logger	2024-02-23 16:27:49 +01:00
Jorge Penadés	1a1e7742d3	feat: refs #6513 create table	2024-02-23 15:32:21 +01:00
Guillermo Bonet	34b5312266	Merge branch 'test' into dev	2024-02-23 15:04:59 +01:00
Guillermo Bonet	e971070f2f	fix: refs #6372 Version	2024-02-23 14:21:40 +01:00
David Domenech	d62c7ef0f5	refs #6372	2024-02-23 13:45:48 +01:00
David Domenech	8076707109	refs #6372	2024-02-23 13:29:36 +01:00
Jorge Penadés	70c400c5f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-23 12:51:22 +01:00
Jorge Penadés	6e161dfee8	fix: refs #6878 column name	2024-02-23 12:45:58 +01:00
Pablo Natek	18da27179d	merge(dev): refs #6005 traduction conflict	2024-02-23 09:40:58 +01:00
Ivan Mas	03fc7cfb4e	Merge branch 'dev' into 6784-delete-clientTypeFk	2024-02-23 08:24:12 +00:00
Alex Moreno	0ad3abcea3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-23 08:39:54 +01:00
Alex Moreno	1d4c48e149	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 08:39:26 +01:00
Alex Moreno	4a2032b9cd	refs #5509 fix(EntryDms): sql	2024-02-23 07:39:56 +01:00
Alex Moreno	1f48245223	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-23 07:13:54 +01:00
Alex Moreno	2b19004783	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-23 07:13:05 +01:00
Alex Moreno	c7dd81e53d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-23 07:12:24 +01:00
David Domenech	f2b1418419	Merge branch 'dev' into 6372-ExpenseManual-Error	2024-02-23 06:03:14 +00:00
Jorge Penadés	76b1433099	fix: refs #6878 use clockIn procedure on update time	2024-02-22 12:48:07 +01:00
Carlos Andrés	ae58c2219b	Merge branch 'dev' into test	2024-02-22 10:16:09 +00:00
David Domenech	13249fae08	refs #6372	2024-02-22 10:47:27 +01:00
Alex Moreno	033b176e72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-22 09:06:03 +01:00
Pablo Natek	f4f6eeb6fe	fix(version): refs #6372 add semicolon	2024-02-22 08:36:14 +01:00
David Domenech	d48fd77f48	refs #6372	2024-02-22 08:25:38 +01:00
David Domenech	5110d6e71d	fix error refs #6372	2024-02-22 07:09:35 +01:00
Javier Segarra	d0c82f694e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-22 07:08:41 +01:00
David Domenech	e4d60d20c5	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-22 05:59:00 +00:00
Robert Ferrús	0a16335eaa	fix: refs #6371 restore tables	2024-02-21 18:48:39 +01:00
Pako Natek	10bdc21829	Merge branch 'dev' into 6906-workerActivity	2024-02-21 16:16:41 +00:00
Javier Segarra	838effadc0	refs #5858 feat: move change to vnx	2024-02-21 15:18:10 +01:00
Alex Moreno	60dfe8ec05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8	2024-02-21 15:12:48 +01:00
Alex Moreno	92f2282632	Revert "Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test" ... This reverts commit cbe23d8df5, reversing changes made to c4a64b93cc.	2024-02-21 14:52:28 +01:00
Alex Moreno	01f1bd0088	Revert "Merge branch 'dev' into test" ... This reverts commit c4a64b93cc, reversing changes made to 2ab1cebb31.	2024-02-21 14:44:34 +01:00
Ivan Mas	48310d24c7	refs #6732 change name supplier.isSerious to supplier.isReal	2024-02-21 14:36:12 +01:00
Alex Moreno	c4a64b93cc	Merge branch 'dev' into test	2024-02-21 13:32:54 +00:00
Javier Segarra	88a88640e5	refs #5858 feat: sql comments	2024-02-21 14:22:06 +01:00
David Domenech	5bef3989cd	refs #6372	2024-02-21 14:07:52 +01:00
Robert Ferrús	fba353f8e4	feat: refs #6371 restore Proveedores_cargueras	2024-02-21 13:43:33 +01:00
Pablo Natek	5e97f820a2	feat(spec): refs #6005 add spec	2024-02-21 12:59:42 +01:00
Pako Natek	3463b8fcb1	done	2024-02-21 12:09:52 +01:00
Ivan Mas	f592045925	refs #6784 Delete clientType.id and modify relationships in json and js	2024-02-21 11:49:27 +01:00
Alex Moreno	946006c7e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-21 07:48:05 +01:00
David Domenech	1cf17a3d8d	refs #6372	2024-02-21 07:35:57 +01:00
Pablo Natek	913e7aa1d8	fix(run): refs #6372 change version	2024-02-20 14:22:07 +01:00
Javier Segarra	811a49275d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-20 13:53:18 +01:00
Pablo Natek	1c40e01fcb	refactor: refs #6005 move the logic to the report	2024-02-20 13:49:42 +01:00
Ivan Mas	3813dbb9fd	refs #6784 Delete clientTypeFk	2024-02-20 13:10:03 +01:00
Robert Ferrús	1563fe2cea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2	2024-02-20 12:30:25 +01:00
Jorge Penadés	9ce162da71	fix: refs #6776 back	2024-02-20 10:59:13 +01:00
Jorge Penadés	9b5823384a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-20 08:26:02 +01:00
David Domenech	8f80b6ab7b	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-20 06:05:34 +00:00
Robert Ferrús	4f6ae220e1	feat: refs #6738 crear las Fk de la tabla flight	2024-02-19 15:10:34 +01:00
Javi Gallego	a7c48e9132	feat: #6392 quito de fixtures para que no falle la fk	2024-02-19 15:05:11 +01:00
Jorge Penadés	e9f7fbed86	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-19 14:46:56 +01:00
Jorge Penadés	d5a3413307	fix: refs #6776 method names & chanmges	2024-02-19 14:46:42 +01:00
Javi Gallego	c53ff1243f	feat: #6392 no es necesario agencyTermConfig	2024-02-19 14:37:36 +01:00
Javi Gallego	2c1172bd88	feat: #6392 sin gastos	2024-02-19 13:56:16 +01:00
Javi Gallego	8642ddcd7f	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-19 13:34:27 +01:00
Carlos Satorres	9e3b4e8451	refs #6842 sql mod sage	2024-02-19 13:30:03 +01:00
Alex Moreno	e8a945ba51	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-19 11:49:20 +01:00
David Domenech	c12fdc2ed4	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-19 10:29:47 +00:00
David Domenech	3d47c9e5e8	refs #6372	2024-02-19 11:27:37 +01:00
Sergio De la torre	7a0320270a	Merge pull request 'test' (!2048) from test into dev ... Reviewed-on: #2048 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-19 10:25:33 +00:00
David Domenech	12f3af68bf	refs #6372	2024-02-19 11:04:07 +01:00