9931 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	b2feb5227c	Merge branch 'dev' into 2974-client_balance	2021-06-23 12:15:36 +00:00
Joan Sanchez	0267220e1f	Merge pull request 'added isDelivered, isReceived and removed travel descriptor' (#672) from 2955-entry_summary_show_receved_sent into dev ... Reviewed-on: #672 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-23 12:15:13 +00:00
Carlos Jimenez Ruiz	029b2f2fdd	Merge branch 'dev' into 2955-entry_summary_show_receved_sent	2021-06-23 12:12:37 +00:00
Joan Sanchez	adbef4f1cf	Merge pull request '2978-pagination_style_update' (#673) from 2978-pagination_style_update into dev ... Reviewed-on: #673	2021-06-23 11:55:58 +00:00
Joan Sanchez	deaade92b0	Shortened packing type	2021-06-22 14:27:45 +02:00
Joan Sanchez	adf16f002b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-06-22 14:11:47 +02:00
Joan Sanchez	256203944e	HOTFIX: Prevent error on tickets without state	2021-06-22 14:11:33 +02:00
Joan Sanchez	b075c0b8dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-06-22 14:10:08 +02:00
Joan Sanchez	a1b4164b5d	2974 - Client balance default company and fixes	2021-06-22 13:57:32 +02:00
Carlos Jimenez Ruiz	39485d17dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2978-pagination_style_update	2021-06-22 11:58:30 +02:00
Carlos Jimenez Ruiz	9a68340d8a	button changes for pagination	2021-06-22 11:58:12 +02:00
Joan Sanchez	79296ac857	2974 - Client balance default company and fixes	2021-06-22 11:57:43 +02:00
Joan Sanchez	7d93f0ac0e	Merge pull request '2973-module_zone_transactions' (#669) from 2973-module_zone_transactions into dev ... Reviewed-on: #669 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-22 09:29:13 +00:00
Carlos Jimenez Ruiz	565f343e19	added isDelivered, isReceived and removed travel descriptor	2021-06-22 09:39:33 +02:00
Carlos Jimenez Ruiz	0421fd8828	back end unit tests for zone endpoints	2021-06-21 15:04:23 +02:00
Carlos Jimenez Ruiz	b651fdebe6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions	2021-06-21 14:35:01 +02:00
Joan Sanchez	591d167c20	Removed package-lock	2021-06-21 13:37:24 +02:00
Joan Sanchez	33d9e985b3	Merge pull request '2742--invoiceIn-create' (#670) from 2742--invoiceIn-create into dev ... Reviewed-on: #670 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-21 11:20:26 +00:00
Joan Sanchez	be9e230fe8	Merge branch 'dev' into 2742--invoiceIn-create	2021-06-21 11:17:48 +00:00
Joan Sanchez	273ebe9c5f	Removed risk min amount	2021-06-21 10:34:41 +00:00
Joan Sanchez	98621b9e42	Removed transaction	2021-06-21 10:00:38 +00:00
Joan Sanchez	8c0171096f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2742--invoiceIn-create	2021-06-21 09:19:00 +00:00
Carlos Jimenez Ruiz	48a2bb7b10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions	2021-06-21 09:08:03 +02:00
Carlos Jimenez Ruiz	5238ebfd9d	Merge pull request '2874 - Edit time entry direction' (#666) from 2874-timeEntry_direction into dev ... Reviewed-on: #666 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-18 15:11:06 +00:00
Carlos Jimenez Ruiz	d218e59e4d	added a timeout to a descriptor load	2021-06-18 17:08:25 +02:00
Carlos Jimenez Ruiz	05c630533a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction	2021-06-18 16:38:33 +02:00
Carlos Jimenez Ruiz	194c61bfe3	Merge pull request '2980 - Invoice in fixes' (#668) from 2980-invoiceIn_fixes into dev ... Reviewed-on: #668 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-18 14:38:14 +00:00
Carlos Jimenez Ruiz	201a4c76ea	e2e updated for worker timecontrol	2021-06-18 16:37:50 +02:00
Joan Sanchez	8f24c3f39b	Merge branch 'dev' into 2980-invoiceIn_fixes	2021-06-18 14:34:48 +00:00
Joan Sanchez	9506a8fd90	Disabled sortable column	2021-06-18 16:34:34 +02:00
Joan Sanchez	6acf922d3b	Merge branch 'dev' into 2980-invoiceIn_fixes	2021-06-18 14:15:42 +00:00
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