Skip to content
Snippets Groups Projects
Commit 32a567f7 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

merged origin/2020.2 into master

parents 48e41ec8 c5603256
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 358 additions and 166 deletions
process/OfferOrder_lib/process.js
+ 1
− 1
View file @ 32a567f7
......@@ -390,7 +390,7 @@ ItemUtils.prototype.getNextItemPosition = function(assignedTo, tree, ids) {
}
} else {
if (ids.length > 0) {
maxPos[0] = this.ItemTree[ids[ids.length-1]].pos.split(".")[0];
maxPos[0] = tree[ids[ids.length-1]].pos.split(".")[0];
}
}
maxPos[maxPos.length-1] = (Number(maxPos[maxPos.length-1]) + 1).toString();
......
process/Offer_lib/process.js
+ 231
− 119
View file @ 32a567f7
This diff is collapsed.
process/Turnover_lib/process.js
+ 19
− 8
View file @ 32a567f7
......@@ -78,22 +78,33 @@ TurnoverUtil.getTurnoverData = function (pMaxYear, pYearCount, pSalesprojectId)
*/
TurnoverUtil.getForecastData = function (pMaxYear, pYearCount, pSalesprojectId)
{
var forecastCategory = translate.text('Forecast');
var forecastCategory = translate.text("Forecast");
var minYear = pMaxYear - pYearCount + 1;
var sqlMask = new SqlMaskingUtils();
// load data
var forecastSelect = newSelect("'" + forecastCategory + "', year(DATE_START) yearNum, month(DATE_START) monthNum, 0 discount, 0 vat, sum(VOLUME) price, 1 quantity, GROUPCODE prodGroup, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName")
.from("FORECAST")
.where("FORECAST.DATE_START", pMaxYear, "year(#) <= ?", SQLTYPES.INTEGER)
.and("FORECAST.DATE_START", minYear, "year(#) >= ?", SQLTYPES.INTEGER)
var forecastSelect = newSelect([
"'" + forecastCategory + "'",
sqlMask.yearFromDate("DATE_START") + " yearNum",
sqlMask.monthFromDate("DATE_START") + " monthNum",
"0 discount",
"0 vat",
"sum(VOLUME) price",
"1 quantity",
"GROUPCODE prodGroup",
"(" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName"
])
.from("FORECAST")
.where("FORECAST.DATE_START", pMaxYear, sqlMask.yearFromDate("#") + " <= ?", SQLTYPES.INTEGER)
.and("FORECAST.DATE_START", minYear, sqlMask.yearFromDate("#") + " >= ?", SQLTYPES.INTEGER);
if (pSalesprojectId)
{
forecastSelect.and("FORECAST.OBJECT_TYPE", 'Salesproject')
forecastSelect.and("FORECAST.OBJECT_TYPE", "Salesproject")
.and("FORECAST.OBJECT_ROWID", pSalesprojectId)
}
forecastSelect.groupBy("year(DATE_START), month(DATE_START), GROUPCODE")
forecastSelect.groupBy([sqlMask.yearFromDate("DATE_START"), sqlMask.monthFromDate("DATE_START"), "GROUPCODE"])
.orderBy("yearNum, monthNum");
return forecastSelect.table();
......
process/buildSerialLetter_serverProcess/process.js
+ 12
− 1
View file @ 32a567f7
......@@ -21,4 +21,15 @@ SingleBinaryUtils.set("SERIALLETTER", "SERIALLETTERFILE", letterId, document.con
var message = translate.text("Download ready");
var description = translate.withArguments("Serial letter \"%0\" can now be downloaded", [document.title]);
notification.addNotification(util.getNewUUID(), text.encodeMS(["SerialLetter", letterId]), null, null, "DownloadReady", null, notification.PRIO_NORMAL, 2, notification.STATE_UNSEEN, [user], message, description);
\ No newline at end of file
var notificationConfig = notification.createConfig()
.initialState(notification.STATE_UNSEEN)
.forcedPriority(notification.PRIO_NORMAL)
.linkInfo(text.encodeMS(["SerialLetter", letterId]))
.daysToLive(2)
.addUserWithId(user)
.notificationType("DownloadReady")
.caption(message)
.description(description);
notification.addNotificationWith(notificationConfig);
\ No newline at end of file
report/Offer_report/reportData.jrxml
+ 87
− 29
View file @ 32a567f7
<?xml version="1.0" encoding="UTF-8"?>
<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="1.0"/>
<property name="ireport.zoom" value="1.7715610000000064"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="ireport.y" value="279"/>
<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:\\dev\\project\\basic\\report\\Offer_report\\"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["C:\\Users\\s.neumaier\\Documents\\AditoProjects\\basic_2020.2\\report\\Offer_report\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
......@@ -32,6 +32,11 @@
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="printDiscount" class="java.lang.String"/>
<parameter name="directlyResponsible" class="java.lang.String"/>
<parameter name="subTotal" class="java.lang.String"/>
<parameter name="InvoiceDiscount" class="java.lang.String"/>
<parameter name="TotalWithoutVat" class="java.lang.String"/>
<parameter name="TotalWithVat" class="java.lang.String"/>
<parameter name="printHeadDiscount" class="java.lang.String"/>
<queryString>
<![CDATA[]]>
</queryString>
......@@ -53,6 +58,9 @@
<field name="OFFER_HEADER" class="java.lang.String"/>
<field name="ITEMSUM" class="java.lang.String"/>
<field name="OFFER_FOOTER" class="java.lang.String"/>
<field name="OFFER_DISCOUNT" class="java.lang.String"/>
<field name="OFFER_DISCOUNTED_NET" class="java.lang.String"/>
<field name="OFFER_DISCOUNTSUM" class="java.lang.String"/>
<sortField name="OFFER_OFFERID"/>
<group name="OFFERID" isStartNewPage="true">
<groupExpression><![CDATA[$F{OFFER_OFFERID}]]></groupExpression>
......@@ -233,19 +241,69 @@
</band>
</groupHeader>
<groupFooter>
<band height="24">
<band height="23">
<line>
<reportElement x="356" y="4" width="196" height="1" uuid="228a3e86-96b6-470f-b9d8-9c566a0f1065"/>
</line>
<textField pattern="#,##0.00;-#,##0.00">
<reportElement x="452" y="6" width="100" height="15" uuid="f71cd6ef-6a10-4bd5-9bd5-4c8de5a276f1"/>
<reportElement x="469" y="8" width="83" height="15" uuid="f71cd6ef-6a10-4bd5-9bd5-4c8de5a276f1"/>
<textElement textAlignment="Right">
<font size="8"/>
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{SUMITEMSUM}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="356" y="8" width="113" height="15" uuid="c505a568-afb9-4cb3-9d15-b7803aeff207"/>
<textElement>
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{subTotal}]]></textFieldExpression>
</textField>
</band>
<band height="18">
<band height="34">
<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
<textField isStretchWithOverflow="true">
<reportElement positionType="Float" x="469" y="19" width="83" height="15" uuid="26cc2b42-75a8-4e17-a674-f75a83465476">
<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
<paragraph lineSpacing="Proportional"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_DISCOUNTED_NET}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement positionType="Float" x="356" y="19" width="113" height="15" uuid="05470803-14c1-4ecc-81f0-de432ec80c27">
<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
</reportElement>
<textElement>
<font size="8" isBold="true"/>
<paragraph lineSpacing="Proportional"/>
</textElement>
<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY} + " " + $P{TotalWithoutVat}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement positionType="Float" x="356" y="2" width="113" height="15" uuid="152d4841-b63c-4cd3-bc6b-935af23ad0b8">
<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
</reportElement>
<textElement>
<font size="8"/>
<paragraph lineSpacing="Proportional"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_DISCOUNT} + " % " + $P{InvoiceDiscount}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
<reportElement positionType="Float" x="469" y="2" width="83" height="15" uuid="e205d256-1ac5-439b-9b9c-3735d7a301df">
<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
</reportElement>
<textElement textAlignment="Right">
<font size="8"/>
<paragraph lineSpacing="Proportional"/>
</textElement>
<textFieldExpression><![CDATA[$F{OFFER_DISCOUNTSUM}]]></textFieldExpression>
</textField>
</band>
<band height="19">
<subreport>
<reportElement isPrintRepeatedValues="false" x="355" y="2" width="196" height="15" isRemoveLineWhenBlank="true" uuid="8683c745-01bf-44aa-af62-a6ba881a9edd"/>
<subreportParameter name="PlusSalestax">
......@@ -257,46 +315,47 @@
</band>
<band height="33">
<textField>
<reportElement x="20" y="13" width="100" height="20" uuid="112f15db-0989-430e-b2c4-61f975f7b8a4">
<printWhenExpression><![CDATA[!$P{OfferPaymentTerm}.equals("")]]></printWhenExpression>
</reportElement>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{PaymentConditions}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="122" y="13" width="100" height="20" uuid="8149be09-d439-4e1a-a853-f82bd5e5683e"/>
<reportElement x="122" y="12" width="100" height="20" uuid="8149be09-d439-4e1a-a853-f82bd5e5683e"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{OfferPaymentTerm}]]></textFieldExpression>
</textField>
<line>
<reportElement x="356" y="29" width="196" height="1" uuid="982cac61-6b87-4439-93cb-6c89fcc7932c"/>
<graphicElement>
<pen lineWidth="3.0" lineStyle="Double"/>
</graphicElement>
</line>
<textField>
<reportElement x="402" y="8" width="90" height="20" uuid="c3444576-6cb8-47f2-9dc9-e892a91ceb07"/>
<textElement textAlignment="Right">
<reportElement x="356" y="7" width="113" height="20" uuid="c3444576-6cb8-47f2-9dc9-e892a91ceb07"/>
<textElement textAlignment="Left">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY}]]></textFieldExpression>
<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY} + " " + $P{TotalWithVat}]]></textFieldExpression>
</textField>
<line>
<reportElement x="356" y="2" width="196" height="1" uuid="8973e664-cfc0-4b52-bd0d-c80a49910da2"/>
</line>
<line>
<reportElement x="356" y="30" width="196" height="1" uuid="982cac61-6b87-4439-93cb-6c89fcc7932c"/>
<graphicElement>
<pen lineWidth="3.0" lineStyle="Double"/>
</graphicElement>
<reportElement x="356" y="1" width="196" height="1" uuid="8973e664-cfc0-4b52-bd0d-c80a49910da2"/>
</line>
<textField pattern="###0.00;-###0.00">
<reportElement x="491" y="8" width="59" height="20" uuid="75bb0951-e562-4170-a5c2-731d3219ec66"/>
<reportElement x="469" y="7" width="81" height="20" uuid="75bb0951-e562-4170-a5c2-731d3219ec66"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{TOTAL}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="20" y="12" width="100" height="20" uuid="112f15db-0989-430e-b2c4-61f975f7b8a4">
<printWhenExpression><![CDATA[!$P{OfferPaymentTerm}.equals("")]]></printWhenExpression>
</reportElement>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{PaymentConditions}]]></textFieldExpression>
</textField>
</band>
<band height="20">
<printWhenExpression><![CDATA[($F{OFFER_FOOTER} != null && !$F{OFFER_FOOTER}.trim().isEmpty())]]></printWhenExpression>
<textField>
<reportElement x="20" y="0" width="100" height="20" uuid="75b328c0-4ab1-478d-afb8-0ed8974da1af">
<printWhenExpression><![CDATA[!$P{OfferDeliveryTerm}.equals("")]]></printWhenExpression>
......@@ -315,7 +374,6 @@
</textField>
</band>
<band height="20">
<printWhenExpression><![CDATA[($F{OFFER_FOOTER} != null && !$F{OFFER_FOOTER}.trim().isEmpty())]]></printWhenExpression>
<textField isStretchWithOverflow="true">
<reportElement x="20" y="0" width="530" height="20" uuid="2a2d0fe8-9c83-43b7-913d-a551a9879608"/>
<textElement>
......
report/Offer_report/reportData_subreport1.jrxml
+ 1
− 1
View file @ 32a567f7
<?xml version="1.0" encoding="UTF-8"?>
<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="reportData_subreport1" pageWidth="200" pageHeight="802" columnWidth="200" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="65da6912-abcf-40ed-a854-750d851fe857">
<property name="ireport.zoom" value="6.72749994932561"/>
<property name="ireport.zoom" value="4.177248169415656"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<parameter name="PlusSalestax" class="java.lang.String"/>
......
report/Reminder_report/reportData.jrxml
+ 6
− 6
View file @ 32a567f7
......@@ -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="Mahnung" 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="0"/>
<property name="ireport.y" value="192"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Kontenabstimmung" class="java.lang.String"/>
<parameter name="Rech.-Nr" class="java.lang.String"/>
......@@ -114,14 +114,14 @@
</textField>
<textField>
<reportElement x="307" y="0" width="81" height="15" uuid="000feb72-9b7d-42e6-ade9-8e12359c3eef"/>
<textElement>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Rechnungsbetrag}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="430" y="0" width="81" height="15" uuid="8eee46c0-f3c3-4563-b1b1-746aeb7e73c6"/>
<textElement>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{OutstandingAmount}]]></textFieldExpression>
......@@ -170,14 +170,14 @@
<textFieldExpression><![CDATA[$P{Reminder}]]></textFieldExpression>
</textField>
<textField pattern="dd.MM.yyyy">
<reportElement x="388" y="192" width="100" height="20" uuid="5141d92f-3325-445b-b616-90630c1648f7"/>
<reportElement x="411" y="192" width="100" height="20" uuid="5141d92f-3325-445b-b616-90630c1648f7"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="13" y="232" width="294" height="20" uuid="3f7d1c4a-a326-436b-831d-5da9fd255bf0"/>
<textField isStretchWithOverflow="true">
<reportElement x="13" y="232" width="542" height="20" isPrintWhenDetailOverflows="true" uuid="3f7d1c4a-a326-436b-831d-5da9fd255bf0"/>
<textElement>
<font size="8" isBold="true"/>
</textElement>
......
system/default/default.aod
+ 1
− 1
View file @ 32a567f7
......@@ -2,7 +2,7 @@
<system xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/system/1.1.0">
<name>default</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<serverConfigPath>$ADITODATA/config/serverconfig_default.xml</serverConfigPath>
<serverConfigPath>C:\Users\s.neumaier\Documents\AditoProjects\basic_2020.2\data\sn-test-basic.dev.c2.adito.cloud_serverconfig_system.xml</serverConfigPath>
<aditoHomePath>$ADITOHOME</aditoHomePath>
<aditoDataPath>$PROJECTHOME/data</aditoDataPath>
<loginUser>admin</loginUser>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment