11465 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	db30ac3175	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-24 11:40:23 +02:00
Carlos Jimenez Ruiz	3bfc08b117	route.summary order by priority	2021-06-24 10:06:31 +02:00
Carlos Jimenez Ruiz	320c04b2d3	update volume is not called when add/remove tickets from route	2021-06-24 09:54:07 +02:00
Joan Sanchez	362c404aba	Css fixes	2021-06-24 09:16:59 +02:00
Joan Sanchez	6e879a54a6	Added preffer-offline again	2021-06-23 14:38:41 +02:00
Joan Sanchez	8f5e499425	Removed prefer-offline	2021-06-23 14:35:35 +02:00
Joan Sanchez	29ceb38a06	Added force param	2021-06-23 14:32:36 +02:00
Joan Sanchez	6662a0abfc	Clean npm cache	2021-06-23 14:31:40 +02:00
Carlos Jimenez Ruiz	6aae09f070	front unit tests final amend	2021-06-23 14:21:48 +02:00
Carlos Jimenez Ruiz	2da72fc993	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild	2021-06-23 14:20:12 +02:00
Carlos Jimenez Ruiz	790c3729aa	Merge pull request '2974- Set user company as default on client balance' (#674) from 2974-client_balance into dev ... Reviewed-on: #674 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-23 12:18:48 +00:00
Carlos Jimenez Ruiz	12c9f3fd7d	Merge branch '2997-export_production' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild	2021-06-23 14:18:23 +02:00
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
Carlos Jimenez Ruiz	625722e4da	package-lock up to date in all services	2021-06-23 13:40:22 +02:00
Carlos Jimenez Ruiz	9389bbf779	front unit tests fix	2021-06-23 13:32:23 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz	e66a3f80bb	e2e amends	2021-06-23 13:23:07 +02:00
Carlos Jimenez Ruiz	c88033a69d	deprecated listWorkers endpoint as it was not in use	2021-06-23 13:22:35 +02:00
Joan Sanchez	efc25fcb53	Updated ids	2021-06-23 12:28:55 +02:00
Joan Sanchez	b0d7f6537b	Updated taxClass	2021-06-23 09:32:10 +02:00
Joan Sanchez	f445194e46	Restored version	2021-06-22 16:30:15 +02:00
Joan Sanchez	e6c50a2033	Updated structure	2021-06-22 16:23:39 +02:00
Joan Sanchez	0a3f3cc57f	Incremented up to 1000 on the users id	2021-06-22 16:11:28 +02:00
Joan Sanchez	1d916a6557	Added version	2021-06-22 15:43:08 +02:00
Joan Sanchez	46bbe07c3f	2997 - Export production	2021-06-22 15:01:10 +02:00
Joan Sanchez	4f2c21707f	2997 - Export production db	2021-06-22 14:59:26 +02: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
Joan Sanchez	3ae520d247	2847 - Driver route now shows item packaging type	2021-06-21 09:10:47 +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