10705 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	ab7e1c9f11	item summary e2e fix	2021-11-12 10:21:54 +01:00
Joan Sanchez	02e651eac8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-12 09:45:05 +01:00
Joan Sanchez	f32db33ed9	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-12 09:43:50 +01:00
Joan Sanchez	93c766e3ca	fix(supplier): removed everyone read acl	2021-11-12 09:32:42 +01:00
Alex Moreno	6fe7875d73	change route	2021-11-12 09:28:19 +01:00
Joan Sanchez	bcaa11a3c4	fix(invoice): order by shipped	2021-11-12 08:45:02 +01:00
Joan Sanchez	cae69a2ce4	fix(invoice): order tickets by id on invoice report	2021-11-12 08:35:00 +01:00
Alex Moreno	2581ce43a7	refactor(descriptor): separate es.yml	2021-11-12 08:32:15 +01:00
Joan Sanchez	c40a73b891	Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-11 17:19:07 +01:00
Joan Sanchez	04da06d778	refactor(smart-table): style changes and added smart-table to sales monitor	2021-11-11 17:18:44 +01:00
Carlos Jimenez Ruiz	acd2d2e51f	front unit tests fix for lastests buys	2021-11-11 17:18:19 +01:00
Carlos Jimenez Ruiz	4fe7d4f566	ticket index rollback	2021-11-11 17:17:48 +01:00
Carlos Jimenez Ruiz	d2dc0bd147	multi check now behaves properly	2021-11-11 16:38:41 +01:00
Alex Moreno	cb35f6d3f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3314-invoice-out_summary	2021-11-11 14:46:35 +01:00
Alex Moreno	dd47f209a2	feat(descriptor-menu): handle error empty input	2021-11-11 14:46:05 +01:00
Alex Moreno	509e002e34	feat(summary): get email	2021-11-11 13:14:34 +01:00
Carlos Jimenez Ruiz	6baa9935de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-11 10:41:51 +01:00
Joan Sanchez	f99e0c5648	Updated default hidden columns	2021-11-11 10:40:21 +01:00
Joan Sanchez	8b31322fa1	fix(contextmenu): exclusion by date range and removed empty or/and arrays	2021-11-11 10:16:44 +01:00
Joan Sanchez	e6c312d73c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-11 08:37:09 +01:00
Joan Sanchez	95dfd4c2dd	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-11 08:27:59 +01:00
Alex Moreno	62cdf52227	refactor(time-control): getWorkedHours.spec	2021-11-11 08:24:57 +01:00
Alex Moreno	a3bb3122ed	fix(time-control): modify select & refactor dates	2021-11-11 08:24:41 +01:00
Carlos Jimenez Ruiz	0bf553e11e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-10 17:07:39 +01:00
Carlos Jimenez Ruiz	d87e8ac226	refactor(entry.lastBuys): usage of smart table on latests buys	2021-11-10 17:07:16 +01:00
Vicent Llopis	41974669e5	fix(testBack): add context	2021-11-10 15:11:42 +01:00
Alex Moreno	7880fb8de9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3314-invoice-out_summary	2021-11-10 14:54:15 +01:00
Carlos Jimenez Ruiz	e688e078ec	Merge pull request '3116-client_balance' (#768) from 3116-client_balance into dev ... Reviewed-on: #768 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-10 13:49:14 +00:00
Alex Moreno	f34130cbd7	feat(invoiceOut): separate index.js and jest test	2021-11-10 14:48:17 +01:00
Carlos Jimenez Ruiz	717ea60084	Merge branch 'dev' into 3116-client_balance	2021-11-10 13:40:56 +00:00
Vicent Llopis	d3ff60719c	fix(last-entries): dateFrom -75 days	2021-11-10 12:34:56 +01:00
Vicent Llopis	9b46b31010	translate	2021-11-10 12:03:53 +01:00
Vicent Llopis	0849f40df7	feat: update backTest	2021-11-10 11:44:29 +01:00
Carlos Jimenez Ruiz	f63ccbda8a	Merge pull request 'feat(supplier): add checkbox isPayMethodChecked' (#771) from 3308-supplier_basic-data into dev ... Reviewed-on: #771 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-10 09:59:49 +00:00
Carlos Jimenez Ruiz	d8c3113adc	Merge branch 'dev' into 3308-supplier_basic-data	2021-11-10 09:57:06 +00:00
Carlos Jimenez Ruiz	115b294b3e	Merge pull request '3319-worker_time-control' (#770) from 3319-worker_time-control into dev ... Reviewed-on: #770 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-10 09:54:43 +00:00
Alex Moreno	2ca48f2ae0	refactor(supplier): remove console.log	2021-11-10 10:48:05 +01:00
Carlos Jimenez Ruiz	766d9c6464	Merge branch 'dev' into 3319-worker_time-control	2021-11-10 09:38:54 +00:00
Carlos Jimenez Ruiz	bd1165d01f	Merge pull request '3271-zone_calendar' (#769) from 3271-zone_calendar into dev ... Reviewed-on: #769 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-10 08:29:59 +00:00
Vicent Llopis	9010992add	fix: test e2e	2021-11-10 09:20:54 +01:00
Vicent Llopis	18aec14fe9	update backTest	2021-11-10 08:46:09 +01:00
Alex Moreno	119d5e45b9	feat(supplier): add checkbox isPayMethodChecked	2021-11-10 08:43:25 +01:00
Alex Moreno	a52c06057f	feat(invoiceOut): separate descriptor	2021-11-09 15:10:43 +01:00
Vicent Llopis	833822978a	feat(client_balance): test e2e	2021-11-09 14:36:39 +01:00
Vicent Llopis	f5977d9f01	delete maxAmount from structure.sql	2021-11-09 14:35:34 +01:00
Carlos Jimenez Ruiz	469c544536	item.index default columns and filter with like	2021-11-09 11:47:54 +01:00
Carlos Jimenez Ruiz	bd51ff3761	Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-09 11:44:25 +01:00
Joan Sanchez	7826897b35	refactor(contextmenu): excludes now ensures negation	2021-11-09 11:44:00 +01:00
Alex Moreno	17aed362f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar	2021-11-09 10:22:11 +01:00
Alex Moreno	0aa0358b50	refactor(events): name of variable	2021-11-09 10:21:28 +01:00