1142 Commits

Author	SHA1	Message	Date
Vicent Llopis	5f29b272e1	feat: add fixtures	2022-03-31 11:38:08 +02:00
Vicent Llopis	bb267dad16	feat: add fixtures	2022-03-31 09:17:27 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Vicent Llopis	e29f820e60	feat(ticket_line): new table ticketRefund and update proc ticket_doRefund	2022-03-30 08:56:35 +02:00
Vicent Llopis	d06b2e8bb7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3605-invoiceIn_intrastat3	2022-03-30 07:30:39 +02:00
Joan Sanchez	bbbb0df1cd	Merge branch 'dev' into 3781-export_database	2022-03-29 10:15:33 +00:00
Carlos Jimenez Ruiz	74fb7c95c2	Merge branch 'dev' into 3621-worker_calendar	2022-03-29 08:18:13 +00:00
Alex Moreno	fd02038c8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3621-worker_calendar	2022-03-29 10:08:29 +02:00
Carlos Jimenez Ruiz	407fe2850b	Merge branch 'dev' into 3408-worker_calendar	2022-03-29 08:06:25 +00:00
Vicent Llopis	889dcf8763	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3781-export_database	2022-03-29 08:56:59 +02:00
Alex Moreno	f853696d03	change fixture name	2022-03-28 13:59:39 +02:00
Carlos Jimenez Ruiz	23c473de89	Merge branch 'dev' into 3408-worker_calendar	2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz	8d70bac5c6	Merge branch 'dev' into 3621-worker_calendar	2022-03-28 10:13:21 +00:00
Carlos Jimenez Ruiz	39694b31b8	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-28 08:40:32 +00:00
Juan Ferrer	85de742630	Export data & structure	2022-03-28 09:44:29 +02:00
Vicent Llopis	e02ab9dd2d	feat: add fixtures	2022-03-24 11:39:19 +01:00
Alex Moreno	254fee5036	feat(worker_calendar): repaint, fix front test and add fixtures	2022-03-23 14:02:48 +01:00
Vicent Llopis	fd7afc962f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-23 12:53:33 +01:00
Vicent Llopis	1056060957	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-23 12:37:34 +01:00
Alex Moreno	dc03a66c6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:01:50 +01:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Alex Moreno	9a1c0a07fd	Merge branch 'dev' into 3680-claim_basic-data_packages	2022-03-23 08:42:52 +00:00
Vicent Llopis	84ebeed8ef	add fixtures	2022-03-21 13:04:25 +01:00
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Alex Moreno	b56e1810c3	test(item_fixedPrice): fix back test & e2e	2022-03-18 10:30:30 +01:00
Vicent Llopis	a32f7b5ef1	add new row	2022-03-17 14:27:55 +01:00
Vicent Llopis	644c24fa3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-17 11:55:07 +01:00
Vicent Llopis	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Alex Moreno	f337f82b35	feat(claim): add packages, and next button	2022-03-15 12:51:33 +01:00
Vicent Llopis	6742d7aa43	upload db changes	2022-03-15 07:22:15 +01:00
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Juan Ferrer	d49d1b437c	User.login() error fixed	2022-03-09 15:34:26 +01:00
Vicent Llopis	91a23088c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-09 08:40:55 +01:00
Vicent Llopis	527387aad5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data	2022-03-08 08:45:40 +01:00
Alex Moreno	efa32a3dc7	export structure	2022-03-04 13:04:28 +01:00
Alex Moreno	138e2ee9b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-04 12:25:05 +01:00
Vicent Llopis	4811254ccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-02 15:07:38 +01:00
Vicent Llopis	ade34c1e0a	add section Autonomous	2022-03-02 14:59:30 +01:00
Alex Moreno	5efb678a53	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:32:18 +01:00
Alex Moreno	ccb5261ff6	Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:31:27 +01:00
Carlos Jimenez Ruiz	2b0f54c3aa	Merge branch 'dev' into 3646-claim-summary	2022-03-02 09:17:19 +00:00
Alex Moreno	bf712ba5af	feat(worker): absences can return all absences of worker	2022-02-25 10:33:47 +01:00
Vicent Llopis	72bfc1ef6e	export db	2022-02-25 08:21:53 +01:00
Vicent Llopis	19887bdd16	feat: add section autonomous	2022-02-24 14:52:32 +01:00
Alex Moreno	fc3a46eb26	refactor(claim): removed importTicketSales and fix tests	2022-02-24 13:52:26 +01:00
Vicent Llopis	b3263fb97e	add fixtures	2022-02-23 12:58:09 +01:00
Alex Moreno	52cf79516a	refactor(claim_summary): move responsability and improve fixtures	2022-02-23 12:23:47 +01:00
Vicent Llopis	591194d710	export db	2022-02-23 09:05:31 +01:00
Alex Moreno	f3ff64c44d	refactor(docuware): name for code	2022-02-23 08:11:54 +01:00
Alex Moreno	0f4649c50f	feat(ticket_descriptor-menu): docuware implemented	2022-02-21 08:48:53 +01:00
Alex Moreno	3aeb2adb56	feat(ticket): docuware pdf	2022-02-16 14:57:47 +01:00
Carlos Jimenez Ruiz	01e269db6d	Merge branch 'dev' into 3052-client_defaulter	2022-02-01 09:03:47 +00:00
Alex Moreno	7cf252a8f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter	2022-02-01 07:29:38 +01:00
Alex Moreno	3d2f661bf0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-02-01 07:20:21 +01:00
Vicent Llopis	44e6219df5	update table companyGroup	2022-01-28 09:30:54 +01:00
Alex Moreno	d0c4099255	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:20:39 +01:00
Alex Moreno	2455a24b68	feat(client_defaulter): section and test	2022-01-25 14:27:30 +01:00
Javi Gallego	5fbbae7ac6	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-24 15:40:37 +01:00
Joan Sanchez	6de82caf0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-01-21 16:17:53 +01:00
Joan Sanchez	ddf62d2496	Updated back unit test	2022-01-21 16:16:39 +01:00
Joan Sanchez	5ff950d078	refactor(invoice): hide report logo for non group companies #3519	2022-01-21 10:33:40 +01:00
Javi Gallego	3c8e6a16a2	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-19 14:19:29 +01:00
Joan Sanchez	352c3205bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor	2022-01-18 13:57:26 +01:00
Alex Moreno	b8355320f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-17 14:50:10 +01:00
Carlos Jimenez Ruiz	dc0a498b4d	Merge branch 'dev' into 3513-export_database	2022-01-17 13:02:32 +00:00
Joan Sanchez	7d16d7aaf2	Closure refactor	2022-01-17 12:33:11 +01:00
Alex Moreno	b05f464517	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3491-ticket_volume	2022-01-17 10:14:58 +01:00
Alex Moreno	245161375c	update database	2022-01-13 08:27:56 +01:00
Alex Moreno	c87e3e1210	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-13 07:20:23 +01:00
Alex Moreno	6f7c1b6a46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-12 14:56:34 +01:00
Alex Moreno	fba09e8c40	feat(ticket_volume): volume for packingType	2022-01-12 14:02:58 +01:00
Alex Moreno	9e491082e7	test(send): backTest and fixtures	2022-01-11 08:39:06 +01:00
Alex Moreno	e4db123672	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-04 13:55:36 +01:00
Alex Moreno	2a9cc2f465	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary	2022-01-03 09:54:11 +01:00
Alex Moreno	db609c1713	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3468-export-database	2022-01-03 08:39:06 +01:00
Alex Moreno	e8a4a9cd8c	update today	2022-01-03 08:38:46 +01:00
Carlos Jimenez Ruiz	ea4fc5c262	updated fixtured to amend failing test	2021-12-30 12:08:05 +01:00
Alex Moreno	a57999aaad	unnecessary space	2021-12-29 11:55:48 +01:00
Alex Moreno	e9f77bb9b4	feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk	2021-12-29 11:51:56 +01:00
Alex Moreno	5401c1ebf6	export database and fixture train	2021-12-24 12:29:47 +01:00
Alex Moreno	1e6355cdde	fixtures	2021-12-22 08:37:50 +01:00
Alex Moreno	67dc5c2cbc	refactor(ticket_basic-data): test e2e	2021-12-22 08:11:33 +01:00
Alex Moreno	e609994efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-21 21:01:18 +01:00
Alex Moreno	18b6efe8f1	test(ticket_basic-data): test and fixtures	2021-12-21 20:58:58 +01:00
Alex Moreno	f67edffcf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data	2021-12-20 13:51:44 +01:00
Joan Sanchez	872f5b488b	Merge branch 'dev' into 3411-route_ticket_fixtures	2021-12-20 09:40:34 +00:00
Alex Moreno	9247bc98f1	feat(db): sql for supplier isPayMethodChecked	2021-12-20 08:01:13 +01:00
Javi Gallego	a99174e42a	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-12-14 09:50:39 +01:00
Vicent Llopis	ac3dc039fe	feat: add fixtures of ticket and update test	2021-12-01 12:49:53 +01:00
Vicent Llopis	b9893220cd	export database	2021-12-01 08:19:28 +01:00
Vicent Llopis	238577ec8f	refactor: change ids by codes and add fixtures	2021-11-30 13:57:17 +01:00
Alex Moreno	771100ccab	remove unnecessary intro and comment	2021-11-26 08:40:20 +01:00
Alex Moreno	eea9413628	fix(item_basic-data): controller, test e2e and model	2021-11-26 08:34:32 +01:00
Alex Moreno	9fce06dfe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data	2021-11-25 11:53:26 +01:00
Alex Moreno	fc2e81826d	export database	2021-11-24 13:02:58 +01:00
Alex Moreno	5931692fac	test(item_basic-data): add genericFk e2e	2021-11-24 09:21:41 +01:00
Carlos Jimenez Ruiz	1f2417b55e	Merge branch 'dev' into 3290-entry_latest-buys	2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz	ff0a3acd6e	Merge branch 'dev' into 3379-payMethod_ibanRequired	2021-11-22 13:32:18 +00:00
Alex Moreno	fe46dbd343	feat(entry_last-buys): add filter isFloramondo	2021-11-22 11:49:30 +01:00
Vicent Llopis	8f2e29787b	fix(payMethod): alter colums name	2021-11-19 10:07:33 +01:00
Javi Gallego	c8e9416448	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-19 07:33:54 +01:00
Carlos Jimenez Ruiz	c1adba3249	Merge branch 'dev' into 3338-worker_calendar	2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz	924e6d063d	moved getBalance modifications to correct version	2021-11-18 12:42:31 +01:00
Carlos Jimenez Ruiz	2bfcaa810c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel	2021-11-18 12:40:50 +01:00
Javi Gallego	b936272898	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-18 07:36:03 +01:00
Vicent Llopis	180fb95a00	feat(createAbsence): add backTest	2021-11-16 10:09:42 +01:00
Alex Moreno	ec25df39e4	transaction activeWithBuyer.js	2021-11-15 14:50:02 +01:00
Alex Moreno	54dc9aacaa	feat(item): add checkbox isFloramondo in search-panel	2021-11-15 13:53:18 +01:00
Alex Moreno	73211c5b3b	Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel	2021-11-15 12:14:37 +01:00
Alex Moreno	adf295ebf3	fix(item): add ng-model, add fixture and transaction back test	2021-11-15 12:14:34 +01:00
Carlos Jimenez Ruiz	d69ee4a597	Merge branch 'dev' into 3328-item_search-panel	2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz	59cdf00134	Merge branch 'dev' into 3312-ibanRequired	2021-11-15 08:24:29 +00:00
Alex Moreno	5c7efbb838	feat(item): back filter buyer in search panel ans test	2021-11-11 10:33:21 +01:00
Carlos Jimenez Ruiz	717ea60084	Merge branch 'dev' into 3116-client_balance	2021-11-10 13:40:56 +00:00
Alex Moreno	119d5e45b9	feat(supplier): add checkbox isPayMethodChecked	2021-11-10 08:43:25 +01:00
Vicent Llopis	f5977d9f01	delete maxAmount from structure.sql	2021-11-09 14:35:34 +01:00
Carlos Jimenez Ruiz	345be297f0	Merge branch 'dev' into 3116-client_balance	2021-11-09 08:26:41 +00:00
Vicent Llopis	395ad1c76d	fix(ibanRequired): set different ibanRequired for Client and Supplier	2021-11-08 15:04:33 +01:00
Vicent Llopis	bfbc9b50c4	feat(client_balance): add maxImport if "cash"	2021-11-08 13:02:42 +01:00
Alex Moreno	45b36a5c77	export-database	2021-11-08 09:28:34 +01:00
Carlos Jimenez Ruiz	683f01ddd8	refactor(zone): removed deprecated column m3Max	2021-10-21 13:19:41 +02:00
Carlos Jimenez Ruiz	14a72b32bd	refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max	2021-10-21 11:37:09 +02:00
Alex Moreno	9c4e46f363	export_database	2021-10-20 13:32:03 +02:00
Joan Sanchez	f87f3e85b4	Merge branch 'dev' into 3211-closure_invoicing	2021-10-19 12:42:13 +00:00
Joan Sanchez	5209414613	feat(closure): should mail the PDF invoice invoiceable clients ... Refs: 3211	2021-10-19 13:46:17 +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	cec04a307d	refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures	2021-10-18 12:05:38 +02:00
Joan Sanchez	f60c754c59	refactor(invoice): Show generate PDF option if it was never generated before ... Refs: 3162	2021-10-01 14:31:42 +02:00
Javi Gallego	e5c9ea850b	testback done	2021-09-24 08:24:34 +02:00
Javi Gallego	3365eadf5e	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-21 14:02:07 +02:00
Carlos Jimenez Ruiz	8d8740a33b	Merge branch 'dev' into 2910-route_closure	2021-09-17 07:27:14 +00:00
Joan Sanchez	f5b1eb3ccd	feat(closure): send to driver the route report on route closure	2021-09-10 10:38:19 +02:00
Carlos Jimenez Ruiz	46b59473a3	refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures	2021-09-09 16:06:44 +02:00
Javi Gallego	8160912fe7	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz	99f4a2ed7d	refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked	2021-09-07 16:07:46 +02:00
Carlos Jimenez Ruiz	ca82d7e759	fix(coillection): collection created dates were wrong for testing purposes	2021-09-06 16:35:31 +02:00
Carlos Jimenez Ruiz	6b465f9150	Merge branch 'dev' into 3068-ticket_colletion	2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz	84b8ed610d	fix(fixtures): dua code dups	2021-09-01 15:30:07 +02:00
Carlos Jimenez Ruiz	158c15afa1	fix(filter): removed fixtures that no longer work due to structure changes	2021-09-01 13:12:32 +02:00
Carlos Jimenez Ruiz	ec9c061051	fix(getUpcomingDeliveries) fixtures were broken due to db structure changes	2021-09-01 12:37:46 +02:00
Joan Sanchez	7a98613ef8	Updated unit tests	2021-09-01 11:48:21 +02:00
Carlos Jimenez Ruiz	07929af0cb	fixed(dua): removed fixtures from duainvoicein as dua has less data on production now	2021-08-31 16:47:27 +02:00
Carlos Jimenez Ruiz	8de6712eab	fix(client): column cplusTerIdNifFk deprecated on production	2021-08-31 16:29:21 +02:00
Joan Sanchez	c592212290	fix(structure): Dumped production database ... Dumped database and fixed structure issues Refs: #3079	2021-08-31 15:15:51 +02:00
Javi Gallego	78a98cd6b7	shrink-datetime	2021-08-15 08:35:14 +02:00
Javi Gallego	87fe3c529a	Merge branch 'dev' into 2940-invoiceInTax-section	2021-08-12 09:39:35 +02:00
Javi Gallego	54634ed22d	test okl	2021-08-12 07:39:26 +02:00
Javi Gallego	d49242751e	Merge branch 'dev' into 2940-invoiceInTax-section	2021-08-10 08:23:13 +02:00
Joan Sanchez	41a1b3d909	2984 - Global invoicing endpoint	2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz	abbce74100	clone invoiceIn from descriptor	2021-07-23 14:06:48 +02:00
Javi Gallego	9054aa0885	Merge branch 'dev' into 2940-invoiceInTax-section	2021-06-30 08:30:40 +02:00
Javi Gallego	59fac7edfa	fixtures	2021-06-29 10:33:01 +02:00
Joan Sanchez	efc25fcb53	Updated ids	2021-06-23 12:28:55 +02:00
Joan Sanchez	b0d7f6537b	Updated taxClass	2021-06-23 09:32:10 +02:00
Joan Sanchez	e6c50a2033	Updated structure	2021-06-22 16:23:39 +02:00
Joan Sanchez	0a3f3cc57f	Incremented up to 1000 on the users id	2021-06-22 16:11:28 +02:00
Joan Sanchez	46bbe07c3f	2997 - Export production	2021-06-22 15:01:10 +02:00
Joan Sanchez	4f2c21707f	2997 - Export production db	2021-06-22 14:59:26 +02:00
Javi Gallego	e2f32a60fd	cambio campos en front	2021-06-17 07:30:22 +02:00
Carlos Jimenez Ruiz	fc3af7b6a6	ticket expedition now shows scan worker and scanned date	2021-06-09 14:25:50 +02:00
Joan Sanchez	f6a0bcb12c	Updated unit tests	2021-05-25 13:33:17 +02:00
Carlos Jimenez Ruiz	60b0488a47	Merge branch 'dev' into 2925-export_db	2021-05-25 09:23:05 +00:00
Joan Sanchez	f7487c76a6	2925 - Exported production database	2021-05-25 11:13:08 +02:00
Carlos Jimenez Ruiz	d440a631c8	getUserConfig now gets default company and warehouse with dynamic code	2021-05-24 17:41:22 +02:00
Carlos Jimenez Ruiz	c16c93a75a	updated fixtures for item	2021-05-19 15:34:17 +02:00
Carlos Jimenez Ruiz	5eb0ab8296	add and edit sales no longer intervene the prices	2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz	72a0b774de	add and get sales now sets item.price from packaging for EMB items	2021-05-19 14:15:28 +02:00
Carlos Jimenez Ruiz	f0fbb13af8	fixtures to english changes + e2e amends	2021-05-17 10:38:53 +02:00
Carlos Jimenez Ruiz	2b83abeefd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 10:13:02 +02:00
Joan Sanchez	e6e91ced99	2905 - Restore ticket shipped and landed	2021-05-13 08:56:26 +02:00
Carlos Jimenez Ruiz	457d23dc16	reoute tickets order columns + endpoint refactor	2021-05-12 09:51:32 +02:00
Joan Sanchez	dc44af148d	2863 - Added sales monitor	2021-05-11 09:43:15 +02:00
Joan Sanchez	29b5cac351	Fixtures for supplier 442	2021-04-30 09:48:28 +02:00
Joan Sanchez	d77e06a5a0	Changed city name	2021-04-30 08:30:21 +02:00
Joan Sanchez	5445764043	Added supplier address fixtures	2021-04-30 08:26:05 +02:00
Carlos Jimenez Ruiz	5931dd238c	Anomalous trigger disabled	2021-04-15 10:43:28 +02:00
Carlos Jimenez Ruiz	2d041142c3	Merge branch 'dev' into 2631-notify_incomplete	2021-04-07 09:30:05 +00:00
Joan Sanchez	d4c6695629	2631 - Notify status change to incomplete	2021-04-07 07:45:00 +02:00
Joan Sanchez	41ee6e70a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail	2021-04-01 08:42:02 +02:00
Joan Sanchez	50f1fd30aa	Risk tolerance fixture	2021-03-30 13:15:42 +02:00
Joan Sanchez	d66cf68e89	Fixed table error	2021-03-30 12:28:43 +02:00
Joan Sanchez	e2a9a64f88	#2871 and #2868. Included ticket filter unit test	2021-03-30 11:20:26 +02:00
Joan Sanchez	4aa616601e	2615 - Waste changes	2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz	a78a73486a	updated routes fixtures and fixed tests	2021-03-23 13:19:11 +01:00
Carlos Jimenez Ruiz	1d521fa9a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-16 10:57:24 +01:00
Carlos Jimenez Ruiz	fb418edc7b	backend modifications for route tickets	2021-03-15 11:32:17 +01:00
Joan Sanchez	d275dcfafd	Fix for procedure changes	2021-03-15 09:45:48 +01:00
Joan Sanchez	f92db8c5a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys	2021-03-12 08:52:07 +01:00
Carlos Jimenez Ruiz	0cb7ddd9ce	ticket.total with and witout VAT refactor	2021-03-10 19:25:26 +01:00
Joan Sanchez	b39ec70a2c	Merge branch 'dev' into 2752-entry_import_buys	2021-03-10 09:54:14 +00:00
Joan Sanchez	5cbd8d632d	Changes	2021-03-09 10:01:40 +01:00
jorgebl	5972526327	Merge branch '2791-item_botanical_remove_field' of https://gitea.verdnatura.es/verdnatura/salix into 2791-item_botanical_remove_field	2021-03-05 08:05:23 +01:00
jorgebl	4a22cd5f85	db changes and acl for logistic boss on section item-botanical	2021-03-04 20:09:35 +01:00
Joan Sanchez	49fbecfc59	Exported db	2021-03-04 08:41:42 +01:00
jorgebl	92db67292c	Removed botanical field and changes "edi" for "vn"	2021-03-04 07:56:31 +01:00
Joan Sanchez	0b532880c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys	2021-03-04 07:54:15 +01:00
Joan Sanchez	e50dcf467f	Requested changes	2021-03-03 12:21:04 +01:00
Joan Sanchez	fed3657487	Export changes & backtest fixes	2021-03-02 14:59:02 +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
Joan Sanchez	84c82ed32d	2595 - Added invoiceIn module	2021-02-10 15:03:11 +01:00
Joan Sanchez	dcad6dc8c8	Merge branch 'dev' into 2725-ticket-create-crear-shimpent	2021-02-10 07:21:29 +00:00
Javi Gallego	3a3dae179c	done	2021-02-10 07:58:11 +01:00
Joan Sanchez	c092bf58b4	Import buys	2021-02-09 07:59:55 +01:00
Carlos Jimenez Ruiz	76d6e2d4b7	worker added to supplier basic data and summary	2021-02-05 15:26:49 +01:00
Carlos Jimenez Ruiz	c442eaa0c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-29 09:13:58 +01:00
Bernat Exposito	01c96272bd	export production	2021-01-26 10:55:30 +01:00
Joan Sanchez	a6e4d68017	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-22 15:05:39 +00:00
Carlos Jimenez Ruiz	a53231c721	amends	2021-01-21 10:44:43 +01:00
Joan Sanchez	c9dc9495dc	2677 - Added rating component to order catalog	2021-01-20 13:51:30 +01:00
Javi Gallego	ea6e234cde	minor fixes	2021-01-11 08:01:57 +01:00
Javi Gallego	6c2138a69a	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-08 15:24:05 +01:00
Bernat Exposito	a2550ce128	export table payment	2021-01-08 10:24:41 +01:00
Javi Gallego	b5cd4e3c9f	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-08 09:44:13 +01:00
Javi Gallego	1884dc8789	fixtures	2021-01-08 09:43:36 +01:00
Bernat Exposito	779b229dfc	refactor tag fixtures	2021-01-07 12:11:14 +01:00
Javi Gallego	c0cc91b6c3	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-07 09:11:34 +01:00
Bernat Exposito	6179921978	export production	2021-01-07 08:37:56 +01:00
Javi Gallego	0d5540b639	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-29 17:00:45 +01:00
Bernat Exposito	a21476e3df	fix searchbar index	2020-12-23 12:42:41 +01:00
Javi Gallego	36bace2a94	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-22 07:42:28 +01:00
Javi Gallego	340927799c	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-21 09:53:00 +01:00
Javi Gallego	3a6d62ac7d	xdiario	2020-12-21 09:52:27 +01:00
Joan Sanchez	d8a2184695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-18 17:24:30 +01:00
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz	177d3cd35b	fixtures amended for calendar testing	2020-12-18 13:16:44 +01:00
Javi Gallego	87adbbfa3c	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-18 08:21:36 +01:00
Bernat Exposito	0b5a98c2fe	export production	2020-12-17 15:17:03 +01:00
Joan Sanchez	5ecd589106	Updated delivery note	2020-12-16 09:24:11 +01:00
Javi Gallego	2bb9125eee	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-16 08:34:54 +01:00
Javi Gallego	963db11686	funcionalidad	2020-12-16 08:33:08 +01:00
Joan Sanchez	59c622481f	Updated image fixtures	2020-12-10 13:21:11 +01:00
Joan Sanchez	260b502cd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-10 07:30:31 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Bernat Exposito	06e7583f2b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production	2020-11-25 12:47:17 +01:00
Bernat Exposito	78f25e0b46	export production	2020-11-25 12:37:44 +01:00
Javi Gallego	b23a441f31	fixtures	2020-11-23 12:20:58 +01:00
Joan Sanchez	d40ea52560	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-20 15:06:34 +01:00
Joan Sanchez	7693a1c449	2569 - Section changes	2020-11-20 15:05:57 +01:00
Joan Sanchez	8a3f5345f4	Merge branch 'dev' into 2575-image_download	2020-11-16 13:54:47 +00:00
Joan Sanchez	359dcc904d	Version merge	2020-11-16 09:08:39 +01:00
Joan Sanchez	8194801308	Supplier cargo migration to vn	2020-11-16 08:48:42 +01:00
Bernat Exposito	6fc14d569c	Merge branch 'dev' into 2575-image_download	2020-11-13 08:32:39 +00:00
Bernat Exposito	5be616ad91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production	2020-11-12 08:04:38 +01:00
Bernat Exposito	1e95f0105a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-11 10:52:46 +01:00
Bernat Exposito	75ffa108fb	refactor back download	2020-11-11 10:52:35 +01:00
Bernat Exposito	e4e4f37609	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-10 08:46:37 +01:00
Bernat Exposito	4ea5993dcc	user image	2020-11-10 08:39:34 +01:00
Joan Sanchez	4c88a46b63	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor	2020-11-05 09:12:25 +01:00
Joan Sanchez	a325ef2a78	2574 - ItemTag refactor sourceTable	2020-11-04 11:29:10 +01:00
Carlos Jimenez Ruiz	d533e9da2e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-03 09:22:07 +01:00
Bernat Exposito	8976034bb0	fix fixtures	2020-11-03 08:15:49 +01:00
Bernat Exposito	f2ee122778	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production	2020-11-03 07:51:25 +01:00
Joan Sanchez	413283288f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-02 15:38:23 +01:00
Bernat Exposito	b2d69127cb	Merge branch 'dev' into 2565-address_fixtures	2020-11-02 14:31:36 +00:00
Joan Sanchez	15b7280222	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-02 14:31:39 +01:00
Joan Sanchez	590de622f5	Added model validations	2020-11-02 14:30:33 +01:00
Bernat Exposito	7e2555ddf1	export production	2020-11-02 10:58:27 +01:00
Bernat Exposito	d6c5e0ef0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2565-address_fixtures	2020-11-02 09:27:35 +01:00
Carlos Jimenez Ruiz	117270e3fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact	2020-11-02 09:19:23 +01:00
Joan Sanchez	565bd013bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-02 08:32:46 +01:00
Bernat Exposito	459f4068ab	fix fixtures	2020-10-31 11:05:16 +01:00
Javi Gallego	b50ae7b8ca	testback arreglados	2020-10-30 15:50:59 +01:00
Joan Sanchez	245b32a47f	Added section	2020-10-30 15:11:45 +01:00
Bernat Exposito	39de960b9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact	2020-10-30 10:23:47 +01:00
Bernat Exposito	7200aa3dfc	fixtures and sql for supplierContact	2020-10-30 10:23:42 +01:00
Javi Gallego	59cbe276f4	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 10:08:38 +01:00
Javi Gallego	31b5a140d4	test completados	2020-10-30 10:07:53 +01:00
Javi Gallego	3fdc9c315d	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 08:40:47 +01:00
Bernat Exposito	ea8d9e70b0	supplier log	2020-10-30 08:27:02 +01:00
Bernat Exposito	792b689b58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log	2020-10-29 13:40:21 +01:00
Bernat Exposito Domenech	a5e6f99b1f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-29 08:06:50 +01:00
Bernat Exposito Domenech	77bc1b562e	create section supplier log	2020-10-28 09:08:27 +01:00
Joan Sanchez	3675f7ed34	2511 - Changed salesAssitant role to claimManager	2020-10-26 12:16:57 +01:00
Bernat Exposito Domenech	58168e78ab	test, translate and supplier searpanel, summary	2020-10-26 08:38:43 +01:00
Bernat Exposito Domenech	fe2f12cd8f	first test step	2020-10-22 09:35:11 +02:00
Javi Gallego	ef7a886d86	Merge branch 'dev' into 2510-client-address-create-test	2020-10-21 10:13:04 +02:00
Bernat Exposito Domenech	7eed2ddd59	export structure and fix test	2020-10-20 12:47:37 +02:00
Bernat Exposito Domenech	cc35998f62	new module supplier, created section index and searchpanel	2020-10-15 08:15:04 +02:00
Javi Gallego	77064d85a0	Merge branch 'dev' into 2443	2020-10-05 12:54:02 +00:00
Joan Sanchez	420dfdbdff	Send notification by email	2020-10-02 12:23:48 +02:00
Javi Gallego	78e22df177	test e2e de expense ok	2020-10-01 16:45:28 +02:00
Bernat Exposito Domenech	5f9ef3aea3	export structure db	2020-09-29 07:37:29 +02:00
Joan Sanchez	0438171a47	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech	790c9bfe6f	update models and fixtures	2020-09-25 14:50:04 +02:00
Joan Sanchez	de3c7acb08	Merge branch 'dev' into 2381-mariaDB	2020-09-24 12:30:44 +00:00
Bernat Exposito Domenech	ce1c4e6f60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap	2020-09-22 14:00:52 +02:00
Juan Ferrer	81de97c071	Merge branch 'dev' into 2381-mariaDB	2020-09-21 18:33:28 +02:00
Juan Ferrer	9528fe0a19	Merge branch 'dev' into 2381-mariaDB	2020-09-21 17:47:55 +02:00
Juan Ferrer	5e056c315f	Tests fixed	2020-09-21 17:46:40 +02:00
Juan Ferrer	1c621cff85	Fixtures fixes	2020-09-21 16:43:17 +02:00
Juan Ferrer	fc6a19b60d	Merge branch 'dev' into 2177-userModule	2020-09-21 14:10:15 +02:00
Juan Ferrer	b9c526c29c	LDAP user & role syncronization	2020-09-21 13:24:43 +02:00
Carlos Jimenez Ruiz	f50f4514fd	fixtures enhanced for tags	2020-09-16 11:11:18 +02:00
Joan Sanchez	1f1b09d456	Updated unit tests	2020-09-15 14:14:13 +02:00
Carlos Jimenez Ruiz	bf17d428e4	entry basic data + some minor refactors	2020-09-11 14:51:58 +02:00
Juan Ferrer	61f3f82117	Merge branch 'dev' into 2381-mariaDB	2020-09-11 14:39:02 +02:00
Juan Ferrer	4b5d2cd0dd	2177 account module ... LDAP test RC1 SQL version changed Tests fixes Back & front tests fixed All tests passed Front and back tests plus some fixes	2020-09-11 14:36:16 +02:00
Carlos Jimenez Ruiz	270e665291	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color	2020-09-10 14:38:48 +02:00
Bernat Exposito Domenech	0cf99a5a83	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production	2020-09-10 11:34:35 +02:00
Bernat Exposito Domenech	87fab5f57c	delete duplicated fixtures	2020-09-10 11:34:32 +02:00
Bernat Exposito Domenech	4f50106e92	fix fixtures	2020-09-10 08:08:00 +02:00
Bernat Exposito Domenech	fb3f01151c	update fixtures	2020-09-09 13:49:03 +02:00
Bernat Exposito Domenech	9ff7232b50	export production and fix test	2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech	ed926c39a1	fix e2e	2020-09-09 11:27:00 +02:00
Bernat Exposito Domenech	d90fb3444c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap	2020-09-08 08:30:00 +02:00
Bernat Exposito Domenech	174cea7bc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-08 07:17:23 +02:00
Carlos Jimenez Ruiz	c3c7ef901a	version pre-hex in vn.ink table	2020-09-04 12:40:23 +02:00
Carlos Jimenez Ruiz	c796132e77	e2e + fixtures amended + refactor	2020-09-02 15:20:28 +02:00
Carlos Jimenez Ruiz	9fa3f17a9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-09-01 17:45:00 +02:00
Javi Gallego	b4952002a3	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 06:49:09 +00:00
Javi Gallego	daee9081d1	test excepto invoiceOut	2020-08-31 12:29:51 +02:00
Javi Gallego	8b26c41b7f	campo packageFk	2020-08-28 17:06:27 +02:00
Carlos Jimenez Ruiz	c70ad808a0	refactor	2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz	d156ca95ba	front and back unit tests	2020-08-27 15:14:30 +02:00
Joan Sanchez	17542472da	2391 - Editable description	2020-08-27 08:24:21 +02:00
Joan Sanchez	4d8a84e774	Fixed back unit tests	2020-08-20 08:45:03 +02:00
Carlos Jimenez Ruiz	3a723a2e3d	zone descriptor e2e	2020-08-14 15:35:50 +02:00
Bernat Exposito Domenech	0d689a8c01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-08-13 10:43:25 +02:00
Bernat Exposito Domenech	689245c27d	fix test	2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech	f180b73656	delete deprecated sql	2020-08-12 13:18:55 +02:00
Bernat Exposito Domenech	1e56619c33	export structure and fix test	2020-08-12 13:07:58 +02:00
Bernat Exposito Domenech	96af9bdcf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap	2020-08-11 11:12:52 +02:00
Bernat Exposito Domenech	9a4e20bb31	new models and fixtures	2020-08-11 11:03:43 +02:00
Juan Ferrer	bbc5193970	#2381 First working version	2020-08-07 14:35:20 +02:00
Carlos Jimenez Ruiz	9402f368f6	ticket index and zone descriptor refactor	2020-07-30 12:51:19 +02:00
Joan Sanchez	cfceaa531e	Merge branch 'dev' into 2350-order_index	2020-07-16 11:18:22 +00:00
Bernat Exposito Domenech	064b950773	export production	2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech	f7100f11ee	first step add right menu in ticket components	2020-07-16 07:43:07 +02:00
Bernat Exposito Domenech	7d6ac265b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index	2020-07-09 08:17:03 +02:00
Joan Sanchez	53d672152b	Merge branch 'dev' into 2343-exportar_produccion	2020-07-07 06:19:12 +00:00
Bernat Exposito Domenech	122dacffb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index	2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech	c42c6c19d6	changes in order index	2020-07-02 07:46:55 +02:00
Joan Sanchez	0a327087ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 11:57:16 +02:00
Javi Gallego	039eec7d26	test excepto fallo e2e	2020-06-30 10:16:22 +02:00
Bernat Exposito Domenech	ea1eb16060	export structure	2020-06-29 07:32:08 +02:00
Joan Sanchez	beb1dd4973	absenceType fixture	2020-06-27 12:16:56 +02:00
Joan Sanchez	b3db5681fe	2290 - Added consumption section	2020-06-12 09:18:19 +02:00
Bernat Exposito Domenech	b3eba1c75a	fix dbtest and export production	2020-06-02 13:53:54 +02:00
Bernat Exposito Domenech	8c2f57e380	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries	2020-05-21 15:26:04 +02:00
Bernat Exposito Domenech	52241e6f2c	update itemLastENtries	2020-05-21 15:26:00 +02:00
Bernat Exposito Domenech	d4dd5eae0c	update fixtures	2020-05-20 14:06:51 +02:00
Bernat Exposito Domenech	8ca12d9fdd	fix bugs in travel summary	2020-05-20 13:19:02 +02:00
Javi Gallego	692af6078c	Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev ... Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2020-05-19 10:21:33 +00:00
Javi Gallego	a7e6e3d4b7	cr juan	2020-05-19 08:46:42 +02:00
Joan Sanchez	4aea769797	2246 Added claim state priority field	2020-05-18 13:46:45 +02:00
Joan Sanchez	53b55468fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor	2020-05-18 11:45:43 +02:00
Joan Sanchez	42bec3a944	1833 Claim action refactor	2020-05-15 14:47:19 +02:00
Bernat Exposito Domenech	5ceb26c6da	update structure and fix test	2020-05-15 13:11:23 +02:00
Javi Gallego	3815edfbea	falta CR	2020-05-15 12:17:34 +02:00
Joan Sanchez	2ad14230b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into app_voz	2020-04-17 14:22:46 +02:00
Javi Gallego	ea1cc68d29	test passed	2020-04-03 17:52:47 +02:00
Ainki	42f3bfb86d	test, fitxures and changes	2020-03-30 14:28:29 +02:00
Javi Gallego	729daf8b34	Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia	2020-03-27 12:16:47 +01:00
Joan Sanchez	d640b66ef5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway	2020-03-27 11:22:00 +01:00
Joan Sanchez	d4ca58edad	Updated back unit test	2020-03-27 09:10:30 +01:00
Javi Gallego	0a8272a730	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita	2020-03-26 17:52:41 +01:00
Javi Gallego	d53cedd5d4	preparado para PR	2020-03-26 17:41:40 +01:00
Joan Sanchez	f231fabef1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving	2020-03-25 16:14:13 +01:00
Juan Ferrer	84bf240e71	All tests passed, but some intermittence in e2e	2020-03-23 23:57:11 +01:00
Joan Sanchez	27b1376799	changes	2020-03-23 11:21:25 +01:00
Bernat Exposito Domenech	a19a0578e9	structure DB	2020-03-16 10:25:49 +01:00
Joan Sanchez	fd91c3061a	Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev	2020-03-06 11:19:26 +00:00
Carlos Jimenez Ruiz	0f3ceea653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2037_getWorkedHours_db_test	2020-03-04 15:13:03 +01:00
Carlos Jimenez Ruiz	0179461cb3	timeBusiness and timeControl db tests	2020-03-04 15:12:36 +01:00
Joan Sanchez	516b112354	Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev	2020-03-04 12:15:41 +00:00
Joan Sanchez	d6278e0df9	2164 - Show confirmation only when data is not empty	2020-03-04 09:26:12 +01:00
Joan Sanchez	f16553ecba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete	2020-03-03 13:59:33 +01:00
Joan Sanchez	04917f980f	Updated E2E	2020-03-02 09:30:54 +01:00
Bernat Exposito Domenech	5e86f67b37	dbtest workerTimeControCheck	2020-03-02 08:18:41 +01:00
Joan Sanchez	28553a1c0d	Worker dms changes	2020-03-02 07:50:07 +01:00
Bernat Exposito Domenech	79fca8b70b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor	2020-02-24 09:25:39 +01:00
Joan Sanchez	224241a954	Merge branch '2038-entry_descriptor_vista_impresion' of verdnatura/salix into dev	2020-02-24 08:02:51 +00:00
Bernat Exposito Domenech	50a8da2064	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor	2020-02-21 12:48:37 +01:00
Bernat Exposito Domenech	9779c6d2ba	entry summary and descriptor	2020-02-21 12:48:34 +01:00
Javi Gallego	4d389176fe	Merge branch 'test' into dev	2020-02-21 08:50:50 +01:00
Javi Gallego	a8137c8a6b	zoneClosure 3	2020-02-20 15:15:50 +01:00
Carlos Jimenez Ruiz	587653fb40	#2119 e2e item.request	2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech	aecfe2b8a9	report entry-order	2020-02-20 09:31:09 +01:00
Bernat Exposito Domenech	3f978bd32b	entry index refactor	2020-02-18 10:33:17 +01:00
Joan Sanchez	fe8a0b4583	Added translation. taxClassCode.sql removed	2020-02-18 07:21:35 +01:00
Joan Sanchez	844b27acb9	2118 - Create new intrastat	2020-02-17 12:47:03 +01:00
Bernat Exposito Domenech	b78858eb7c	export structure db	2020-02-13 09:30:18 +01:00
Bernat Exposito Domenech	1887cc8c60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db	2020-02-13 08:44:25 +01:00
Bernat Exposito Domenech	4abf87552d	db production exported	2020-02-12 14:38:51 +01:00
Carlos Jimenez Ruiz	2a7f826cf6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary	2020-02-12 14:36:14 +01:00
Carlos Jimenez Ruiz	e8a178d5f4	#2006 e2e route.summary plus refactors	2020-02-12 14:36:05 +01:00
Bernat Exposito Domenech	e0f7b917d7	db test ticket_recalcComponent	2020-02-12 10:39:46 +01:00
Joan Sanchez	c174d0a29e	acl fix	2020-01-29 14:50:53 +01:00
Joan Sanchez	35e443a112	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members	2020-01-28 09:03:33 +01:00
Joan Sanchez	0044bd2efa	updated tests	2020-01-28 09:03:20 +01:00
Bernat Exposito Domenech	849faad6ea	add m3Max in agency.basicData	2020-01-27 09:45:13 +01:00
Joan Sanchez	921af4dcc2	Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev	2020-01-24 12:52:30 +00:00
Bernat Exposito Domenech	2bcd0caa06	update structure db	2020-01-24 12:55:54 +01:00
Javi Gallego	08fda3ed1b	#workedHours	2020-01-24 12:38:08 +01:00
Joan Sanchez	25ffa839a2	added incoterms & customs agent to address forms	2020-01-24 09:47:24 +01:00
Joan Sanchez	deada69ca4	Added models	2020-01-23 14:59:37 +01:00
Bernat Exposito Domenech	6700daf0e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db	2020-01-23 12:58:47 +01:00
Bernat Exposito Domenech	64bd721287	update structure db	2020-01-23 12:58:38 +01:00
Bernat Exposito	6c0cc3d204	Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev	2020-01-23 10:00:58 +00:00
Bernat Exposito Domenech	2790cc8057	update structure	2020-01-22 14:34:45 +01:00
Joan Sanchez	77f6333aba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph	2020-01-21 12:23:10 +01:00
Joan Sanchez	f0b4c26aea	added travel thermograph create & remove methods	2020-01-21 12:21:53 +01:00
Joan Sanchez	20b4f6ec74	updated tests	2020-01-21 09:33:26 +01:00
Joan Sanchez	5e4ab8b128	Loggable errors	2020-01-21 09:00:42 +01:00
Joan Sanchez	41e69a2e9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph	2020-01-20 13:05:06 +01:00
Bernat Exposito Domenech	0fe0596b3e	worker phone refactor	2020-01-20 11:03:40 +01:00
Joan Sanchez	4002b51565	added section	2020-01-17 08:43:10 +01:00
Joan Sanchez	1704f5e93b	Merge branch '2011-client_phone' of verdnatura/salix into dev	2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech	74b688dc4b	client phone refactor	2020-01-17 07:24:57 +01:00
Joan Sanchez	3cba6f0293	Translated family names	2020-01-16 14:35:40 +01:00
Joan Sanchez	2b2e6532f6	changes to percentage filter	2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech	1307f6c5fb	update structure	2020-01-15 13:43:38 +01:00
Bernat Exposito Domenech	1f60aac446	export structure db	2020-01-15 08:19:22 +01:00
Carlos Jimenez Ruiz	83d2ec40d4	Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev	2020-01-09 10:50:26 +00:00
Bernat Exposito Domenech	d432c32577	export production and create new models	2020-01-09 10:49:09 +01:00
Joan Sanchez	5a7bd4e18f	filters refactor	2020-01-08 12:27:18 +01:00
Bernat Exposito Domenech	730b8e160f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data	2020-01-07 08:30:55 +01:00
Bernat Exposito Domenech	814c96434e	routebasic	2020-01-03 14:31:02 +01:00
Joan Sanchez	8a36e0913f	changed fixtures for dynamic holidays	2020-01-03 08:43:03 +01:00
Joan Sanchez	a5eb8e5315	extended worker contract ranges & fixed invoice	2020-01-02 11:10:26 +01:00
Joan Sanchez	8f92abe49c	fixed procedure bug	2019-12-31 14:01:05 +01:00
Joan Sanchez	417642ac9e	updated UserPhone acl	2019-12-31 11:07:46 +01:00
Joan Sanchez	0ece53a35e	Send chat message with user avatar	2019-12-27 08:49:51 +01:00
Bernat Exposito Domenech	0827b998a1	update structure sql	2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech	e9d416671d	update fixtures and structure db	2019-12-20 13:51:04 +01:00
Joan Sanchez	72d591e143	sql changes	2019-12-20 10:59:17 +01:00
Joan Sanchez	b9415c0335	updated sql	2019-12-20 10:40:12 +01:00
Bernat Exposito Domenech	aab970e667	client.phone section	2019-12-17 09:11:28 +01:00
Bernat Exposito Domenech	c1db827889	update structure db	2019-12-16 11:33:10 +01:00
Bernat Exposito Domenech	e4c17492f0	update structure	2019-12-16 09:22:59 +01:00
Bernat Exposito Domenech	d66519a39f	set autoincrement db to one	2019-12-16 08:48:12 +01:00
Bernat Exposito Domenech	ff117c1811	merge conflicts structure.sql	2019-12-13 09:06:39 +01:00
Bernat Exposito Domenech	dd86961542	update structure	2019-12-13 08:46:40 +01:00
Bernat Exposito	6d1bd7575d	Merge branch '1925excludeTables' of verdnatura/salix into dev	2019-12-13 06:17:03 +00:00
Juan Ferrer	d61b08ed10	Merge branch '1922-mysql8' of verdnatura/salix into dev	2019-12-12 13:49:05 +00:00
Bernat Exposito Domenech	e8c216799c	update estructure	2019-12-12 14:28:58 +01:00
Joan Sanchez	62aae9ce14	removed password from fixtures	2019-12-12 09:46:29 +01:00
Juan Ferrer	3428dfa6e0	Migration complete & test	2019-12-11 15:01:01 +01:00
Bernat Exposito Domenech	d0a2f4627b	1707 route.ticket sistema tablas que soporte dirección salida para warehouses	2019-12-10 12:42:14 +01:00
Bernat Exposito Domenech	f6eabc81da	add models and update structure db	2019-12-05 14:20:11 +01:00
Bernat	f38210ddd2	udate structure db	2019-12-04 11:09:36 +01:00
Bernat	89e127f0ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1904delete_vn2008_references	2019-11-26 14:26:50 +01:00
Bernat	18b5342609	update fixtures and structure db	2019-11-26 14:15:43 +01:00
Bernat Exposito	a4a48e76a4	Merge branch '1762-worker_dms' of verdnatura/salix into dev	2019-11-25 08:33:04 +00:00
Joan Sanchez	f9dba9489f	updated tests	2019-11-25 09:17:24 +01:00
Bernat	5040d1d4a8	#1711 Eliminar referencias al esquema vn2008	2019-11-22 14:34:28 +01:00
Joan Sanchez	a077dd5165	test unitario	2019-11-22 14:34:20 +01:00
Bernat	1ce0c63bf2	1711Eliminar_referencias_vn2008	2019-11-22 08:23:31 +01:00
Bernat	038ba3edb2	1711 update structure db	2019-11-21 13:18:30 +01:00
Carlos Jimenez Ruiz	8202a6f419	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests	2019-11-21 11:17:17 +01:00
Joan Sanchez	56a73f152e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-21 09:33:10 +01:00
Joan Sanchez	5f28d39bbf	dynamic header & footer texts by company #1336	2019-11-21 09:33:08 +01:00
Carlos Jimenez Ruiz	c04640bd62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests	2019-11-21 09:19:15 +01:00
Carlos Jimenez Ruiz	52a8d5e0c2	#1891 tests for worker time control function	2019-11-21 09:19:03 +01:00
Bernat	0473f1de82	#1711 Eliminar referencias al esquema vn2008	2019-11-21 09:09:17 +01:00
Bernat	525e115781	#1711 Eliminar referencias al esquema vn2008	2019-11-21 07:24:31 +01:00
Bernat	ee3a83ac0a	update structure and fixtures	2019-11-19 13:40:29 +01:00
Bernat	b608273510	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-19 12:51:11 +01:00
Bernat	99585b9cc9	fix fixtures	2019-11-19 12:50:50 +01:00
Joan Sanchez	3d90e80c82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-19 11:53:04 +01:00
Joan Sanchez	f9deb9f52d	send closure error by email	2019-11-19 11:53:01 +01:00
Bernat	12825f0503	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-19 11:43:00 +01:00
Bernat	0b58b5d09a	update fixtures tblContadores	2019-11-19 11:40:46 +01:00
Carlos Jimenez Ruiz	04b4f60c48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-18 16:35:21 +01:00
Juan Ferrer	4d4e4f31f4	vnZoneEvents refactor	2019-11-18 16:31:37 +01:00
Carlos Jimenez Ruiz	8629b72d55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-14 14:22:22 +01:00
Carlos Jimenez Ruiz	34bd35ce4e	#1852 worker.time-control	2019-11-14 14:20:05 +01:00
Joan Sanchez	e0ed9072c9	unified LCR and CORE #1868	2019-11-14 08:16:52 +01:00
Joan Sanchez	236dcbf207	changed isRaid to isVirtual, atenderFk to attenderFk	2019-11-13 13:22:39 +01:00
Bernat	a3159f7dbd	dumped data updated	2019-11-13 10:41:14 +01:00
Joan Sanchez	308c4dfb88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor	2019-11-13 08:09:54 +01:00
Bernat	7cbbc4c18e	#1870 exportar produccion a la local	2019-11-12 11:13:20 +01:00
Joan Sanchez	963ac3ad77	dumpedfixtures rollback	2019-11-11 11:56:13 +01:00
Joan Sanchez	6f7962935d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor	2019-11-11 11:24:26 +01:00
Joan Sanchez	5705c37f92	show attachments on email templates attachment component	2019-11-07 11:19:05 +01:00
Javi Gallego	729f6cb767	changes to zone	2019-11-06 13:44:58 +01:00
Joan Sanchez	114e8c87d6	export sample table	2019-11-06 10:56:18 +01:00
Joan Sanchez	3cd92211a1	test fixed & export sample table	2019-11-06 10:55:04 +01:00
Javi Gallego	03a4da307d	Tarea #1848 test back arreglados/comentados	2019-10-31 12:54:16 +01:00
Bernat	cb90e86f64	#1846 exportar produccion a la local	2019-10-29 11:28:35 +01:00
Bernat	eb384425f2	#1777 travel.descriptor	2019-10-24 14:43:11 +02:00
Bernat	afd7c5684a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary	2019-10-24 12:49:23 +02:00
Bernat	7bdb497976	#1773 travel.summary & #1774	2019-10-24 12:49:18 +02:00
Carlos Jimenez Ruiz	c84625b0d5	#1713 route.tickets boton mas bajo derecha	2019-10-23 09:25:28 +02:00
Bernat	939c507fba	#1810 El método listPackaging filtrar por isPackagingReturnable	2019-10-21 09:16:52 +02:00
Bernat	6adeb689eb	Tarea #1814 refactor fixtures userPhone	2019-10-21 08:52:42 +02:00
Bernat	1cedd6cbfd	merge	2019-10-18 08:38:25 +02:00
Bernat	7a89ab5335	#1778 Refactor worker.phone	2019-10-18 08:36:33 +02:00
Carlos Jimenez Ruiz	bdbadaf61a	#1819 fixtures	2019-10-17 14:30:52 +02:00
Bernat	25bd28990a	Refactor #1812 refactor phone	2019-10-15 14:44:00 +02:00
Bernat	ed1ed7f50b	#1738 exportar estructura y datos de produccion a la local	2019-10-15 07:23:34 +02:00
Joan Sanchez	05d0f50606	changed warehouse from ticket id 17	2019-10-10 09:58:34 +02:00
Joan Sanchez	73b1f18759	Fixed production errors #1699	2019-09-19 08:58:42 +02:00
Bernat	cbbce91def	#1693 export structure, data and fix back test	2019-09-17 13:52:29 +02:00
Joan Sanchez	7a1ae9177b	Special characters not allowed on socialName #1635	2019-09-09 09:05:13 +02:00
Bernat	e8cb57e27a	#1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen	2019-09-06 09:47:58 +02:00
Bernat	a2228fa15f	Tarea #1673 exportar estructura y datos de produccion a la local	2019-09-04 09:06:08 +02:00
Bernat	b9c13ac3a3	#1664 , table city deprecated	2019-09-02 14:58:58 +02:00
Carlos Jimenez Ruiz	11b99d9a5f	#1618 e2e ticket.basicData.stepOne	2019-08-20 14:18:32 +02:00
Bernat	3cea9cf405	#1637 update fixtures for dms	2019-08-12 14:07:30 +02:00
Joan Sanchez	0918f154e9	transfer partially sale #1251	2019-08-09 08:04:44 +02:00
Joan Sanchez	a5486ec694	Get allowed content-types from model #1598	2019-08-08 08:37:03 +02:00
Joan Sanchez	eccf381e56	contabilize worker.calenday holidays, updated styles	2019-07-31 09:50:47 +02:00
Bernat	7571cd6e1b	Bug/Test #1607 ticket.updateDiscount and fix test	2019-07-31 07:46:24 +02:00
Bernat	4bc7d88162	refactor fixtures #1620	2019-07-30 11:57:28 +02:00
Bernat	46dac984ab	Refactor #1620 Eliminar referencias al esquema vn2008	2019-07-29 15:02:43 +02:00
Bernat	772095fc1e	Tarea #1617 eliminar vn2008.Gastos de export.data.sh	2019-07-29 11:37:44 +02:00
Bernat	e6ac764762	Tarea #1617 eliminar tablas de export.data.sh	2019-07-29 09:51:49 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Joan Sanchez	6d5412227a	Changed invoiceOut pdf to hasPdf	2019-07-24 12:42:33 +02:00
Bernat	8089c32ec2	Tarea #1611 export db roduction to local	2019-07-23 14:56:57 +02:00
Joan Sanchez	a7b15c2dfc	fixed dms back unit tests	2019-07-16 14:48:48 +02:00
Bernat	b98b534eec	Tarea #1583 exportar produccio a la local	2019-07-05 14:16:33 +02:00
Bernat	65ec629221	Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse	2019-07-03 08:29:40 +02:00
Carlos Jimenez Ruiz	4ac419b419	#1528 e2e claim/detail	2019-07-02 14:44:36 +02:00
Bernat	dd38a21e8d	Refactor #1569 claim.delete, update fixtures and fix test	2019-07-01 11:56:16 +02:00
Bernat	b3ade3c7f5	Tarea #1511 ... refactr fixtures expedition	2019-06-27 13:20:30 +02:00
Bernat	fb2545994c	Refactor #1563 fixtures item	2019-06-27 12:38:30 +02:00
Bernat	e945967762	Refactor #1563 fixtures item,sale,saleComponent	2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz	c352a12d49	merge	2019-06-26 15:02:22 +02:00
Carlos Jimenez Ruiz	fe7278af66	#1387 e2e Ticket Edit sale path	2019-06-26 14:19:08 +02:00
Bernat	682a75ac76	#1533 update fixtures and fix test	2019-06-25 14:00:55 +02:00
Bernat	1227f7ac83	Test #1549 Arreglar test de back	2019-06-21 13:19:51 +02:00
Bernat	7f2b61b39c	Test #1549 fix back test	2019-06-21 07:50:56 +02:00
Carlos Jimenez Ruiz	200488ab30	removed typo from fixtures sql	2019-06-20 14:42:47 +02:00
Carlos Jimenez Ruiz	73ccf9a107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-19 14:42:59 +02:00
Carlos Jimenez Ruiz	560cce7c8c	#1537 refactor fixtures	2019-06-19 14:40:47 +02:00
Carlos Jimenez Ruiz	63febf8bd0	#1537 refactor fixtures + e2e fixes	2019-06-19 09:03:45 +02:00
Bernat	1336bf092d	Test #1540 Reparar test back db	2019-06-19 07:20:02 +02:00
Carlos Jimenez Ruiz	fcc0ad6098	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz	b8a4861f01	#1526 refactor fixtures	2019-06-14 12:27:41 +02:00
Joan Sanchez	9c00e7e67c	Autocomplete geolocation from postcode #1519 and #1531	2019-06-13 13:08:11 +02:00
Carlos Jimenez Ruiz	921af523f8	#1526 refactor fixtures	2019-06-12 11:38:31 +02:00
Bernat	2504d06bab	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:23:55 +02:00
Carlos Jimenez Ruiz	e0cc80277c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-07 14:13:49 +02:00
Joan Sanchez	43e87a1cb1	mege from test to dev - no structure	2019-06-07 13:07:23 +02:00
Joan Sanchez	4545d1f649	merge from test to dev - no structure	2019-06-07 13:06:54 +02:00
Carlos Jimenez Ruiz	3ce4eafcee	merge	2019-06-07 09:24:27 +02:00
Carlos Jimenez Ruiz	777b0b3a38	#1400 report.sepaCore IBAN portugal	2019-06-07 09:18:54 +02:00
Bernat	ea38ff221d	#1467 ticket filter with hours	2019-06-07 07:45:12 +02:00
Joan Sanchez	c28734ff61	added dms tasks #1499, #1469, #1468, #1484	2019-06-06 13:59:11 +02:00
Bernat	3a338739d1	Tarea #1462 Route.descriptior Añadir menú - actualizar m3	2019-06-05 13:51:34 +02:00
Javi Gallego	0f5ebf42ec	Tarea #1506 worker.pbx quitar campo password	2019-06-04 12:54:41 +02:00
quique	a6a6ea5b06	WorkerTimerControl App	2019-06-03 09:41:54 +02:00
quique	b034333cdb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-03 09:20:35 +02:00
quique	8005b0a892	WorkerTimeControl App	2019-06-03 09:20:20 +02:00
Bernat	62fe9d760c	#1488 #1489 ticket sale updatePrice and backTest	2019-06-03 08:01:24 +02:00
Carlos Jimenez Ruiz	a179cc8491	#1492 e2e proyecto Zone	2019-05-30 14:17:11 +02:00
Bernat	d4a3a1a72e	export production structure and fixtures updated	2019-05-30 13:45:13 +02:00
Javi Gallego	e01765e34e	test back-front fixed	2019-05-30 08:41:08 +02:00
Bernat	7a7ea03bff	1485 refactor updatePrice	2019-05-29 12:41:26 +02:00
Bernat	69434caa52	#1470 update fixtures, client.dms gestdoc	2019-05-28 11:26:54 +02:00
Carlos Jimenez Ruiz	33f81ee4b7	#1472 update table vn2008.gesttip	2019-05-27 11:04:57 +02:00
Bernat	59069749a2	1461 fix test back	2019-05-27 09:19:23 +02:00
Javi Gallego	f871879ee5	merge fixtures dinamicas para zoneCalendar	2019-05-23 13:33:06 +02:00
Bernat	7bbabffc26	merge update fixtures zones	2019-05-23 13:29:24 +02:00
Bernat	e12d29ad62	merge fixtures for zone	2019-05-23 13:24:31 +02:00
Bernat	ae2fa8d0af	1459 export production to local	2019-05-23 09:31:37 +02:00
Bernat	443feef673	#1456 fixtores for dms and model	2019-05-23 09:30:29 +02:00
Bernat	33b1cca215	#1456 update fixtures and add dms view	2019-05-22 12:09:15 +02:00
Joan Sanchez	fe250b8269	fixed workerTimeControl fixtures	2019-05-21 13:48:19 +02:00
Joan Sanchez	183bf137f6	added workerTimeControl #1360	2019-05-17 13:27:51 +02:00
Bernat	d0c4a4d478	update worker fixtures	2019-05-17 11:09:24 +02:00
Bernat	1f128797c3	export production to local, fix test and add fixtures	2019-05-09 09:32:04 +02:00
Carlos Jimenez Ruiz	189cefe327	#1407 email core francia LCR	2019-05-08 11:09:27 +02:00
Carlos Jimenez Ruiz	c9521d1024	#1407 email core francia LCR	2019-05-08 10:42:26 +02:00
Carlos Jimenez Ruiz	62550b76f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-08 08:48:57 +02:00
Carlos Jimenez Ruiz	92b171cfce	#1407 email core francia LCR	2019-05-08 08:48:47 +02:00
Bernat	86e0d66f55	#926 update fixtures and model claimState	2019-05-07 08:18:14 +02:00
Carlos Jimenez Ruiz	8771098045	#1350 route.index	2019-05-03 18:23:44 +02:00
Carlos Jimenez Ruiz	b60ee825ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-03 17:38:47 +02:00
Bernat	91e8b1f81b	update fixtures, #1388 ticket descript change shiiped hour	2019-05-03 12:23:57 +02:00
Carlos Jimenez Ruiz	8bfcdf435f	#1351 e2e order.catalog + extensions refactor	2019-05-02 11:23:54 +02:00
Bernat	a8a5193a86	1389 update fixtures for invoiceOut and fix test	2019-04-29 11:40:54 +02:00
Bernat	94480a8189	#1329 fix test and fixtures, update ticket-service	2019-04-24 07:43:11 +02:00
Carlos Jimenez Ruiz	8d5cc93ddb	#1359 refactor absences	2019-04-23 13:29:52 +02:00
Bernat	bc005b2310	#1346 fix confirm.js and update item request	2019-04-18 11:02:28 +02:00
Carlos Jimenez Ruiz	e34cb8ce84	#1351 e2e order.catalog	2019-04-17 09:37:55 +02:00
Bernat	c2b3ff8d81	#1335 worker/filter renamed columns acordantly	2019-04-16 08:42:44 +02:00
Carlos Jimenez Ruiz	9c596b06c8	merge	2019-04-15 14:37:12 +02:00
Carlos Jimenez Ruiz	82ed0078d2	#1339 Print - Hoja de rutas	2019-04-15 14:34:33 +02:00
Joan Sanchez	ac8a27d2f4	Added ticket invoice #1310	2019-04-12 13:54:31 +02:00
Bernat	6d9fee06f6	new models and cau 10507	2019-04-11 11:44:34 +02:00
Carlos Jimenez Ruiz	0343aea2a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-10 09:48:52 +02:00
Carlos Jimenez Ruiz	17f5e46497	#1284 Print - Informe zona	2019-04-10 09:45:45 +02:00
Joan Sanchez	20ba05a655	item filter by id or barcode	2019-04-10 09:32:29 +02:00
Juan Ferrer	f46d50fc48	DB versioning fixes	2019-04-08 09:38:38 +02:00
Bernat	ad830e52fc	update structure db from production	2019-04-05 09:20:22 +02:00
Bernat	eaa3a36fde	update fixtures and structure	2019-04-04 09:02:39 +02:00
Carlos Jimenez Ruiz	09288c2c12	merge	2019-04-03 15:19:05 +02:00
Joan Sanchez	3a19141d58	added smsConfig fixture	2019-04-03 12:27:08 +02:00
Juan Ferrer	13ca2f7e52	DB versioning	2019-04-03 10:29:05 +02:00