Pedidos a proveedor: ficha del pedido recolocada para hacerla más vistosa.

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

Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm

@@ -18,10 +18,10 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
       476)
     object Bevel1: TBevel
       Left = 10
-      Top = 434
-      Width = 529
-      Height = 5
-      Shape = bsBottomLine
+      Top = 432
+      Width = 566
+      Height = 2
+      Shape = bsTopLine
     end
     object rdxDestino1: TRadioButton
       Left = 10
@@ -73,7 +73,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
     end
     object bModificar: TBitBtn
       Left = 448
-      Top = 403
+      Top = 396
       Width = 128
       Height = 25
       Caption = 'Modificar la direcci'#243'n...'
@@ -130,7 +130,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
       Width = 551
     end
     object edtEntregarA: TcxDBButtonEdit
-      Left = 70
+      Left = 242
       Top = 445
       DataBinding.DataField = 'PERSONA_CONTACTO'
       DataBinding.DataSource = dsPedido
@@ -213,12 +213,14 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
       end
       object dxLayoutControl1Item8: TdxLayoutItem
         Caption = 'Bevel1'
+        Offsets.Bottom = 5
+        Offsets.Top = 5
         ShowCaption = False
         Control = Bevel1
         ControlOptions.ShowBorder = False
       end
       object dxLayoutControl1Item7: TdxLayoutItem
-        Caption = 'Entregar a:'
+        Caption = 'Entregar este pedido a la persona de contacto:'
         Control = edtEntregarA
         ControlOptions.ShowBorder = False
       end

Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.dfm

@@ -1,24 +1,32 @@
 inherited frViewObraReserva: TfrViewObraReserva
   Width = 586
-  Height = 46
+  Height = 72
   ExplicitWidth = 586
-  ExplicitHeight = 46
+  ExplicitHeight = 72
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
     Width = 586
-    Height = 46
+    Height = 72
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitHeight = 46
     DesignSize = (
       586
-      46)
+      72)
+    object Label1: TLabel
+      Left = 10
+      Top = 10
+      Width = 235
+      Height = 13
+      Caption = 'Reservar el material de este pedido para la obra:'
+    end
     object cbListaObrasReserva: TcxDBLookupComboBox
       Left = 25
-      Top = 10
+      Top = 29
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'ID_OBRA'
       DataBinding.DataSource = dsPedido
@@ -51,6 +59,13 @@ inherited frViewObraReserva: TfrViewObraReserva
       ShowCaption = False
       Hidden = True
       ShowBorder = False
+      object dxLayoutControl1Item1: TdxLayoutItem
+        Caption = 'Label1'
+        ShowCaption = False
+        Control = Label1
+        ControlOptions.AutoColor = True
+        ControlOptions.ShowBorder = False
+      end
       object dxLayoutControl1Item6: TdxLayoutItem
         Offsets.Left = 15
         ShowCaption = False
@@ -60,11 +75,11 @@ inherited frViewObraReserva: TfrViewObraReserva
     end
   end
   object dsPedido: TDADataSource
-    Left = 320
+    Left = 200
     Top = 8
   end
   object dsObras: TDADataSource
-    Left = 288
+    Left = 160
     Top = 8
   end
 end

Source/Modulos/Pedidos a proveedor/Views/uViewObraReserva.pas

@@ -31,6 +31,8 @@ type
     dxLayoutControl1Item6: TdxLayoutItem;
     cbListaObrasReserva: TcxDBLookupComboBox;
     dsObras: TDADataSource;
+    Label1: TLabel;
+    dxLayoutControl1Item1: TdxLayoutItem;
   protected
     FObrasController : IObrasController;
     FObras: IBizObra;

Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm

@@ -1,25 +1,27 @@
 inherited frViewPedidoProveedor: TfrViewPedidoProveedor
-  Width = 787
-  Height = 615
+  Width = 965
+  Height = 546
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
-  ExplicitWidth = 787
-  ExplicitHeight = 615
+  ExplicitWidth = 965
+  ExplicitHeight = 546
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 787
-    Height = 615
+    Width = 965
+    Height = 546
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitWidth = 787
+    ExplicitHeight = 615
     DesignSize = (
-      787
-      615)
+      965
+      546)
     object edtFechaPedido: TcxDBDateEdit
-      Left = 137
+      Left = 121
       Top = 55
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_PEDIDO'
@@ -38,11 +40,11 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 1
-      Width = 240
+      Width = 4
     end
     object edtFechaConfirmacion: TcxDBDateEdit
-      Left = 137
-      Top = 195
+      Left = 599
+      Top = 240
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_CONFIRMACION'
       DataBinding.DataSource = DADataSource
@@ -58,12 +60,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
-      Width = 240
+      TabOrder = 10
+      Width = 359
     end
     object edtFechaEntrega: TcxDBDateEdit
-      Left = 137
-      Top = 222
+      Left = 599
+      Top = 267
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENTREGA'
       DataBinding.DataSource = DADataSource
@@ -77,12 +79,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
-      Width = 240
+      TabOrder = 11
+      Width = 359
     end
     object memObservaciones: TcxDBMemo
-      Left = 526
-      Top = 213
+      Left = 484
+      Top = 324
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
@@ -96,10 +98,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 12
       Height = 380
-      Width = 358
+      Width = 239
     end
     object eReferencia: TcxDBTextEdit
-      Left = 137
+      Left = 121
       Top = 28
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REFERENCIA'
@@ -118,73 +120,73 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 0
-      Width = 240
+      Width = 359
     end
     inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv
       Left = 22
-      Top = 279
-      Width = 355
-      Height = 314
+      Top = 168
+      Width = 432
+      Height = 270
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 9
+      TabOrder = 6
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 279
-      ExplicitWidth = 355
-      ExplicitHeight = 314
+      ExplicitTop = 168
+      ExplicitWidth = 432
+      ExplicitHeight = 270
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 355
-        Height = 314
+        Width = 432
+        Height = 270
         ExplicitWidth = 355
         ExplicitHeight = 314
         inherited Bevel1: TBevel
-          Top = 190
-          Width = 529
-          ExplicitTop = 190
-          ExplicitWidth = 529
+          Top = 204
+          Width = 412
+          ExplicitTop = 204
+          ExplicitWidth = 412
         end
         inherited rdxDestino1: TRadioButton
-          Width = 335
-          ExplicitWidth = 335
+          Width = 414
+          ExplicitWidth = 414
         end
         inherited rdxDestino2: TRadioButton
-          Width = 335
-          ExplicitWidth = 335
+          Width = 414
+          ExplicitWidth = 414
         end
         inherited cbListaAlmacenes: TcxDBLookupComboBox
-          ExplicitWidth = 320
-          Width = 320
+          ExplicitWidth = 399
+          Width = 399
         end
         inherited bModificar: TBitBtn
-          Left = 336
-          Top = 159
-          ExplicitLeft = 336
-          ExplicitTop = 159
+          Left = 294
+          Top = 168
+          ExplicitLeft = 294
+          ExplicitTop = 168
         end
         inherited txtDireccion: TStaticText
-          Width = 320
-          Height = 102
-          ExplicitWidth = 320
-          ExplicitHeight = 102
+          Width = 399
+          Height = 62
+          ExplicitWidth = 399
+          ExplicitHeight = 62
         end
         inherited RadioButton1: TRadioButton
-          Width = 335
-          ExplicitWidth = 335
+          Width = 454
+          ExplicitWidth = 454
         end
         inherited cbListaObras: TcxDBLookupComboBox
-          ExplicitWidth = 320
-          Width = 320
+          ExplicitWidth = 439
+          Width = 439
         end
         inherited edtEntregarA: TcxDBButtonEdit
-          Top = 201
-          ExplicitTop = 201
-          ExplicitWidth = 275
-          Width = 275
+          Top = 217
+          ExplicitTop = 217
+          ExplicitWidth = 394
+          Width = 394
         end
       end
       inherited ActionList1: TActionList
@@ -199,7 +201,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       end
     end
     object cbFormaPago: TcxDBLookupComboBox
-      Left = 137
+      Left = 121
       Top = 82
       DataBinding.DataField = 'ID_FORMA_PAGO'
       DataBinding.DataSource = DADataSource
@@ -226,10 +228,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 2
-      Width = 102
+      Width = 24
     end
     object bFormasPago: TButton
-      Left = 364
+      Left = 322
       Top = 82
       Width = 132
       Height = 21
@@ -238,8 +240,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       OnClick = bFormasPagoClick
     end
     object edtFechaEnvio: TcxDBDateEdit
-      Left = 137
-      Top = 168
+      Left = 599
+      Top = 213
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENVIO'
       DataBinding.DataSource = DADataSource
@@ -255,11 +257,11 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 6
-      Width = 240
+      TabOrder = 9
+      Width = 344
     end
     object eReferenciaPedidoCli: TcxTextEdit
-      Left = 137
+      Left = 121
       Top = 109
       Anchors = [akLeft, akTop, akRight]
       Enabled = False
@@ -279,10 +281,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 4
-      Width = 102
+      Width = 221
     end
     object bVerPedidoCliente: TButton
-      Left = 364
+      Left = 322
       Top = 109
       Width = 132
       Height = 23
@@ -290,9 +292,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       TabOrder = 5
     end
     inline frViewProveedorPedido1: TfrViewProveedorPedido
-      Left = 526
+      Left = 484
       Top = 28
-      Width = 358
+      Width = 486
       Height = 149
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
@@ -300,74 +302,89 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 11
+      TabOrder = 8
       ReadOnly = False
-      ExplicitLeft = 526
+      ExplicitLeft = 484
       ExplicitTop = 28
-      ExplicitWidth = 358
+      ExplicitWidth = 486
       ExplicitHeight = 149
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 358
+        Width = 486
         Height = 266
         ExplicitWidth = 358
         ExplicitHeight = 266
         inherited edtlNombre: TcxDBTextEdit
-          ExplicitWidth = 230
-          Width = 230
+          ExplicitWidth = 213
+          Width = 213
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          ExplicitWidth = 230
-          Width = 230
+          ExplicitWidth = 213
+          Width = 213
         end
         inherited edtCalle: TcxDBTextEdit
-          ExplicitWidth = 230
-          Width = 230
+          ExplicitWidth = 213
+          Width = 213
         end
         inherited edtPoblacion: TcxDBTextEdit
-          ExplicitWidth = 112
-          Width = 112
+          ExplicitWidth = 95
+          Width = 95
         end
         inherited edtProvincia: TcxDBTextEdit
-          ExplicitWidth = 230
-          Width = 230
+          ExplicitWidth = 213
+          Width = 213
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 249
-          ExplicitLeft = 249
+          Left = 367
+          ExplicitLeft = 367
         end
         inherited Button3: TBitBtn
-          Left = 133
-          ExplicitLeft = 133
+          Left = 251
+          ExplicitLeft = 251
         end
         inherited edtPersonaContacto: TcxDBTextEdit
-          ExplicitWidth = 230
-          Width = 230
+          ExplicitWidth = 213
+          Width = 213
         end
         inherited edtReferenciaAsignada: TcxDBTextEdit
-          Left = 210
-          ExplicitLeft = 210
+          Left = 328
+          ExplicitLeft = 328
         end
         inherited edtFax: TcxDBTextEdit
-          ExplicitWidth = 37
-          Width = 37
+          ExplicitWidth = 82
+          Width = 82
         end
       end
     end
     inline frViewObraReserva1: TfrViewObraReserva
-      Left = 137
-      Top = 547
-      Width = 586
-      Height = 46
+      Left = 22
+      Top = 452
+      Width = 331
+      Height = 72
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 10
+      TabOrder = 7
       ReadOnly = False
-      ExplicitLeft = 137
-      ExplicitTop = 547
+      ExplicitLeft = 22
+      ExplicitTop = 452
+      ExplicitWidth = 331
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 331
+        DesignSize = (
+          331
+          72)
+        inherited Label1: TLabel
+          Width = 235
+          ExplicitWidth = 235
+        end
+        inherited cbListaObrasReserva: TcxDBLookupComboBox
+          ExplicitWidth = 296
+          Width = 296
+        end
+      end
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
@@ -442,25 +459,6 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             end
           end
         end
-        object dxLayoutControl1Group5: TdxLayoutGroup
-          AutoAligns = [aaHorizontal]
-          Caption = 'Situaci'#243'n del pedido'
-          object dxLayoutControl1Item7: TdxLayoutItem
-            Caption = 'Enviado al prov. el d'#237'a:'
-            Control = edtFechaEnvio
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item4: TdxLayoutItem
-            Caption = 'Confirmado el d'#237'a:'
-            Control = edtFechaConfirmacion
-            ControlOptions.ShowBorder = False
-          end
-          object dxLayoutControl1Item5: TdxLayoutItem
-            Caption = 'Entrega prevista:'
-            Control = edtFechaEntrega
-            ControlOptions.ShowBorder = False
-          end
-        end
         object dxLayoutControl1Group8: TdxLayoutGroup
           AutoAligns = []
           AlignHorz = ahClient
@@ -475,9 +473,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           end
         end
         object dxLayoutControl1Group11: TdxLayoutGroup
+          AutoAligns = [aaHorizontal]
+          AlignVert = avBottom
           Caption = 'Datos de reserva'
           object dxLayoutControl1Item13: TdxLayoutItem
             Caption = 'Reservar para obra:'
+            ShowCaption = False
             Control = frViewObraReserva1
             ControlOptions.AutoColor = True
             ControlOptions.ShowBorder = False
@@ -500,6 +501,25 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             ControlOptions.ShowBorder = False
           end
         end
+        object dxLayoutControl1Group5: TdxLayoutGroup
+          AutoAligns = [aaHorizontal]
+          Caption = 'Situaci'#243'n del pedido'
+          object dxLayoutControl1Item7: TdxLayoutItem
+            Caption = 'Enviado al prov. el d'#237'a:'
+            Control = edtFechaEnvio
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item4: TdxLayoutItem
+            Caption = 'Confirmado el d'#237'a:'
+            Control = edtFechaConfirmacion
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item5: TdxLayoutItem
+            Caption = 'Entrega prevista:'
+            Control = edtFechaEntrega
+            ControlOptions.ShowBorder = False
+          end
+        end
         object dxLayoutControl1Group7: TdxLayoutGroup
           AutoAligns = [aaHorizontal]
           AlignVert = avClient