10603 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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	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
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
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
Alex Moreno	119d5e45b9	feat(supplier): add checkbox isPayMethodChecked	2021-11-10 08:43:25 +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
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
Alex Moreno	f45db68e0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3319-worker_time-control	2021-11-09 10:10:20 +01:00
Alex Moreno	da80fee0e2	refactor(time-control): getWorkedHours.spec	2021-11-09 10:09:44 +01:00
Carlos Jimenez Ruiz	345be297f0	Merge branch 'dev' into 3116-client_balance	2021-11-09 08:26:41 +00:00
Carlos Jimenez Ruiz	127077b985	Merge pull request 'export-database' (#767) from 3304-export_database into dev ... Reviewed-on: #767 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-09 08:20:02 +00:00
Carlos Jimenez Ruiz	63b90a4246	Merge branch 'dev' into 3304-export_database	2021-11-09 08:04:21 +00:00
Alex Moreno	7009cc0cc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar	2021-11-09 08:40:42 +01:00
Alex Moreno	9ab51fc21f	feat(eventsFiltered): add backTest & refactor zone	2021-11-09 08:39:20 +01:00
Alex Moreno	9e4627617d	fix(time-control): modify select & refactor dates	2021-11-08 14:08:44 +01:00
Joan Sanchez	2bf7250117	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-08 13:40:22 +01:00
Joan Sanchez	a48617e267	Group first	2021-11-08 13:39:12 +01:00
Vicent Llopis	bfbc9b50c4	feat(client_balance): add maxImport if "cash"	2021-11-08 13:02:42 +01:00
Joan Sanchez	7dc95b8cbf	Group first	2021-11-08 12:50:13 +01:00
Alex Moreno	9c877ceb7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar	2021-11-08 11:31:26 +01:00
Alex Moreno	6e2f7d9e0d	feat(events): get range date of calendar	2021-11-08 11:30:00 +01:00
Alex Moreno	45b36a5c77	export-database	2021-11-08 09:28:34 +01:00
Carlos Jimenez Ruiz	208f38baad	Merge pull request 'fix(claim): salesPersonFk where add officeBoss' (#766) from 3295-claim_search-panel into dev ... Reviewed-on: #766 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-08 08:25:19 +00:00
Vicent Llopis	000ae21ce5	create colum sql	2021-11-08 09:16:27 +01:00
Vicent Llopis	fbbb1ecdf6	feat(client_balance): add maxImport if "cash"	2021-11-08 08:59:42 +01:00
Carlos Jimenez Ruiz	8fff96ca05	Merge branch 'dev' into 3295-claim_search-panel	2021-11-08 07:54:10 +00:00
Carlos Jimenez Ruiz	e474f97aec	Merge pull request 'feat(entry_descriptor): add supplier button' (#764) from 3289-entry_descriptor into dev ... Reviewed-on: #764 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-08 07:53:53 +00:00
Carlos Jimenez Ruiz	46fde9a703	Merge branch 'dev' into 3289-entry_descriptor	2021-11-08 07:50:04 +00:00
Joan Sanchez	06b72ae708	fix(pickup-order): changed sql query from pickup order	2021-11-08 07:41:10 +01:00
Alex Moreno	3324f4acd2	fix(zone): back remoteMethod	2021-11-04 07:56:12 +01:00
Alex Moreno	bb0745532b	fix(claim): salesPersonFk where add officeBoss	2021-11-02 11:24:52 +01:00
Alex Moreno	b01298ed17	feat(entry_descriptor): add supplier button	2021-11-02 08:25:43 +01:00
Alex Moreno	b2dd9e6076	feat(zone): filter calendar	2021-11-02 07:55:35 +01:00