14633 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	c2735e54a0	Merge pull request '2952-ticket.sale-tracking_part2' (!1310) from 2952-ticket.sale-tracking_part2 into dev ... Reviewed-on: #1310 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-13 07:17:25 +00:00
Vicent Llopis	4da8546bdf	Merge branch 'dev' into 2952-ticket.sale-tracking_part2	2023-02-13 07:14:28 +00:00
Joan Sanchez	8a8f535776	Merge pull request 'Fixes #5181 Ticket.summary-recargo' (!1297) from 5181-ticket.summary-recargo into dev ... Reviewed-on: #1297 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-13 07:02:30 +00:00
Alexandre Riera	a7e9e52ad4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-13 07:34:13 +01:00
Pau	294b4acbe2	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-13 06:03:21 +00:00
Joan Sanchez	2f2658d8b2	Merge pull request 'hotfix_intrastat' (!1321) from hotfix_intrastat into master ... Reviewed-on: #1321	2023-02-10 11:21:21 +00:00
Vicent Llopis	ac3faddac1	fix: actulizada sql intrastat y se muestra solamente cuando toca	2023-02-10 12:09:51 +01:00
Alexandre Riera	6cb815faaf	.	2023-02-10 10:13:41 +01:00
Alex Moreno	d715f5ab7b	Merge pull request 'MASTER_fix(client-debt-statment): typo' (!1319) from hoFix_client-debt-statment_typo into master ... Reviewed-on: #1319	2023-02-10 09:05:34 +00:00
Alex Moreno	d8acf45e0d	fix(client-debt-statment): typo	2023-02-10 09:34:42 +01:00
Alexandre Riera	4787de3df5	fixing merge	2023-02-10 09:04:49 +01:00
Alexandre Riera	a468fb2c66	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-10 09:02:44 +01:00
Alexandre Riera	9dc07d88d6	fixing e2e	2023-02-10 08:56:30 +01:00
Alexandre Riera	194069c0c2	refs #5194 fixed stock, lines	2023-02-10 08:46:54 +01:00
Alex Moreno	a094eedfe3	Merge pull request 'fix(delivery-note_report): fix taxes' (!1318) from hotFix_delivery-note-report into master ... Reviewed-on: #1318	2023-02-09 13:02:39 +00:00
Alex Moreno	0529d56d4e	fix(delivery-note_report): fix taxes	2023-02-09 13:30:52 +01:00
Joan Sanchez	ebee9144b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-09 09:16:30 +01:00
Joan Sanchez	461799f137	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-02-09 08:56:30 +01:00
Alexandre Riera	0e75a5f23a	Merge pull request 'hotfix ticketFutureAdvance warehouse' (!1316) from hotFix-ticketFutureAdvance-warehouse into master ... Reviewed-on: #1316	2023-02-09 07:18:06 +00:00
Alexandre Riera	725b7b9bce	Merge branch 'master' into hotFix-ticketFutureAdvance-warehouse	2023-02-08 12:48:23 +00:00
Alexandre Riera	ef5b29d6f3	hotfix ticketFutureAdvance warehouse	2023-02-08 13:47:35 +01:00
Alex Moreno	b209ecb011	feat: create post route for debug	2023-02-08 10:56:51 +01:00
Alexandre Riera	4413c8828b	refs #5152 added confirmation popup	2023-02-08 10:54:21 +01:00
Vicent Llopis	b70311999d	refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción	2023-02-08 09:41:09 +01:00
Alexandre Riera	549d530690	.	2023-02-08 07:35:52 +01:00
Pau	86e6672e49	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-07 13:39:36 +00:00
Vicent Llopis	cec7602e1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-07 13:44:53 +01:00
Vicent Llopis	6cb3930be0	feat: añadido icono info, que indica de que almacén se saca la información	2023-02-07 13:40:39 +01:00
Alexandre Riera	0e8848b31c	Merge pull request 'entrLatestBuys addFilter' (!1311) from entryLatestBuys-addFilter into dev ... Reviewed-on: #1311 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-07 11:41:47 +00:00
Alexandre Riera	9f2ff4e4b7	addFilter	2023-02-07 12:30:30 +01:00
Joan Sanchez	71c9ed3a4e	Merge pull request 'MASTER-fix(invoiceIn_descriptor): supplier.email' (!1307) from hotFix_invoiceIn_supplier_email into master ... Reviewed-on: #1307	2023-02-07 08:39:16 +00:00
Alex Moreno	3d27879ce8	Merge branch 'master' into hotFix_invoiceIn_supplier_email	2023-02-07 08:09:10 +00:00
Joan Sanchez	90830e7ce9	Merge pull request 'hotfix balanceCompensation' (!1303) from hotFix-balance-compensation into master ... Reviewed-on: #1303	2023-02-07 07:39:02 +00:00
Alexandre Riera	d3564209ba	findById	2023-02-07 08:05:48 +01:00
Alex Moreno	f891b5a00f	Merge branch 'master' into hotFix_invoiceIn_supplier_email	2023-02-06 14:12:51 +00:00
Vicent Llopis	2e8aabab14	fix: type relation in models	2023-02-06 14:32:54 +01:00
Vicent Llopis	499c9fa706	refactor	2023-02-06 14:03:38 +01:00
Vicent Llopis	a2f93e68b1	feat: add 'parking' column	2023-02-06 13:57:04 +01:00
Alexandre Riera	6d3bcc97f3	Merge branch 'master' into hotFix-balance-compensation	2023-02-06 12:00:03 +00:00
Alexandre Riera	c397757762	sql version updated	2023-02-06 12:26:54 +01:00
Vicent Llopis	4f76465246	fix: no recarga cada vez	2023-02-06 12:24:26 +01:00
Alexandre Riera	68b4d269ff	Merge branch 'dev' into 4588-campo-nota-ultimo-usuario	2023-02-06 09:18:13 +00:00
Alexandre Riera	7af9aa46e9	Merge pull request 'fixes #5074 ticket balance pone null' (!1308) from 5074-ticket-balance-null into dev ... Reviewed-on: #1308 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-06 09:02:42 +00:00
Joan Sanchez	9b177a17a7	Merge pull request 'hotfix itemConfig' (!1309) from hotfix-itemConfig into master ... Reviewed-on: #1309	2023-02-06 08:13:43 +00:00
Alexandre Riera	0a9d37ca08	hotfix itemConfig	2023-02-06 09:01:13 +01:00
Alexandre Riera	3879dfc89b	Merge branch '5074-ticket-balance-null' of https://gitea.verdnatura.es/verdnatura/salix into 5074-ticket-balance-null	2023-02-06 08:19:16 +01:00
Alexandre Riera	f2f8a4eb04	fix test	2023-02-06 08:19:13 +01:00
Alexandre Riera	2c946b38d4	Merge branch 'dev' into 5074-ticket-balance-null	2023-02-06 07:08:50 +00:00
Alexandre Riera	df3e818182	refs #5074 refactor this.receipt.description	2023-02-06 08:07:50 +01:00
Alexandre Riera	b5b2e429e5	Merge pull request 'fixes #3291 entry.latest-buys añadir el buscador de la cesta' (!1298) from 3291-entryLatestBuys-buscador into dev ... Reviewed-on: #1298 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-06 06:42:06 +00:00