10269 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	1cc4e60bad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2840-ticket_card_sale_deprecations	2021-03-24 16:45:57 +01:00
Carlos Jimenez Ruiz	41bb4cbaab	deprecated vat and subTotal related methods + tests fixed	2021-03-24 16:43:54 +01:00
Joan Sanchez	de7f1bbc12	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-24 14:26:09 +01:00
Joan Sanchez	302dedef0f	Missing translations & attachment fix	2021-03-24 14:25:57 +01:00
jorgebl	393b9ba38c	Correct name	2021-03-24 14:17:27 +01:00
jorgebl	81fbc81314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum	2021-03-24 13:54:41 +01:00
jorgebl	e01b7420d9	Added total cost of item	2021-03-24 13:54:29 +01:00
Joan Sanchez	2c1b155122	Added missing translation	2021-03-24 13:48:14 +01:00
Carlos Jimenez Ruiz	ba7818ff43	Merge pull request '2819-notify_assignment' (#584) from 2819-notify_assignment into dev ... Reviewed-on: #584 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-24 12:40:33 +00:00
Joan Sanchez	e767e95729	Loggable fixes	2021-03-24 13:09:35 +01:00
Joan Sanchez	c65fbef3df	Merge branch 'dev' into 2819-notify_assignment	2021-03-24 11:47:38 +00:00
Joan Sanchez	32805dbafb	Added model unit test	2021-03-24 12:45:26 +01:00
Joan Sanchez	412dd34229	Merge pull request 'e2e for account create and home firefox fix' (#583) from 2841-e2e_account_create_and_basic_data into dev ... Reviewed-on: #583 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-24 10:21:56 +00:00
Joan Sanchez	23facc8a50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2841-e2e_account_create_and_basic_data	2021-03-24 11:14:20 +01:00
Joan Sanchez	00aeaafc49	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-24 11:12:51 +01:00
Joan Sanchez	0e9b3bd39a	Missing translation	2021-03-24 11:12:36 +01:00
Carlos Jimenez Ruiz	3e47e124dc	made the name shorter to fix display issues on firefox	2021-03-24 11:10:24 +01:00
Joan Sanchez	7a35e60b8a	Merge branch 'dev' into 2841-e2e_account_create_and_basic_data	2021-03-24 10:10:22 +00:00
Carlos Jimenez Ruiz	81ae63356a	removed the edition steps to avoid errors	2021-03-24 11:09:58 +01:00
Carlos Jimenez Ruiz	a62c030166	made the name shorter to fix display issues on firefox	2021-03-24 11:06:48 +01:00
Joan Sanchez	14f0cbaf42	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-24 11:06:15 +01:00
Joan Sanchez	53ae45d4c8	Deleted old .keep file	2021-03-24 11:05:41 +01:00
Joan Sanchez	c6ee58a278	Added new changes version	2021-03-24 11:05:05 +01:00
Joan Sanchez	5599487eb8	Merge pull request '2846 - Added title property to descriptor name' (#582) from 2846-descriptor_title into dev ... Reviewed-on: #582 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-24 09:47:46 +00:00
Carlos Jimenez Ruiz	b6824450ef	Merge branch 'dev' into 2846-descriptor_title	2021-03-24 09:43:46 +00:00
Carlos Jimenez Ruiz	5941baae40	removed the edition steps to avoid errors	2021-03-24 10:05:12 +01:00
Carlos Jimenez Ruiz	7c46f513e2	Merge pull request '2705-route_tickets_refactor' (#576) from 2705-route_tickets_refactor into dev ... Reviewed-on: #576 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-24 08:04:34 +00:00
Joan Sanchez	f889e7942b	2846 - Added title property to descriptor name	2021-03-24 07:44:38 +01:00
Carlos Jimenez Ruiz	409f56ec7f	e2e path resurrected for route tickets	2021-03-23 17:19:05 +01:00
Joan Sanchez	b3d333368b	#2819 - Notify worker assignment	2021-03-23 16:19:45 +01:00
Carlos Jimenez Ruiz	89d123c7f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-23 13:19:30 +01:00
Carlos Jimenez Ruiz	a78a73486a	updated routes fixtures and fixed tests	2021-03-23 13:19:11 +01:00
Joan Sanchez	e2db0d5742	Merge pull request '2811 Show how many lines are going to edit' (#572) from 2811-entry_latest_buys into dev ... Reviewed-on: #572 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-23 11:44:34 +00:00
jorgebl	868a0dbff7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-23 09:43:34 +01:00
Joan Sanchez	241ef6d467	Merge pull request '2843-claim_pickup_order' (#579) from 2843-claim_pickup_order into dev ... Reviewed-on: #579 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-22 16:38:56 +00:00
Joan Sanchez	e4685bb4e4	Merge branch 'dev' into 2843-claim_pickup_order	2021-03-22 16:36:45 +00:00
Joan Sanchez	321fe07742	Merge pull request 'Changed message' (#580) from 2794-ticket_descriptor into dev ... Reviewed-on: #580 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-22 16:35:21 +00:00
Carlos Jimenez Ruiz	84378fd607	tickets already in route are no longer shown + tests	2021-03-22 16:13:12 +01:00
jorgebl	e96fd3d1f7	Changed message	2021-03-22 16:11:52 +01:00
Carlos Jimenez Ruiz	0023a88bfc	restored the auto state to its previous version	2021-03-22 11:32:57 +01:00
jorgebl	fb5af479e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2843-claim_pickup_order	2021-03-22 10:58:13 +01:00
jorgebl	7e903f91a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 10:32:33 +01:00
Carlos Jimenez Ruiz	1e247e63a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-22 10:32:07 +01:00
Joan Sanchez	eb12126603	Rollback test changes	2021-03-22 10:27:07 +01:00
Carlos Jimenez Ruiz	584947c52c	Merge pull request '2669 - Changes to the translate values function' (#577) from 2669-loggable_refactor into dev ... Reviewed-on: #577 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-22 09:24:50 +00:00
jorgebl	322a12e65c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 10:24:01 +01:00
jorgebl	5f95bf4e15	Removed vn-horizontal and styles in the spans	2021-03-22 10:23:52 +01:00
Joan Sanchez	6da84e46c1	Added throw error	2021-03-22 10:20:04 +01:00
jorgebl	b7b86cd719	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 09:39:06 +01:00
Joan Sanchez	985bcc61b1	Rollback	2021-03-22 09:11:02 +01:00