From f357933a48da3d91b5ec2fb93bf3f43352b26fb4 Mon Sep 17 00:00:00 2001 From: roberto Date: Tue, 8 Sep 2015 15:21:03 +0000 Subject: [PATCH] Cambio solicitado en informe en ingles y en ficha articulo git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@237 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2 --- Source/Informes/6/en/InfPresupuestoCliente.fr3 | 6 +++--- Source/Modulos/Articulos/Views/uViewArticulos.dfm | 4 ---- Source/Modulos/Articulos/Views/uViewArticulos.pas | 9 +++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Source/Informes/6/en/InfPresupuestoCliente.fr3 b/Source/Informes/6/en/InfPresupuestoCliente.fr3 index 500e57f..243cdad 100644 --- a/Source/Informes/6/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/6/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -46,8 +46,8 @@ - - + + diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm index 5f0106d..ff417f6 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm @@ -150,8 +150,6 @@ inherited frViewArticulos: TfrViewArticulos StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 272 - Width = 272 end inherited edtFechaFinFiltro: TcxDateEdit Left = 376 @@ -160,8 +158,6 @@ inherited frViewArticulos: TfrViewArticulos StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 376 - ExplicitWidth = 221 - Width = 221 end inherited eLista: TcxComboBox Left = 634 diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas index c0914d6..7577b21 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas @@ -187,10 +187,11 @@ procedure TfrViewArticulos.cxGridViewDataControllerCompare( AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); begin inherited; - if (AItemIndex = cxGridViewREFERENCIA.Index) and - (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then - Compare := CompararReferencias(V1, V2) - else +//El campo referencias de los articulos no se comportará como el resto de referencias, por lo que la ordenación siempre será alfabética como el resto de columnas del grid +// if (AItemIndex = cxGridViewREFERENCIA.Index) and +// (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then +// Compare := CompararReferencias(V1, V2) +// else Compare := VarCompare(V1, V2); end;