9772 Commits

All Branches

Search

Author	SHA1	Message	Date
jorgebl	d2879087ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message	2021-03-12 12:41:06 +01:00
Carlos Jimenez Ruiz	7c34555afd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time	2021-03-12 12:30:55 +01:00
Carlos Jimenez Ruiz	8dc60ea3a3	Merge pull request '2752 - Import json file' (#524) from 2752-entry_import_buys into dev ... Reviewed-on: #524 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-12 11:28:13 +00:00
jorgebl	c74b635a1a	Translate and show url of item	2021-03-12 12:24:08 +01:00
Carlos Jimenez Ruiz	8018b20d95	e2e path for entry.buy.card.index import	2021-03-12 11:56:02 +01:00
jorgebl	fdecf6510f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-12 10:02:56 +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
Joan Sanchez	4c7d95f001	Requested changes + e2e updated	2021-03-12 08:45:41 +01:00
Joan Sanchez	be37334f49	Requested changes	2021-03-12 08:17:56 +01:00
Carlos Jimenez Ruiz	fc6fc73df7	Merge pull request '2824-ticket_totalWith_and_without_VAT' (#571) from 2824-ticket_totalWith_and_without_VAT into dev ... Reviewed-on: #571 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-11 16:08:44 +00:00
Carlos Jimenez Ruiz	674b959bbc	minor refactor	2021-03-11 15:14:08 +01:00
Carlos Jimenez Ruiz	05ee2ee2d3	ticket.sale front unit test fix	2021-03-11 10:44:34 +01:00
Joan Sanchez	1ed4dd27d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-11 08:59:02 +01:00
Joan Sanchez	1719f53111	2734 - Recreate invoice	2021-03-11 08:58:34 +01:00
Carlos Jimenez Ruiz	4c0d583556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT	2021-03-10 19:25:43 +01:00
Carlos Jimenez Ruiz	0cb7ddd9ce	ticket.total with and witout VAT refactor	2021-03-10 19:25:26 +01:00
Joan Sanchez	e29dd4db42	Updated it description	2021-03-10 11:14:50 +01:00
Joan Sanchez	a0358044a1	Acl fix	2021-03-10 11:11:04 +01:00
Joan Sanchez	a7c2e08f8f	ACl fixes	2021-03-10 11:04:56 +01:00
Joan Sanchez	b39ec70a2c	Merge branch 'dev' into 2752-entry_import_buys	2021-03-10 09:54:14 +00:00
Joan Sanchez	c144d9ed47	Unit test changed query path	2021-03-10 10:53:22 +01:00
Joan Sanchez	a4d2c531a3	Changes	2021-03-10 10:29:58 +01:00
jorgebl	2f68509e65	WIP: added styles	2021-03-10 09:49:24 +01:00
jorgebl	45f9c1188d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-10 09:48:17 +01:00
Joan Sanchez	2a2e276c6b	Added back unit test plus fixes	2021-03-10 09:01:32 +01:00
Joan Sanchez	ab755e29c7	Merge branch 'dev' into 2787-change_css_date_time	2021-03-09 14:01:04 +00:00
Joan Sanchez	31205f4556	Added front unit test	2021-03-09 13:39:22 +01:00
Joan Sanchez	2541623423	Merge pull request 'Added icon for supplier descriptor' (#569) from 2733-supplier_descriptor_icon into dev ... Reviewed-on: #569 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-09 11:37:03 +00:00
Joan Sanchez	5cbd8d632d	Changes	2021-03-09 10:01:40 +01:00
Joan Sanchez	9da59949fd	Merge branch 'dev' into 2733-supplier_descriptor_icon	2021-03-09 08:31:03 +00:00
Joan Sanchez	e7cabc052e	Merge pull request '2832 Fixed problem with conditional for validate the role on item summary' (#568) from 2832-summary_validate_h4 into dev ... Reviewed-on: #568 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-09 08:27:15 +00:00
jorgebl	59882cca77	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon	2021-03-09 09:26:02 +01:00
jorgebl	2d36d4e610	Added line break in vn-icon	2021-03-09 09:25:10 +01:00
Joan Sanchez	ff6c80aa7e	Merge branch 'dev' into 2832-summary_validate_h4	2021-03-09 08:24:10 +00:00
Carlos Jimenez Ruiz	6316abdb4b	Merge pull request '2831-item_botanical_refactor' (#567) from 2831-item_botanical_refactor into dev ... Reviewed-on: #567 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-09 08:11:00 +00:00
jorgebl	1922280c61	QA rename some descriptions in test and reworked the test	2021-03-08 17:49:04 +01:00
jorgebl	1379691576	Added icon for supplier descriptor	2021-03-08 13:52:11 +01:00
jorgebl	43dc158d7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4	2021-03-08 13:17:38 +01:00
jorgebl	5cb959f5b8	removed controller.data from submit	2021-03-08 13:12:13 +01:00
jorgebl	27816b29e7	Removed ids on controller.data	2021-03-08 13:06:35 +01:00
jorgebl	134365dd9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2831-item_botanical_refactor	2021-03-08 12:55:44 +01:00
jorgebl	d09e47835e	Rename the statements for correctly description the action	2021-03-08 12:40:13 +01:00
jorgebl	6e08a66343	Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical	2021-03-08 12:38:54 +01:00
jorgebl	32ea2dbda6	Added permisions from models in table salix ACL	2021-03-08 12:32:35 +01:00
Carlos Jimenez Ruiz	dbb0deeb5a	Merge pull request '2703 Put time in 00:00 when field "shipped" change' (#563) from 2703-ticket_step_one into dev ... Reviewed-on: #563 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-08 09:54:32 +00:00
Carlos Jimenez Ruiz	5c776c0f11	Merge branch 'dev' into 2703-ticket_step_one	2021-03-08 09:48:38 +00:00
Carlos Jimenez Ruiz	5c183997d3	Merge pull request '2806-e2e_account_index' (#565) from 2806-e2e_account_index into dev ... Reviewed-on: #565 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-08 08:51:39 +00:00
Joan Sanchez	2aff48c42d	2837 - Updated fonts	2021-03-08 09:34:58 +01:00
Carlos Jimenez Ruiz	9fccc70069	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-08 09:21:50 +01:00
jorgebl	192d7627b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4	2021-03-08 09:12:34 +01:00