10556 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Joan Sanchez	06b72ae708	fix(pickup-order): changed sql query from pickup order	2021-11-08 07:41:10 +01:00
Joan Sanchez	7dc9173431	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-29 17:06:16 +02:00
Joan Sanchez	026e5d706f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-10-29 11:43:05 +02:00
Joan Sanchez	3f73084c7d	Changed report translations	2021-10-29 11:42:03 +02:00
Carlos Jimenez Ruiz	ddd72798fa	Merge pull request 'feat(description): concat bank with tickets' (#763) from 3260-ticket_receipt into dev ... Reviewed-on: #763 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-28 11:36:27 +00:00
Carlos Jimenez Ruiz	13aa96d6a8	test(payout): e2e path updated for ticket payout	2021-10-28 13:30:07 +02:00
Alex Moreno	21686b4a92	feat(test): modify jest test	2021-10-27 09:55:35 +02:00
Alex Moreno	92b916580e	feat(description): concat bank with tickets	2021-10-26 10:20:35 +02:00
Joan Sanchez	f7e2182722	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-25 12:19:55 +02:00
Joan Sanchez	e739693708	Merge pull request 'Added exportation report & send report with client invoicing' (#762) from 3254-exportation_report into dev ... Reviewed-on: #762 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-25 10:16:36 +00:00
Joan Sanchez	6578a498ca	feat(exportation): added exportation report & send report with client invoicing ... Refs: 3254	2021-10-25 12:13:33 +02:00
Joan Sanchez	66830f32fd	feat(exportation): added exportation report & send report with client invoicing ... Refs: 3254	2021-10-25 11:58:23 +02:00
Joan Sanchez	b055618577	Merge pull request 'refactor(monitors): added transactions to endpoints' (#761) from 3100-monitors into dev ... Reviewed-on: #761 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-10-25 07:26:26 +00:00
Carlos Jimenez Ruiz	13c06bf5be	refactor(monitors): added transactions to endpoints	2021-10-22 17:32:10 +02:00
Joan Sanchez	2cdc22bc4d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-22 11:46:16 +02:00
Joan Sanchez	aa27ebffc9	renamed method	2021-10-22 10:47:44 +02:00
Joan Sanchez	8a679b2c8b	fix(invoice): fixed error for invoice with incoterms	2021-10-22 10:26:40 +02:00
Joan Sanchez	c6d7ec8ec4	Merge pull request '3089-zone_itemMaxSize' (#760) from 3089-zone_itemMaxSize into dev ... Reviewed-on: #760 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-10-21 11:39:49 +00:00
Carlos Jimenez Ruiz	683f01ddd8	refactor(zone): removed deprecated column m3Max	2021-10-21 13:19:41 +02:00
Carlos Jimenez Ruiz	f070dd3c71	merge	2021-10-21 11:38:54 +02:00
Carlos Jimenez Ruiz	14a72b32bd	refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max	2021-10-21 11:37:09 +02:00
Joan Sanchez	66e962be78	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-21 08:00:28 +02:00
Carlos Jimenez Ruiz	5ea014aeff	feat(monitors): added auto-refresh feature to ticket monitors	2021-10-20 15:42:09 +02:00
Joan Sanchez	4c3c6a7d99	Merge pull request 'feat(monitors): added auto-refresh feature to ticket monitors' (#759) from 3248-monitor_toggle into dev ... Reviewed-on: #759 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-10-20 13:41:32 +00:00
Carlos Jimenez Ruiz	1c51d34f7d	feat(monitors): added auto-refresh feature to ticket monitors	2021-10-20 14:40:08 +02:00
Carlos Jimenez Ruiz	944915cd31	Merge pull request 'export_database' (#758) from 3246-export_production into dev ... Reviewed-on: #758 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-20 12:36:01 +00:00
Alex Moreno	9c4e46f363	export_database	2021-10-20 13:32:03 +02:00
Joan Sanchez	11b908668d	Merge pull request '3127-starredModules_role_bug' (#757) from 3127-starredModules_role_bug into dev ... Reviewed-on: #757 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-10-20 10:17:00 +00:00
Carlos Jimenez Ruiz	b2a87644c2	fix(starred-module): only available modules can be marked as starred now	2021-10-20 12:07:07 +02:00
Carlos Jimenez Ruiz	a881e4d179	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3127-starredModules_role_bug	2021-10-20 11:25:01 +02:00
Carlos Jimenez Ruiz	7460986a8d	refactor(e2e): moved animation and transition cancelation to post-login	2021-10-20 11:23:55 +02:00
Carlos Jimenez Ruiz	600de05d29	eslint rules update	2021-10-20 10:38:22 +02:00
Carlos Jimenez Ruiz	866d301410	fix(starred): demoted user wont get error when listing modules	2021-10-20 10:37:56 +02:00
Carlos Jimenez Ruiz	2c90245604	Merge pull request '3235-entry_summary' (#755) from 3235-entry_summary into dev ... Reviewed-on: #755 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-20 08:34:58 +00:00
Vicent Llopis	601d358b51	refactor(entry_summary): ident a line	2021-10-20 10:02:03 +02:00
Vicent Llopis	f6de57a9b5	Merge branch '3235-entry_summary' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary	2021-10-20 07:50:55 +02:00
Vicent Llopis	4a5cf187a5	refactor(entry_summary): ident a line	2021-10-20 07:50:51 +02:00
Carlos Jimenez Ruiz	97242031eb	Merge branch 'dev' into 3235-entry_summary	2021-10-19 14:43:06 +00:00
Joan Sanchez	9986d4eb03	feat(closure): should mail the PDF invoice invoiceable clients ... Refs: 3211	2021-10-19 15:11:20 +02:00
Carlos Jimenez Ruiz	2c0d0e7ad3	Merge pull request 'fix(sale): delete :: in image' (#752) from 3105-ticket_sale into dev ... Reviewed-on: #752 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-19 13:07:30 +00:00
Vicent Llopis	1ba7f16ad3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary	2021-10-19 14:53:54 +02:00
Alex Moreno	b4986b619a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3105-ticket_sale	2021-10-19 14:50:39 +02:00
Carlos Jimenez Ruiz	a6dbf2c43c	Merge pull request 'feat(closure): should mail the PDF invoice invoiceable clients' (#754) from 3211-closure_invoicing into dev ... Reviewed-on: #754 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-19 12:46:53 +00:00
Joan Sanchez	f87f3e85b4	Merge branch 'dev' into 3211-closure_invoicing	2021-10-19 12:42:13 +00:00
Joan Sanchez	0f9639832d	Merge pull request '3242-travel_thermograph_required_fields' (#753) from 3242-travel_thermograph_required_fields into dev ... Reviewed-on: #753 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-10-19 12:41:50 +00:00
Joan Sanchez	5209414613	feat(closure): should mail the PDF invoice invoiceable clients ... Refs: 3211	2021-10-19 13:46:17 +02:00
Carlos Jimenez Ruiz	4a47c136a0	refactor(e2e): removed waitForTimeout from e2e paths	2021-10-19 13:11:31 +02:00
Carlos Jimenez Ruiz	da00b231ba	refactor(puppeteer): added slowMo 5 to puppeteer actions for stability	2021-10-19 13:00:24 +02:00