Changes between Version 17 and Version 18 of AdvancedReports

Timestamp:

05/04/24 14:35:18 (7 months ago)

Author:

216049

Comment:

--

AdvancedReports

@@ -145 +145 @@
   WHEN sum_b IS NOT NULL THEN COALESCE(sum_b::int, 0)
   ELSE 0
-END
+end as total_income
 from (
 select 
@@ -152 +152 @@
 from kazna k
 where k.kz_plateno = true and (k.kz_datum between (make_date(extract(year from (now() - '1 years'::interval))::int, 1, 1)) and
-                                                                        (make_date(extract(year from (now() - '1 years'::interval))::int, 12, 31)))
-                                                                        and (k.kz_datum_plateno between (make_date(extract(year from (now() - '1 years'::interval))::int, 1, 1)) and
-                                                                        (make_date(extract(year from (now() - '1 years'::interval))::int, 12, 31)))
+                                                                        (make_date(extract(year from (now() - '1 years'::interval))::int, 12, 31)))
+                                                                        and (k.kz_datum_plateno between (make_date(extract(year from (now() - '1 years'::interval))::int, 1, 1)) and
+                                                                        (make_date(extract(year from (now() - '1 years'::interval))::int, 12, 31)))
 )  sum_kz,
 (
@@ -161 +161 @@
 join tipbilet tb on tb.tb_id = b.tb_id 
 where b.b_datum_na_kupuvanje between (make_date(extract(year from (now() - '1 years'::interval))::int, 1, 1)) and
-                                                                        (make_date(extract(year from (now() - '1 years'::interval))::int, 12, 31))
+                                                                        (make_date(extract(year from (now() - '1 years'::interval))::int, 12, 31))
 )  sum_b
-)
-
+) 
   }}}
 }}}