diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index c93edcee..f4910a29 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,58 +54,58 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm 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/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3 index 5bbe84f1..34427208 100644 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ b/Source/Informes/1/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3 index ee6e09c0..0af47dfc 100644 --- a/Source/Informes/2/InfAlbaranCliente.fr3 +++ b/Source/Informes/2/InfAlbaranCliente.fr3 @@ -1,5 +1,5 @@ - + diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas index 23fabbb0..106cf3d9 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas @@ -188,12 +188,16 @@ begin Cell(iRowCount, 1).Range.Text := FieldByName('REFERENCIA').AsString; 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); + ACantidad := FloatToStr(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; diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas index eca9e9b1..7ed8a87b 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas @@ -165,11 +165,15 @@ begin Cell(iContador, 1).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(iContador, 2).Range.Text := AText + ' ' + FieldByName('UNIDAD_MEDIDA').AsString; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 5c7d02ac..182a83e9 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 1ca473ef..6e071dcb 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.7.8.0\0" VALUE "ProductVersion", "1.7.8.0\0" - VALUE "CompileDate", "martes, 22 de septiembre de 2009 10:09\0" + VALUE "CompileDate", "miércoles, 23 de septiembre de 2009 10:14\0" END END BLOCK "VarFileInfo"