Skip to content
Snippets Groups Projects
Commit d7c1dd08 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1029613][Aktionen "Angebot erstellen" bei anderen Modulen]

parent 4322df0e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 417 additions and 75 deletions
entity/Offer_entity/Offer_entity.aod
+ 6
− 0
View file @ d7c1dd08
......@@ -240,6 +240,12 @@
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
<name>offerReport</name>
<fieldType>ACTION</fieldType>
<title>Offer report</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/offerreport/onActionProcess.js</onActionProcess>
</entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/Offer_entity/entityfields/offerreport/onActionProcess.js 0 → 100644
+ 4
− 0
View file @ d7c1dd08
import("system.vars");
import("OfferOrder_lib");
OfferUtils.openOfferReport(vars.get("$field.OFFERID"));
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 114
− 0
View file @ d7c1dd08
......@@ -1095,6 +1095,120 @@
<entry>
<key>Prices</key>
</entry>
<entry>
<key>keine Standard-E-Mail Büro vorhanden !</key>
</entry>
<entry>
<key>no valid format</key>
</entry>
<entry>
<key>Lieferbedingung</key>
</entry>
<entry>
<key>Seite</key>
</entry>
<entry>
<key>Senden per E-Mail</key>
</entry>
<entry>
<key>zzgl. Summe UmSt</key>
</entry>
<entry>
<key>Pos.</key>
</entry>
<entry>
<key>ISO 3166-1 alpha-3</key>
</entry>
<entry>
<key>ISO 3166-1 alpha-2</key>
</entry>
<entry>
<key>0.00</key>
</entry>
<entry>
<key>Zahlungsbedingung</key>
</entry>
<entry>
<key>Relationship</key>
</entry>
<entry>
<key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
</entry>
<entry>
<key>Bitte einen Adressat in &amp;apos;to&amp;apos; eintragen!</key>
</entry>
<entry>
<key>Gesamt</key>
</entry>
<entry>
<key>Artikel-Nr</key>
</entry>
<entry>
<key>Native Name</key>
</entry>
<entry>
<key>ZIP code is not valid</key>
</entry>
<entry>
<key>Rabatt</key>
</entry>
<entry>
<key>#,##0</key>
</entry>
<entry>
<key>Einzelpreis</key>
</entry>
<entry>
<key>von</key>
</entry>
<entry>
<key>Nummer</key>
</entry>
<entry>
<key>Offer report</key>
</entry>
<entry>
<key>New offer</key>
</entry>
<entry>
<key>dd.MM.yyyy</key>
</entry>
<entry>
<key>Artikelbezeichnung</key>
</entry>
<entry>
<key>UMSt</key>
</entry>
<entry>
<key>no valid mail-address format</key>
</entry>
<entry>
<key>Menge</key>
</entry>
<entry>
<key>Ihr zuständiger Betreuer:</key>
</entry>
<entry>
<key>#,##0.00</key>
</entry>
<entry>
<key>jDitoRC</key>
</entry>
<entry>
<key>Latin Name</key>
</entry>
<entry>
<key>Organisation name</key>
</entry>
<entry>
<key>Firma</key>
</entry>
<entry>
<key>Summe</key>
</entry>
<entry>
<key>Angebot</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 116
− 0
View file @ d7c1dd08
......@@ -1383,6 +1383,122 @@
<entry>
<key>Product_GuI</key>
</entry>
<entry>
<key>keine Standard-E-Mail Büro vorhanden !</key>
</entry>
<entry>
<key>no valid format</key>
</entry>
<entry>
<key>Lieferbedingung</key>
</entry>
<entry>
<key>Seite</key>
</entry>
<entry>
<key>Senden per E-Mail</key>
</entry>
<entry>
<key>zzgl. Summe UmSt</key>
</entry>
<entry>
<key>Pos.</key>
</entry>
<entry>
<key>ISO 3166-1 alpha-3</key>
</entry>
<entry>
<key>ISO 3166-1 alpha-2</key>
</entry>
<entry>
<key>0.00</key>
</entry>
<entry>
<key>Zahlungsbedingung</key>
</entry>
<entry>
<key>Relationship</key>
</entry>
<entry>
<key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
<value>Für dieses Binärfeld ist nur ein Datensatz erlaubt.</value>
</entry>
<entry>
<key>Bitte einen Adressat in &amp;apos;to&amp;apos; eintragen!</key>
</entry>
<entry>
<key>Gesamt</key>
</entry>
<entry>
<key>Artikel-Nr</key>
</entry>
<entry>
<key>Native Name</key>
</entry>
<entry>
<key>ZIP code is not valid</key>
</entry>
<entry>
<key>Rabatt</key>
</entry>
<entry>
<key>#,##0</key>
</entry>
<entry>
<key>Einzelpreis</key>
</entry>
<entry>
<key>von</key>
</entry>
<entry>
<key>Nummer</key>
</entry>
<entry>
<key>Offer report</key>
<value>Agebotsbericht</value>
</entry>
<entry>
<key>New offer</key>
</entry>
<entry>
<key>dd.MM.yyyy</key>
</entry>
<entry>
<key>Artikelbezeichnung</key>
</entry>
<entry>
<key>UMSt</key>
</entry>
<entry>
<key>no valid mail-address format</key>
</entry>
<entry>
<key>Menge</key>
</entry>
<entry>
<key>Ihr zuständiger Betreuer:</key>
</entry>
<entry>
<key>#,##0.00</key>
</entry>
<entry>
<key>jDitoRC</key>
</entry>
<entry>
<key>Latin Name</key>
</entry>
<entry>
<key>Organisation name</key>
</entry>
<entry>
<key>Firma</key>
</entry>
<entry>
<key>Summe</key>
</entry>
<entry>
<key>Angebot</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 116
− 0
View file @ d7c1dd08
......@@ -1108,6 +1108,122 @@
<entry>
<key>Internal sales manager</key>
</entry>
<entry>
<key>keine Standard-E-Mail Büro vorhanden !</key>
</entry>
<entry>
<key>no valid format</key>
</entry>
<entry>
<key>Lieferbedingung</key>
</entry>
<entry>
<key>Seite</key>
</entry>
<entry>
<key>Senden per E-Mail</key>
</entry>
<entry>
<key>zzgl. Summe UmSt</key>
</entry>
<entry>
<key>Pos.</key>
</entry>
<entry>
<key>ISO 3166-1 alpha-3</key>
</entry>
<entry>
<key>ISO 3166-1 alpha-2</key>
</entry>
<entry>
<key>0.00</key>
</entry>
<entry>
<key>Zahlungsbedingung</key>
</entry>
<entry>
<key>Relationship</key>
</entry>
<entry>
<key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
<value>For this binary field only one data-item is allowed</value>
</entry>
<entry>
<key>Bitte einen Adressat in &amp;apos;to&amp;apos; eintragen!</key>
</entry>
<entry>
<key>Gesamt</key>
</entry>
<entry>
<key>Artikel-Nr</key>
</entry>
<entry>
<key>Native Name</key>
</entry>
<entry>
<key>ZIP code is not valid</key>
</entry>
<entry>
<key>Rabatt</key>
</entry>
<entry>
<key>#,##0</key>
</entry>
<entry>
<key>Einzelpreis</key>
</entry>
<entry>
<key>von</key>
</entry>
<entry>
<key>Nummer</key>
</entry>
<entry>
<key>Offer report</key>
<value></value>
</entry>
<entry>
<key>New offer</key>
</entry>
<entry>
<key>dd.MM.yyyy</key>
</entry>
<entry>
<key>Artikelbezeichnung</key>
</entry>
<entry>
<key>UMSt</key>
</entry>
<entry>
<key>no valid mail-address format</key>
</entry>
<entry>
<key>Menge</key>
</entry>
<entry>
<key>Ihr zuständiger Betreuer:</key>
</entry>
<entry>
<key>#,##0.00</key>
</entry>
<entry>
<key>jDitoRC</key>
</entry>
<entry>
<key>Latin Name</key>
</entry>
<entry>
<key>Organisation name</key>
</entry>
<entry>
<key>Firma</key>
</entry>
<entry>
<key>Summe</key>
</entry>
<entry>
<key>Angebot</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
process/OfferOrder_lib/process.js
+ 46
− 65
View file @ d7c1dd08
This diff is collapsed.
process/Report_lib/process.js
+ 14
− 9
View file @ d7c1dd08
......@@ -35,9 +35,8 @@ ReportData.begin = function(pFieldNames)
ReportData.prototype.add = function(pValues)
{
for (let i = 0; i < pValues.length; i++) {
if (_reportFields.length == pValues[i].length)
if (this._reportFields.length == pValues[i].length)
{
this._reportFields.push(pFieldNames[i]);
this._reportValues.push(pValues[i]);
}
else
......@@ -51,12 +50,12 @@ ReportData.prototype.add = function(pValues)
ReportData.prototype.getReportFields = function()
{
return _reportFields;
return this._reportFields;
}
ReportData.prototype.getReportValues = function()
{
return _reportValues;
return this._reportValues;
}
/**
......@@ -84,7 +83,7 @@ Report.prototype.addReportParams = function(pParams) {
{
for (var param in pParams)
{
reportParams[param] = pParams[param];
this.reportParams[param] = pParams[param];
}
}
......@@ -98,14 +97,14 @@ Report.prototype.addReportParams = function(pParams) {
* @return {Report} this
*/
Report.prototype.addSubReportData = function(pParamName, pReportData) {
if (pReportData.getRportValues().length > 0)
if (pReportData.getReportValues().length > 0)
{
if (this.reportParams == null)
{
this.reportParams = {};
}
this.reportParams[pParamName] = this._getSubReportMap(pReportData.getReportFields(), pReportData.getRportValues());
this.reportParams[pParamName] = this._getSubReportMap(pReportData.getReportFields(), pReportData.getReportValues());
}
return this;
}
......@@ -121,12 +120,18 @@ Report.prototype.setReportData = function(pReportData) {
}
Report.prototype.exportReport = function(pFilename, pCondition, pExportFormat, pWhereOrder, pLanguage) {
if (pCondition == undefined) pCondition = "";
if (pWhereOrder == undefined) pWhereOrder = null;
var doc = [pFilename, report.exportToBytes(this.reportName, pCondition, pExportFormat, pWhereOrder, this.reportParams, this.reportData.getReportFields(), this.reportData.getReportValues(), pLanguage)];
return doc;
}
Report.prototype.openReport = function(pCondition) {
neon.openReport(this.reportName, pCondition, this.reportParams, this.reportData.getReportFields(), this.reportData.getReportValues());
Report.prototype.openReport = function(pCondition, pVariables) {
if (pCondition == undefined) pCondition = "";
if (pVariables == undefined) pVariables = null;
neon.openReport(this.reportName, pCondition, this.reportParams, this.reportData.getReportFields(), this.reportData.getReportValues(), pVariables);
return this;
}
......
report/RPTJ_OFFER/RPTJ_OFFER.aod
+ 1
− 1
View file @ d7c1dd08
......@@ -5,7 +5,7 @@
<description></description>
<comment>&amp;lt;null value&amp;gt;</comment>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>AO_DATEN</alias>
<alias>Data_alias</alias>
<reportData>%aditoprj%/report/RPTJ_OFFER/reportData.jrxml</reportData>
<reportType>JASPER</reportType>
<subReports>
......
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