CSPACE-4252 - Sample reports should not include deleted documents, so modified exampl...

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper
index ca81228b2e6e3107993f1fe3be7a82082ddf57fa..b2b633e022aaf69009c6073716b2050573ee0b60 100644 (file)
Binary files a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper and b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper differ

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
index 337482b54e21f9ca898e3d3d0ca3aa81763770ff..bb5c3944e3740d60cf9f43416f1976449d9336cd 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
@@ -35,7 +35,8 @@
 FROM
      "public"."acquisitions_common" acquisitions_common INNER JOIN "public"."hierarchy" hierarchy ON acquisitions_common."id" = hierarchy."id"
 INNER JOIN "public"."collectionspace_core" core ON acquisitions_common."id" = core."id"
-WHERE core.tenantid = $P{tenantid}
+INNER JOIN "public"."misc" misc ON misc."id" = hierarchy."id"
+WHERE core.tenantid = $P{tenantid} AND misc.lifecyclestate != 'deleted'
 $P!{where_clause}]]>
        </queryString>
        <field name="acquisitions_common_originalobjectpurchasepricevalue" class="java.lang.String"/>