Ticket #91 -> En las obras, poner la dirección del cliente como dirección de la obra.

Ticket #92 -> Considerar la dirección fiscal de un cliente como dirección a elegir.

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

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm

@@ -172,6 +172,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
         Left = 0
         Top = 0
@@ -192,104 +196,101 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         ExplicitHeight = 378
         inherited ToolBar1: TToolBar
           Width = 751
-          Height = 51
+          Height = 46
           ExplicitWidth = 751
-          ExplicitHeight = 51
+          ExplicitHeight = 46
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
+            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
           inherited ToolButton14: TToolButton
-            Left = 334
+            Left = 0
-            Top = 0
             Wrap = False
-            ExplicitLeft = 334
+            ExplicitLeft = 0
-            ExplicitTop = 0
           end
           inherited FontName: TJvFontComboBox
-            Left = 399
+            Left = 65
-            Top = 0
+            Top = 22
-            ExplicitLeft = 399
+            ExplicitLeft = 65
-            ExplicitTop = 0
+            ExplicitTop = 22
           end
           inherited FontSize: TEdit
-            Left = 544
+            Left = 210
-            Top = 0
+            Top = 22
-            ExplicitLeft = 544
+            ExplicitLeft = 210
-            ExplicitTop = 0
+            ExplicitTop = 22
           end
-          inherited ToolButton13: TToolButton [7]
+          inherited UpDown1: TUpDown
-            Left = 0
+            Left = 252
-            Top = 0
+            Top = 22
-            Wrap = True
+            ExplicitLeft = 252
-            ExplicitLeft = 0
+            ExplicitTop = 22
-            ExplicitTop = 0
-            ExplicitHeight = 27
           end
-          inherited UpDown1: TUpDown [8]
+          inherited ToolButton13: TToolButton
-            Left = 0
+            Left = 269
-            Top = 27
+            Top = 22
-            ExplicitLeft = 0
+            ExplicitLeft = 269
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton6: TToolButton
-            Left = 17
+            Left = 277
-            Top = 27
+            Top = 22
-            ExplicitLeft = 17
+            ExplicitLeft = 277
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton7: TToolButton
-            Left = 83
+            Left = 343
-            Top = 27
+            Top = 22
-            ExplicitLeft = 83
+            ExplicitLeft = 343
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton8: TToolButton
-            Left = 150
+            Left = 410
-            Top = 27
+            Top = 22
-            ExplicitLeft = 150
+            ExplicitLeft = 410
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton12: TToolButton
-            Left = 233
+            Left = 493
-            Top = 27
+            Top = 22
-            ExplicitLeft = 233
+            ExplicitLeft = 493
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton9: TToolButton
-            Left = 241
+            Left = 501
-            Top = 27
+            Top = 22
-            ExplicitLeft = 241
+            ExplicitLeft = 501
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton10: TToolButton
-            Left = 386
+            Left = 646
-            Top = 27
+            Top = 22
-            ExplicitLeft = 386
+            ExplicitLeft = 646
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton11: TToolButton
-            Left = 511
+            Left = 771
-            Top = 27
+            Top = 22
-            ExplicitLeft = 511
+            ExplicitLeft = 771
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 77
+          Top = 72
           Width = 751
-          Height = 301
+          Height = 306
           ExplicitTop = 77
           ExplicitWidth = 751
           ExplicitHeight = 301
         end
         inherited TBXDock1: TTBXDock
-          Top = 51
+          Top = 46
           Width = 751
           ExplicitTop = 51
           ExplicitWidth = 751
@@ -311,6 +312,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
@@ -412,7 +417,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       inherited ImporteDto: TcxDBCurrencyEdit
         Left = 164
         Top = 112
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 164
         ExplicitTop = 112
         ExplicitWidth = 188
@@ -422,7 +431,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 555
         Top = 38
         DataBinding.DataField = ''
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 555
         ExplicitTop = 38
         ExplicitWidth = 182
@@ -431,7 +444,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       inherited ImporteTotal: TcxDBCurrencyEdit
         Left = 485
         Top = 112
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 485
         ExplicitTop = 112
         ExplicitWidth = 252
@@ -440,7 +457,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       inherited edtDescuento: TcxDBSpinEdit
         Left = 93
         Top = 112
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 112
       end
@@ -448,14 +469,22 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 484
         Top = 38
         DataBinding.DataField = ''
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 484
         ExplicitTop = 38
       end
       inherited ImporteBase: TcxDBCurrencyEdit
         Left = 484
         Top = 11
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 484
         ExplicitTop = 11
         ExplicitWidth = 253
@@ -465,7 +494,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 484
         Top = 65
         DataBinding.DataField = ''
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 484
         ExplicitTop = 65
       end
@@ -473,7 +506,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 555
         Top = 65
         DataBinding.DataField = ''
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 555
         ExplicitTop = 65
         ExplicitWidth = 182
@@ -482,7 +519,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
       inherited eImporteNeto: TcxDBCurrencyEdit
         Left = 93
         Top = 11
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 11
         ExplicitWidth = 259
@@ -492,7 +533,11 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 93
         Top = 139
         Properties.OnValidate = frViewTotales1ePortePropertiesValidate
+        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 139
         ExplicitWidth = 259
@@ -502,6 +547,10 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Left = 93
         Top = 38
         DataBinding.DataField = ''
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 38
         ExplicitWidth = 121
@@ -518,9 +567,14 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         Top = 65
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 65
         ExplicitWidth = 259
+        ExplicitHeight = 0
         Width = 259
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas

@@ -265,7 +265,7 @@ begin
                 ADireccion := FAlbaran.Cliente.Direcciones;
               end
         else begin
-          ADireccion := AClientesController.ElegirDireccionEntrega(FAlbaran.Cliente.Direcciones, 'Seleccione la dirección del cliente que quiere utilizar como dirección de envio de este albaran.');
+          ADireccion := AClientesController.ElegirDireccionEntrega(FAlbaran.Cliente, 'Seleccione la dirección del cliente que quiere utilizar como dirección de envio de este albaran.');
         end;
       end;
 

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm

@@ -41,16 +41,20 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.Shadow = False
       Style.ButtonStyle = bts3D
       Style.ButtonTransparency = ebtNone
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 2
       Width = 336
     end
@@ -65,9 +69,13 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.BorderStyle = ebs3D
       Style.HotTrack = False
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 21
       Height = 141
       Width = 399
@@ -87,14 +95,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.Color = clMenuBar
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 0
       Width = 336
     end
@@ -119,29 +131,53 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 399
         Align = alTop
-        ExplicitWidth = 360
+        ExplicitWidth = 399
         inherited edtlNombre: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 325
           Width = 325
         end
         inherited edtNIFCIF: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 325
           Width = 325
         end
         inherited edtCalle: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 325
           Width = 325
         end
         inherited edtPoblacion: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 207
           Width = 207
         end
         inherited edtProvincia: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 325
           Width = 325
         end
         inherited edtCodigoPostal: TcxDBTextEdit
           Left = 307
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 307
         end
         inherited Button3: TBitBtn
@@ -176,12 +212,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 8
       Width = 336
     end
@@ -195,12 +235,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 10
       Width = 65
     end
@@ -215,12 +259,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 12
       Width = 336
     end
@@ -234,12 +282,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 13
       Width = 336
     end
@@ -273,13 +325,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 5
       Width = 198
     end
@@ -302,14 +358,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.ButtonStyle = bts3D
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 3
       Width = 198
     end
@@ -336,14 +396,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.ButtonStyle = bts3D
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 20
       Width = 265
     end
@@ -375,14 +439,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.ButtonStyle = bts3D
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 16
       Width = 235
     end
@@ -401,14 +469,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.Color = clMenuBar
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 7
       Width = 336
     end
@@ -426,16 +498,20 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.Shadow = False
       Style.ButtonStyle = bts3D
       Style.ButtonTransparency = ebtNone
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 18
       Width = 265
     end
@@ -453,14 +529,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.Color = clMenuBar
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 1
       Width = 336
     end
@@ -478,14 +558,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.ButtonStyle = bts3D
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 19
       Width = 265
     end
@@ -503,14 +587,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.ButtonStyle = bts3D
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 9
       Width = 235
     end
@@ -528,14 +616,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.ButtonStyle = bts3D
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 11
       Width = 336
     end

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas

@@ -166,7 +166,7 @@ begin
   AClientesController := TClientesController.Create;
   AAlbaranController := TAlbaranesClienteController.Create;
   try
-    ADireccion := AClientesController.ElegirDireccionEntrega(FAlbaran.Cliente.Direcciones, 
+    ADireccion := AClientesController.ElegirDireccionEntrega(FAlbaran.Cliente, 
       'Seleccione la dirección del cliente que quiere utilizar como dirección de envio de este albaran.');
     if Assigned(ADireccion) then
     begin
@@ -175,6 +175,7 @@ begin
       FAlbaran.IMPORTE_PORTE := ADireccion.PORTE;
     end;
   finally
+    ADireccion := NIL;
     AClientesController := NIL;
     AAlbaranController := NIL;
   end;

Source/Modulos/Contactos/Controller/View/uIEditorElegirDireccionEntrega.pas

@@ -3,14 +3,14 @@ unit uIEditorElegirDireccionEntrega;
 interface
 
 uses
-  uBizDireccionesContacto, uGUIBase;
+  uBizContactos, uBizDireccionesContacto, uGUIBase;
 
 type
   IEditorElegirDireccionEntrega = interface
     ['{AB909782-25E1-4715-B98A-EA62FB9DC03C}']
-    function GetDireccion: IBizDireccionesContacto;
+    function GetContacto: IBizContacto;
-    procedure SetDireccion(const Value: IBizDireccionesContacto);
+    procedure SetContacto(const Value: IBizContacto);
-    property Direccion: IBizDireccionesContacto read GetDireccion write SetDireccion;
+    property Contacto : IBizContacto read GetContacto write SetContacto;
 
     procedure SetMensaje (const AValue: String);
     function GetMensaje: String;

Source/Modulos/Contactos/Controller/uClientesController.pas

@@ -13,7 +13,7 @@ type
   ['{AAC3C51A-37F7-4961-B39F-FBC6B6A2B0F1}']
     function BuscarTodosTiendaWeb: IBizCliente;
     function TieneDatosBancarios(ACliente: IBizCliente) : Boolean;
-    function ElegirDireccionEntrega(ADirecciones: IBizDireccionesContacto; AMensaje: String): IBizDireccionesContacto;
+    function ElegirDireccionEntrega(ACliente: IBizCliente; AMensaje: String): IBizDireccionesContacto;
     function ElegirPersonaContacto(APersonal: IBizContactoPersonal; AMensaje: String): IBizContactoPersonal;
     function EsEliminable(ACliente: IBizContacto): Boolean;
     function Eliminar(ACliente: IBizContacto; AllItems: Boolean = false): Boolean; overload;
@@ -40,7 +40,7 @@ type
     function ElegirContacto(AContactos : IBizContacto;
       AMensaje: String; AMultiSelect: Boolean): IBizContacto; override;
     function TieneDatosBancarios(ACliente: IBizCliente) : Boolean;
-    function ElegirDireccionEntrega(ADirecciones: IBizDireccionesContacto;
+    function ElegirDireccionEntrega(ACliente: IBizCliente;
       AMensaje: String): IBizDireccionesContacto;
     function ElegirPersonaContacto(APersonal: IBizContactoPersonal;
       AMensaje: String): IBizContactoPersonal;
@@ -123,7 +123,7 @@ begin
   end;
 end;
 
-function TClientesController.ElegirDireccionEntrega(ADirecciones: IBizDireccionesContacto;
+function TClientesController.ElegirDireccionEntrega(ACliente: IBizCliente;
   AMensaje: String): IBizDireccionesContacto;
 var
   AEditor : IEditorElegirDireccionEntrega;
@@ -134,7 +134,7 @@ begin
   if Assigned(AEditor) then
   begin
     try
-      AEditor.Direccion := ADirecciones;
+      AEditor.Contacto := ACliente;
       AEditor.Mensaje := AMensaje;
       if IsPositiveResult(AEditor.ShowModal) then
         Result := AEditor.DireccionSeleccionada;

Source/Modulos/Contactos/Controller/uDireccionesContactoController.pas

@@ -13,6 +13,7 @@ type
     procedure CopiarDireccionFiscal(AContacto: IBizContacto; ADireccion: IBizDireccionesContacto; AAnadir : Boolean = True); 
     procedure Ver(ADireccion : IBizDireccionesContacto);
     function Localizar(ADirecciones: IBizDireccionesContacto; const ID : Integer): Boolean;
+    function Nuevo : IBizDireccionesContacto;
   end;
 
   TDireccionesContactoController = class(TControllerBase, IDireccionesContactoController)
@@ -22,6 +23,7 @@ type
     procedure CopiarDireccionFiscal(AContacto: IBizContacto; ADireccion: IBizDireccionesContacto; AAnadir : Boolean = True);
     procedure Ver(ADireccion : IBizDireccionesContacto);
     function Localizar(ADirecciones: IBizDireccionesContacto; const ID : Integer): Boolean;
+    function Nuevo : IBizDireccionesContacto;    
     constructor Create; override;
     destructor Destroy; override;
   end;
@@ -96,6 +98,16 @@ begin
   end;
 end;
 
+function TDireccionesContactoController.Nuevo: IBizDireccionesContacto;
+var
+  ADireccion : IBizDireccionesContacto;
+begin
+  ADireccion := FDataModule.NewDireccion;
+  ADireccion.DataTable.Active := True;
+  ADireccion.Insert;
+  Result := ADireccion;
+end;
+
 procedure TDireccionesContactoController.Ver(
   ADireccion: IBizDireccionesContacto);
 var

Source/Modulos/Contactos/Controller/uProveedoresController.pas

@@ -11,7 +11,7 @@ type
     ['{50F10D01-5120-470D-A61D-99FE8A76DF93}']
     function BuscarSubcontratas: IBizProveedor;    
     function BuscarTodosTiendaWeb: IBizProveedor;
-    function ElegirDireccionEntrega(ADirecciones: IBizDireccionesContacto; AMensaje: String): IBizDireccionesContacto;
+    function ElegirDireccionEntrega(AProveedor: IBizProveedor; AMensaje: String): IBizDireccionesContacto;
     function EsEliminable(AProveedor: IBizContacto): Boolean;
     function Eliminar(AProveedor: IBizContacto; AllItems: Boolean = false): Boolean; overload;
     procedure Preview(AProveedor : IBizProveedor; AllItems: Boolean = false);
@@ -36,7 +36,7 @@ type
     procedure VerTodos(AContactos: IBizContacto); override;
     function ElegirContacto(AContactos : IBizContacto;
       AMensaje: String; AMultiSelect: Boolean): IBizContacto; override;
-    function ElegirDireccionEntrega(ADirecciones: IBizDireccionesContacto;
+    function ElegirDireccionEntrega(AProveedor: IBizProveedor;
       AMensaje: String): IBizDireccionesContacto;
     function EsEliminable(AProveedor: IBizContacto): Boolean;
     function Eliminar(AProveedor: IBizContacto; AllItems: Boolean = false): Boolean; overload;
@@ -130,7 +130,7 @@ begin
   end;
 end;
 
-function TProveedoresController.ElegirDireccionEntrega(ADirecciones: IBizDireccionesContacto;
+function TProveedoresController.ElegirDireccionEntrega(AProveedor: IBizProveedor;
   AMensaje: String): IBizDireccionesContacto;
 var
   AEditor : IEditorElegirDireccionEntrega;
@@ -142,7 +142,7 @@ begin
     if Assigned(AEditor) then
        with AEditor do
        begin
-         Direccion := ADirecciones;
+         Contacto := AProveedor;
          Mensaje := AMensaje;
          if IsPositiveResult(ShowModal) then
            Result := DireccionSeleccionada;

Source/Modulos/Contactos/Data/uDataModuleContactos.pas

@@ -34,6 +34,7 @@ type
     function _GetDirecciones: IBizDireccionesContacto;
     function _GetItems (IDCategoria : Integer): IBizContacto; virtual;
     function _GetPersonal: IBizContactoPersonal;
+    function NewDireccion : IBizDireccionesContacto;    
 
     // Report
     function GetReport(const ListaID: TIntegerList): Binary;
@@ -72,6 +73,30 @@ begin
   end;
 end;
 
+function TDataModuleContactos.NewDireccion: IBizDireccionesContacto;
+var
+  Condicion: TDAWhereExpression;
+begin
+  ShowHourglassCursor;
+  try
+    Result := Self._GetDirecciones;
+
+    with Result.DataTable.DynamicWhere do
+    begin
+      // (ID = :ID)
+      Condicion := NewBinaryExpression(NewField('', fld_DireccionesContactoID), NewConstant(ID_NULO, datInteger), dboEqual);
+
+      if IsEmpty then
+         Expression := Condicion
+      else
+         Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
+    end;
+
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 function TDataModuleContactos._GetDatosBancarios: IBizContactosDatosBancarios;
 var
   ADatosBancarios : TDAMemDataTable;

Source/Modulos/Contactos/Model/Data/uIDataModuleContactos.pas

@@ -14,6 +14,7 @@ type
     function _GetDatosBancarios : IBizContactosDatosBancarios;
     function _GetDirecciones: IBizDireccionesContacto;
     function _GetPersonal: IBizContactoPersonal;
+    function NewDireccion : IBizDireccionesContacto;
   end;
 
 implementation

Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.dfm

@@ -2,13 +2,16 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
   Left = 227
   Top = 108
   BorderStyle = bsDialog
-  Caption = 'Elegir una direcciones de cliente'
+  Caption = 'Elegir una direcci'#243'n de cliente'
-  ClientHeight = 383
+  ClientHeight = 506
   ClientWidth = 599
   Color = clBtnFace
   ParentFont = True
   OldCreateOrder = True
   Position = poOwnerFormCenter
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
   object JvgWizardHeader1: TJvgWizardHeader
@@ -48,7 +51,7 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
   end
   inline frViewBarraSeleccion1: TfrViewBarraSeleccion
     Left = 0
-    Top = 334
+    Top = 457
     Width = 599
     Height = 49
     Align = alBottom
@@ -60,7 +63,7 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     ParentFont = False
     TabOrder = 0
     ReadOnly = False
-    ExplicitTop = 334
+    ExplicitTop = 457
     ExplicitWidth = 599
     inherited JvFooter1: TJvFooter
       Width = 599
@@ -85,10 +88,10 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     end
   end
   object DBCtrlGrid1: TDBCtrlGrid
-    Left = 8
+    Left = 45
-    Top = 66
+    Top = 214
-    Width = 583
+    Width = 539
-    Height = 261
+    Height = 241
     Margins.Left = 10
     Margins.Top = 10
     Margins.Right = 10
@@ -97,16 +100,15 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     AllowInsert = False
     Color = clBtnFace
     DataSource = dsDirecciones
-    PanelHeight = 87
+    PanelHeight = 80
-    PanelWidth = 566
+    PanelWidth = 522
     ParentColor = False
     TabOrder = 1
-    SelectedColor = clHighlight
     OnDblClick = DBCtrlGrid1DblClick
     object eCalle: TDBText
       Left = 48
-      Top = 28
+      Top = 25
-      Width = 512
+      Width = 472
       Height = 17
       DataField = 'CALLE'
       DataSource = dsDirecciones
@@ -121,8 +123,8 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     end
     object ePoblacion: TDBText
       Left = 70
-      Top = 47
+      Top = 42
-      Width = 277
+      Width = 251
       Height = 17
       DataField = 'POBLACION'
       DataSource = dsDirecciones
@@ -136,9 +138,9 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
       OnDblClick = ComponenteDblClick
     end
     object eTelefono: TDBText
-      Left = 423
+      Left = 383
-      Top = 66
+      Top = 59
-      Width = 137
+      Width = 130
       Height = 17
       DataField = 'TELEFONO'
       DataSource = dsDirecciones
@@ -152,9 +154,9 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
       OnDblClick = ComponenteDblClick
     end
     object eProvincia: TDBText
-      Left = 423
+      Left = 383
-      Top = 47
+      Top = 42
-      Width = 137
+      Width = 130
       Height = 17
       DataField = 'PROVINCIA'
       DataSource = dsDirecciones
@@ -169,8 +171,8 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     end
     object ePersonaContacto: TDBText
       Left = 124
-      Top = 66
+      Top = 59
-      Width = 284
+      Width = 261
       Height = 17
       DataField = 'PERSONA_CONTACTO'
       DataSource = dsDirecciones
@@ -200,9 +202,9 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
       OnDblClick = ComponenteDblClick
     end
     object eCodigoPostal: TDBText
-      Left = 353
+      Left = 327
-      Top = 47
+      Top = 42
-      Width = 64
+      Width = 50
       Height = 17
       DataField = 'CODIGO_POSTAL'
       DataSource = dsDirecciones
@@ -217,31 +219,240 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
     end
     object Label1: TLabel
       Left = 15
-      Top = 28
+      Top = 25
       Width = 27
       Height = 13
       Caption = 'Calle:'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
       OnDblClick = ComponenteDblClick
     end
     object Label2: TLabel
       Left = 15
-      Top = 47
+      Top = 42
       Width = 49
       Height = 13
       Caption = 'Poblaci'#243'n:'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
       OnDblClick = ComponenteDblClick
     end
     object Label4: TLabel
       Left = 15
-      Top = 66
+      Top = 59
       Width = 103
       Height = 13
       Caption = 'Persona de contacto:'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
       OnDblClick = ComponenteDblClick
     end
   end
+  object rdxDestino1: TRadioButton
+    Left = 16
+    Top = 77
+    Width = 335
+    Height = 17
+    Action = actDirSocial
+    TabOrder = 2
+    TabStop = True
+  end
+  object RadioButton1: TRadioButton
+    Left = 16
+    Top = 193
+    Width = 335
+    Height = 17
+    Action = actOtro
+    TabOrder = 3
+    TabStop = True
+  end
+  object pnlDirSocial: TPanel
+    Left = 45
+    Top = 97
+    Width = 520
+    Height = 81
+    Color = clWindow
+    ParentBackground = False
+    TabOrder = 4
+    object DBText1: TDBText
+      Left = 8
+      Top = 5
+      Width = 497
+      Height = 17
+      DataField = 'NOMBRE'
+      DataSource = dsContacto
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      Transparent = True
+    end
+    object Label3: TLabel
+      Left = 13
+      Top = 23
+      Width = 27
+      Height = 13
+      Caption = 'Calle:'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
+    end
+    object DBText2: TDBText
+      Left = 46
+      Top = 23
+      Width = 465
+      Height = 17
+      DataField = 'CALLE'
+      DataSource = dsContacto
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      Transparent = True
+    end
+    object Label5: TLabel
+      Left = 13
+      Top = 40
+      Width = 49
+      Height = 13
+      Caption = 'Poblaci'#243'n:'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
+    end
+    object DBText3: TDBText
+      Left = 68
+      Top = 40
+      Width = 251
+      Height = 17
+      DataField = 'POBLACION'
+      DataSource = dsContacto
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      Transparent = True
+    end
+    object DBText4: TDBText
+      Left = 325
+      Top = 40
+      Width = 50
+      Height = 17
+      DataField = 'CODIGO_POSTAL'
+      DataSource = dsContacto
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      Transparent = True
+    end
+    object DBText5: TDBText
+      Left = 381
+      Top = 40
+      Width = 130
+      Height = 17
+      DataField = 'PROVINCIA'
+      DataSource = dsContacto
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      Transparent = True
+    end
+    object DBText7: TDBText
+      Left = 381
+      Top = 57
+      Width = 130
+      Height = 17
+      DataField = 'TELEFONO_1'
+      DataSource = dsContacto
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      Transparent = True
+    end
+    object Label6: TLabel
+      Left = 13
+      Top = 57
+      Width = 103
+      Height = 13
+      Caption = 'Persona de contacto:'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
+    end
+    object DBText6: TDBText
+      Left = 122
+      Top = 57
+      Width = 261
+      Height = 17
+      DataField = 'PERSONA_CONTACTO'
+      DataSource = dsContacto
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      Transparent = True
+    end
+  end
   object dsDirecciones: TDADataSource
-    Left = 24
+    Left = 16
-    Top = 286
+    Top = 222
+  end
+  object ActionList1: TActionList
+    Left = 16
+    Top = 104
+    object actDirSocial: TAction
+      Caption = 'Utilizar la direcci'#243'n social del cliente:'
+      Checked = True
+      GroupIndex = 1
+      OnExecute = actDirSocialExecute
+    end
+    object actOtro: TAction
+      Caption = 'Utilizar la siguiente direcci'#243'n del cliente'
+      GroupIndex = 1
+      OnExecute = actOtroExecute
+      OnUpdate = actOtroUpdate
+    end
+  end
+  object dsContacto: TDADataSource
+    Left = 16
+    Top = 134
   end
 end

Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.pas

@@ -5,9 +5,10 @@ interface
 uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
   Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit,
-  uIEditorElegirDireccionEntrega, uCustomView,
+  uIEditorElegirDireccionEntrega, uCustomView, uBizContactos,
   uViewBase, uViewBarraSeleccion, JvExControls, JvComponent, JvgWizardHeader,
-  DBCGrids, uBizDireccionesContacto, uDAInterfaces;
+  DBCGrids, uBizDireccionesContacto, uDAInterfaces, ActnList,
+  uDireccionesContactoController;
 
 type
   TfEditorElegirDireccionEntrega = class(TForm, IEditorElegirDireccionEntrega)
@@ -25,32 +26,58 @@ type
     Label1: TLabel;
     Label2: TLabel;
     Label4: TLabel;
+    rdxDestino1: TRadioButton;
+    RadioButton1: TRadioButton;
+    ActionList1: TActionList;
+    actDirSocial: TAction;
+    actOtro: TAction;
+    dsContacto: TDADataSource;
+    pnlDirSocial: TPanel;
+    DBText1: TDBText;
+    Label3: TLabel;
+    DBText2: TDBText;
+    Label5: TLabel;
+    DBText3: TDBText;
+    DBText4: TDBText;
+    DBText5: TDBText;
+    DBText7: TDBText;
+    Label6: TLabel;
+    DBText6: TDBText;
     procedure frViewBarraSeleccion1actSeleccionarExecute(Sender: TObject);
     procedure frViewBarraSeleccion1actCancelarExecute(Sender: TObject);
     procedure DBCtrlGrid1DblClick(Sender: TObject);
     procedure ComponenteDblClick(Sender: TObject);
-
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure actDirSocialExecute(Sender: TObject);
+    procedure actOtroExecute(Sender: TObject);
+    procedure actOtroUpdate(Sender: TObject);
   protected
     FDirecciones: IBizDireccionesContacto;
-    function GetDireccion: IBizDireccionesContacto;
+    FContacto : IBizContacto;
-    procedure SetDireccion(const Value: IBizDireccionesContacto);
+    FDireccionesController : IDireccionesContactoController;
+    function GetContacto: IBizContacto;
+    procedure SetContacto(const Value: IBizContacto);
 
     procedure SetMensaje (const AValue: String);
     function GetMensaje: String;
 
     function GetDireccionSeleccionada: IBizDireccionesContacto;
+
+    procedure RefrescarEstado;
+  published
   public
     property Mensaje : String read GetMensaje write SetMensaje;
-    property Direccion: IBizDireccionesContacto read GetDireccion write SetDireccion;
+    property Contacto : IBizContacto read GetContacto write SetContacto;
     property DireccionSeleccionada: IBizDireccionesContacto read GetDireccionSeleccionada;
-
   end;
 
 implementation
 {$R *.dfm}
 
 uses
-  uDireccionesContactoController;
+  uStringsUtils;
 
 { TfEditorDireccionEntrega }
 
@@ -59,6 +86,53 @@ begin
   frViewBarraSeleccion1.actSeleccionar.Execute;
 end;
 
+procedure TfEditorElegirDireccionEntrega.FormCreate(Sender: TObject);
+begin
+  FDireccionesController := TDireccionesContactoController.Create;
+end;
+
+procedure TfEditorElegirDireccionEntrega.FormDestroy(Sender: TObject);
+begin
+  FDireccionesController := NIL;
+end;
+
+procedure TfEditorElegirDireccionEntrega.FormShow(Sender: TObject);
+begin
+  if Assigned(FContacto) then
+  begin
+    if Supports(FContacto, IBizCliente) then
+    begin
+      Caption := 'Elegir una dirección de cliente';
+      JvgWizardHeader1.Captions.Text := 'Seleccione una dirección de cliente';
+    end;
+    if Supports(FContacto, IBizProveedor) then
+    begin
+      Caption := 'Elegir una dirección de proveedor';
+      JvgWizardHeader1.Captions.Text := 'Seleccione una dirección de proveedor';
+    end;
+  end;
+
+  actDirSocial.Checked := True;
+  RefrescarEstado;
+end;
+
+procedure TfEditorElegirDireccionEntrega.actDirSocialExecute(Sender: TObject);
+begin
+  actDirSocial.Checked := True;
+  RefrescarEstado;
+end;
+
+procedure TfEditorElegirDireccionEntrega.actOtroExecute(Sender: TObject);
+begin
+  actOtro.Checked := True;
+  RefrescarEstado;
+end;
+
+procedure TfEditorElegirDireccionEntrega.actOtroUpdate(Sender: TObject);
+begin
+  (Sender as TAction).Enabled := (FDirecciones.RecordCount > 0)
+end;
+
 procedure TfEditorElegirDireccionEntrega.ComponenteDblClick(Sender: TObject);
 begin
   DBCtrlGrid1DblClick(Sender);
@@ -76,16 +150,45 @@ begin
   ModalResult := mrOk;
 end;
 
-function TfEditorElegirDireccionEntrega.GetDireccion: IBizDireccionesContacto;
+function TfEditorElegirDireccionEntrega.GetContacto: IBizContacto;
 begin
-  Result := FDirecciones;
+  Result := FContacto;
 end;
 
 function TfEditorElegirDireccionEntrega.GetDireccionSeleccionada: IBizDireccionesContacto;
 begin
-  // Devuelvo el mismo objeto que recibo pero con el punto de lectura
+  Result := FDireccionesController.Nuevo;
-  // posicionado en la dirección elegida.
+  if actOtro.Checked then
-  Result := FDirecciones;
+  begin
+    with Result do
+    begin
+      NOMBRE := FDirecciones.NOMBRE;
+      CALLE := FDirecciones.CALLE;
+      POBLACION := FDirecciones.POBLACION;
+      CODIGO_POSTAL := FDirecciones.CODIGO_POSTAL;
+      PROVINCIA := FDirecciones.PROVINCIA;
+      TELEFONO := FDirecciones.TELEFONO;
+      FAX := FDirecciones.FAX;
+      MOVIL := FDirecciones.MOVIL;
+      EMAIL := FDirecciones.EMAIL;
+      PERSONA_CONTACTO := FDirecciones.PERSONA_CONTACTO;
+    end;
+  end
+  else begin
+    with Result do
+    begin
+      NOMBRE := FContacto.NOMBRE;
+      CALLE := FContacto.CALLE;
+      POBLACION := FContacto.POBLACION;
+      CODIGO_POSTAL := FContacto.CODIGO_POSTAL;
+      PROVINCIA := FContacto.PROVINCIA;
+      TELEFONO := FContacto.TELEFONO_1;
+      FAX := FContacto.FAX;
+      MOVIL := FContacto.MOVIL_1;
+      EMAIL := FContacto.EMAIL_1;
+      PERSONA_CONTACTO := FContacto.PERSONA_CONTACTO;
+    end;
+  end;
 end;
 
 function TfEditorElegirDireccionEntrega.GetMensaje: String;
@@ -93,18 +196,47 @@ begin
   Result := JvgWizardHeader1.Comments.Text;
 end;
 
-procedure TfEditorElegirDireccionEntrega.SetDireccion(const Value: IBizDireccionesContacto);
+procedure TfEditorElegirDireccionEntrega.RefrescarEstado;
 begin
-  FDirecciones := Value;
+  if (actOtro.Checked) then
-  if Assigned(FDirecciones) then
+  begin
-    dsDirecciones.DataTable := FDirecciones.DataTable
+    DBCtrlGrid1.Enabled := True;
-  else
+    DBCtrlGrid1.Color := clWindow;
+    pnlDirSocial.Enabled := False;
+    pnlDirSocial.Color := clBtnFace;
+  end;
+
+  if (actDirSocial.Checked) then
+  begin
+    DBCtrlGrid1.Enabled := False;
+    DBCtrlGrid1.Color := clBtnFace;
+    pnlDirSocial.Enabled := True;
+    pnlDirSocial.Color := clWindow;
+  end;
+end;
+
+procedure TfEditorElegirDireccionEntrega.SetContacto(const Value: IBizContacto);
+begin
+  FContacto := Value;
+  if Assigned(FContacto) then
+  begin
+    FDirecciones := FContacto.Direcciones;
+    dsContacto.DataTable := FContacto.DataTable;
+    dsDirecciones.DataTable := FDirecciones.DataTable;
+  end
+  else begin
+    FDirecciones := NIL;
     dsDirecciones.DataTable := NIL;
+    dsContacto.DataTable := NIL;
+  end;
 end;
 
 procedure TfEditorElegirDireccionEntrega.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  if not EsCadenaVacia(AValue) then
+    JvgWizardHeader1.Comments.Text := AValue
+  else
+    JvgWizardHeader1.Comments.Text := ' ';
 end;
 
 end.

Source/Modulos/Contactos/Views/uViewContacto.dfm

@@ -112,12 +112,16 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 3
       Width = 256
     end
@@ -134,14 +138,18 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.ButtonStyle = bts3D
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 4
       Width = 155
     end
@@ -158,14 +166,18 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       Style.ButtonStyle = bts3D
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 6
       Width = 256
     end
@@ -178,12 +190,16 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 5
       Width = 65
     end
@@ -197,12 +213,16 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 15
       Height = 86
       Width = 630
@@ -216,12 +236,16 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 9
       Width = 156
     end
@@ -234,12 +258,16 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 8
       Width = 156
     end
@@ -252,12 +280,16 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 10
       Width = 156
     end
@@ -270,12 +302,16 @@ inherited frViewContacto: TfrViewContacto
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 11
       Width = 156
     end
@@ -290,12 +326,16 @@ inherited frViewContacto: TfrViewContacto
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 2
       Width = 256
     end
@@ -309,12 +349,16 @@ inherited frViewContacto: TfrViewContacto
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 1
       Width = 104
     end
@@ -331,12 +375,16 @@ inherited frViewContacto: TfrViewContacto
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 12
       Width = 127
     end
@@ -353,12 +401,16 @@ inherited frViewContacto: TfrViewContacto
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 13
       Width = 127
     end
@@ -375,12 +427,16 @@ inherited frViewContacto: TfrViewContacto
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 14
       Width = 127
     end
@@ -396,13 +452,17 @@ inherited frViewContacto: TfrViewContacto
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 0
       Width = 99
     end
@@ -416,12 +476,16 @@ inherited frViewContacto: TfrViewContacto
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.Kind = lfStandard
       StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.Kind = lfStandard
       StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 7
       Width = 256
     end

Source/Modulos/Contactos/Views/uViewContacto.pas

@@ -109,7 +109,7 @@ type
     procedure SetController (const Value : IContactosController); virtual;
   public
     constructor Create(AOwner : TComponent); override;
-    destructor Destroy;
+    destructor Destroy; override;
     property Controller : IContactosController read GetController
       write SetController;
     property Contacto: IBizContacto read GetContacto write SetContacto;
@@ -245,6 +245,8 @@ begin
 
   if Assigned(FPoblaciones) then
     FreeANDNIL(FPoblaciones);
+
+  inherited;
 end;
 
 procedure TfrViewContacto.eMailTrabajoPropertiesEditValueChanged(Sender: TObject);

Source/Modulos/Gestion de documentos/Controller/GestorDocumentos_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Gestion de documentos\Controller\GestorDocumentos_Controller.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf285.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf498.tmp */

Source/Modulos/Gestion de documentos/Data/GestorDocumentos_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Gestion de documentos\Data\uDataModuleGestorDocumentos.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Gestion de documentos\Data\GestorDocumentos_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf283.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf496.tmp */

Source/Modulos/Obras/Views/uViewObra.dfm

@@ -1,24 +1,22 @@
 inherited frViewObra: TfrViewObra
-  Width = 841
+  Width = 451
-  Height = 487
+  Height = 304
   Align = alClient
   ExplicitWidth = 451
   ExplicitHeight = 304
   object dxLayoutControlObra: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 841
+    Width = 451
-    Height = 487
+    Height = 304
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
-    ExplicitWidth = 451
-    ExplicitHeight = 304
     DesignSize = (
-      841
+      451
-      487)
+      304)
     object eNombre: TcxDBTextEdit
       Left = 130
       Top = 34
@@ -171,7 +169,7 @@ inherited frViewObra: TfrViewObra
       Width = 203
     end
     object eCodigoPostal: TcxDBTextEdit
-      Left = 310
+      Left = 189
       Top = 145
       DataBinding.DataField = 'CODIGO_POSTAL'
       DataBinding.DataSource = DADataSource
@@ -247,7 +245,7 @@ inherited frViewObra: TfrViewObra
       Width = 224
     end
     inline frViewSubcontrataObra1: TfrViewSubcontrataObra
-      Left = 431
+      Left = 310
       Top = 283
       Width = 503
       Height = 159
@@ -259,7 +257,7 @@ inherited frViewObra: TfrViewObra
       ParentFont = False
       TabOrder = 11
       ReadOnly = False
-      ExplicitLeft = 431
+      ExplicitLeft = 310
       ExplicitTop = 283
       ExplicitWidth = 503
       ExplicitHeight = 159
@@ -312,16 +310,16 @@ inherited frViewObra: TfrViewObra
           Width = 375
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 296
+          Left = 249
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 296
+          ExplicitLeft = 249
         end
         inherited Button3: TBitBtn
-          Left = 155
+          Left = 108
-          ExplicitLeft = 155
+          ExplicitLeft = 108
         end
         inherited edtPersonaContacto: TcxDBTextEdit
           Style.LookAndFeel.SkinName = ''
@@ -332,12 +330,12 @@ inherited frViewObra: TfrViewObra
           Width = 375
         end
         inherited edtReferenciaAsignada: TcxDBTextEdit
-          Left = 257
+          Left = 210
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 257
+          ExplicitLeft = 210
         end
         inherited edtTlf: TcxDBTextEdit
           Style.LookAndFeel.SkinName = ''
@@ -362,7 +360,7 @@ inherited frViewObra: TfrViewObra
       end
     end
     inline frViewClienteAsociadoObra1: TfrViewClienteAsociadoObra
-      Left = 431
+      Left = 310
       Top = 34
       Width = 503
       Height = 213
@@ -374,7 +372,7 @@ inherited frViewObra: TfrViewObra
       ParentFont = False
       TabOrder = 10
       ReadOnly = False
-      ExplicitLeft = 431
+      ExplicitLeft = 310
       ExplicitTop = 34
       ExplicitWidth = 503
       ExplicitHeight = 213
@@ -424,16 +422,16 @@ inherited frViewObra: TfrViewObra
           Width = 429
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 296
+          Left = 192
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 296
+          ExplicitLeft = 192
         end
         inherited Button3: TBitBtn
-          Left = 186
+          Left = 82
-          ExplicitLeft = 186
+          ExplicitLeft = 82
         end
       end
     end

Source/Modulos/Obras/Views/uViewObra.pas

@@ -207,14 +207,12 @@ procedure TfrViewObra.OnClienteChanged(Sender: TObject);
 var
   AClientesController : IClientesController;
   ADireccion : IBizDireccionesContacto;
-  AVerMensaje : Boolean;
 begin
   if Assigned(FObra) then
   begin
     FObra.Edit;
     FObra.ID_CLIENTE := frViewClienteAsociadoObra1.ID_Cliente;
 
-    AVerMensaje := False;
     AClientesController := TClientesController.Create;
     try
     { // Esto podría ser configurable en el programa
@@ -224,14 +222,10 @@ begin
         case frViewClienteAsociadoObra1.Cliente.Direcciones.RecordCount of
           0   : begin
                   FController.CopiarDireccion(frViewClienteAsociadoObra1.Cliente, FObra);
-                  AVerMensaje := True;
+                  ShowInfoMessage('Dirección de la obra actualizada.', 'Se ha actualizado los datos de la dirección de la obra con los datos del cliente.');
                 end;
-          1   : begin
-                  FController.CopiarDireccion(frViewClienteAsociadoObra1.Cliente.Direcciones, FObra);
-                  AVerMensaje := True;
-                end
           else begin
-            ADireccion := AClientesController.ElegirDireccionEntrega(frViewClienteAsociadoObra1.Cliente.Direcciones, '');
+            ADireccion := AClientesController.ElegirDireccionEntrega(frViewClienteAsociadoObra1.Cliente, '');
             ShowHourglassCursor;
             try
               if Assigned(ADireccion) then
@@ -245,10 +239,6 @@ begin
     finally
       AClientesController := NIL;
     end;
-
-    if AVerMensaje then
-      ShowInfoMessage('Dirección de la obra actualizada.', 'Se ha actualizado los datos de la dirección de la obra con los datos del cliente.');
-
   end;
 end;
 

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm

@@ -179,6 +179,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
         Left = 0
         Top = 0
@@ -199,101 +203,103 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitHeight = 386
         inherited ToolBar1: TToolBar
           Width = 735
-          Height = 73
+          Height = 46
           ExplicitWidth = 735
-          ExplicitHeight = 73
+          ExplicitHeight = 46
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
+            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
           inherited ToolButton14: TToolButton
-            Left = 334
+            Left = 0
-            Top = 0
+            Wrap = False
-            ExplicitLeft = 334
+            ExplicitLeft = 0
-            ExplicitTop = 0
           end
           inherited FontName: TJvFontComboBox
+            Left = 65
             Top = 22
+            ExplicitLeft = 65
             ExplicitTop = 22
           end
           inherited FontSize: TEdit
+            Left = 210
             Top = 22
             Width = 200
+            ExplicitLeft = 210
             ExplicitTop = 22
             ExplicitWidth = 200
           end
           inherited UpDown1: TUpDown
-            Left = 345
+            Left = 410
             Top = 22
-            ExplicitLeft = 345
+            ExplicitLeft = 410
             ExplicitTop = 22
           end
           inherited ToolButton13: TToolButton
-            Left = 362
+            Left = 427
             Top = 22
-            ExplicitLeft = 362
+            ExplicitLeft = 427
             ExplicitTop = 22
           end
           inherited ToolButton6: TToolButton
-            Left = 370
+            Left = 435
             Top = 22
-            ExplicitLeft = 370
+            ExplicitLeft = 435
             ExplicitTop = 22
           end
           inherited ToolButton7: TToolButton
-            Left = 436
+            Left = 501
             Top = 22
-            ExplicitLeft = 436
+            ExplicitLeft = 501
             ExplicitTop = 22
           end
           inherited ToolButton8: TToolButton
-            Left = 503
+            Left = 568
             Top = 22
-            ExplicitLeft = 503
+            ExplicitLeft = 568
             ExplicitTop = 22
           end
           inherited ToolButton12: TToolButton
-            Left = 0
+            Left = 651
             Top = 22
-            Wrap = True
+            ExplicitLeft = 651
-            ExplicitLeft = 0
             ExplicitTop = 22
-            ExplicitHeight = 27
           end
           inherited ToolButton9: TToolButton
-            Left = 0
+            Left = 659
-            Top = 49
+            Top = 22
-            ExplicitLeft = 0
+            ExplicitLeft = 659
-            ExplicitTop = 49
+            ExplicitTop = 22
           end
           inherited ToolButton10: TToolButton
-            Left = 145
+            Left = 804
-            Top = 49
+            Top = 22
-            ExplicitLeft = 145
+            ExplicitLeft = 804
-            ExplicitTop = 49
+            ExplicitTop = 22
           end
           inherited ToolButton11: TToolButton
-            Left = 270
+            Left = 929
-            Top = 49
+            Top = 22
-            ExplicitLeft = 270
+            ExplicitLeft = 929
-            ExplicitTop = 49
+            ExplicitTop = 22
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 99
+          Top = 72
           Width = 735
-          Height = 287
+          Height = 314
           ExplicitTop = 72
           ExplicitWidth = 735
           ExplicitHeight = 314
         end
         inherited TBXDock1: TTBXDock
-          Top = 73
+          Top = 46
           Width = 735
           ExplicitTop = 46
           ExplicitWidth = 735
@@ -315,6 +321,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagPortada: TTabSheet
       Caption = 'Portada'
       ImageIndex = 3
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Panel1: TPanel
         Left = 0
         Top = 0
@@ -446,6 +456,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagMemoria: TTabSheet
       Caption = 'Memoria'
       ImageIndex = 4
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Panel2: TPanel
         Left = 0
         Top = 0
@@ -748,6 +762,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
@@ -1036,6 +1054,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitLeft = 93
         ExplicitTop = 65
         ExplicitWidth = 259
+        ExplicitHeight = 0
         Width = 259
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas

@@ -299,13 +299,8 @@ begin
                   FPresupuesto.Edit;
                   FPresupuesto.IMPORTE_PORTE := 0;
                 end;
-          1   : begin
-                  FController.CopiarDireccionEnvio(FPresupuesto.Cliente.Direcciones, FPresupuesto);
-                  FPresupuesto.Edit;
-                  FPresupuesto.IMPORTE_PORTE := FPresupuesto.Cliente.Direcciones.PORTE;
-                end
           else begin
-            ADireccion := AClientesController.ElegirDireccionEntrega(FPresupuesto.Cliente.Direcciones, '');
+            ADireccion := AClientesController.ElegirDireccionEntrega(FPresupuesto.Cliente, '');
             ShowHourglassCursor;
             try
               if Assigned(ADireccion) then
@@ -327,6 +322,7 @@ begin
            FController.DetallesController.ActualizarDetalles(FPresupuesto.Detalles, FPresupuesto.Cliente);
 
     finally
+      ADireccion := NIL;
       AClientesController := NIL;
     end;
   end;

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm

@@ -2,6 +2,7 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente
   Caption = 'Lista de presupuestos de cliente'
   ClientWidth = 674
   ExplicitWidth = 682
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm

@@ -318,7 +318,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
         Width = 494
         Height = 245
         ExplicitWidth = 494
-        ExplicitHeight = 117
+        ExplicitHeight = 245
         inherited edtlNombre: TcxDBTextEdit
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
@@ -372,6 +372,12 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
           ExplicitLeft = 292
         end
         inherited edtPersonaContacto: TcxDBButtonEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 494
+          Width = 494
         end
       end
     end

Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.pas

@@ -107,7 +107,7 @@ begin
   AClientesController := TClientesController.Create;
   APresupuestoController := TPresupuestosClienteController.Create;
   try
-    ADireccion := AClientesController.ElegirDireccionEntrega(FPresupuesto.Cliente.Direcciones, 
+    ADireccion := AClientesController.ElegirDireccionEntrega(FPresupuesto.Cliente, 
       'Seleccione la dirección del cliente que quiere utilizar como dirección de envio de este presupuesto.');
     if Assigned(ADireccion) then
     begin
@@ -116,6 +116,7 @@ begin
       FPresupuesto.IMPORTE_PORTE := ADireccion.PORTE;
     end;
   finally
+    ADireccion := NIL;
     AClientesController := NIL;
     APresupuestoController := NIL;
   end;

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.2.4.0\0"
               VALUE "ProductVersion", "1.2.4.0\0"
-              VALUE "CompileDate", "martes, 02 de septiembre de 2008 17:41\0"
+              VALUE "CompileDate", "martes, 02 de septiembre de 2008 20:39\0"
          END
     END
     BLOCK "VarFileInfo"