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
This commit is contained in:
roberto 2015-09-08 15:21:03 +00:00
parent 52b6b3df65
commit f357933a48
3 changed files with 8 additions and 11 deletions

File diff suppressed because one or more lines are too long

View File

@ -150,8 +150,6 @@ inherited frViewArticulos: TfrViewArticulos
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 272
Width = 272
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 376 Left = 376
@ -160,8 +158,6 @@ inherited frViewArticulos: TfrViewArticulos
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 376 ExplicitLeft = 376
ExplicitWidth = 221
Width = 221
end end
inherited eLista: TcxComboBox inherited eLista: TcxComboBox
Left = 634 Left = 634

View File

@ -187,10 +187,11 @@ procedure TfrViewArticulos.cxGridViewDataControllerCompare(
AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
begin begin
inherited; inherited;
if (AItemIndex = cxGridViewREFERENCIA.Index) and //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
(VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then // if (AItemIndex = cxGridViewREFERENCIA.Index) and
Compare := CompararReferencias(V1, V2) // (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
else // Compare := CompararReferencias(V1, V2)
// else
Compare := VarCompare(V1, V2); Compare := VarCompare(V1, V2);
end; end;