334 Commits

Author	SHA1	Message	Date
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00:00
Carlos Satorres	fa8fd8d5bc	refs #5398 update from oldbranch	2023-05-25 11:41:14 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Alexandre Riera	a2055d35fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes	2023-05-08 09:48:09 +02:00
Juan Ferrer	ea5b032b40	refs #5517 Travel create E2E fixes	2023-05-05 13:00:45 +02:00
Alexandre Riera	8ae5a0de0f	refs #5513 adding backs and models	2023-05-04 12:03:47 +02:00
Carlos Satorres	17425a627c	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-05-02 11:25:17 +00:00
Carlos Satorres	af875dd67e	Merge	2023-04-26 10:26:54 +02:00
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10:04 +02:00
Juan Ferrer	9694a35343	refs #5517 Added: Tests, filter panel, model and props titles	2023-04-20 19:46:57 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Carlos Satorres	d399cda050	refs #5316 quitar comment	2023-04-17 10:34:08 +02:00
Carlos Satorres	60d3729b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-17 08:55:22 +02:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Vicent Llopis	3790e3457f	refs #5517 añadidas más traducciones	2023-04-13 08:43:42 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Carlos Satorres	1ce2705869	refs #5316 last kkentry	2023-04-11 15:04:49 +02:00
Carlos Satorres	d21ab7a5a7	refs #5316 primer kkeo	2023-04-11 10:32:21 +02:00
Joan Sanchez	8b4c70e8ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-30 14:57:00 +02:00
Alexandre Riera	8b4121e021	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-27 08:38:35 +02:00
Vicent Llopis	5784f05fd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-24 08:34:04 +01:00
Alexandre Riera	0baccc4745	refs #5206 fix tests front	2023-03-24 08:25:37 +01:00
Alexandre Riera	c6fc2dee24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-23 10:53:11 +01:00
Alexandre Riera	60eabbf7a0	Merge branch 'test' into hotfix-added-grabUser-logs	2023-03-22 10:37:57 +00:00
Alexandre Riera	59c3ef23de	grabUser added	2023-03-22 11:03:13 +01:00
Vicent Llopis	6d04933fe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-16 14:01:19 +01:00
Joan Sanchez	e911f7a127	Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev ... Reviewed-on: #1391 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:27:33 +00:00
Vicent Llopis	1b8ed05f71	refs #5395 feat: modificado orderBy, añadida columna importa y corregidos errores	2023-03-15 13:28:28 +01:00
Vicent Llopis	1047ac0b64	refs #4980 fix: la sección no estaba filtrando por el filtro por defecto	2023-03-14 10:18:59 +01:00
Vicent Llopis	50ccb61728	refactor: el report llama directamente al filtro de extra-community	2023-03-14 09:59:29 +01:00
Joan Sanchez	6495e016a8	Endpoints refactor	2023-03-14 08:17:46 +01:00
Alexandre Riera	874fd0656c	refs #5206 url gets params	2023-03-10 10:05:16 +01:00
Joan Sanchez	37043beb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-03 07:44:31 +01:00
Alexandre Riera	ed5208c9e4	refs #5206 implemented general search, missing tests	2023-03-02 15:10:17 +01:00
Alexandre Riera	dbe42e3bf4	refs #5206 version with plane added, needs to implement general search	2023-03-02 13:55:47 +01:00
Alexandre Riera	be1993cf8b	refs #5206 version with top-searcher and two fields for reference and id	2023-03-02 11:33:55 +01:00
Joan Sanchez	3076123c04	Updated models relation	2023-01-24 09:05:50 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Vicent Llopis	7261415e16	fix: añadido length	2022-12-21 09:36:31 +01:00
Vicent Llopis	e616835600	delete: hasDateRange()	2022-12-14 13:40:28 +01:00
Vicent Llopis	f7a97a8139	fix: siempre muestra el botón si hay datos	2022-12-14 13:31:56 +01:00
Alex Moreno	8df7b91127	fix: entry ref	2022-11-30 15:24:33 +01:00
Alex Moreno	e497ddd664	fix: add td-editable	2022-10-10 09:21:14 +02:00
Alex Moreno	18cd34bccb	fix(travel_extraCommunity): css	2022-10-10 08:57:41 +02:00
Alex Moreno	00d5876f88	hotFix(travel_extraCommunity): fix css	2022-10-07 14:35:16 +02:00
Joan Sanchez	a065d77929	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-10-03 13:37:59 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Javi Gallego	a662bb90a2	Merge branch 'dev' into #4226-remove-density	2022-09-27 09:32:48 +02:00
Joan Sanchez	7f78286d6b	Reports refactor	2022-09-26 13:33:27 +02:00
Alex Moreno	06eab58b3d	is agency	2022-09-14 12:45:40 +02:00
Alex Moreno	49a7a05310	feat(travel_extra-community): add vn-anchor	2022-09-14 08:08:07 +02:00
Alex Moreno	2b101cf7c1	refactor(travel_extra-community): use smart-table, fix scroll	2022-09-13 15:11:14 +02:00
Javi Gallego	5cf102c7fd	sustituido density por weightByPiece	2022-08-24 14:13:26 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	fdf6e04233	change travel.agencyFk by agencyModeFk	2022-07-13 14:36:03 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Carlos Jimenez Ruiz	cce1d93dde	jasmine reporters config for CI	2022-05-12 11:43:41 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +02:00
Alex Moreno	98755656dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-04-06 12:43:12 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Vicent Llopis	8c744a0135	refacto: translate corrected	2022-03-29 10:17:26 +02:00
Vicent Llopis	64ae7ee8ea	feat: modify filter	2022-03-28 13:24:26 +02:00
Vicent Llopis	a5b3bdfa8d	feat: add backTest	2022-03-28 13:24:11 +02:00
Vicent Llopis	1e587be2ed	(fix): filter repaired	2022-03-28 11:57:19 +02:00
Vicent Llopis	ad7bcd7cc2	delete two filter fields	2022-03-28 09:28:01 +02:00
Alex Moreno	79c74d92b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-03-25 13:22:04 +01:00
Carlos Jimenez Ruiz	abd758721e	Merge branch 'dev' into 3553-travel_summary	2022-01-27 09:36:22 +00:00
Alex Moreno	65c32c9ed3	fix(travel_summary): vn-check change value to ng-model	2022-01-26 11:40:44 +01:00
Alex Moreno	0a8153d44c	feat(travel_search-panel): add continent filter	2022-01-26 10:09:47 +01:00
Alex Moreno	8e274f4f17	refactor(travel): deprecated travelThermograph.temperature	2021-12-24 10:10:28 +01:00
Carlos Jimenez Ruiz	5be2eb974f	refactor(test): adapted the new thermograph front unit test to expect thermograph data to be defined	2021-10-19 11:08:03 +02:00
Carlos Jimenez Ruiz	e3942c0bb9	refactor(thermograph): empty fields handler added and correct usage of thermograph.code	2021-10-19 10:58:58 +02:00
Carlos Jimenez Ruiz	580ba36357	refactor(jasmine): usage of done on async functions is deprecated	2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz	6cf1737c0d	refactor(thermograph): temperature column now displays the correct data	2021-09-28 11:59:04 +02:00
Javi Gallego	8160912fe7	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz	c7558dfb0b	refactor(temperatures): added crudmodel autoload for temperatures	2021-09-07 11:54:53 +02:00
Carlos Jimenez Ruiz	8bdb02c0fc	refactor(createThermograph): endpoint rollsback only if transaction was created in it	2021-09-07 10:30:53 +02:00
Carlos Jimenez Ruiz	c4e51146fd	refactor(thermograph): temperatures source updated on frontend	2021-09-06 16:39:44 +02:00
Carlos Jimenez Ruiz	56276783db	test(thermograph): e2e and unit tests for the backend of thermograph	2021-09-06 16:39:04 +02:00
Carlos Jimenez Ruiz	1f0bcb63f1	refactor(thermograph): added temperature model + updated thermographs models and endpoints	2021-09-06 16:38:27 +02:00
Carlos Jimenez Ruiz	f2f81442d9	fix(cloneWithEntries): endpoint was broken due to production changes	2021-09-02 14:17:35 +02:00
Javi Gallego	bb764e206a	test	2021-08-18 12:36:18 +02:00
Joan Sanchez	ae091a3b11	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-02 14:41:45 +02:00
Joan Sanchez	35e3c8ce65	HOTFIX: 3009 - Unlock report button	2021-07-02 14:35:24 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz	34e0d0b7cf	translations update	2021-06-16 09:50:32 +02:00
Carlos Jimenez Ruiz	8aa3d269ea	Travel descriptor now shows delete option if there are no entries	2021-06-15 16:41:01 +02:00
Carlos Jimenez Ruiz	c776d34cdf	invoiceIn basic data and summary added some fields	2021-06-10 17:08:21 +02:00
Joan Sanchez	2e7d56cc26	Test fixes	2021-05-12 12:11:27 +02:00
Joan Sanchez	ab755e29c7	Merge branch 'dev' into 2787-change_css_date_time	2021-03-09 14:01:04 +00:00
Joan Sanchez	e50dcf467f	Requested changes	2021-03-03 12:21:04 +01:00
Joan Sanchez	718021cff8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index	2021-03-01 11:49:31 +01:00
jorgebl	3af50dfc80	QA refactor	2021-02-24 11:32:31 +01:00