diff --git a/MultiTool.Form/GridLoader.vb b/MultiTool.Form/GridLoader.vb index 4487c08..96d97d0 100644 --- a/MultiTool.Form/GridLoader.vb +++ b/MultiTool.Form/GridLoader.vb @@ -62,7 +62,7 @@ Public Class GridLoader Return pGrid End Function - Private Function GetColumnType(pColumn As Templates.Template.Column) + Private Function GetColumnType(pColumn As Templates.Template.Column) As DevExpress.Data.UnboundColumnType Select Case pColumn.DataType Case ColumnType.Boolean Return DevExpress.Data.UnboundColumnType.Boolean diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 1d88107..2c86e70 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -321,7 +321,10 @@ Public Class frmImportMain Dim oReportGenerator = New ReportGenerator(Of OrderReport)(LogConfig, Database, My.TemplateConfiguration, My.GeneralConfiguration) - Dim oReport As OrderReport = oReportGenerator.GenerateReport(oDocument) + + + + Dim oReport As OrderReport = oReportGenerator.GenerateReport(oDocument, CurrentTemplate) Dim oPrintTool As New ReportPrintTool(oReport) oPrintTool.Report.CreateDocument(False) oPrintTool.ShowPreview() @@ -506,7 +509,7 @@ Public Class frmImportMain Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) ' Generate the report - Dim oReport = ReportGenerator.GenerateReport(oDocument) + Dim oReport = ReportGenerator.GenerateReport(oDocument, CurrentTemplate) Dim oFilePath = ReportGenerator.GetReportFilePath(oDocument, CurrentTemplate) ' Export it to pdf @@ -645,7 +648,7 @@ Public Class frmImportMain WebService.RaiseWebServiceProgress("Bericht erzeugen") ' Generate the report - Dim oReport = ReportGenerator.GenerateReport(pDocument) + Dim oReport = ReportGenerator.GenerateReport(pDocument, CurrentTemplate) Dim oFilePath = ReportGenerator.GetReportFilePath(pDocument, CurrentTemplate) WebService.RaiseWebServiceProgress("Bericht exportieren") diff --git a/MultiTool.Shared/Constants.vb b/MultiTool.Shared/Constants.vb index 6e8299c..9f1c288 100644 --- a/MultiTool.Shared/Constants.vb +++ b/MultiTool.Shared/Constants.vb @@ -5,6 +5,8 @@ Public Const FUNCTION_GLN = "GLN" Public Const FUNCTION_EAN = "EAN" + Public Const FUNCTION_PRICE = "PRICE" + Public Const FUNCTION_SQL = "SQL" Public Const TEMPLATE_TYPE_DATE = "xs:date" Public Const TEMPLATE_TYPE_INTEGER = "xs:integer"