7900 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	66f4674392	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2285-ticket_closure	2020-09-07 10:05:52 +02:00
Joan Sanchez	03a0a22526	Updated unit test	2020-09-07 08:53:47 +02:00
Joan Sanchez	52b851e75b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-07 08:34:17 +02:00
Joan Sanchez	52cbcf1fa3	Updated description	2020-09-07 08:34:04 +02:00
Joan Sanchez	955de285f2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-07 08:01:29 +02:00
Joan Sanchez	ba9cfedec7	Worker calendar holiday name	2020-09-07 07:59:27 +02:00
Joan Sanchez	637f0e392d	Merge pull request '2415-fix_invoiceOut_e2e' (#366) from 2415-fix_invoiceOut_e2e into dev ... Reviewed-on: #366	2020-09-03 10:20:10 +00:00
Carlos Jimenez Ruiz	9739de4f74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2415-fix_invoiceOut_e2e	2020-09-03 12:02:06 +02:00
Carlos Jimenez Ruiz	8e05915ff4	e2e path now clears days onwards input for search	2020-09-03 12:01:57 +02:00
Joan Sanchez	68f011e53c	Added waitFor(500) ms	2020-09-03 11:53:39 +02:00
Carlos Jimenez Ruiz	31b967e368	Merge pull request 'removed autoLoad from vnTable' (#333) from 1788-remove_autoload_vnTable into dev ... Reviewed-on: #333 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-09-02 14:45:43 +00:00
Carlos Jimenez Ruiz	07d85c519e	Merge branch '1788-remove_autoload_vnTable' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable	2020-09-02 16:31:11 +02:00
Carlos Jimenez Ruiz	13f80cd76c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable	2020-09-02 15:52:44 +02:00
Carlos Jimenez Ruiz	1d73bba204	Merge pull request 'latestsBuys + e2e path' (#340) from 2341-Entry_lastBuy_section into dev ... Reviewed-on: #340 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-09-02 13:35:42 +00:00
Carlos Jimenez Ruiz	c796132e77	e2e + fixtures amended + refactor	2020-09-02 15:20:28 +02:00
Carlos Jimenez Ruiz	605fbe7999	refactor	2020-09-02 13:09:30 +02:00
Carlos Jimenez Ruiz	1c0d5dbd76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-09-02 09:42:13 +02:00
Carlos Jimenez Ruiz	742a1c9ea8	removed focus on test	2020-09-02 09:42:10 +02:00
Carlos Jimenez Ruiz	11e1a6f845	Merge pull request 'First version of multicheck selection' (#363) from 2427-multicheck_selection into dev ... Reviewed-on: #363 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-02 07:24:15 +00:00
Joan Sanchez	33aec33cba	Updated unit test	2020-09-02 08:12:32 +02:00
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