12689 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	8160912fe7	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz	0472deb9b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3049-item_index_show_lastbuy_landed	2021-09-08 10:40:07 +02:00
Carlos Jimenez Ruiz	538805828e	refactor(item): item index now shows last buy landing	2021-09-08 10:39:54 +02:00
Joan Sanchez	ed2922b185	Merge branch 'dev' into 3065-client_businessTypeFk_required	2021-09-08 08:13:04 +00:00
Joan Sanchez	e1de1154ad	Merge pull request 'refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked' (#728) from 3065-client_businessTypeFk_required into dev ... Reviewed-on: #728 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-09-08 08:06:35 +00:00
Carlos Jimenez Ruiz	398e79c069	Merge branch 'dev' into 3065-client_businessTypeFk_required	2021-09-08 07:55:55 +00:00
Carlos Jimenez Ruiz	41011091ff	Merge pull request 'feat(monitor): Sort by amount of problems on a ticket list' (#723) from 3041-monitor_sort_problems into dev ... Reviewed-on: #723 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-08 07:53:06 +00:00
Javi Gallego	2fe4fad28a	test front ok	2021-09-08 09:44:46 +02:00
Joan Sanchez	903caef155	fix(path): Was not showing the old inactive client	2021-09-08 08:39:37 +02:00
Joan Sanchez	db538a3f6f	Merge branch 'dev' into 3041-monitor_sort_problems	2021-09-08 06:11:39 +00:00
Joan Sanchez	29bc0c04fb	test(monitor): Updated back unit tests	2021-09-08 08:08:10 +02:00
Carlos Jimenez Ruiz	99f4a2ed7d	refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked	2021-09-07 16:07:46 +02:00
Carlos Jimenez Ruiz	fa54dc5fa9	Merge pull request 'fix(osticket): Filter by non-merged tickets' (#727) from 3080-osticket_report into dev ... Reviewed-on: #727 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-07 10:17:50 +00:00
Carlos Jimenez Ruiz	21c34b90ec	Merge branch 'dev' into 3080-osticket_report	2021-09-07 10:16:02 +00:00
Joan Sanchez	afece39bdc	Merge pull request '3061-send_thermograph' (#725) from 3061-send_thermograph into dev ... Reviewed-on: #725 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-09-07 10:14:38 +00:00
Joan Sanchez	2bf55f04bc	fix(osticket): Filter by non-merged tickets	2021-09-07 12:12:58 +02:00
Carlos Jimenez Ruiz	2ce79a8d49	Merge branch 'dev' into 3061-send_thermograph	2021-09-07 10:10:09 +00:00
Carlos Jimenez Ruiz	471da0f4da	fix(clone): invoiceIn clone now adds (2) to the ref	2021-09-07 11:55:26 +02:00
Carlos Jimenez Ruiz	c7558dfb0b	refactor(temperatures): added crudmodel autoload for temperatures	2021-09-07 11:54:53 +02:00
Carlos Jimenez Ruiz	8bdb02c0fc	refactor(createThermograph): endpoint rollsback only if transaction was created in it	2021-09-07 10:30:53 +02:00
Joan Sanchez	6ca7ced067	refactor(monitor): removed unused code	2021-09-07 10:27:19 +02:00
Carlos Jimenez Ruiz	7c66517964	Merge pull request 'fix(bank): the search by bank was not searching by numerical and string values' (#724) from 3084-client_balance_bank into dev ... Reviewed-on: #724 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-07 08:09:21 +00:00
Joan Sanchez	04a817c4f9	fix(problems): problems filter was not working properly on sales monitor ... Refs: 3040	2021-09-07 07:41:57 +02:00
Carlos Jimenez Ruiz	c4e51146fd	refactor(thermograph): temperatures source updated on frontend	2021-09-06 16:39:44 +02:00
Carlos Jimenez Ruiz	56276783db	test(thermograph): e2e and unit tests for the backend of thermograph	2021-09-06 16:39:04 +02:00
Carlos Jimenez Ruiz	1f0bcb63f1	refactor(thermograph): added temperature model + updated thermographs models and endpoints	2021-09-06 16:38:27 +02:00
Carlos Jimenez Ruiz	ca82d7e759	fix(coillection): collection created dates were wrong for testing purposes	2021-09-06 16:35:31 +02:00
Joan Sanchez	4db25bf722	refactor(risk): the risk icon now is colored red when the client has a risk greater than the risk tolerance ... Refs: 3045	2021-09-03 16:30:25 +02:00
Joan Sanchez	13f78359d5	fix(bank): the search by bank was not differentiating between numerical values and string values ... Refs: 3084	2021-09-03 14:00:47 +02:00
Joan Sanchez	273086472a	test(salesfilter): updated unit test for sales filter	2021-09-03 12:27:19 +02:00
Joan Sanchez	8623f914c7	feat(monitor): Sort by amount of problems on a ticket list	2021-09-03 12:09:37 +02:00
Joan Sanchez	559ff95fd7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-09-03 07:36:42 +02:00
Joan Sanchez	681b8afb15	fix(invoice): missing UserError import	2021-09-03 07:23:26 +02:00
Javi Gallego	bc34be85ef	fix	2021-09-02 17:49:25 +02:00
Carlos Jimenez Ruiz	86553b5472	Merge pull request 'feat(Searchbar): You can now filter by a ticket collection' (#722) from 3068-ticket_colletion into dev ... Reviewed-on: #722 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-02 13:20:29 +00:00
Carlos Jimenez Ruiz	6b465f9150	Merge branch 'dev' into 3068-ticket_colletion	2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz	ee22fde8c0	Merge pull request 'fix(structure): Dumped production database' (#721) from 3079-export_production into dev ... Reviewed-on: #721 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-09-02 13:06:40 +00:00
Carlos Jimenez Ruiz	0337a1d6db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3079-export_production	2021-09-02 14:17:50 +02:00
Carlos Jimenez Ruiz	f2f81442d9	fix(cloneWithEntries): endpoint was broken due to production changes	2021-09-02 14:17:35 +02:00
Carlos Jimenez Ruiz	71f77ea69c	test(clone): e2e path for clone is broken #3082	2021-09-02 12:56:35 +02:00
Carlos Jimenez Ruiz	85844973d6	refactor(geolocation): create province now uses autonomy instead of country	2021-09-02 11:56:59 +02:00
Joan Sanchez	0b704db353	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-09-02 08:56:19 +02:00
Joan Sanchez	b68e99b412	fix(invoice): invoicing was throwing a transaction error ... Refs: 3077	2021-09-02 08:55:41 +02:00
Joan Sanchez	84c4b8b7f0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-09-02 08:22:39 +02:00
Joan Sanchez	4f8e319b89	fix(model): Added missing property "isAutoConciliated" to accounting-type model	2021-09-02 08:22:18 +02:00
Carlos Jimenez Ruiz	84b8ed610d	fix(fixtures): dua code dups	2021-09-01 15:30:07 +02:00
Carlos Jimenez Ruiz	f5548a82a3	test(clone): invoiceIn clone production trigger broke the test	2021-09-01 15:02:27 +02:00
Carlos Jimenez Ruiz	158c15afa1	fix(filter): removed fixtures that no longer work due to structure changes	2021-09-01 13:12:32 +02:00
Carlos Jimenez Ruiz	ec9c061051	fix(getUpcomingDeliveries) fixtures were broken due to db structure changes	2021-09-01 12:37:46 +02:00
Joan Sanchez	7a98613ef8	Updated unit tests	2021-09-01 11:48:21 +02:00