14764 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	c11df75a82	Merge branch 'master' into hotFix_invoiceIn_supplier_email	2023-02-06 06:30:56 +00:00
Alexandre Riera	fd31547b22	Merge branch 'dev' into 3291-entryLatestBuys-buscador	2023-02-06 06:00:41 +00:00
Alexandre Riera	546b3f6c9b	refs #3291 lateral menu added, fixed tests	2023-02-03 15:21:27 +01:00
Joan Sanchez	8158cb6860	feat(db): export prod structure & data ... Refs: #5192	2023-02-03 15:08:41 +01:00
Alex Moreno	2717c6420c	fix(invoiceIn_descriptor): supplier.email	2023-02-03 14:58:58 +01:00
Vicent Llopis	ba5616055b	feat: item.descriptor en summary coge el warehouse por defecto	2023-02-03 14:31:50 +01:00
Joan Sanchez	38f34adc9a	Merge pull request 'master → test' (!1305) from master into test ... Reviewed-on: #1305	2023-02-03 12:44:42 +00:00
Vicent Llopis	065f91afcf	Merge pull request '4873-zone.delivery-day' (!1248) from 4873-zone.delivery-day into dev ... Reviewed-on: #1248 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-03 12:28:35 +00:00
Vicent Llopis	e69a6ae0dc	add changelog	2023-02-03 13:25:38 +01:00
Vicent Llopis	c32a627fe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day	2023-02-03 13:23:42 +01:00
Guillermo Bonet	220f7ee0f8	Merge pull request '4975-mdbBranch-dsName' (!1304) from 4975-mdbBranch-dsName into master ... Reviewed-on: #1304	2023-02-03 12:09:27 +00:00
Guillermo Bonet	ca24de7ee5	refs #4975 Changed description	2023-02-03 12:50:19 +01:00
Guillermo Bonet	dddeca0832	refs #4975 Added property dsName in mdbBranch tab	2023-02-03 12:46:01 +01:00
Alex Moreno	cf9338e891	Merge pull request '5043-mock_Date' (!1260) from 5043-mock_Date into dev ... Reviewed-on: #1260 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-02-03 10:57:49 +00:00
Alexandre Riera	141ae7b11c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador	2023-02-03 11:56:09 +01:00
Alex Moreno	03d7a2908b	refactor: only mock vn.time from 2000 to 2002	2023-02-03 11:25:14 +01:00
Alex Moreno	575784c870	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-03 10:03:59 +01:00
Alex Moreno	15c1cdfcef	Merge pull request 'fixes #5170-feat(recover-password): use user' (!1300) from 5170-recover-password_use_user into dev ... Reviewed-on: #1300 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-02-03 08:18:28 +00:00
Alex Moreno	e16c16c194	Merge branch 'dev' into 5170-recover-password_use_user	2023-02-03 08:12:54 +00:00
Juan Ferrer	f4fc597c2c	Merge pull request 'master to test' (!1302) from master into test ... Reviewed-on: #1302	2023-02-03 08:12:09 +00:00
Pau	6c8609e180	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 07:52:14 +00:00
Vicent Llopis	508bce73bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-03 08:41:35 +01:00
Pau	be68d56af3	Merge pull request 'fixes #5174 Refactor ticket weekly to use smartTable' (!1275) from 5174-refactor-ticket-weekly into dev ... Reviewed-on: #1275 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-03 07:41:27 +00:00
Pau	e3de54b811	changed styles on summary	2023-02-03 08:35:15 +01:00
Pau	199dd2ba8d	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 06:09:38 +00:00
Pau	af1e68675f	Merge branch 'dev' into 5174-refactor-ticket-weekly	2023-02-03 06:04:52 +00:00
Alexandre Riera	6533b92ad3	Merge branch 'master' into hotFix-balance-compensation	2023-02-02 14:15:05 +00:00
Alexandre Riera	21281e09db	hotfix removed supplier	2023-02-02 15:13:53 +01:00
Alex Moreno	8a50c56284	fix(updateWorkCenter): use vnNew()	2023-02-02 14:52:40 +01:00
Alex Moreno	6c772643a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-02 11:55:11 +01:00
Vicent Llopis	cf54415e61	Merge pull request '5084-monitor.index_tickets' (!1301) from 5084-monitor.index_tickets into dev ... Reviewed-on: #1301 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-02 10:52:51 +00:00
Alex Moreno	d5cf1f4ff8	Merge pull request 'fix: getRate2' (!1290) from hotFix_getRate2 into master ... Reviewed-on: #1290	2023-02-02 10:50:03 +00:00