9870 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	b02d7b3a3b	Merge pull request 'fixed getSummary unit test' (#631) from back_unit_test_fix into dev ... Reviewed-on: #631	2021-05-24 10:08:59 +00:00
Carlos Jimenez Ruiz	e418d6239b	fixed getSummary unit test	2021-05-24 11:28:23 +02:00
Joan Sanchez	ec7cc169f5	Merge pull request '2920-item_descriptor_user_warehouse' (#630) from 2920-item_descriptor_user_warehouse into dev ... Reviewed-on: #630 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-05-24 09:23:33 +00:00
Carlos Jimenez Ruiz	2a4ff5a97b	fixed a problem where warehouseFk wasn't yet defined upon updateStock call	2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz	025766857f	e2e path fixed for worker calendar	2021-05-21 18:09:10 +02:00
Carlos Jimenez Ruiz	9a1b6e4653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse	2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz	5c18c5c94c	ticket module descriptor now takes warehouseFk from the ticket	2021-05-21 15:31:28 +02:00
Carlos Jimenez Ruiz	1bfe537186	claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig	2021-05-21 15:31:05 +02:00
Joan Sanchez	a0b512e3c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-21 14:24:31 +02:00
Joan Sanchez	a376ca32df	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-21 14:23:50 +02:00
Joan Sanchez	95073183e9	Email rollback	2021-05-21 14:19:39 +02:00
Joan Sanchez	60185bdf34	Merge branch 'dev' into 2891-ticket_sale_problems	2021-05-21 07:24:34 +00:00
Joan Sanchez	e661fccf40	Merge pull request '2620-mostrar-disponible' (#628) from 2620-mostrar-disponible into dev ... Reviewed-on: #628 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-05-21 07:18:02 +00:00
Joan Sanchez	a103c8d7fc	2891 - Get ticket problems for every sale	2021-05-21 08:49:32 +02:00
Joan Sanchez	6f245698f2	Merge branch 'dev' into 2620-mostrar-disponible	2021-05-21 06:29:43 +00:00
Joan Sanchez	b7049122fe	Url fix	2021-05-20 10:28:37 +02:00
Joan Sanchez	e136387fcb	Merge pull request '2921 - Changed the ticket url of rocket notifications' (#626) from 2921-notification_url into dev ... Reviewed-on: #626	2021-05-20 08:27:36 +00:00
Joan Sanchez	fbc11b7a39	Merge branch 'dev' into 2921-notification_url	2021-05-20 08:23:45 +00:00
Javi Gallego	b7bcb4bd17	selectores	2021-05-19 19:15:47 +02:00
Javi Gallego	df073cce2f	refactor tod usa get sales	2021-05-19 17:04:13 +02:00
Javi Gallego	bc887bce8e	Merge pull request '2885-ticket_sale_item_family_not_restricted' (#627) from 2885-ticket_sale_item_family_not_restricted into dev ... Reviewed-on: #627 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-05-19 13:39:42 +00:00
Carlos Jimenez Ruiz	c16c93a75a	updated fixtures for item	2021-05-19 15:34:17 +02:00
Carlos Jimenez Ruiz	2494af0113	removed unused relation from item @addSale	2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz	5eb0ab8296	add and edit sales no longer intervene the prices	2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz	72a0b774de	add and get sales now sets item.price from packaging for EMB items	2021-05-19 14:15:28 +02:00
Carlos Jimenez Ruiz	df9373aded	e2e amends due to html changes on logs	2021-05-19 14:14:04 +02:00
Joan Sanchez	a5c3ba3926	2921 - Changed the ticket url of rocket notifications	2021-05-19 10:26:58 +02:00
Joan Sanchez	782783b0b4	Merge pull request '2908-logs_no_ellipsize' (#625) from 2908-label_value_full_text into dev ... Reviewed-on: #625 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-05-18 13:47:27 +00:00
Joan Sanchez	714142f868	Merge branch 'dev' into 2908-label_value_full_text	2021-05-18 12:53:33 +00:00
Carlos Jimenez Ruiz	8fb5d66d8d	replaced spans with label-value components	2021-05-18 14:53:08 +02:00
Joan Sanchez	98d7f246a4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-18 14:44:38 +02:00
Joan Sanchez	a9e33abacc	FIX: Show employee list	2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz	137eb52945	Merge branch '2908-label_value_full_text' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text	2021-05-18 14:35:57 +02:00
Carlos Jimenez Ruiz	c12f352d14	Merge branch 'dev' into 2908-label_value_full_text	2021-05-18 12:29:32 +00:00
Carlos Jimenez Ruiz	e10dc53a9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text	2021-05-18 14:22:36 +02:00
Joan Sanchez	82c64bf096	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-18 14:22:13 +02:00
Joan Sanchez	dcebe94294	Show supplier name on route-driver report	2021-05-18 14:21:49 +02:00
Joan Sanchez	3402bd119d	Css fixes	2021-05-18 13:46:43 +02:00
Carlos Jimenez Ruiz	06d396a76a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text	2021-05-18 13:22:57 +02:00
Carlos Jimenez Ruiz	c0e2ff12da	moved vn-log to salix components + css changes and renamed worker-log to log	2021-05-18 13:22:40 +02:00
Carlos Jimenez Ruiz	bf05296b84	made dev debug info window less nav intrusive	2021-05-18 13:20:08 +02:00
Joan Sanchez	5c760b3faa	Max height	2021-05-18 12:21:01 +02:00
Joan Sanchez	c310bfab49	Updated z-index	2021-05-18 11:58:32 +02:00
Joan Sanchez	b87e79b9d3	Changes	2021-05-18 11:58:32 +02:00
Joan Sanchez	6ec28cbc86	Removed transaction block	2021-05-18 11:58:32 +02:00
Joan Sanchez	bc7f2d8193	Responsive	2021-05-18 11:58:32 +02:00
Joan Sanchez	bb67277c68	#2913, #2914 - Changes to sales monitors	2021-05-18 11:58:32 +02:00
Carlos Jimenez Ruiz	a5f4936e60	Merge pull request '#2913, #2914 - Changes to sales monitors' (#624) from 2913-monitor_changes into dev ... Reviewed-on: #624 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-18 08:29:29 +00:00
Joan Sanchez	ce96e92389	Updated z-index	2021-05-18 10:20:15 +02:00
Joan Sanchez	400bf7b4f2	Changes	2021-05-18 10:05:13 +02:00