10551 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	f969323a86	ticket create now takes clientFk from params	2021-06-08 17:30:00 +02:00
Joan Sanchez	3c8629b3f3	Added entilementRate effects	2021-06-08 16:36:16 +02:00
Joan Sanchez	43ddd509b6	Merge pull request '2945-travel_create_e2e_fix' (#642) from 2945-travel_create_e2e_fix into dev ... Reviewed-on: #642 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-08 07:54:44 +00:00
Carlos Jimenez Ruiz	485ab14501	Merge branch 'dev' into 2945-travel_create_e2e_fix	2021-06-08 07:51:43 +00:00
Joan Sanchez	6017f5090d	Merge pull request 'getWorkedHours refactor' (#641) from 2943-timecontrol_now_showing_hours into dev ... Reviewed-on: #641 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-08 07:50:45 +00:00
Carlos Jimenez Ruiz	76e723cc34	Merge branch 'dev' into 2943-timecontrol_now_showing_hours	2021-06-08 07:47:42 +00:00
Joan Sanchez	67b9fb2c37	Merge pull request '2937-module_transactions' (#640) from 2937-module_transactions into dev ... Reviewed-on: #640 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-08 07:46:14 +00:00
Carlos Jimenez Ruiz	943ce150b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2945-travel_create_e2e_fix	2021-06-08 09:37:00 +02:00
Carlos Jimenez Ruiz	d164cb1c2c	added waitForTimeout to e2e for the autocompleted fields	2021-06-08 09:34:49 +02:00
Javi Gallego	8878a2280a	models	2021-06-08 08:04:38 +02:00
Joan Sanchez	4674fc9414	Merge branch 'dev' into 2937-module_transactions	2021-06-08 05:43:55 +00:00
Joan Sanchez	d7bb6cb184	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-07 15:02:29 +02:00
Carlos Jimenez Ruiz	238975644f	Merge branch 'dev' into 2943-timecontrol_now_showing_hours	2021-06-07 13:02:27 +00:00
Carlos Jimenez Ruiz	3894fe94ec	Merge branch 'dev' into 2937-module_transactions	2021-06-07 13:02:20 +00:00
Javi Gallego	c7e2e3c703	accountingType.isAutoConciliated == true	2021-06-07 14:58:48 +02:00
Joan Sanchez	8fa64122f8	Ammends	2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz	a46fef5295	endpoint minor refactor	2021-06-07 14:26:34 +02:00
Joan Sanchez	3f74b52049	Merge pull request 'accountingType.isAutoConciliated == true' (#639) from 2944-createReceipt into dev ... Reviewed-on: #639 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-07 11:35:03 +00:00
Joan Sanchez	71821c6f4b	Merge branch 'dev' into 2944-createReceipt	2021-06-07 10:43:11 +00:00
Carlos Jimenez Ruiz	8fd7faa47b	fixed bug module importation + rewritten tests	2021-06-07 11:12:56 +02:00
Joan Sanchez	589f9339a4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-07 10:41:46 +02:00
Javi Gallego	c90fa41fae	accountingType.isAutoConciliated == true	2021-06-07 07:57:46 +02:00
Joan Sanchez	f6c4ef8150	HOTFIX: Compatible SQL with MySQL	2021-06-07 07:32:07 +02:00
Carlos Jimenez Ruiz	647b7a93cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions	2021-06-04 17:16:10 +02:00
Carlos Jimenez Ruiz	b38605442e	transactions for entry module endpoints	2021-06-04 17:16:02 +02:00
Joan Sanchez	c853cfc86f	Refactor	2021-06-04 15:49:48 +02:00
Joan Sanchez	2c0fc7e45e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-04 11:46:37 +02:00
Joan Sanchez	6b65aa87d8	HOTFIX: Max width for client name field	2021-06-04 11:46:09 +02:00
Joan Sanchez	b77ecc2c06	changes2	2021-06-04 11:45:35 +02:00
Joan Sanchez	f8df3f1f3d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework	2021-06-04 11:10:43 +02:00
Joan Sanchez	749b4103a1	Merge pull request 'invoiceInLog section, model and table' (#638) from 2932-invoiceIn_log into dev ... Reviewed-on: #638 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-04 08:44:34 +00:00
Joan Sanchez	651a9356f3	Merge branch 'dev' into 2932-invoiceIn_log	2021-06-04 07:54:18 +00:00
Javi Gallego	2604c81533	falta solucionar test	2021-06-04 08:24:33 +02:00
Joan Sanchez	e1c1bb8425	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-04 08:00:08 +02:00
Joan Sanchez	8bb254e93f	HOTFIX: Ticket monitor clientGetDebt	2021-06-03 16:29:45 +02:00
Joan Sanchez	edf18938a6	HOTFIX: clientGetDebt	2021-06-03 16:21:43 +02:00
Carlos Jimenez Ruiz	b0bed3c1c4	invoiceInLog section, model and table	2021-06-03 16:14:52 +02:00
Joan Sanchez	523f9c6df0	Added new sql version folder	2021-06-03 13:45:57 +02:00
Joan Sanchez	d1daed3540	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-03 13:39:51 +02:00
Joan Sanchez	5962a68d15	HOTFIX: Sort by zone hour	2021-06-03 12:40:27 +02:00
Joan Sanchez	ded387f95d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-03 11:41:01 +02:00
Joan Sanchez	d6dd39d447	Updated ticketGetProblems()	2021-06-03 11:40:39 +02:00
Joan Sanchez	3fcd78e1f3	Changes	2021-06-03 11:00:40 +02:00
Joan Sanchez	85d79707bc	Merge pull request 'moved transferor from fiscal data to basic data + e2e' (#637) from 2927-move_last_client into dev ... Reviewed-on: #637 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-03 07:32:51 +00:00
Carlos Jimenez Ruiz	86631c84d0	moved transferor from fiscal data to basic data + e2e	2021-06-02 17:35:30 +02:00
Joan Sanchez	e2ec78461a	HOTFIX: Update production starred modules data	2021-06-02 13:45:18 +02:00
Joan Sanchez	9ae91e1470	Merge pull request '2834-sort-starred-modules' (#636) from 2834-sort-starred-modules into dev ... Reviewed-on: #636 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-02 10:01:13 +00:00
Joan Sanchez	346ef98645	Merge branch 'dev' into 2834-sort-starred-modules	2021-06-02 09:47:51 +00:00
Carlos Jimenez Ruiz	611907f4dd	Merge pull request '#2934 - HOTFIX: Route suggested tickets' (#635) from 2934-suggested_tickets into dev ... Reviewed-on: #635 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-06-02 09:28:12 +00:00
Joan Sanchez	655380a52c	Removed focus	2021-06-02 10:33:10 +02:00