10358 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	dd7f37e36c	Merge pull request 'added ticket.nickname to basicdata' (#663) from 2960-ticket_basicdata_add_alias into dev ... Reviewed-on: #663 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-18 14:15:15 +00:00
Joan Sanchez	a4f20daf17	Updated unit test	2021-06-18 16:14:30 +02:00
Carlos Jimenez Ruiz	6a2638ad9b	nickname added to english loopback locale	2021-06-18 16:10:24 +02:00
Joan Sanchez	a50eebfed4	Replaced salesPerson by packages column	2021-06-18 16:07:13 +02:00
Carlos Jimenez Ruiz	4656b2e25a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias	2021-06-18 15:54:41 +02:00
Carlos Jimenez Ruiz	1afae3d56d	address nickname now gets updated when client or address updates	2021-06-18 15:54:33 +02:00
Carlos Jimenez Ruiz	ba0fdcd743	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions	2021-06-18 15:05:10 +02:00
Carlos Jimenez Ruiz	82cb9ed749	zone module endpoints now have transactions	2021-06-18 15:05:03 +02:00
Joan Sanchez	20e933ed07	2980 - Invoice in fixes	2021-06-18 13:29:59 +02:00
Joan Sanchez	0ff114ff36	Ammends	2021-06-18 12:32:37 +02:00
Joan Sanchez	c622f24b0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction	2021-06-18 11:12:58 +02:00
Carlos Jimenez Ruiz	962724a29e	Merge pull request '2906 - Number of packages' (#667) from 2906-deliveryNote_packages into dev ... Reviewed-on: #667 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-18 08:32:46 +00:00
Carlos Jimenez Ruiz	e74f1f109e	Merge branch 'dev' into 2906-deliveryNote_packages	2021-06-18 08:27:46 +00:00
Joan Sanchez	fa9aea120c	Merge pull request '2948-ticket_sale_itemPackingType' (#661) from 2948-ticket_sale_itemPackingType into dev ... Reviewed-on: #661 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-18 08:27:11 +00:00
Joan Sanchez	325afe2245	2906 - Number of packages	2021-06-18 08:42:55 +02:00
Joan Sanchez	b36b48f4b3	Merge branch 'dev' into 2874-timeEntry_direction	2021-06-18 06:04:33 +00:00
Joan Sanchez	bc7c288742	Updated unit tests	2021-06-18 08:03:55 +02:00
Joan Sanchez	8695fadc18	Merge branch 'dev' into 2948-ticket_sale_itemPackingType	2021-06-18 05:21:01 +00:00
Joan Sanchez	8c55466572	Merge pull request 'added a waitForTimeout to allow descriptor component to load' (#664) from 2972-travel_e2e into dev ... Reviewed-on: #664 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-18 05:20:41 +00:00
Javi Gallego	a6c093cf16	Merge branch 'dev' into 2940-invoiceInTax-section	2021-06-18 07:07:52 +02:00
Carlos Jimenez Ruiz	b6d96f57f2	Merge branch 'dev' into 2972-travel_e2e	2021-06-17 14:22:12 +00:00
Carlos Jimenez Ruiz	2724033909	added a waitForTimeout to allow descriptor component to load	2021-06-17 16:17:18 +02:00
Joan Sanchez	bbbf008076	Added done() to async beforeAll()	2021-06-17 16:09:17 +02:00
Joan Sanchez	bb80621890	2874 - Edit time entry direction	2021-06-17 15:09:04 +02:00
Carlos Jimenez Ruiz	cf1fde6892	Merge pull request 'expedition-minor-changes' (#662) from expedition-minor-changes into dev ... Reviewed-on: #662 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-17 10:04:36 +00:00
Carlos Jimenez Ruiz	b906a8e91d	added ticket.nickname to basicdata	2021-06-17 11:52:12 +02:00
Javi Gallego	577129a24a	test e2e	2021-06-17 08:17:02 +02:00
Javi Gallego	d0389cabf4	excluyo e2e para pasar test verde	2021-06-17 08:02:39 +02:00
Javi Gallego	e2f32a60fd	cambio campos en front	2021-06-17 07:30:22 +02:00
Javi Gallego	dc0212d2fc	chip	2021-06-16 18:36:42 +02:00
Carlos Jimenez Ruiz	b9bfb35008	e2e fix	2021-06-16 17:58:47 +02:00
Carlos Jimenez Ruiz	7370269e4d	ticket.sale now shows Packing type	2021-06-16 17:06:11 +02:00
Joan Sanchez	2a1a0a3244	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-16 13:33:32 +02:00
Joan Sanchez	c8d378cc36	Merge pull request '2928-entry_latestsbuys_weight' (#660) from 2928-entry_latestsbuys_weight into dev ... Reviewed-on: #660 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-16 11:18:28 +00:00
Carlos Jimenez Ruiz	da2d62899f	Merge pull request '2956 - Fix for extra community report' (#659) from 2956-extraCommunity_hotfix into master ... Reviewed-on: #659	2021-06-16 11:16:09 +00:00
Joan Sanchez	9c09d60775	Updated var name	2021-06-16 13:14:13 +02:00
Joan Sanchez	e7c62d2e71	2956 - Fix for extra community report	2021-06-16 13:04:54 +02:00
Carlos Jimenez Ruiz	47ad63c154	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2928-entry_latestsbuys_weight	2021-06-16 12:29:46 +02:00
Carlos Jimenez Ruiz	588a499c44	editLatestsBuys now is called only with id and itemFk	2021-06-16 12:29:40 +02:00
Carlos Jimenez Ruiz	9dbff9842f	Merge pull request '2961 - Show tickets on summary' (#657) from 2961-summary_tickets into dev ... Reviewed-on: #657 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-16 10:28:17 +00:00
Carlos Jimenez Ruiz	f5ad0c9c1c	Merge branch 'dev' into 2961-summary_tickets	2021-06-16 10:18:47 +00:00
Carlos Jimenez Ruiz	fc1587bcdd	Merge pull request '2941 - Monitor changes' (#654) from 2941-salesMonitor_changes into dev ... Reviewed-on: #654 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-16 10:18:31 +00:00
Joan Sanchez	447d8341e7	Merge branch 'dev' into 2941-salesMonitor_changes	2021-06-16 09:49:12 +00:00
Joan Sanchez	b7342ec15d	Merge pull request '2965-delete_travel_from_descriptor' (#656) from 2965-delete_travel_from_descriptor into dev ... Reviewed-on: #656 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-16 09:48:58 +00:00
Joan Sanchez	76623d8c95	Merge branch 'dev' into 2941-salesMonitor_changes	2021-06-16 09:47:45 +00:00
Joan Sanchez	0ce782a4de	Updated unit tests	2021-06-16 11:40:00 +02:00
Joan Sanchez	3e938fa9fb	Updated unit tests	2021-06-16 11:15:17 +02:00
Carlos Jimenez Ruiz	b9cdc5ed6a	Merge branch 'dev' into 2965-delete_travel_from_descriptor	2021-06-16 08:19:01 +00:00
Joan Sanchez	efc9edb384	Fixes	2021-06-16 10:13:06 +02:00
Joan Sanchez	c3bebc9f7e	Merge pull request 'removed several columns from bulk edit and added packingOut' (#652) from 2929-entry_latestsbuys_refactor into dev ... Reviewed-on: #652 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-16 08:02:31 +00:00