13578 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	6c895ee1ab	Merge pull request '3927-monitor_ticket' (#951) from 3927-monitor_ticket into dev ... Reviewed-on: #951 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 14:19:31 +00:00
Carlos Jimenez Ruiz	9c085fa653	Merge branch 'dev' into 3927-monitor_ticket	2022-05-09 14:14:01 +00:00
Joan Sanchez	7365143eac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-09 16:09:17 +02:00
Carlos Jimenez Ruiz	fcb87148f8	Merge pull request '3900-client_credit' (#946) from 3900-client_credit into dev ... Reviewed-on: #946 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 13:53:41 +00:00
Carlos Jimenez Ruiz	93d29bb202	Merge branch 'dev' into 3900-client_credit	2022-05-09 13:16:04 +00:00
Carlos Jimenez Ruiz	58ab1ab4dc	Merge pull request '3750-claim_photo' (#935) from 3750-claim_photo into dev ... Reviewed-on: #935 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-09 13:15:14 +00:00
Vicent Llopis	f08a384a7c	fix: e2e test	2022-05-09 14:49:37 +02:00
Alex Moreno	d9055abca9	fix(entry_summary): get entry.id	2022-05-09 14:44:30 +02:00
Carlos Jimenez Ruiz	efc43c9611	Merge branch 'dev' into 3750-claim_photo	2022-05-09 12:36:27 +00:00
Vicent Llopis	a6b8674302	feat(invoiceIn.tax): add button for create an expence	2022-05-09 14:34:20 +02:00
Alex Moreno	a00728384f	Merge branch '3409-clientCredit_maxRows' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows	2022-05-09 13:19:38 +02:00
Alex Moreno	55574919d2	rename	2022-05-09 13:19:34 +02:00
Alex Moreno	54fdc4b6e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows	2022-05-09 13:19:20 +02:00
Joan Sanchez	f806a598ea	Updated method path	2022-05-09 13:15:48 +02:00
Vicent Llopis	bd7eb67aeb	fix: add CAST DECIMAL(10,2)	2022-05-09 12:31:38 +02:00
Joan Sanchez	f380d5fd28	Merge pull request '3942-ticket.volume' (#953) from 3942-ticket.volume into dev ... Reviewed-on: #953 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-09 08:29:23 +00:00
Joan Sanchez	30faef061c	Merge pull request '3973-monitor-client_dateFilter_Master' (#965) from 3973-monitor-client_dateFilter into master ... Reviewed-on: #965 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-09 07:28:22 +00:00
Alex Moreno	d34a8629f7	fix(setSaleQuantity): save originalQuantity	2022-05-06 13:09:37 +02:00
Vicent Llopis	3fa86f0f15	fix: backTest	2022-05-06 09:08:34 +02:00
Vicent Llopis	a0af774837	fix: test	2022-05-06 09:02:52 +02:00
Vicent Llopis	ddcbaa72c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3940-export_database	2022-05-06 08:08:06 +02:00
Alex Moreno	798147ea99	jenkins error	2022-05-05 14:40:13 +02:00
Alex Moreno	1e3b05a95d	remove console.log	2022-05-05 13:32:34 +02:00
Alex Moreno	70aca5d11a	fix(worker): fix getMonth	2022-05-05 13:25:57 +02:00
Juan Ferrer	bfd8c8d47a	DB export	2022-05-04 15:58:36 +02:00
Vicent Llopis	93e3ea103a	added frontTest	2022-05-04 12:05:46 +02:00
Vicent Llopis	9862960c99	comment frontTest	2022-05-04 12:00:39 +02:00
Vicent Llopis	38f5541ef4	execute jenkins test	2022-05-04 11:27:03 +02:00
Alex Moreno	ac4d4e6db1	test and fixtures	2022-05-04 10:59:37 +02:00
Javi Gallego	dcd5d07a28	menu order	2022-05-04 10:43:40 +02:00
Vicent Llopis	66685e7541	feat(ticket.expedition): add popover	2022-05-04 10:35:31 +02:00
Alex Moreno	b5a73ec3a2	fix(monitor_client): clientsFilter refactor	2022-05-04 10:32:14 +02:00
Alex Moreno	0cae852dea	refactor	2022-05-04 10:28:17 +02:00
Alex Moreno	1cc199e26b	refactor(client-credit)	2022-05-04 10:26:13 +02:00
Juan Ferrer	6d5d9ca0e4	DB export	2022-05-04 07:54:45 +02:00
Alex Moreno	800b4984ff	fix(test): use ctx.options	2022-05-04 07:46:47 +02:00
Vicent Llopis	d0f9613b4e	delete hedera fixtures	2022-05-04 07:19:45 +02:00
Alex Moreno	e140c9d1f4	console.logs	2022-05-03 15:17:34 +02:00
Joan Sanchez	d99d2f1e50	Merge pull request '3961-fix(monitor_client): fix scroll' (#962) from 3961-monitor_clients_fix into master ... Reviewed-on: #962 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-03 12:31:43 +00:00
Alex Moreno	f364c19c70	fix(monitor_client): fix scroll	2022-05-03 14:08:46 +02:00
Javi Gallego	6584a29ce5	create deleteTrashFiles	2022-05-03 11:16:56 +02:00
Joan Sanchez	951ef60806	Merge pull request '3965-fix(diver-route): supplierAgencyTerm' (#960) from 3965-driver-route_sql into master ... Reviewed-on: #960 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-02 13:01:02 +00:00
Alex Moreno	dbc5c61050	fix(diver-route): supplierAgencyTerm	2022-05-02 14:53:03 +02:00
Joan Sanchez	c6e554c608	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3327-global_invoicing	2022-05-02 14:52:02 +02:00
Joan Sanchez	d156cb1c30	Queue transaction	2022-05-02 13:52:57 +02:00
Joan Sanchez	ef7392e38d	Merge pull request 'Merge from dev to master' (#959) from test into master ... Reviewed-on: #959	2022-05-02 10:44:22 +00:00
Joan Sanchez	269f156e4a	Merge branch 'master' into test	2022-05-02 10:44:08 +00:00
Joan Sanchez	3942badbc4	Merge pull request '3962-fix(delivery-note): type not required' (#958) from 3962-ticket_delivery-note into test ... Reviewed-on: #958	2022-05-02 10:42:07 +00:00
Alex Moreno	3f07400705	fix(delivery-note): type not required	2022-05-02 12:28:17 +02:00
Alex Moreno	b40b8d931d	feat(client_credit): remove de old rows	2022-05-02 11:18:39 +02:00