diff --git a/Source/Modulos/Informes base/Views/uViewSumarios.dfm b/Source/Modulos/Informes base/Views/uViewSumarios.dfm index b3bb4cad..2cdfdca5 100644 --- a/Source/Modulos/Informes base/Views/uViewSumarios.dfm +++ b/Source/Modulos/Informes base/Views/uViewSumarios.dfm @@ -88,6 +88,7 @@ inherited frViewSumarios: TfrViewSumarios object cxStyleRepository1: TcxStyleRepository Left = 216 Top = 104 + PixelsPerInch = 96 object cxStyleNombreColumna: TcxStyle AssignedValues = [svColor, svTextColor] Color = clWindow diff --git a/Source/Modulos/Informes base/Views/uViewSumarios.pas b/Source/Modulos/Informes base/Views/uViewSumarios.pas index ee71f19c..cdbe3acb 100644 --- a/Source/Modulos/Informes base/Views/uViewSumarios.pas +++ b/Source/Modulos/Informes base/Views/uViewSumarios.pas @@ -104,27 +104,25 @@ end; procedure TfrViewSumarios.AplicarSumarioVista ( const APosition: TcxSummaryPosition; const AColumnCaption: String; const AKind: TcxSummaryKind); -const - MASK_MONEDA = ',0.## €;-,0.## €'; - MASK_NUMERO = '#,##0'; var AColumn : TcxGridDBColumn; + ADisplayFormat : string; begin AColumn := ViewInformeBaseGrid.GetColumnByCaption(AColumnCaption); + + if (AColumn.Properties is TcxCustomTextEditProperties) then + ADisplayFormat := TcxCustomTextEditProperties(AColumn.Properties).DisplayFormat + else + ADisplayFormat := ''; + if APosition = spFooter then begin AColumn.Summary.FooterKind := AKind; - if (AKind in [skSum, skAverage]) and (AColumn.PropertiesClassName = 'TcxCurrencyEditProperties') then - AColumn.Summary.FooterFormat := MASK_MONEDA - else - AColumn.Summary.FooterFormat := MASK_NUMERO; + //AColumn.Summary.FooterFormat := ADisplayFormat; end else begin AColumn.Summary.GroupFooterKind := AKind; - if (AKind in [skSum, skAverage]) and (AColumn.PropertiesClassName = 'TcxCurrencyEditProperties') then - AColumn.Summary.GroupFooterFormat := MASK_MONEDA - else - AColumn.Summary.GroupFooterFormat := MASK_NUMERO; + // AColumn.Summary.GroupFooterFormat := ADisplayFormat; end; end;