4589 Commits

Author	SHA1	Message	Date
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
Carlos Satorres	1315bfda88	refs #6755 fix test	2024-03-13 14:18:53 +01:00
Robert Ferrús	6163cad8a5	refs #6738	2024-03-13 14:17:10 +01:00
Pako Natek	67b55ae845	fixtures local	2024-03-13 14:16:27 +01:00
Robert Ferrús	fad30eb56d	feat: refs #6738	2024-03-13 14:08:14 +01:00
Pako Natek	25f979156a	nuevo url para catalogue y sliders_get	2024-03-13 14:00:59 +01:00
Guillermo Bonet	11dcb6e79f	refactor: refs #6875 packing not null, negative or zero	2024-03-13 13:45:57 +01:00
Carlos Satorres	41fbae7eec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-13 13:37:38 +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
Sergio De la torre	b4fe00a028	Merge branch 'dev' into 6078_workerActivty	2024-03-13 11:36:59 +00: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
Guillermo Bonet	14571ed10f	Merge branch 'dev' into 7018-procMigration	2024-03-13 09:39:55 +00:00
Robert Ferrús	786eb08779	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-13 07:07:42 +00:00
Alex Moreno	bce82881f3	Merge branch 'dev' into 6005-backupLabeler	2024-03-13 07:03:56 +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
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
Carlos Satorres	106296be7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-12 12:55:56 +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	c1d0ea7e27	refs #5858: breaklines	2024-03-12 09:40:42 +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	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	35dab518c8	Merge branch 'dev' into 6005-backupLabeler	2024-03-11 12:41:07 +00:00
Pablo Natek	421ca8654d	fix(changes): refs #6005 remove changes files	2024-03-11 13:39:03 +01: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
Pablo Natek	8529bed895	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-03-11 12:01:13 +01:00
Carlos Satorres	35c5e127d4	Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod	2024-03-11 09:48:36 +01:00
Carlos Satorres	b051b0512f	refs #6842 fix fixtures	2024-03-11 09:48:29 +01:00
Jorge Penadés	e5387b0b65	fix: refs #5186 use date function	2024-03-11 09:14:05 +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
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
Javier Segarra	4994a836c7	refs #5858 feat: alter table util.notification	2024-03-09 11:27:29 +01:00
Robert Ferrús	b6af349d89	Merge branch '6610-hotFixDeleteTicketsWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 6610-hotFixDeleteTicketsWeekly	2024-03-08 12:32:25 +01:00
Robert Ferrús	b1e90fabb2	refs #6610	2024-03-08 12:32:22 +01:00
Guillermo Bonet	1027ef6479	Merge branch 'dev' into 6495-procRefactor4	2024-03-08 11:31:54 +00:00
Robert Ferrús	05b60150a0	Merge branch 'master' into 6610-hotFixDeleteTicketsWeekly	2024-03-08 11:20:07 +00: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	74c199384c	fix: refs #6372 vn2008.clean	2024-03-08 10:42:07 +01:00
Guillermo Bonet	37e8518242	feat: refs #6372 Added saleLabel to vn.clean	2024-03-08 10:38:35 +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
Pako Natek	b588b9807c	fixtures local	2024-03-07 13:45:53 +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	f29212cb65	deploy: refs #6995 production dump	2024-03-07 10:34:24 +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	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
Alex Moreno	b8f09f363f	fix: refs #6995 restore vn2008.jerarquia	2024-03-07 09:33:32 +01:00
Carlos Satorres	64d82d92d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor	2024-03-07 09:28:32 +01:00
Robert Ferrús	bf9842d5fd	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-07 07:16:11 +00: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
Robert Ferrús	29926db45f	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-07 06:01:37 +00: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
Sergio De la torre	dc6cfafd05	Merge branch 'dev' into 6607_checking_boxes	2024-03-06 16:03:24 +00:00
Carlos Andrés	c81749da78	feat: add column department.pbxQueue refs #6387	2024-03-06 16:38:34 +01:00
Ivan Mas	6b2533cfb1	refs #6498 correccion errores 2	2024-03-06 15:16:55 +01:00
Carlos Satorres	a14ab90d5a	refs #6755 fix restore add fixtures	2024-03-06 14:41:58 +01:00
Robert Ferrús	194947dc9a	feat: refs #6500 procRefactor8	2024-03-06 14:11:07 +01:00
Alex Moreno	9ab0228714	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction	2024-03-06 13:58:10 +01:00
Carlos Satorres	58a239708d	refs #6842 remove sage	2024-03-06 13:11:41 +01:00
Carlos Satorres	6a13a33f84	min c	2024-03-06 13:09:41 +01:00
Carlos Satorres	a24445439a	remove v	2024-03-06 13:09:03 +01:00
Carlos Satorres	59a0cb3f4a	refs #6842 deprecated and move	2024-03-06 13:08:20 +01:00
Ivan Mas	492c6f4dd6	refs #6969 test	2024-03-06 12:50:44 +01:00
Ivan Mas	7947d6644e	refs #6498 Correcion errores	2024-03-06 12:44:59 +01:00
Sergio De la torre	49800a5cab	Merge branch 'dev' into 6607_checking_boxes	2024-03-06 11:36:05 +00:00
Sergio De la torre	010f585ed4	Merge branch 'dev' into 6193_inventory	2024-03-06 11:33:34 +00:00
Robert Ferrús	5ee78a6b8c	Merge branch 'dev' into 6500-procRefactor8	2024-03-06 11:06:40 +00:00
Robert Ferrús	276acf04fa	Merge branch '6500-procRefactor8' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8	2024-03-06 12:02:37 +01:00
Robert Ferrús	2f0c1612c2	feat: refs #6500 delete procedure	2024-03-06 12:02:34 +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
Javier Segarra	2f0c8d96d2	refs 5858 fix: resolve breaklines	2024-03-06 11:41:25 +01:00
Jorge Penadés	50a1d5b5ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-06 11:31:02 +01:00
Guillermo Bonet	094c00aabd	Merge branch 'dev' into 6495-procRefactor4	2024-03-06 10:17:45 +00:00
Ivan Mas	3cb45dd57b	Merge branch 'test' into 6969-Error_packaging-buyUltimateFromInterval	2024-03-06 10:08:50 +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
Sergio De la torre	5e6c4b21ba	Merge branch 'dev' into 6193_inventory	2024-03-06 09:44:07 +00:00
Sergio De la torre	922d106bbd	Merge branch 'dev' into 6607_checking_boxes	2024-03-06 09:43:39 +00:00
David Domenech	57c7f4d391	Merge branch 'dev' into 6874-item_getSimilar	2024-03-06 09:30:28 +00:00
Robert Ferrús	9c6db881b8	Merge branch 'dev' into 6500-procRefactor8	2024-03-06 09:12:45 +00: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
Guillermo Bonet	4e28c315f7	Merge branch 'dev' into 6874-item_getSimilar	2024-03-06 06:14:13 +00:00
Carlos Andrés	66b7a3e8f5	feat: restricciones AWB para travel y entry refs #6960	2024-03-05 17:30:29 +01:00
Sergio De la torre	34572112ec	Merge branch 'dev' into 6193_inventory	2024-03-05 15:21:16 +00:00
Sergio De la torre	2d5aae3b40	Merge branch 'dev' into 6607_checking_boxes	2024-03-05 15:11:14 +00:00
Sergio De la torre	d397980efb	refs #6607 feat:[checking boxes]	2024-03-05 16:10:56 +01:00
Guillermo Bonet	f601c12468	refactor: refs #6948 Requested changes	2024-03-05 15:02:09 +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
Ivan Mas	68846d3018	refs #6499 Refactor historico_multiple	2024-03-05 13:43:03 +01:00
Robert Ferrús	9992a8b4ff	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-05 12:23:38 +00:00
Robert Ferrús	1580914567	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-03-05 12:23:23 +00:00
Robert Ferrús	e83b0622cf	refs 6500 rateView	2024-03-05 13:21:53 +01:00
Pako Natek	9c14836bc7	BlueMonkey	2024-03-05 13:18:13 +01:00
Guillermo Bonet	950d7a2461	refactor: refs #6874 Changed params item_getSimilar	2024-03-05 12:48:39 +01:00
Robert Ferrús	9aad1dd6e8	feat: refs #6500 procRefactor8	2024-03-05 12:41:54 +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
Guillermo Bonet	d2f451c613	ticket #162561 hotfix	2024-03-05 12:33:28 +01:00
Sergio De la torre	cf181521d6	refs #6078 feat:add workeractivity	2024-03-05 11:53:57 +01:00
Sergio De la torre	726558d5a7	refs #6607 feat:[checking boxes]	2024-03-05 10:37:15 +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	05380df4f8	Merge pull request 'refactor: refs #6874 Proc itemProposal' (!2123) from 6874-itemProposalRefactor into dev ... Reviewed-on: #2123 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-05 06:35:04 +00:00
Robert Ferrús	c9b6cbf67b	fix: vDatedFrom y vDatedTo	2024-03-05 07:15:38 +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
Guillermo Bonet	a96743c3b9	refactor: refs #6494 Requested changes	2024-03-04 13:34:42 +01:00
Guillermo Bonet	cf810fe497	refactor: refs #6874 Proc itemProposal	2024-03-04 13:14:41 +01:00
Guillermo Bonet	24efc1dd28	Merge branch 'dev' into 6874-itemProposalRefactor	2024-03-04 11:43:36 +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
Robert Ferrús	5175c91b2d	fix: quitar delete	2024-03-04 11:51:55 +01:00
Jorge Penadés	9cff06ae3d	feat: refs #6276 acl itemBarcode delete	2024-03-04 09:30:07 +01:00
Ivan Mas	bd5d88f5ef	refs #6969 Error packaging	2024-03-04 08:41:09 +01:00
Guillermo Bonet	28dbb200fc	refactor: refs #6874 Proc itemProposal	2024-03-04 08:38:24 +01:00
Ivan Mas	1ccec1e0fb	refs #6499 procRefactor part 6	2024-03-04 08:11:06 +01:00
Robert Ferrús	31bd88e856	Merge branch 'master' into rutasAnalyzeHotFix	2024-03-04 06:56:58 +00: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
Guillermo Bonet	0b63991303	Merge branch 'dev' into 6494-procRefactor3	2024-03-04 06:07:24 +00:00
Alex Moreno	a3052c1cf9	refs #6925 hotFix(invoice) parenthesis & handle incoterms error	2024-03-01 15:05:12 +01:00
Juanjo Breso	c889353459	feat: refs#6493 modificar procedimiento balance_create	2024-03-01 14:37:14 +01:00
Carlos Andrés	292b77d57e	feat: restricciones AWB para travel y entry refs #6960	2024-03-01 14:36:49 +01:00
Carlos Andrés	b9e774cea0	feat: restricciones AWB para travel y entry refs #6960	2024-03-01 14:26:36 +01:00
Jorge Penadés	026c3c80a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-03-01 13:48:00 +01:00
Robert Ferrús	5e2f9dd3d0	fix: poner nombres correcto	2024-03-01 12:58:48 +01:00
Robert Ferrús	19f8d1bb81	fix: poner nombres en camelCase	2024-03-01 12:57:34 +01:00
Robert Ferrús	87799fbc64	fix: rutasAnalyzeHotFix	2024-03-01 12:30:37 +01: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	3caed386e9	feat: refs #5186 add fixtures	2024-03-01 12:23:06 +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
Robert Ferrús	8365d9b843	Merge branch 'dev' into 6959-sale_checkWithoutComponents	2024-03-01 10:32:16 +00: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	3dd4d48557	refactor: refs #6495 Deleted residual procs	2024-03-01 07:47:15 +01: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
Robert Ferrús	594780d6cb	feat: refs #6958 delete sale_checkNoComponents	2024-02-29 13:44:49 +01:00
Pako Natek	2f275d8f32	itemType add	2024-02-29 13:06:26 +01:00
Juanjo Breso	e047d445d3	feat: refs#6493 modificado entry_getTransfer	2024-02-29 12:00:43 +01:00
Juanjo Breso	ecd7e8eb98	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-02-29 11:59:13 +01:00
Robert Ferrús	624c214178	fix: refs #6777 Fixed version	2024-02-29 10:46:08 +01:00
Javier Segarra	8e976d2e4f	refs #5858 feat: remove Schedule system	2024-02-29 09:28:27 +01:00
Robert Ferrús	311401daba	fix: refs #6777 ticketMRW	2024-02-29 08:59:25 +01:00
Robert Ferrús	41d7f4d25e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-02-29 08:28:10 +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
Guillermo Bonet	01fb865a76	Merge branch 'dev' into 6495-procRefactor4	2024-02-29 06:36:43 +00:00
Guillermo Bonet	b4ae5a0a3b	Merge branch 'dev' into 6499-procRefactor7	2024-02-29 06:36:33 +00:00
Guillermo Bonet	96bab9b27d	refactor: refs #6496 Requested changes	2024-02-29 07:37:23 +01:00
Guillermo Bonet	a2dc65cb31	Merge branch 'dev' into 6496-cleanVn2008	2024-02-29 06:32:05 +00:00
Guillermo Bonet	7a43ccaa36	refactor: refs #6496 Requested changes	2024-02-29 07:32:19 +01:00
Carlos Satorres	de9787642d	Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations	2024-02-28 14:05:45 +01:00
Carlos Satorres	c7f527133e	refs #6053 fixture	2024-02-28 14:05:43 +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
Robert Ferrús	8ce71a06d1	Merge branch 'master' into 6501-entry_getTransferFix	2024-02-28 10:53:25 +00: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
Robert Ferrús	82445683a7	fix: refs #6501 entry_getTransferFix	2024-02-28 09:19:57 +01:00
Guillermo Bonet	9f2d1a8c0f	refactor: refs #6499 Minor change	2024-02-28 09:13:01 +01:00
Guillermo Bonet	b8e6cc9f9c	refactor: refs #6499 Added comments	2024-02-28 09:08:47 +01:00
Guillermo Bonet	cba0e55846	refactor: refs #6499 Added comments	2024-02-28 08:39:49 +01:00
Guillermo Bonet	b9c5930f68	refactor: refs #6499 Minor changes	2024-02-28 08:29:12 +01:00
Guillermo Bonet	6c67462943	refactor: refs #6499 Minor changes	2024-02-28 08:26:17 +01:00
Guillermo Bonet	80ecd698f8	refactor: refs #6499 Migrated procs to vn	2024-02-28 08:23:58 +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
Carlos Satorres	c5e66f1862	Merge branch 'dev' into 5640-fixtures_clientSocialNameUPPER	2024-02-27 08:31:43 +00:00
Jorge Penadés	5f20a66ad7	fix: refs #6513 use vn	2024-02-27 08:50:23 +01:00
Pablo Natek	afaa5fee7d	fix(spec): refs #6349 fix fixtures	2024-02-26 19:00:45 +01:00
Pablo Natek	8263b203a7	remove(claimRma): refs #6349 remove	2024-02-26 18:38:50 +01:00
Carlos Andrés	7ffc11e45a	Merge pull request 'feat: comprobaciones facturas contabilizadas refs #6932' (!2091) from 6932-cambios-en-ENT-con-facturas-contabilzadas into dev ... Reviewed-on: #2091 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-02-26 16:22:26 +00:00
Carlos Andrés	dcb09cd9f9	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-26 15:54:13 +01:00
Carlos Andrés	9cbcd70d4d	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-26 15:44:34 +01:00
Carlos Andrés	f1329a4624	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-26 15:43:17 +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
Ivan Mas	e3b735d80b	Merge branch 'dev' into 6721-método-de-pago-al-volver-a-activar-trabajadores	2024-02-26 13:14:15 +00: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
Carlos Andrés	bfd86c8972	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-26 12:18:57 +01:00
Carlos Andrés	a19ce04a40	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-26 12:18:02 +01:00
Alex Moreno	b1a8fcf968	refs #6925 fix(invoice): incoterms error	2024-02-26 11:50:46 +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
Alex Moreno	24d925ac8c	Merge branch 'dev' into 5640-fixtures_clientSocialNameUPPER	2024-02-26 06:03:42 +00: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
Juan Ferrer	13aca51f2d	build: refs #6915 dump & rocket shows Jenkins URL	2024-02-23 18:57:32 +01:00
Carlos Andrés	4cc950011e	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-23 18:15:07 +01:00
Carlos Andrés	55bc6418f5	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-23 18:13:01 +01:00
Carlos Andrés	5fe4f794cc	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-23 18:10:23 +01:00
Carlos Andrés	bed4faceb7	feat: comprobaciones facturas contabilizadas refs #6932	2024-02-23 18:04:43 +01:00
Jorge Penadés	3c038a060c	feat: refs #6513 WIP triggers & logger	2024-02-23 16:27:49 +01:00
Carlos Andrés	c18b42a717	feat: validar caracteres invocieIn.supplierref #6931	2024-02-23 16:01:55 +01:00
Carlos Andrés	29a96ede56	feat: validar caracteres invocieIn.supplierref #6931	2024-02-23 15:58:00 +01:00
Carlos Andrés	b9a2cad1f1	feat: validar caracteres invocieIn.supplierref #6931	2024-02-23 15:46:30 +01:00
Carlos Andrés	6f599cbe4a	Merge branch 'dev' into 6931-Líneas-en-referencias-de-invoiceIn.supplierRef	2024-02-23 15:45:37 +01:00
Carlos Andrés	e0cee8f559	feat: validar caracteres invocieIn.supplierref #6931	2024-02-23 15:41:30 +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
Alex Moreno	771545fa63	refs #5640 fix(fixutures): client social name	2024-02-23 15:01:57 +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	f51df43d17	Merge branch 'master' into 6878-hotfix-addManualTimeEntries	2024-02-23 07:32:18 +00:00
Guillermo Bonet	6345d1ae42	fix refs #6780 XDiario	2024-02-23 08:14:58 +01:00
Sergio De la torre	08b109140d	Merge branch 'dev' into 6193_inventory	2024-02-23 07:02:53 +00:00
Alex Moreno	489432b4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-23 07:51:26 +01:00
Sergio De la torre	131ae6b522	refs #6193 feat:modify inventory	2024-02-23 07:44:25 +01:00
Alex Moreno	607b908814	Merge branch 'dev' into 6414-fix_backTest_newWorker	2024-02-23 06:41:36 +00:00
Alex Moreno	4a2032b9cd	refs #5509 fix(EntryDms): sql	2024-02-23 07:39:56 +01:00
Robert Ferrús	6580fd44cd	fix: refs #6371 bankPolicy_notifyExpired accountingFk	2024-02-23 07:18:32 +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
Juan Ferrer	20e5eda4d1	fix: refs #6915 broken view vn.doc removed	2024-02-22 16:16:32 +01:00
Carlos Satorres	fac7071bae	refs #6414 fix(newWorker): back test	2024-02-22 14:38:26 +01:00
Ivan Mas	a0cb32ea10	refs #6784 Delete unnecessary JOINs	2024-02-22 14:01:19 +01: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
Guillermo Bonet	0344a81785	fix: refs #6780 Rollback vn2008.versiones	2024-02-22 09:08:37 +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
Javier Segarra	cc90b13668	refs #5858 feat: remove unnecesary update	2024-02-21 15:05:38 +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
David Domenech	658c351860	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-21 13:36:42 +00: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	7bf89cd448	Merge branch 'dev' into 5858-zone_Collisions	2024-02-21 13:27:38 +00:00
Javier Segarra	88a88640e5	refs #5858 feat: sql comments	2024-02-21 14:22:06 +01:00
David Domenech	29accbb23e	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-21 13:10:20 +00:00
David Domenech	5bef3989cd	refs #6372	2024-02-21 14:07:52 +01:00
Javier Segarra	e00133458b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-21 13:48:53 +01:00
Robert Ferrús	fba353f8e4	feat: refs #6371 restore Proveedores_cargueras	2024-02-21 13:43:33 +01:00
Ivan Mas	84270d29b8	refs #6626 modify invoiceInTax	2024-02-21 13:15:46 +01:00
Ivan Mas	f30a5a7597	refs #6626 invoiceInTax different transactions	2024-02-21 13:13:28 +01:00
Pablo Natek	5e97f820a2	feat(spec): refs #6005 add spec	2024-02-21 12:59:42 +01:00
Ivan Mas	65cb2d45fd	refs #6784 Eliminate row in fixtures.before.sql	2024-02-21 12:30:25 +01:00
Ivan Mas	f0daf2dd9a	refs #6784 Modify fixtures.before.sql	2024-02-21 12:22:27 +01:00
Pako Natek	40a3df18e8	Merge branch 'dev' into 6906-workerActivity	2024-02-21 11:14:35 +00:00
Pako Natek	3463b8fcb1	done	2024-02-21 12:09:52 +01:00
Robert Ferrús	7d39813fd0	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-02-21 11:09:02 +00: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
Sergio De la torre	448763ee72	refs #6834 feat:handle Error	2024-02-21 07:15:43 +01:00
Sergio De la torre	614652c357	refs #6834 feat:handle Error	2024-02-21 07:08:45 +01:00
Sergio De la torre	be81835474	refs #6834 feat:handle Error	2024-02-20 16:11:59 +01:00
Sergio De la torre	b9fe990003	refs #6834 feat:handle Error	2024-02-20 16:10:16 +01:00
Javier Segarra	be0e835a37	refs #5878 feat: remove vn_event_getCollisions	2024-02-20 14:40:38 +01:00
Pablo Natek	59336b8588	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2024-02-20 14:33:45 +01:00
Javier Segarra	791687f271	refs #5878 feat: comments	2024-02-20 14:27:22 +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
David Domenech	1fb0545817	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-20 13:21:38 +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
Pablo Natek	ab7eb88913	merge(dev): refs #6005 merge dev	2024-02-20 09:34:08 +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
Guillermo Bonet	6daa7a03ff	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-20 06:26:16 +00: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
Jorge Penadés	d127354905	Merge branch 'dev' into 6776-makeMulti	2024-02-19 12:21:48 +00:00
Pako Natek	f0d59f12e6	Merge branch 'dev' into 6358-boxPicking-BluePinguin	2024-02-19 10:55:11 +00: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
Jorge Penadés	8d1dea8a00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-19 11:19:59 +01:00
Jorge Penadés	882c179e89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-19 11:14:02 +01:00
David Domenech	12f3af68bf	refs #6372	2024-02-19 11:04:07 +01:00
David Domenech	cc600542ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-19 10:58:36 +01:00
Pablo Natek	2e01b6ee0a	refactor(packing): refs #6875 add restriction on vn.buy.packing field not null and > 0	2024-02-19 09:55:54 +01:00
Sergio De la torre	5b541aa804	refs #6531 feat:modify name	2024-02-19 09:13:03 +01:00
Pako Natek	ad1010f3fc	Merge branch 'dev' into 6358-boxPicking-BluePinguin	2024-02-19 07:37:54 +00:00
Pako Natek	3ef26bfd7d	packing	2024-02-19 08:34:17 +01:00
Sergio De la torre	15de4f0b73	refs #6531 feat:showLastTickets	2024-02-16 15:56:40 +01:00
Pablo Natek	c10cb7c051	feat(spec): refs #6403 mrwIntegration	2024-02-16 14:15:13 +01:00
Sergio De la torre	f4ea220578	Merge branch 'dev' into 6559_getSectors	2024-02-16 12:54:45 +00:00
Jorge Penadés	8cecff36ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-16 13:14:59 +01:00
Jorge Penadés	030f42d03f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 13:11:02 +01:00
Jorge Penadés	f8ceca3575	Merge branch 'dev' into 6760-modifyTransferClient	2024-02-16 11:58:39 +00:00
Pako Natek	f048412ad5	Merge branch 'dev' into 6358-boxPicking_ultimate	2024-02-16 11:13:10 +00:00
Pako Natek	bf67c2348d	refactor proc	2024-02-16 12:05:47 +01:00
Jorge Penadés	63c615655b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-16 08:34:05 +01:00
Pablo Natek	85b1391006	fix(sql): refs #6403 merge master	2024-02-16 08:31:41 +01:00
Pablo Natek	94fe0220e5	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6403-mrwIntegration	2024-02-16 08:30:06 +01:00
Jorge Penadés	556a67ecfc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	2024-02-16 08:26:32 +01:00
David Domenech	ae0ce91127	refs #6685	2024-02-16 06:10:09 +01:00
Jorge Penadés	3d25b599ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti	2024-02-15 14:49:21 +01:00
Jorge Penadés	f11aa2605b	feat: refs #6776 back & procedure modified	2024-02-15 14:48:30 +01:00
Pako Natek	24b564f1ce	test	2024-02-15 14:42:06 +01:00
Pako Natek	7413644295	contact_request and deliveryDate_get	2024-02-15 14:37:09 +01:00
Javi Gallego	27627017c5	feat: #6392 fk que faltan	2024-02-15 14:21:49 +01:00
David Domenech	04fe6a8596	refs #6372	2024-02-15 13:58:12 +01:00
Pako Natek	ec9604323d	commit	2024-02-15 13:54:34 +01:00
Pako Natek	04df5a0ccd	refs #6021	2024-02-15 13:52:58 +01:00
Pako Natek	55d15dbca2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-floranet	2024-02-15 13:50:15 +01:00
David Domenech	03b5ed064d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-15 13:48:21 +01:00
Guillermo Bonet	3950f287c9	Merge branch 'dev' into 6721-método-de-pago-al-volver-a-activar-trabajadores	2024-02-15 12:24:26 +00:00
Guillermo Bonet	4b568bc41e	Merge branch 'dev' into 6775-itemProposalAdd	2024-02-15 13:19:58 +01:00
Pako Natek	0eaeb2e805	nueva rama	2024-02-15 13:13:22 +01:00
Juan Ferrer	38cfb6e03e	build: refs #6859 Merge from test	2024-02-15 11:47:33 +01:00
Juan Ferrer	a9ccbfc1d4	Merge branch 'test' into dev	2024-02-15 11:41:01 +01:00
Juan Ferrer	cc24ecdc7d	build(dump): refs #6859	2024-02-15 11:28:46 +01:00
Guillermo Bonet	f63abc1a6e	fix: refs #6859 zoneEstimatedDelivery	2024-02-15 11:07:47 +01:00
Guillermo Bonet	256aa76e23	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-15 09:18:13 +00:00
Alex Moreno	625922275c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-02-15 10:14:19 +01:00
Alex Moreno	6685a20114	build: refs #6859 myt pull db	2024-02-15 10:04:15 +01:00
Jorge Penadés	fa7b94590d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient	2024-02-15 08:36:00 +01:00
Javi Gallego	6691155217	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-15 08:14:56 +01:00
Javier Segarra	234ea26fe2	Merge branch 'test' into 2687_fix_travel_cloneWithEntries	2024-02-15 07:07:44 +00:00
Alex Moreno	fddbf6451b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-02-15 07:52:08 +01:00
Guillermo Bonet	46a1ad35b5	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-15 06:50:03 +00:00
Javier Segarra	d9756a0f3f	refs #2687 feat: comments	2024-02-15 07:49:57 +01:00
Javi Gallego	798bd10303	Merge pull request 'feat: refs #5720 vehicle nuevos campos' (!2029) from 5720-poolbancario into dev ... Reviewed-on: #2029 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-14 14:02:21 +00:00
Javi Gallego	d7efdacab3	Merge branch 'dev' into 5720-poolbancario	2024-02-14 13:47:13 +00:00
Robert Ferrús	88f508a424	fix: refs #6371 balanceNestTree add constraint	2024-02-14 14:42:04 +01:00
Jorge Penadés	32f8d13359	fix: refs #6760 back modified & revoke update on ticket.clientFk	2024-02-14 13:15:31 +01:00
Guillermo Bonet	8ee8fe1851	Merge branch '6778-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6778-changeViewDependencesVn2008	2024-02-14 12:12:41 +01:00
Guillermo Bonet	35fc8930ce	fix: refs #6778 Fix and tested	2024-02-14 12:12:40 +01:00
Guillermo Bonet	18c10e2dd7	refactor: refs #6778 Requested changes	2024-02-14 11:39:15 +01:00
Guillermo Bonet	2c82a64029	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-14 10:38:33 +00:00
Guillermo Bonet	b46087b75c	refactor: refs #6501 Requested changes	2024-02-14 11:21:22 +01:00
Guillermo Bonet	b815677a1f	Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration	2024-02-14 11:16:53 +01:00
Guillermo Bonet	b64637254b	refactor: refs #6501 Requested changes	2024-02-14 11:16:52 +01:00
Guillermo Bonet	08db19bf4e	Merge branch 'dev' into 6501-procMigration	2024-02-14 10:11:12 +00:00
Guillermo Bonet	cddb8dc216	Merge branch 'dev' into 6501-procMigration	2024-02-14 10:06:23 +00:00
Guillermo Bonet	874f776498	refactor: refs #6501 Requested changes	2024-02-14 11:05:16 +01:00
David Domenech	0c7ca79ae0	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-14 10:03:49 +00:00
David Domenech	fd785ee429	refs #6372	2024-02-14 11:01:37 +01:00
Javier Segarra	d1b24125f4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2687_fix_travel_cloneWithEntries	2024-02-14 09:33:34 +01:00
Javier Segarra	fb1d11af17	refs #2687 feat: comments	2024-02-14 09:32:44 +01:00
Javier Segarra	b9a624d9cd	refs #2687 feat: create util.procedures	2024-02-14 09:30:31 +01:00
Javi Gallego	3665db359e	feat: #63922 actualiza usando las fk	2024-02-14 09:02:39 +01:00
Robert Ferrús	4cfe4cf96d	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-14 07:39:18 +00:00
Juanjo Breso	8542f1fae5	feat: refs #6728 revision triggers test	2024-02-14 08:34:02 +01:00
Juanjo Breso	6fe6e35607	Merge branch 'dev' into 6693-revisarTriggersPendientes	2024-02-14 07:10:08 +00:00
Juanjo Breso	c2dadc09a2	feat: refs #6693 comprobar triggers	2024-02-14 07:36:38 +01:00
Guillermo Bonet	d83823ed0e	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-14 07:07:00 +01:00
Guillermo Bonet	9dd5b725e1	Merge branch 'dev' into 6501-procMigration	2024-02-14 06:04:25 +00:00
Guillermo Bonet	142c1bf7bd	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-14 06:03:46 +00:00
Ivan Mas	add5fedc4e	Merge branch 'dev' into 6830-item_getLackOrigin	2024-02-13 13:12:02 +00:00
Juanjo Breso	c9294680a5	Merge branch 'dev' into 6693-revisarTriggersPendientes	2024-02-13 12:53:13 +00:00
Pako Natek	cf0d7e04a1	rounding stickers down	2024-02-13 13:43:31 +01:00
Josep Domingo	35df439f14	refs#6721 MetodoPagoActivarTrabajadores	2024-02-13 13:19:26 +01:00
Guillermo Bonet	92261ebe0d	fix: refs #5586 Tests fix	2024-02-13 13:09:12 +01:00
Guillermo Bonet	42de1a7e51	Merge branch 'dev' into 5586-optimizeNegativeBases	2024-02-13 12:29:46 +01:00
Jorge Penadés	76b4f8f46f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient	2024-02-13 11:46:47 +01:00
Guillermo Bonet	bf6d068830	Merge pull request 'refactor: refs #6781 Deleted timeControlDevice' (!2032) from 6781-timeControlDevice into dev ... Reviewed-on: #2032 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-02-13 10:16:43 +00:00
Jorge Penadés	579f2abe5b	fix: refs #6813 remove quotation marks	2024-02-13 11:16:00 +01:00
Guillermo Bonet	3c6e3a9856	Merge branch 'dev' into 6501-procMigration	2024-02-13 10:15:46 +00:00
Guillermo Bonet	ed67b1168f	refactor: refs #6501 Requested changes	2024-02-13 11:14:35 +01:00
Jorge Penadés	db2919b482	fix: refs #6813 procedure	2024-02-13 11:05:21 +01:00
Jorge Penadés	d7fb31ee60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6813-fixCreditClient	2024-02-13 10:16:12 +01:00
Guillermo Bonet	d3755d6aa2	Merge branch 'dev' into 6775-itemProposalAdd	2024-02-13 09:11:55 +00:00
Guillermo Bonet	b1fa834626	refactor: refs #6775 Deleted proc itemProposal_Add	2024-02-13 10:12:08 +01:00
Javi Gallego	51afb87122	feat: #6392 cambia gasto	2024-02-13 09:54:26 +01:00
Juanjo Breso	185cc4f17f	feat: refs #6693 revisar triggers	2024-02-13 09:50:07 +01:00
Jorge Penadés	6116ada156	fix: refs #6813 remove inserts	2024-02-13 09:35:39 +01:00
Guillermo Bonet	41db1c924f	refactor: refs #6781 Deleted timeControlDevice	2024-02-13 09:20:21 +01:00
Javier Segarra	37dd3c00c5	updates	2024-02-13 09:11:39 +01:00
Josep Domingo	3b35e4dae8	refs#6685 RestoreViewCredit	2024-02-13 08:57:49 +01:00
Javier Segarra	24984e8aca	Revert "refs #5858 feat: comments" ... This reverts commit 05d685c86b.	2024-02-13 08:32:04 +01:00
Alex Moreno	06fe4957d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-13 08:13:58 +01:00
Javi Gallego	118fbcb94f	feat: #5720 vehicle nuevos campos	2024-02-13 07:55:40 +01:00
Josep Domingo	a897a05e8b	feat: refs#6685RestoreViewCredit	2024-02-13 07:52:09 +01:00
Guillermo Bonet	97f02187e3	Merge branch 'dev' into 6184-saveCmr	2024-02-13 07:35:07 +01:00
Guillermo Bonet	c4528a9eac	Merge branch 'dev' into 6501-procMigration	2024-02-13 06:16:13 +00:00
Guillermo Bonet	fb84fe4b97	refactor: refs #6501 Requested changes	2024-02-13 07:16:32 +01:00
Javier Segarra	242d675d28	Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-12 15:13:27 +01:00
Javier Segarra	955828c63e	refs #5858 feat: comments	2024-02-12 15:13:18 +01:00
Alex Moreno	5f60f2a00e	refs #5509 feat(EntryDms): add fixtures	2024-02-12 15:04:49 +01:00
Robert Ferrús	3c7fda87c8	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-12 12:59:24 +00:00
Ivan Mas	474c616b86	Merge branch 'dev' into 6446-Delete-function-nz-from-DB	2024-02-12 12:54:21 +00:00
Guillermo Bonet	00109e86af	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-12 12:20:03 +00:00
Javier Segarra	05d685c86b	refs #5858 feat: comments	2024-02-12 13:17:47 +01:00
Javier Segarra	e8c783ca68	refs #5858 feat: comments	2024-02-12 13:14:41 +01:00
David Domenech	a5529f0e0a	Merge branch 'dev' into 6372-Delete-views-from-vn2008	2024-02-12 11:29:40 +00:00
David Domenech	37a47edfdc	refs #6372	2024-02-12 12:25:58 +01:00
Javier Segarra	0a398fdd6c	refs #5858 feat: comments	2024-02-12 11:37:08 +01:00
Guillermo Bonet	96d6637a3f	refactor: refs #6501 Minor change	2024-02-12 11:32:07 +01:00
Guillermo Bonet	ee67a02bf0	refactor: refs #6501 Minor change	2024-02-12 11:28:54 +01:00
David Domenech	e1567dfb9e	refs #6372	2024-02-12 11:20:12 +01:00
Robert Ferrús	ead206bd92	Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1Fix	2024-02-12 10:16:06 +00:00
Robert Ferrús	8a7441be57	feat: refs #6371	2024-02-12 11:14:17 +01:00
Guillermo Bonet	fb76381624	refactor: refs #6501 Minor change	2024-02-12 11:02:24 +01:00
Guillermo Bonet	4b5802202d	refactor: refs #6501 Minor change	2024-02-12 10:36:09 +01:00
Javier Segarra	7f1e3c66e2	refs #5858 feat: define event	2024-02-12 10:35:12 +01:00
Guillermo Bonet	23bf9b2750	refactor: refs #6501 Minor change	2024-02-12 10:28:25 +01:00
Javier Segarra	cff59d197d	refs #5858 feat: use active event when trigger	2024-02-12 10:28:07 +01:00
Javier Segarra	337190ef6d	refs #5858 feat: use notification system	2024-02-12 10:27:46 +01:00
Guillermo Bonet	f89ae0aad9	refactor: refs #6501 Minor change	2024-02-12 10:18:31 +01:00
Javier Segarra	4799151565	refs #5858 feat: fixtures.before.sql	2024-02-12 10:12:17 +01:00
Guillermo Bonet	212bf58932	refactor: refs #6501 Minor change	2024-02-12 10:08:56 +01:00
Guillermo Bonet	fc5daf119c	Merge branch 'dev' into 6501-procMigration	2024-02-12 07:56:38 +00:00
Javier Segarra	a756c3bc3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions	2024-02-12 08:51:58 +01:00
Javi Gallego	a18ddc8e9a	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-12 08:45:53 +01:00
Javi Gallego	c818601552	feat: #6392 constraint solved	2024-02-12 08:45:47 +01:00
Javier Segarra	380e0ef651	refs #2687 fix: clone Travel as user action	2024-02-12 08:44:54 +01:00
Ivan Mas	b06f80e091	refs #6446 Delete function nz from db	2024-02-12 08:11:49 +01:00
David Domenech	b712b65d76	refs #6372	2024-02-12 07:44:40 +01:00
David Domenech	6044c160f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-12 07:21:40 +01:00
Sergio De la torre	1f99450ecb	Merge branch 'dev' into 6651_itemShelving_get	2024-02-12 05:57:02 +00:00
Guillermo Bonet	c8b156771d	feat: refs #6395 Added buyerFk in buy	2024-02-09 14:00:16 +01:00
Ivan Mas	362d825202	fix: refs #6443 #6444 #6445 ChangeRevokeToGrant	2024-02-09 13:38:09 +01:00
Jorge Penadés	4aeb88229d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-09 13:07:42 +01:00
Guillermo Bonet	dbe63ad11b	refactor: refs #6501 Fix grant errors	2024-02-09 11:45:31 +01:00
Guillermo Bonet	2d6c56cd26	Merge branch '6501-procMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6501-procMigration	2024-02-09 11:41:24 +01:00
Guillermo Bonet	22e6f547fa	refactor: refs #6501 Migrated procs from vn2008 to vn	2024-02-09 11:41:23 +01:00
Guillermo Bonet	cc863a65f6	refactor: refs #6501 Migrated procs from vn2008 to vn	2024-02-09 11:40:20 +01:00
Guillermo Bonet	0cea80ad46	Merge branch 'dev' into 6501-procMigration	2024-02-09 10:39:47 +00:00
Javi Gallego	463b3fb6f3	feat: #6392 solveConflicts	2024-02-09 11:35:47 +01:00
Sergio De la torre	dcefc9d382	refs #6651 feat:add urlImage	2024-02-09 11:14:30 +01:00
Robert Ferrús	02bf78d00a	feat: refs #6830 item_getLack origin	2024-02-09 09:22:24 +01:00
Sergio De la torre	08728d3162	refs #6651 feat:add urlImage	2024-02-09 07:51:51 +01:00
Jorge Penadés	4f9c1b8c95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6272-updateFiscalData	2024-02-09 07:49:32 +01:00
Sergio De la torre	c2360ca154	refs #6559 feat:quit call get_sectors	2024-02-09 06:59:39 +01:00
Guillermo Bonet	18a27e032f	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-08 13:55:00 +00:00
Jorge Penadés	d1ea1aafff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-08 13:12:48 +01:00
Robert Ferrús	53a367f4b3	feat: refs #6371 cleanTablesFix	2024-02-08 13:04:06 +01:00
Guillermo Bonet	cd613c770c	Merge branch 'dev' into 6184-saveCmr	2024-02-08 11:25:24 +00:00
Guillermo Bonet	6a94a48a9d	refactor: refs #6609 sectorType description to code	2024-02-08 12:18:37 +01:00
Guillermo Bonet	a2bb3c476c	Merge branch '6609-sectorType' of https://gitea.verdnatura.es/verdnatura/salix into 6609-sectorType	2024-02-08 12:08:20 +01:00
Guillermo Bonet	3f400f92e5	refactor: refs #6609 sectorType description to code	2024-02-08 12:08:19 +01:00
Guillermo Bonet	2676cb840c	Merge branch 'dev' into 6609-sectorType	2024-02-08 11:05:05 +00:00
Guillermo Bonet	2e009b6f25	refactor: refs #6609 sectorType description to code	2024-02-08 12:04:34 +01:00
Guillermo Bonet	974228eedd	refactor: refs #5586 Optimized SQL negativeBases	2024-02-08 11:37:15 +01:00
Javi Gallego	3e8fbce34d	feat: #6392 testeado	2024-02-08 11:08:03 +01:00
Ivan Mas	dee7019824	refs #6443 migrate vn2008.cc_to_iban to util.accountNumberToIban	2024-02-08 10:50:56 +01:00
Jorge Penadés	2940c68516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-02-08 08:36:05 +01:00
Pablo Natek	d2d28889b6	merge(master): refs #6403 merge master fix conflicts	2024-02-07 16:55:09 +01:00
Pablo Natek	6c9215bb51	feat(mrw): refs #6403 big commit	2024-02-07 16:52:43 +01:00
Robert Ferrús	be4403819d	feat: refs #6777	2024-02-07 11:45:14 +01:00
Robert Ferrús	747dabd154	feat: refs #6777	2024-02-07 11:41:22 +01:00
Jorge Penadés	aff8ee28ea	fix: refs #6272 back & create test	2024-02-07 10:16:47 +01:00
Alex Moreno	e6735f9ea7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-07 08:35:54 +01:00
Alex Moreno	87864593b2	Merge branch 'dev' into 6184-saveCmr	2024-02-07 06:17:35 +00:00
Guillermo Bonet	c1789433f8	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-07 07:10:11 +01:00
Javi Gallego	153e002cb8	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 15:54:06 +01:00
Javi Gallego	6a738627e7	feat: #6392 adaptado a los nuevos nombres	2024-02-06 15:42:03 +01:00
Robert Ferrús	0fc1caeae6	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-02-06 13:56:24 +00:00
Robert Ferrús	714cd3c2c3	feat: refs #6777	2024-02-06 14:55:20 +01:00
Robert Ferrús	c598e62d1e	feat: refs #6777 change dependencies vn2008 to vn part7	2024-02-06 14:03:33 +01:00
Guillermo Bonet	c3174c0c38	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-06 13:02:30 +00:00
Guillermo Bonet	f4feb6e8b7	Merge branch 'dev' into 6184-saveCmr	2024-02-06 12:13:48 +01:00
Ivan Mas	80314d86cf	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 10:36:42 +00:00
Alex Moreno	409bf9649f	Merge branch 'dev' into 6757-supplierMayus	2024-02-06 09:29:43 +00:00
Ivan Mas	a2fcf2df23	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 09:25:34 +00:00
Juan Ferrer	edb445b080	Merge branch 'dev' into 6444-MigrateVn2008.intrastat_netoFunctionToVn	2024-02-06 09:11:54 +00:00
Carlos Satorres	318f74072e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus	2024-02-06 10:09:11 +01:00
Juanjo Breso	6b5e1ecc01	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 09:07:43 +00:00
Juanjo Breso	a949c25860	feat refs #5167 changes required	2024-02-06 10:09:39 +01:00
Carlos Satorres	6002c6cd7a	refs #6757 fix trad	2024-02-06 10:07:39 +01:00
Juanjo Breso	7ebb9cb429	feat: refs #5167 change required	2024-02-06 09:55:47 +01:00
Ivan Mas	c3912dd098	Merge branch 'dev' into refs-#6665-Clean-Views-vn2008-(1/9)	2024-02-06 08:51:57 +00:00
Juanjo Breso	c4eea81723	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 08:43:30 +00:00
Javi Gallego	19ab90a03c	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 09:24:19 +01:00
Guillermo Bonet	8c13ebc5fc	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-06 08:23:18 +00:00
Ivan Mas	5729ba90d1	Merge branch 'dev' into 6445-Remove-Vn2008.red-Function	2024-02-06 08:04:50 +00:00
Jorge Penadés	fd4b246bd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-06 08:41:30 +01:00
Ivan Mas	438af34d73	refs #6444 cambio vUnits por vStems	2024-02-06 08:40:06 +01:00
Robert Ferrús	00d64b2a57	Merge branch '6777-changeDependenciesVn2008toVnPart7' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-02-06 08:37:30 +01:00
Robert Ferrús	3500886149	feat: refs #6777 tabulacion	2024-02-06 08:37:28 +01:00
Guillermo Bonet	a72acbb08f	fix: refs# 6642 Bug apply version	2024-02-06 08:21:34 +01:00
Juanjo Breso	923d6a610a	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte2	2024-02-06 07:20:18 +00:00
Guillermo Bonet	f67b5fabe6	Merge branch 'test' into dev	2024-02-06 08:18:39 +01:00
Guillermo Bonet	8ccaacbc07	fix: refs# 6642 Bug apply version	2024-02-06 08:15:25 +01:00
Alex Moreno	f7a93a7ccb	Merge branch 'dev' into 4466-invoiceInRectificated	2024-02-06 07:06:16 +00:00
Juanjo Breso	9f6807204d	feat: refs #5167 changes required	2024-02-06 08:05:30 +01:00
Guillermo Bonet	92abc3fb78	Merge branch 'dev' into 6184-saveCmr	2024-02-06 07:05:27 +00:00
Juanjo Breso	b480df069d	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-06 06:50:40 +00:00
David Domenech	b7bb1b9784	refs #6372 feat: vn2008 to vn	2024-02-06 07:37:33 +01:00
David Domenech	0aed49d603	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008	2024-02-06 07:29:42 +01:00
Javi Gallego	990ab82461	Merge branch 'dev' into 6392-balance-produccion-propia	2024-02-06 07:26:35 +01:00
Javi Gallego	147721642b	Merge branch 'dev' into 6749-disponible-sin-dar-vida	2024-02-06 06:22:21 +00:00
Guillermo Bonet	d6ae1fd1f8	Merge branch 'dev' into 6184-saveCmr	2024-02-06 06:39:51 +01:00
Robert Ferrús	e89240a8c7	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-02-05 12:57:04 +00:00
Robert Ferrús	01512c7d36	feat: refs #6777 change dependecies vn2008 to vn	2024-02-05 13:52:28 +01:00
Ivan Mas	6fb198f579	refs #6665 revoke permissions	2024-02-05 13:09:35 +01:00
Javi Gallego	c9785e76da	fix: hotfix puppeteer updated to 21.11.0	2024-02-05 12:56:23 +01:00
Alex Moreno	691853df49	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack	2024-02-05 12:55:16 +01:00
Ivan Mas	9247a802bd	refs #6665 delete unused views	2024-02-05 12:21:11 +01:00
Guillermo Bonet	80aaaf3fc5	Merge branch 'dev' into 6778-changeViewDependencesVn2008	2024-02-05 08:02:04 +00:00
Guillermo Bonet	d28cacfbad	refactor: refs #6778 Migrated views of vn2008 to vn	2024-02-05 09:02:31 +01:00
Jorge Penadés	17680b2cc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 08:49:48 +01:00
Juanjo Breso	4a73bd0133	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-05 07:40:38 +00:00
Ivan Mas	1a869766b9	refs #6444 change code accord to conventions	2024-02-05 08:32:45 +01:00
Jorge Penadés	567359ad6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-05 08:27:42 +01:00
Jorge Penadés	4164fd8250	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund	2024-02-05 08:22:42 +01:00
Juanjo Breso	f4591aae85	feat: refs #5167 Restaurar zoneEstimatedDelivery	2024-02-05 08:07:12 +01:00
David Domenech	045dfa2aa1	Merge pull request 'test' (!1995) from test into dev ... Reviewed-on: #1995 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-02-05 07:00:34 +00:00
Juanjo Breso	592e5c877f	Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined	2024-02-05 06:49:51 +00:00
Juanjo Breso	2ff7700088	Merge branch 'dev' into 6686-Limpieza-vistas-esquema-vn2008-part3	2024-02-05 06:35:43 +00:00
David Domenech	d2fec7beee	refs #6642	2024-02-05 07:30:04 +01:00
Josep Domingo	e704f2eaf7	feat: refs #6689 Deleted view vn2008	2024-02-05 07:11:50 +01:00
Josep Domingo	4b0b4797ad	Merge branch 'dev' into 6689-deleteViewsVn2008-6	2024-02-05 06:00:02 +00:00
Juan Ferrer	c3aeaf4da7	fix: refs #6371 Versions fixed	2024-02-02 23:07:29 +01:00
Jorge Penadés	fde749de57	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated	2024-02-02 15:56:20 +01:00