Inventario -> La pantalla de salida/entrada/traslado se ha retocado algo estéticamente.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@496 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm

@@ -162,25 +162,9 @@ inherited fEditorDetalleReservas: TfEditorDetalleReservas
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 669
           ExplicitWidth = 669
-          inherited txtFiltroTodo: TcxTextEdit
+          inherited eLista: TcxComboBox
-            Style.LookAndFeel.SkinName = ''
+            ExplicitWidth = 20
-            StyleDisabled.LookAndFeel.SkinName = ''
+            Width = 20
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-          end
-          inherited edtFechaIniFiltro: TcxDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-          end
-          inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 413
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 413
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -212,6 +196,14 @@ inherited fEditorDetalleReservas: TfEditorDetalleReservas
         BuiltInReportLink = True
       end
     end
+    inherited cxViewGridPopupMenu: TcxGridPopupMenu
+      PopupMenus = <
+        item
+          GridView = frViewDetalleReservas1.cxGridView
+          HitTypes = [gvhtCell]
+          Index = 0
+        end>
+    end
   end
   inherited EditorActionList: TActionList [4]
     Left = 96

Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm

@@ -3,13 +3,17 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
   Top = 196
   Caption = 'Entrada de art'#237'culos en almac'#233'n'
   ClientHeight = 556
+  ClientWidth = 773
   OnClose = CustomEditorClose
+  ExplicitWidth = 781
   ExplicitHeight = 590
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Width = 773
     Caption = 'Entrada de art'#237'culos en '
     inherited Image1: TImage
+      Left = 746
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -31,6 +35,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
     end
   end
   inherited TBXDock: TTBXDock
+    Width = 773
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 164
       object TBXItem7: TTBXItem [16]
@@ -40,6 +45,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       end
     end
     inherited tbxMenu: TTBXToolbar
+      ExplicitWidth = 773
       inherited TBXSubmenuItem4: TTBXSubmenuItem
         object TBXItem33: TTBXItem [11]
           Action = actGuardarCerrar
@@ -52,6 +58,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
   end
   inherited pgPaginas: TPageControl
     Top = 257
+    Width = 767
     Height = 277
     MultiLine = True
     Visible = False
@@ -66,6 +73,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
   end
   inherited StatusBar: TJvStatusBar
     Top = 537
+    Width = 773
     Panels = <
       item
         Width = 200
@@ -76,7 +84,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
     AlignWithMargins = True
     Left = 5
     Top = 224
-    Width = 642
+    Width = 763
     Height = 30
     Margins.Left = 5
     Margins.Top = 2
@@ -94,6 +102,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
     ShowHint = True
     TabOrder = 4
     Transparent = True
+    ExplicitWidth = 642
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -124,8 +133,9 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
   object TBXDockPaneles: TTBXDock [5]
     Left = 0
     Top = 76
-    Width = 652
+    Width = 773
     Height = 146
+    ExplicitWidth = 652
     object pnlMovimiento: TTBXDockablePanel
       Left = 0
       Top = 89
@@ -134,8 +144,8 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       CaptionRotation = dpcrAlwaysVert
       DockedHeight = 53
       DockMode = dmCannotFloat
-      DockPos = 88
+      DockPos = 3
-      DockRow = 2
+      DockRow = 1
       FloatingWidth = 128
       FloatingHeight = 84
       ShowCaptionWhenDocked = False
@@ -143,7 +153,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       TabOrder = 0
       Visible = False
       DesignSize = (
-        648
+        769
         53)
       object Label1: TLabel
         Left = 266
@@ -154,7 +164,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
         Caption = 'Motivo:'
       end
       object Label2: TLabel
-        Left = 8
+        Left = 12
         Top = 17
         Width = 107
         Height = 13
@@ -164,7 +174,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
         ParentColor = False
       end
       object eFechaMovimiento: TcxDateEdit
-        Left = 122
+        Left = 126
         Top = 14
         Style.BorderColor = clWindowFrame
         Style.BorderStyle = ebs3D
@@ -182,6 +192,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
         Left = 308
         Top = 14
         Anchors = [akLeft, akTop, akRight]
+        AutoSize = False
         Style.BorderColor = clWindowFrame
         Style.BorderStyle = ebs3D
         Style.HotTrack = False
@@ -194,7 +205,8 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
         StyleHot.LookAndFeel.Kind = lfStandard
         StyleHot.LookAndFeel.NativeStyle = True
         TabOrder = 1
-        Width = 3397
+        Height = 21
+        Width = 445
       end
     end
     object pnlEntradaPedido: TTBXDockablePanel
@@ -205,8 +217,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       CaptionRotation = dpcrAlwaysVert
       DockedHeight = 85
       DockMode = dmCannotFloat
-      DockPos = 88
+      DockPos = 0
-      DockRow = 2
       FloatingWidth = 128
       FloatingHeight = 84
       ShowCaptionWhenDocked = False
@@ -262,7 +273,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
         ParentFont = False
       end
       object Label6: TLabel
-        Left = 8
+        Left = 5
         Top = 49
         Width = 47
         Height = 13
@@ -314,7 +325,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
   inline frViewEntradaSalidaArticulos1: TfrViewEntradaSalidaArticulos [6]
     Left = 0
     Top = 254
-    Width = 652
+    Width = 773
     Height = 283
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
@@ -329,18 +340,20 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
     ExplicitWidth = 652
     ExplicitHeight = 283
     inherited cxGrid: TcxGrid
-      Width = 652
+      Width = 757
-      Height = 155
+      Height = 139
-      ExplicitWidth = 652
+      ExplicitLeft = 8
-      ExplicitHeight = 155
+      ExplicitTop = 110
+      ExplicitWidth = 636
+      ExplicitHeight = 139
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
-      Width = 652
+      Width = 773
       ExplicitWidth = 652
       inherited TBXDockablePanel1: TTBXDockablePanel
         ExplicitWidth = 652
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 652
+          Width = 773
           ExplicitWidth = 652
           inherited txtFiltroTodo: TcxTextEdit
             ExplicitWidth = 555
@@ -352,10 +365,10 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-          Width = 652
+          Width = 773
           ExplicitWidth = 652
           inherited tbxBotones: TTBXToolbar
-            Width = 642
+            Width = 763
             ExplicitWidth = 642
           end
         end
@@ -366,10 +379,10 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
       ExplicitTop = 257
       ExplicitWidth = 652
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 652
+        Width = 773
         ExplicitWidth = 652
         inherited TBXToolbar1: TTBXToolbar
-          Width = 642
+          Width = 763
           ExplicitWidth = 642
         end
       end

Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm

@@ -1,5 +1,20 @@
 inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
+  Width = 674
+  Height = 464
+  ExplicitWidth = 674
+  ExplicitHeight = 464
   inherited cxGrid: TcxGrid
+    AlignWithMargins = True
+    Left = 8
+    Top = 110
+    Width = 658
+    Height = 320
+    Margins.Left = 8
+    Margins.Top = 8
+    Margins.Right = 8
+    Margins.Bottom = 8
+    ExplicitWidth = 674
+    ExplicitHeight = 336
     inherited cxGridView: TcxGridDBTableView
       DataController.KeyFieldNames = 'ID_ALMACEN;ID_ARTICULO'
       DataController.Options = [dcoAnsiSort, dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoFocusTopRowAfterSorting, dcoImmediatePost]
@@ -30,18 +45,32 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
       object cxGridViewREFERENCIA_PED_CLI: TcxGridDBColumn
         DataBinding.FieldName = 'REFERENCIA_PED_CLI'
         Visible = False
+        Width = 55
       end
       object cxGridViewREFERENCIA: TcxGridDBColumn
         Caption = 'Referencia'
         DataBinding.FieldName = 'REFERENCIA'
+        Width = 65
       end
       object cxGridViewREFERENCIA_PROV: TcxGridDBColumn
         Caption = 'Ref. proveedor'
         DataBinding.FieldName = 'REFERENCIA_PROVEEDOR'
+        Width = 80
       end
       object cxGridViewDESCRIPCION: TcxGridDBColumn
+        Caption = 'Descripci'#243'n'
         DataBinding.FieldName = 'DESCRIPCION'
         PropertiesClassName = 'TcxRichEditProperties'
+        Width = 303
+      end
+      object cxGridViewSTOCK: TcxGridDBColumn
+        Caption = 'Stock actual'
+        DataBinding.FieldName = 'STOCK'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.Alignment.Horz = taRightJustify
+        Properties.ReadOnly = True
+        HeaderAlignmentHorz = taRightJustify
+        Width = 94
       end
       object cxGridViewCANTIDAD: TcxGridDBColumn
         Caption = 'Cantidad'
@@ -50,23 +79,25 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
         Properties.Alignment.Horz = taRightJustify
         FooterAlignmentHorz = taRightJustify
         HeaderAlignmentHorz = taRightJustify
+        Width = 80
       end
       object cxGridViewID_EMPRESA: TcxGridDBColumn
         DataBinding.FieldName = 'ID_EMPRESA'
         Visible = False
       end
-      object cxGridViewSTOCK: TcxGridDBColumn
-        Caption = 'Stock actual'
-        DataBinding.FieldName = 'STOCK'
-      end
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
+    Width = 674
+    ExplicitWidth = 674
     inherited TBXDockablePanel1: TTBXDockablePanel
+      ExplicitWidth = 674
       inherited dxLayoutControl1: TdxLayoutControl
+        Width = 674
+        ExplicitWidth = 674
         inherited txtFiltroTodo: TcxTextEdit
-          ExplicitWidth = 510
+          ExplicitWidth = 577
-          Width = 510
+          Width = 577
         end
         inherited edtFechaIniFiltro: TcxDateEdit
           ExplicitWidth = 121
@@ -81,14 +112,32 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
         inherited eLista: TcxComboBox
           Left = 383
           ExplicitLeft = 383
-          ExplicitWidth = 214
+          ExplicitWidth = 281
-          Width = 214
+          Width = 281
+        end
+      end
+      inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+        Width = 674
+        ExplicitWidth = 674
+        inherited tbxBotones: TTBXToolbar
+          Width = 664
+          ExplicitWidth = 664
         end
       end
     end
   end
   inherited pnlAgrupaciones: TTBXDockablePanel
-    ExplicitWidth = 607
+    Top = 438
+    ExplicitTop = 438
+    ExplicitWidth = 674
+    inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+      Width = 674
+      ExplicitWidth = 674
+      inherited TBXToolbar1: TTBXToolbar
+        Width = 664
+        ExplicitWidth = 664
+      end
+    end
   end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
@@ -96,6 +145,16 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
       BuiltInReportLink = True
     end
   end
+  inherited cxStyleRepository1: TcxStyleRepository
+    object cxStyle_CANTIDAD_IMPAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = 13828095
+    end
+    object cxStyle_CANTIDAD_PAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = 15532031
+    end
+  end
   object DADataSourceAlmacenes: TDADataSource
     Left = 56
     Top = 16

Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas

@@ -43,6 +43,11 @@ type
     cxGridViewREFERENCIA: TcxGridDBColumn;
     cxGridViewREFERENCIA_PROV: TcxGridDBColumn;
     cxGridViewSTOCK: TcxGridDBColumn;
+    cxStyle_CANTIDAD_IMPAR: TcxStyle;
+    cxStyle_CANTIDAD_PAR: TcxStyle;
+    procedure cxGridViewStylesGetContentStyle(
+      Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+      AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
   private
 //Es para cuando el almacen destino sea relativo a cada artículo, como lo vamos a
 //hacer relativo al conjunto esto sobra
@@ -82,4 +87,32 @@ begin
   Result := FAlmacenes;
 end;}
 
+{ TfrViewEntradaSalidaArticulos }
+
+{ TfrViewEntradaSalidaArticulos }
+
+procedure TfrViewEntradaSalidaArticulos.cxGridViewStylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
+begin
+  inherited;
+  if Assigned(AItem) then
+  begin
+    if AItem.Index = cxGridViewCANTIDAD.Index then
+    begin
+      if Odd(ARecord.Index) then
+        AStyle := cxStyle_NORMAL_PAR
+      else
+        AStyle := cxStyle_NORMAL_IMPAR;
+      AStyle.Font.Style := [fsBold];
+    end
+    else begin
+      if Odd(ARecord.Index) then
+        AStyle := cxStyle_ORDENADO_PAR
+      else
+        AStyle := cxStyle_ORDENADO_IMPAR;
+    end;
+  end;
+end;
+
 end.