diff --git a/entity/AnyContact_entity/entityfields/withprivat_param/valueProcess.js b/entity/AnyContact_entity/entityfields/withprivat_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..755662df1632264e94e6a4d766bb65ead50a553d --- /dev/null +++ b/entity/AnyContact_entity/entityfields/withprivat_param/valueProcess.js @@ -0,0 +1,3 @@ +import("system.result"); + +result.string("0") \ No newline at end of file diff --git a/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js b/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..be3227f265bc70e2000c01813a33053950a02445 --- /dev/null +++ b/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js @@ -0,0 +1,13 @@ +import("system.vars"); +import("system.db"); +import("system.result"); +import("Sql_lib"); + +var cond = SqlCondition.begin() + +// filter privat company if it is not needed +if (!vars.exists("$param.WithPrivat_param") || vars.get("$param.WithPrivat_param") != "1") + cond.andPrepare("ORGANISATION.ORGANISATIONID", "0", "# <> ?"); + +//TODO: use a preparedCondition when available #1030812 #1034026 +result.string(db.translateCondition(cond.build("1 = 1"))); \ No newline at end of file diff --git a/entity/Offer_entity/entityfields/printoffer/onActionProcess.js b/entity/Offer_entity/entityfields/printoffer/onActionProcess.js index 5fb8f8d4a73ea9302b5258163a43b627a6307f51..13c9a3c76ae4297d3dfbd3b3fe4d6f48ed582deb 100644 --- a/entity/Offer_entity/entityfields/printoffer/onActionProcess.js +++ b/entity/Offer_entity/entityfields/printoffer/onActionProcess.js @@ -1,4 +1,5 @@ import("system.vars"); import("Offer_lib"); -OfferUtils.openOfferReport(vars.get("$field.OFFERID")); \ No newline at end of file +if(vars.get("$field.OFFERID")) + OfferUtils.openOfferReport(vars.get("$field.OFFERID")); \ No newline at end of file diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js index 084653a597f386c9405e33ccbab052d481c2389a..c0a78b65fcc7d06d1ecf7e58b4145e60fba794ac 100644 --- a/process/Offer_lib/process.js +++ b/process/Offer_lib/process.js @@ -276,7 +276,6 @@ OfferUtils.openOfferReport = function (pOfferID) "OFFERITEM_UNITTEXT" //17 ]) .add(itemData)); - offerReport.openReport(); } diff --git a/report/Offer_report/reportData.jasper b/report/Offer_report/reportData.jasper new file mode 100644 index 0000000000000000000000000000000000000000..1b25c6b57d7b08967b562a64534597f8cf889d7d Binary files /dev/null and b/report/Offer_report/reportData.jasper differ diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml index a1352b4ee0b60ddd1d50598f567090e3626b8a24..655c1c8169be52ea690c238ed1a74fe12a714a30 100644 --- a/report/Offer_report/reportData.jrxml +++ b/report/Offer_report/reportData.jrxml @@ -2,7 +2,7 @@ <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea"> <property name="ireport.zoom" value="2.1435888100000016"/> <property name="ireport.x" value="0"/> - <property name="ireport.y" value="94"/> + <property name="ireport.y" value="0"/> <parameter name="myAddr" class="java.lang.String"/> <parameter name="Pos" class="java.lang.String"/> <parameter name="Articledescription" class="java.lang.String"/> @@ -24,7 +24,7 @@ <parameter name="OfferDeliveryTerm" class="java.lang.String"/> <parameter name="responsible" class="java.lang.String"/> <parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false"> - <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\Offer_report\\"]]></defaultValueExpression> + <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic5.1\\report\\Offer_report\\"]]></defaultValueExpression> </parameter> <parameter name="adito.datasource.subdata" class="java.lang.Object"/> <parameter name="SUMITEMSUM" class="java.lang.Double"/> diff --git a/report/Offer_report/reportData_subreport1.jasper b/report/Offer_report/reportData_subreport1.jasper new file mode 100644 index 0000000000000000000000000000000000000000..1d190c32f169439542bd289ff905e98d8268b317 Binary files /dev/null and b/report/Offer_report/reportData_subreport1.jasper differ