diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f31..1641339f 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas index a1e57c44..13abae7a 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas @@ -372,15 +372,23 @@ begin Cell(iRowCount, 2).Range.Text := FieldByName('CONCEPTO').AsString; ACantidad := FloatToStr(FieldByName('CANTIDAD').AsFloat); - AIndice := Pos(',', ACantidad); - if AIndice > 0 then - AText := FormatFloat('#,0.00', FieldByName('CANTIDAD').AsFloat) - else - AText := FormatFloat('#,0.##', FieldByName('CANTIDAD').AsFloat); + if ACantidad = '0' then + AText := '' + else begin + AIndice := Pos(',', ACantidad); + if AIndice > 0 then + AText := FormatFloat('#,0.00', FieldByName('CANTIDAD').AsFloat) + else + AText := FormatFloat('#,0.##', FieldByName('CANTIDAD').AsFloat); + end; Cell(iRowCount, 3).Range.Text := AText + ' ' + FieldByName('UNIDAD_MEDIDA').AsString; - Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat); - Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat); + if FieldByName('IMPORTE_UNIDAD').AsFloat <> 0 then + Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat); + + if FieldByName('IMPORTE_TOTAL').AsFloat <> 0 then + Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat); + TotalCapitulo := TotalCapitulo + FieldByName('IMPORTE_TOTAL').AsFloat; end; TipoConAnterior := FieldByName('TIPO_DETALLE').AsString; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index b2953fc7..591beb1c 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 259be46d..ba3be1ca 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality - FalseTrueFalse/standaloneTrueFalse1770FalseFalseFalseFalseFalse308212521.7.7.01.7.7.0miƩrcoles, 08 de julio de 2009 11:18 + FalseTrueFalse/standaloneTrueFalse1780FalseFalseFalseFalseFalse308212521.7.8.01.7.8.0martes, 01 de septiembre de 2009 18:11 ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 3f995668..a8cbaf1a 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 1,7,7,0 -PRODUCTVERSION 1,7,7,0 +FILEVERSION 1,7,8,0 +PRODUCTVERSION 1,7,8,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "1.7.7.0\0" - VALUE "ProductVersion", "1.7.7.0\0" - VALUE "CompileDate", "martes, 04 de agosto de 2009 16:44\0" + VALUE "FileVersion", "1.7.8.0\0" + VALUE "ProductVersion", "1.7.8.0\0" + VALUE "CompileDate", "martes, 01 de septiembre de 2009 18:15\0" END END BLOCK "VarFileInfo"