Changes between Version 11 and Version 12 of AdvancedReports

Timestamp:

02/14/23 19:35:21 (22 months ago)

Author:

201065

Comment:

--

AdvancedReports

@@ -82 +82 @@
 left join (
         select articleid, locationid, coalesce(sum(quantity), 0) as incoming from orderedarticles o
-        where o.articlestatus='In progress' or o.articlestatus='Delivered'
+        where o.articlestatus='ORDERED' or o.articlestatus='DELIVERED'
         group by o.articleid, o.locationid
 ) q2 on q2.articleid=a.articleid and q2.locationid=l.locationid
@@ -144 +144 @@
 select s.supplierinfo, u.firstname, u.lastname, u.username, coalesce(sum(o2.quantity), 0) as koldostavena, coalesce(sum(o2.quantity*o2.price)) as zarabotkasupp from suppliers s 
         left join users u on u.userid=s.userid
-        left join orders o on o.supplieruserid=s.userid and (o.status='Delivered' or o.status='Processed') 
-        left join orderedarticles o2 on o2.orderid=o.orderid and (o2.articlestatus='Delivered' or o2.articlestatus='Processed')
+        left join orders o on o.supplieruserid=s.userid and (o.status='DELIVERED' or o.status='PROCESSED') 
+        left join orderedarticles o2 on o2.orderid=o.orderid and (o2.articlestatus='DELIVERED' or o2.articlestatus='PROCESSED')
         group by s.userid, u.userid
         order by zarabotkasupp desc