10470 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	218c37c134	Merge pull request '3098-item_tag_productor' (#742) from 3098-item_tag_productor into dev ... Reviewed-on: #742 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-09-24 08:09:06 +00:00
Carlos Jimenez Ruiz	8c446edc9e	Merge branch 'dev' into 3098-item_tag_productor	2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz	3118b104eb	Merge pull request 'Search limit by date range was not being applied' (#741) from 3059-ticket_index_filter into dev ... Reviewed-on: #741 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-24 08:01:55 +00:00
Carlos Jimenez Ruiz	c6692ca951	Merge branch 'dev' into 3059-ticket_index_filter	2021-09-24 07:54:50 +00:00
Carlos Jimenez Ruiz	88f1d1d3a5	Merge pull request 'Send invoice to specific email address from descriptor option' (#739) from 3010-send_invoice into dev ... Reviewed-on: #739 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-24 07:53:57 +00:00
Carlos Jimenez Ruiz	5f0e2825b8	Merge branch 'dev' into 3059-ticket_index_filter	2021-09-24 07:46:09 +00:00
Carlos Jimenez Ruiz	7369f4aa54	Merge branch 'dev' into 3010-send_invoice	2021-09-24 07:44:24 +00:00
Carlos Jimenez Ruiz	14b92e530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-24 09:37:37 +02:00
Joan Sanchez	0e287447bf	SQL version folder	2021-09-24 09:09:16 +02:00
Joan Sanchez	39ff9d0ddb	Removed package-lock	2021-09-24 08:19:12 +02:00
Joan Sanchez	4fc14685e4	Removed package-lock	2021-09-24 08:18:41 +02:00
Joan Sanchez	98944f4b12	Updated node version	2021-09-24 08:10:13 +02:00
Carlos Jimenez Ruiz	8fc17f05c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor	2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz	368f54b872	refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present	2021-09-23 17:19:47 +02:00
Joan Sanchez	8c3a3d83e0	Removed vn-mysql package	2021-09-23 07:59:56 +02:00
Carlos Jimenez Ruiz	f74d2cc302	test(tags): moved code used on a single test to the correct place	2021-09-22 15:16:45 +02:00
Carlos Jimenez Ruiz	95ff46db09	refactor(buys): entry buys now show item.subName	2021-09-22 15:15:52 +02:00
Carlos Jimenez Ruiz	23ba5657c5	refactor(sales): ticket sales now shows item.subName	2021-09-22 15:14:29 +02:00
Carlos Jimenez Ruiz	c971d3ee01	refactor(consumption): client consuption now shows item.subName	2021-09-22 15:13:29 +02:00
Joan Sanchez	352f214f6f	Merge pull request '2995-supplierAccount-modificaciones' (#714) from 2995-supplierAccount-modificaciones into dev ... Reviewed-on: #714 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-09-22 10:58:04 +00:00
Javi Gallego	40e589203e	test fixed	2021-09-22 07:42:58 +02:00
Carlos Jimenez Ruiz	aae54b5707	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-21 18:49:35 +02:00
Carlos Jimenez Ruiz	cc90a08f03	refactor(ticket): ticket endpoins now can receive transactions	2021-09-21 18:48:59 +02:00
Carlos Jimenez Ruiz	ca00e3611c	package-lock after removing vn-mysql	2021-09-21 18:43:45 +02:00
Joan Sanchez	08cba0a9c8	fix(filter): search limit by date range was not being applied ... Refs: 3059	2021-09-21 15:49:59 +02:00
Javi Gallego	6058e2a60a	npm i	2021-09-21 14:11:03 +02:00
Javi Gallego	3365eadf5e	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-21 14:02:07 +02:00
Joan Sanchez	d41378a532	Updated unit test	2021-09-21 13:51:38 +02:00
Joan Sanchez	32d492efd3	refactor(deliveryNote): updated report translations	2021-09-21 13:03:07 +02:00
Joan Sanchez	96e283b2bf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-09-21 12:57:04 +02:00
Joan Sanchez	6e89fa1b5e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-09-21 12:56:49 +02:00
Joan Sanchez	689662f9bb	fix code duplication	2021-09-21 12:48:51 +02:00
Carlos Jimenez Ruiz	95b4d23599	added agency and route columns to client.summary tickets	2021-09-21 12:39:54 +02:00
Joan Sanchez	786589f214	fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination ... Refs: 3093	2021-09-21 12:25:22 +02:00
Joan Sanchez	deb085ce9f	fix(bankEntity): was not sending back the data id	2021-09-21 08:43:21 +02:00
Joan Sanchez	c9cda92fbf	refactor(smtp): replaced field "sender" with "receiver"	2021-09-20 14:32:15 +02:00
Joan Sanchez	cd478a9f7b	Removed line break	2021-09-20 14:02:04 +02:00
Joan Sanchez	369b79c6af	refactor(invoice): removed unnecessary class	2021-09-20 14:01:40 +02:00
Joan Sanchez	a0ac55bc3e	refactor(invoice): send invoice to specific email address from descriptor option ... Refs: 3010	2021-09-20 13:59:57 +02:00
Carlos Jimenez Ruiz	b9460723f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-20 13:09:58 +02:00
Carlos Jimenez Ruiz	8ab67f0ba5	Merge pull request 'Component shows now the year week numbers' (#738) from 2389-calendar_weeks into dev ... Reviewed-on: #738 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-20 08:50:08 +00:00
Carlos Jimenez Ruiz	c17cedd124	Merge branch 'dev' into 2389-calendar_weeks	2021-09-20 08:44:49 +00:00
Carlos Jimenez Ruiz	2846089f8e	Merge pull request 'Added warning text for non returned packagings' (#737) from 3097-delivery_note_text into dev ... Reviewed-on: #737 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-20 08:15:08 +00:00
Joan Sanchez	e07e8ec658	Merge branch 'dev' into 2389-calendar_weeks	2021-09-20 08:11:21 +00:00
Joan Sanchez	69346a17a0	Removed unused code	2021-09-20 10:10:25 +02:00
Carlos Jimenez Ruiz	51417adffe	refactor(wtf): removed unused package	2021-09-20 09:51:09 +02:00
Joan Sanchez	f90eb4c39d	refactor(deliveryNote): added warning text for non returned packagings ... Refs: 3097	2021-09-20 08:57:51 +02:00
Joan Sanchez	22cbe4875f	fix(upload-photo): Updated translation	2021-09-17 12:56:12 +02:00
Joan Sanchez	7223344aa0	Merge pull request 'fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination' (#736) from 3093-fix_dup_tickets into dev ... Reviewed-on: #736 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-17 09:59:29 +00:00
Joan Sanchez	560993cc8c	Removed unused translation	2021-09-17 11:34:26 +02:00