7933 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	9fa3f17a9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-09-01 17:45:00 +02:00
Joan Sanchez	6a065091de	First version of multicheck selection	2020-09-01 15:13:33 +02:00
Joan Sanchez	ecb98dfac5	Descriptor fix	2020-09-01 12:10:32 +02:00
Carlos Jimenez Ruiz	a555dea339	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable	2020-09-01 10:51:54 +02:00
Carlos Jimenez Ruiz	79b5ac0c3c	Merge branch 'dev' into 1788-remove_autoload_vnTable	2020-09-01 08:47:41 +00:00
Joan Sanchez	048270711d	Merge pull request 'campo packageFk' (#360) from 2411-ticket-expedition-añadir-campo-packagingFk into dev ... Reviewed-on: #360 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-01 07:41:32 +00:00
Joan Sanchez	cb4fe1f610	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 07:37:48 +00:00
Carlos Jimenez Ruiz	d33f86c86d	Merge pull request '2409 - Added filter by selection' (#362) from 2409-last_entries_contextmenu into dev ... Reviewed-on: #362 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-01 07:30:12 +00:00
Joan Sanchez	5a16a10b8f	Merge branch 'dev' into 2409-last_entries_contextmenu	2020-09-01 06:55:13 +00:00
Javi Gallego	b4952002a3	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 06:49:09 +00:00
Javi Gallego	a5fbe57159	gulpfile	2020-09-01 08:42:31 +02:00
Javi Gallego	a567738f2c	set addressFk	2020-09-01 08:33:11 +02:00
Joan Sanchez	8ae7871318	Removed procedure	2020-09-01 07:56:56 +02:00
Joan Sanchez	0a542a2057	Updated unit test	2020-09-01 07:38:03 +02:00
Joan Sanchez	156c5de17d	Merge pull request '2416 - Item request - Added state filter' (#361) from 2408-item_request into dev ... Reviewed-on: #361 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-08-31 13:23:13 +00:00
Joan Sanchez	b34545b316	Merge branch 'dev' into 2408-item_request	2020-08-31 13:11:07 +00:00
Carlos Jimenez Ruiz	f797fdce94	Merge pull request '2391 - Editable description(done) + e2e' (#359) from 2391-client_balance_description into dev ... Reviewed-on: #359 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-08-31 13:05:12 +00:00
Joan Sanchez	8aa9918d84	2409 - Added filter by selection	2020-08-31 15:03:00 +02:00
Carlos Jimenez Ruiz	a156a26e19	e2e updated	2020-08-31 15:00:11 +02:00
Javi Gallego	daee9081d1	test excepto invoiceOut	2020-08-31 12:29:51 +02:00
Joan Sanchez	6297d09de2	Updated syntax	2020-08-31 12:14:39 +02:00
Joan Sanchez	4a870213ce	Merge branch 'dev' into 2408-item_request	2020-08-31 09:03:41 +00:00
Joan Sanchez	7a1d697375	Merge branch 'dev' into 2391-client_balance_description	2020-08-31 08:26:02 +00:00
Carlos Jimenez Ruiz	7a2779b597	Merge pull request '2394 - Removed call to order_total()' (#358) from 2394-order_index_total into dev ... Reviewed-on: #358 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-08-31 08:23:34 +00:00
Joan Sanchez	95601f5d55	Updated translations	2020-08-31 10:15:02 +02:00
Joan Sanchez	8b67c6f1a5	Merge branch 'dev' into 2394-order_index_total	2020-08-31 08:01:48 +00:00
Joan Sanchez	baf9ec6e70	2416 - Item request - Added state filter	2020-08-31 08:32:30 +02:00
Carlos Jimenez Ruiz	5c53c9301e	path e2e + fixes + exclusion	2020-08-28 19:52:54 +02:00
Javi Gallego	8b26c41b7f	campo packageFk	2020-08-28 17:06:27 +02:00
Carlos Jimenez Ruiz	0b4f65724e	semantics, traductions and small aditions	2020-08-28 10:40:47 +02:00
Carlos Jimenez Ruiz	c70ad808a0	refactor	2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz	2f81e41881	grping and pcking shown as per item last entries	2020-08-27 16:42:01 +02:00
Carlos Jimenez Ruiz	58fc25d91f	grouping & packaging according to grouping mode	2020-08-27 16:40:08 +02:00
Carlos Jimenez Ruiz	5614a39f91	traductuctions	2020-08-27 15:29:48 +02:00
Carlos Jimenez Ruiz	a66656dcce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-08-27 15:14:41 +02:00
Carlos Jimenez Ruiz	d156ca95ba	front and back unit tests	2020-08-27 15:14:30 +02:00
Joan Sanchez	f4a63e0876	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-08-27 14:32:10 +02:00
Joan Sanchez	7c4d9b9460	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-27 14:31:54 +02:00
Joan Sanchez	a75938b6d0	Updated error handler	2020-08-27 14:23:40 +02:00
Joan Sanchez	55d047c0dd	Renamed error var	2020-08-27 14:11:22 +02:00
Joan Sanchez	fd67a85fe8	Changed to 1 second	2020-08-27 14:09:21 +02:00
Joan Sanchez	0c4939830b	Fixed error	2020-08-27 14:00:40 +02:00
Joan Sanchez	6f3fb83cd7	Changes	2020-08-27 13:53:11 +02:00
Joan Sanchez	32de0e1e6f	Removed focus	2020-08-27 12:43:57 +02:00
Joan Sanchez	914407012a	Fixed bank search expression	2020-08-27 11:58:28 +02:00
Joan Sanchez	f14b484faf	Added ACL to td-editable	2020-08-27 11:23:39 +02:00
Joan Sanchez	ac181bb845	Updated unit tests	2020-08-27 11:16:36 +02:00
Joan Sanchez	1b764e0b3a	Merge branch 'dev' into 2394-order_index_total	2020-08-27 07:54:53 +00:00
Joan Sanchez	17542472da	2391 - Editable description	2020-08-27 08:24:21 +02:00
Carlos Jimenez Ruiz	3a82ef0e06	2375 entry lastBuy seccion	2020-08-26 16:33:47 +02:00