9180 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Javi Gallego	ee2aeb2337	Merge pull request '2804 Fixed problem with link of Sales person on ticket descriptor' (#558) from 2804-ticket_descriptor_salesPerson into dev ... Reviewed-on: #558 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-02-25 15:12:19 +00:00
jorgebl	0d7a41f862	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2804-ticket_descriptor_salesPerson	2021-02-25 15:52:18 +01:00
jorgebl	b9594f5238	Add descriptor popover	2021-02-25 15:51:51 +01:00
Carlos Jimenez Ruiz	0c4c2b0df4	Merge pull request '2820 Added scope days on item request section + test' (#556) from 2820-add_item_scopeDays into dev ... Reviewed-on: #556 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-25 11:28:29 +00:00
jorgebl	4cedd53bce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2820-add_item_scopeDays	2021-02-25 11:02:51 +01:00
Carlos Jimenez Ruiz	8a77c7ad97	Merge pull request '2789 correct filter tag and changed type names for 3 digits' (#555) from 2789-entry_multiple_changes into dev ... Reviewed-on: #555 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-25 10:00:51 +00:00
jorgebl	c55d65a7fd	QA refactor	2021-02-25 10:49:19 +01:00
jorgebl	218a506a4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes	2021-02-25 09:54:21 +01:00
jorgebl	e2e026de6e	Update npm	2021-02-25 09:54:16 +01:00
Joan Sanchez	89abf424fb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-25 08:17:26 +01:00
Carlos Jimenez Ruiz	12111be861	Merge pull request '2776 Show on summary and basic data the boss of the worker' (#554) from 2776-add_boss_summary into dev ... Reviewed-on: #554 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-24 16:07:54 +00:00
jorgebl	c9730929e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary	2021-02-24 16:14:41 +01:00
Carlos Jimenez Ruiz	e6a2ce7c17	Merge pull request 'Added multiplier in item section and filter selection' (#553) from 2781-add_stemMultiplier_item into dev ... Reviewed-on: #553 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-24 15:14:09 +00:00
jorgebl	1f1db53d41	Summary boss shown on descriptor	2021-02-24 16:12:44 +01:00
Joan Sanchez	c2a2204437	Regex change	2021-02-24 16:04:09 +01:00
Joan Sanchez	ddb77a5c05	Regex change	2021-02-24 15:55:09 +01:00
Joan Sanchez	d3879635a8	Regex changes	2021-02-24 15:54:02 +01:00
jorgebl	06dcb4b28c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary	2021-02-24 14:54:23 +01:00
jorgebl	f1c481de64	QA refactor	2021-02-24 14:49:58 +01:00
Joan Sanchez	1c819e692e	Floramondo image download fixes	2021-02-24 14:37:49 +01:00
jorgebl	d551389d3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item	2021-02-24 12:26:05 +01:00
jorgebl	df9ca2ad3e	Fixed filter description	2021-02-24 12:24:50 +01:00
Carlos Jimenez Ruiz	7ab77e6662	Merge pull request 'Formated sql and tests passed' (#551) from 2603-travel_create_autocomplete_date into dev ... Reviewed-on: #551 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-24 10:53:06 +00:00
jorgebl	3af50dfc80	QA refactor	2021-02-24 11:32:31 +01:00
Joan Sanchez	347ac77878	Changes to file names	2021-02-24 09:59:41 +01:00
jorgebl	7895af8a54	Fixed test	2021-02-23 17:00:31 +01:00
jorgebl	2c041b9912	Remove focus	2021-02-23 16:31:05 +01:00
jorgebl	e32914d990	Fixed error test	2021-02-23 16:27:18 +01:00
jorgebl	3eae322a6a	Added scope days and test	2021-02-23 16:09:29 +01:00
jorgebl	71eeaadb43	Removed focus on test	2021-02-23 14:54:07 +01:00
jorgebl	2e75bf376c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes	2021-02-23 11:53:07 +01:00
jorgebl	da20eac685	Putting propertie name for order and showing the 3 digits of type	2021-02-23 11:52:29 +01:00
jorgebl	799bb3a955	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-23 11:10:06 +01:00
jorgebl	9855bd14fe	Translate Boss	2021-02-23 11:08:57 +01:00
jorgebl	5e549b4d0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary	2021-02-23 10:42:19 +01:00
jorgebl	69f53972d5	Added filter for selection	2021-02-22 16:43:40 +01:00
jorgebl	5ef48919ec	Added translate multiplier	2021-02-22 13:41:31 +01:00
jorgebl	3c3dc861ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item	2021-02-22 13:37:43 +01:00
Carlos Jimenez Ruiz	2e838d9b97	Merge pull request '2764-Ticket_sale_consignee' (#537) from 2764-Ticket_sale_consignee into dev ... Reviewed-on: #537 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-22 11:59:43 +00:00
jorgebl	77d8388c43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-22 09:59:38 +01:00
jorgebl	5692b5f07e	Added conditional and test	2021-02-22 09:53:03 +01:00
jorgebl	8deb11d333	Added boss on basic data and summary	2021-02-19 17:45:45 +01:00
Joan Sanchez	ddb443ab8f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-18 13:17:34 +01:00
Joan Sanchez	8ddbcc24a7	Added priority to image download queue	2021-02-18 13:03:49 +01:00
Joan Sanchez	bc9168aaa0	Merge pull request '2583-create_account_supplier' (#552) from 2583-create_account_supplier into dev ... Reviewed-on: #552 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-17 15:22:43 +00:00
Joan Sanchez	5b40edb284	Line break	2021-02-17 16:11:34 +01:00
Jorge Padawan	3763b95f62	Added multiplier in sections and filter selection	2021-02-17 15:38:57 +01:00
Jorge Padawan	aa29f546ae	put global bank entity model	2021-02-17 15:05:17 +01:00
Joan Sanchez	68dc2488ca	Updated sharp version	2021-02-17 14:38:47 +01:00