10424 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	c00201b236	corrected a typo	2021-08-31 11:01:14 +02:00
Joan Sanchez	1061450385	Merge pull request '2407-eliminar-trigger-ticketAfterUpdate' (#711) from 2407-eliminar-trigger-ticketAfterUpdate into dev ... Reviewed-on: #711 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-08-31 06:49:31 +00:00
Joan Sanchez	d2280a783c	Changes	2021-08-31 08:44:31 +02:00
Joan Sanchez	a0efe5f896	Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate	2021-08-31 06:27:23 +00:00
Joan Sanchez	4be6dce1e0	Merge pull request '3070_deprecate_item_niches' (#718) from 3070_deprecate_item_niches into dev ... Reviewed-on: #718 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-08-30 13:05:56 +00:00
Joan Sanchez	17a732e811	Merge branch 'dev' into 3070_deprecate_item_niches	2021-08-30 13:00:02 +00:00
Carlos Jimenez Ruiz	b27b82830f	Merge pull request '3075 - Show closure hour from an event' (#717) from 3075-delivery_days_hour into dev ... Reviewed-on: #717 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-08-30 12:59:45 +00:00
Joan Sanchez	4dc107bc58	Removed console.log()	2021-08-30 14:51:02 +02:00
Joan Sanchez	3247f35b90	3075 - Show closure hour from an event	2021-08-30 14:14:21 +02:00
Carlos Jimenez Ruiz	3e0f2b5c26	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches	2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz	52e1df2af5	removed the usage of niches from item index and summary	2021-08-30 13:31:24 +02:00
Carlos Jimenez Ruiz	8a6da66916	removed niche section	2021-08-30 13:31:07 +02:00
Carlos Jimenez Ruiz	e6bc856b35	removed niches model, relations and its usages	2021-08-30 13:29:16 +02:00
Carlos Jimenez Ruiz	0b331c4026	adapted a test that was using the niches model	2021-08-30 13:27:51 +02:00
Carlos Jimenez Ruiz	5ca795adb3	removed niche icon	2021-08-30 13:27:18 +02:00
Carlos Jimenez Ruiz	aac06e6f32	removed niche usages from e2e paths & selectors	2021-08-30 13:26:54 +02:00
Carlos Jimenez Ruiz	d5625d19f1	removed ACL for item niche	2021-08-30 13:24:13 +02:00
Joan Sanchez	73d76848b2	Removed version	2021-08-30 11:41:17 +02:00
Carlos Jimenez Ruiz	83dcc54b7e	Merge pull request '3063 - Get item from card without a name' (#716) from 3063-item_card_hotfix into dev ... Reviewed-on: #716 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-08-30 09:34:00 +00:00
Joan Sanchez	74dfa9f757	3063 - Get item from card without a name	2021-08-30 11:23:46 +02:00
Javi Gallego	488ef17559	insert mail	2021-08-27 09:01:21 +02:00
Javi Gallego	072f88d1a5	refactor	2021-08-23 14:47:26 +02:00
Javi Gallego	cffe25d41f	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-08-18 12:38:41 +02:00
Javi Gallego	bb764e206a	test	2021-08-18 12:36:18 +02:00
Javi Gallego	d0f0b52b66	minor changes	2021-08-18 08:24:07 +02:00
Javi Gallego	78a98cd6b7	shrink-datetime	2021-08-15 08:35:14 +02:00
Joan Sanchez	c9dcf141c9	Merge pull request '3038-module_transactions' (#713) from 3038-module_transactions into dev ... Reviewed-on: #713 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-08-13 15:43:39 +00:00
Joan Sanchez	23b73aaa41	Merge branch 'dev' into 3038-module_transactions	2021-08-13 15:28:58 +00:00
Joan Sanchez	63ba467a81	Merge pull request '3042-ticket_summary' (#712) from 3042-ticket_summary into dev ... Reviewed-on: #712 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-08-13 15:28:43 +00:00
Carlos Jimenez Ruiz	fcd71bb48f	Merge branch 'dev' into 3042-ticket_summary	2021-08-13 15:07:40 +00:00
Carlos Jimenez Ruiz	12b809822a	Merge branch 'dev' into 3038-module_transactions	2021-08-13 15:03:16 +00:00
Carlos Jimenez Ruiz	7a7bbe2ba8	more module transactions	2021-08-13 16:46:44 +02:00
Joan Sanchez	7ebabfdc24	Removed empty translations	2021-08-13 16:34:54 +02:00
Carlos Jimenez Ruiz	cd334bf967	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions	2021-08-13 16:29:15 +02:00
Carlos Jimenez Ruiz	1a045442d4	added acl to goToUser button on client and worker descriptors	2021-08-13 14:53:39 +02:00
Carlos Jimenez Ruiz	e1fe2aa5b5	added the claim icon to the ticket summary lines	2021-08-13 12:30:22 +02:00
Carlos Jimenez Ruiz	1339b5b474	updated the fonts file	2021-08-13 12:29:57 +02:00
Carlos Jimenez Ruiz	d5e40320ae	removed unwanted console.log	2021-08-13 12:29:48 +02:00
Javi Gallego	f2a81974d0	dbChanges	2021-08-13 09:19:58 +02:00
Javi Gallego	249ea918dd	Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate	2021-08-13 08:18:34 +02:00
Joan Sanchez	590cd8af0b	Merge pull request '2940-invoiceInTax-section' (#680) from 2940-invoiceInTax-section into dev ... Reviewed-on: #680 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-08-13 06:11:05 +00:00
Joan Sanchez	48e6079527	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section	2021-08-13 08:04:42 +02:00
Joan Sanchez	29ec883390	Merge pull request '3044 - FIX: Load correct tickets on different situations' (#710) from 3044-summary_getTickets into dev ... Reviewed-on: #710 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-08-13 06:02:57 +00:00
Joan Sanchez	9ec07de1cd	Added SQL version 10350-august	2021-08-13 08:02:09 +02:00
Carlos Jimenez Ruiz	8acf6c23ab	Merge branch '2940-invoiceInTax-section' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section	2021-08-12 17:28:31 +02:00
Carlos Jimenez Ruiz	70b4dd3ed8	e2e for invoiceIn tax	2021-08-12 17:27:39 +02:00
Carlos Jimenez Ruiz	e547642c16	corrected a syntax error preventing the changes to apply	2021-08-12 17:26:46 +02:00
Joan Sanchez	911ea20b0f	Updated package-lock	2021-08-12 14:16:31 +02:00
Joan Sanchez	cb129a4b64	Removed package-lock	2021-08-12 14:10:15 +02:00
Javi Gallego	5efcd6a57e	translation	2021-08-12 14:00:15 +02:00