diff --git a/Source/ApplicationBase/ApplicationBase.dpk b/Source/ApplicationBase/ApplicationBase.dpk
index 235a8d9d..114e64a2 100644
--- a/Source/ApplicationBase/ApplicationBase.dpk
+++ b/Source/ApplicationBase/ApplicationBase.dpk
@@ -65,11 +65,11 @@ contains
   uIEditorEmpresas in 'Empresas\Controller\View\uIEditorEmpresas.pas',
   uIEditorDatosBancarioEmpresa in 'Empresas\Controller\View\uIEditorDatosBancarioEmpresa.pas',
   uIEditorEmpresa in 'Empresas\Controller\View\uIEditorEmpresa.pas',
-  uViewEmpresa in 'Empresas\Views\uViewEmpresa.pas',
+  uViewEmpresa in 'Empresas\Views\uViewEmpresa.pas' {frViewEmpresa: TFrame},
   uEditorDatosBancariosEmpresa in 'Empresas\Views\uEditorDatosBancariosEmpresa.pas',
   uEditorEmpresa in 'Empresas\Views\uEditorEmpresa.pas',
   uEmpresasViewRegister in 'Empresas\Views\uEmpresasViewRegister.pas',
-  uViewDatosBancarios in 'Empresas\Views\uViewDatosBancarios.pas',
+  uViewDatosBancarios in 'Empresas\Views\uViewDatosBancarios.pas' {frViewDatosBancarios: TFrame},
   uBizUsuarios in 'Usuarios\Model\uBizUsuarios.pas',
   schUsuariosServer_Intf in 'Usuarios\Model\schUsuariosServer_Intf.pas',
   schUsuariosClient_Intf in 'Usuarios\Model\schUsuariosClient_Intf.pas',
diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj
index c48ad70c..46139f45 100644
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@@ -52,6 +52,20 @@
       
       
       
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
@@ -67,27 +81,27 @@
     <DelphiCompile Include="ApplicationBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Articulos\Base.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\designide.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\GUIBase.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\JvJansD11R.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\PLuginSDK_D10R.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Articulos\xmlrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Base.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\designide.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\GUIBase.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvJansD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\PLuginSDK_D10R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\xmlrtl.dcp" />
     <DCCReference Include="Empresas\Controller\uDatosBancariosEmpresaController.pas" />
     <DCCReference Include="Empresas\Controller\uEmpresasController.pas" />
     <DCCReference Include="Empresas\Controller\View\uIEditorDatosBancarioEmpresa.pas" />
@@ -104,8 +118,14 @@
     <DCCReference Include="Empresas\Views\uEditorDatosBancariosEmpresa.pas" />
     <DCCReference Include="Empresas\Views\uEditorEmpresa.pas" />
     <DCCReference Include="Empresas\Views\uEmpresasViewRegister.pas" />
-    <DCCReference Include="Empresas\Views\uViewDatosBancarios.pas" />
-    <DCCReference Include="Empresas\Views\uViewEmpresa.pas" />
+    <DCCReference Include="Empresas\Views\uViewDatosBancarios.pas">
+      <Form>frViewDatosBancarios</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Empresas\Views\uViewEmpresa.pas">
+      <Form>TfrViewEmpresa</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
     <DCCReference Include="ProvinciasPoblaciones\Controller\uProvinciasPoblacionesController.pas" />
     <DCCReference Include="ProvinciasPoblaciones\Data\uDataModuleProvinciasPoblaciones.pas">
       <Form>DataModuleProvinciasPoblaciones</Form>
diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res
index 8b251f31..1641339f 100644
Binary files a/Source/ApplicationBase/ApplicationBase.res and b/Source/ApplicationBase/ApplicationBase.res differ
diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
index 7f37cfc9..b8eb6259 100644
--- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
@@ -124,22 +124,10 @@ inherited fEditorEmpresa: TfEditorEmpresa
             ExplicitWidth = 234
             Width = 234
           end
-          inherited eProvincia: TcxDBTextEdit
-            Top = 294
-            ExplicitTop = 294
-            ExplicitWidth = 234
-            Width = 234
-          end
-          inherited ePoblacion: TcxDBTextEdit
-            Top = 267
-            ExplicitTop = 267
-            ExplicitWidth = 99
-            Width = 99
-          end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 286
+            Left = 278
             Top = 267
-            ExplicitLeft = 286
+            ExplicitLeft = 278
             ExplicitTop = 267
           end
           inherited ePaginaWeb: TcxDBTextEdit
@@ -246,6 +234,19 @@ inherited fEditorEmpresa: TfEditorEmpresa
             Top = 189
             ExplicitTop = 189
           end
+          inherited cbProvincia: TcxDBComboBox
+            Top = 267
+            ExplicitTop = 267
+            ExplicitWidth = 91
+            Width = 91
+          end
+          inherited cbPoblacion: TcxDBComboBox
+            Top = 294
+            Properties.OnInitPopup = nil
+            ExplicitTop = 294
+            ExplicitWidth = 234
+            Width = 234
+          end
         end
       end
     end
@@ -271,24 +272,12 @@ inherited fEditorEmpresa: TfEditorEmpresa
         inherited cxGrid: TcxGrid
           Width = 660
           Height = 400
-          ExplicitWidth = 666
-          ExplicitHeight = 406
+          ExplicitWidth = 660
+          ExplicitHeight = 400
         end
         inherited ToolBar1: TToolBar
           Width = 660
-          ExplicitWidth = 666
-          inherited ToolButton1: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton4: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton2: TToolButton
-            ExplicitWidth = 113
-          end
-          inherited ToolButton7: TToolButton
-            ExplicitWidth = 113
-          end
+          ExplicitWidth = 660
         end
       end
     end
diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
index 8ca52619..7ef114d4 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
@@ -1,13 +1,13 @@
 inherited frViewEmpresa: TfrViewEmpresa
   Width = 734
-  Height = 442
+  Height = 548
   ExplicitWidth = 734
-  ExplicitHeight = 442
+  ExplicitHeight = 548
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
     Width = 734
-    Height = 442
+    Height = 548
     Align = alClient
     ParentBackground = True
     TabOrder = 0
@@ -31,7 +31,7 @@ inherited frViewEmpresa: TfrViewEmpresa
     end
     object eCalle: TcxDBTextEdit
       Left = 117
-      Top = 272
+      Top = 250
       DataBinding.DataField = 'CALLE'
       DataBinding.DataSource = DADataSource
       Style.BorderColor = clWindowFrame
@@ -45,47 +45,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 6
-      Width = 324
-    end
-    object eProvincia: TcxDBTextEdit
-      Left = 117
-      Top = 326
-      DataBinding.DataField = 'PROVINCIA'
-      DataBinding.DataSource = DADataSource
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
-      Width = 324
-    end
-    object ePoblacion: TcxDBTextEdit
-      Left = 117
-      Top = 299
-      DataBinding.DataField = 'POBLACION'
-      DataBinding.DataSource = DADataSource
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
-      Width = 189
+      Width = 223
     end
     object eCodigoPostal: TcxDBTextEdit
-      Left = 376
-      Top = 299
+      Left = 267
+      Top = 277
       DataBinding.DataField = 'CODIGO_POSTAL'
       DataBinding.DataSource = DADataSource
       Style.BorderColor = clWindowFrame
@@ -99,10 +63,10 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 8
-      Width = 65
+      Width = 73
     end
     object ePaginaWeb: TcxDBTextEdit
-      Left = 566
+      Left = 465
       Top = 220
       DataBinding.DataField = 'PAGINA_WEB'
       DataBinding.DataSource = DADataSource
@@ -117,10 +81,10 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 17
-      Width = 146
+      Width = 247
     end
     object eMailParticular: TcxDBTextEdit
-      Left = 566
+      Left = 465
       Top = 193
       DataBinding.DataField = 'EMAIL_2'
       DataBinding.DataSource = DADataSource
@@ -135,10 +99,10 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 16
-      Width = 146
+      Width = 247
     end
     object eMailTrabajo: TcxDBTextEdit
-      Left = 566
+      Left = 465
       Top = 166
       DataBinding.DataField = 'EMAIL_1'
       DataBinding.DataSource = DADataSource
@@ -153,11 +117,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 15
-      Width = 146
+      Width = 247
     end
     object cxDBMemo1: TcxDBMemo
       Left = 22
-      Top = 383
+      Top = 361
       DataBinding.DataField = 'NOTAS'
       DataBinding.DataSource = DADataSource
       Style.BorderColor = clWindowFrame
@@ -171,11 +135,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 10
-      Height = 29
-      Width = 419
+      Height = 75
+      Width = 318
     end
     object eTlfParticular: TcxDBTextEdit
-      Left = 566
+      Left = 465
       Top = 55
       DataBinding.DataField = 'TELEFONO_2'
       DataBinding.DataSource = DADataSource
@@ -190,10 +154,10 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 12
-      Width = 146
+      Width = 247
     end
     object eTlfTrabajo: TcxDBTextEdit
-      Left = 566
+      Left = 465
       Top = 28
       DataBinding.DataField = 'TELEFONO_1'
       DataBinding.DataSource = DADataSource
@@ -208,10 +172,10 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 11
-      Width = 146
+      Width = 247
     end
     object eTlfMovil: TcxDBTextEdit
-      Left = 566
+      Left = 465
       Top = 82
       DataBinding.DataField = 'MOVIL_1'
       DataBinding.DataSource = DADataSource
@@ -226,10 +190,10 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 13
-      Width = 146
+      Width = 247
     end
     object eFax: TcxDBTextEdit
-      Left = 566
+      Left = 465
       Top = 109
       DataBinding.DataField = 'FAX'
       DataBinding.DataSource = DADataSource
@@ -244,7 +208,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 14
-      Width = 146
+      Width = 247
     end
     object eNombre: TcxDBTextEdit
       Left = 117
@@ -263,7 +227,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 0
-      Width = 324
+      Width = 223
     end
     object eNIFCIF: TcxDBTextEdit
       Left = 117
@@ -282,7 +246,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 1
-      Width = 324
+      Width = 223
     end
     object memRegistroMercantil: TcxDBMemo
       Left = 117
@@ -302,7 +266,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 2
       Height = 48
-      Width = 324
+      Width = 223
     end
     object cxDBSpinEdit1: TcxDBSpinEdit
       Left = 117
@@ -325,7 +289,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       Width = 60
     end
     object cxDBImage1: TcxDBImage
-      Left = 471
+      Left = 370
       Top = 277
       DataBinding.DataField = 'LOGOTIPO'
       DataBinding.DataSource = DADataSource
@@ -338,12 +302,12 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 18
-      Height = 143
-      Width = 212
+      Height = 249
+      Width = 313
     end
     object eParamMargen: TcxDBSpinEdit
       Left = 117
-      Top = 215
+      Top = 193
       DataBinding.DataField = 'PARAM_MARGEN'
       DataBinding.DataSource = DADataSource
       Properties.OnValidate = eParamMargenPropertiesValidate
@@ -364,7 +328,7 @@ inherited frViewEmpresa: TfrViewEmpresa
     end
     object eParamTiempo: TcxDBCurrencyEdit
       Left = 240
-      Top = 215
+      Top = 193
       DataBinding.DataField = 'PARAM_TIEMPO'
       DataBinding.DataSource = DADataSource
       Properties.Alignment.Horz = taRightJustify
@@ -383,6 +347,55 @@ inherited frViewEmpresa: TfrViewEmpresa
       TabOrder = 5
       Width = 100
     end
+    object cbProvincia: TcxDBComboBox
+      Left = 117
+      Top = 277
+      DataBinding.DataField = 'PROVINCIA'
+      DataBinding.DataSource = DADataSource
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.PostPopupValueOnTab = True
+      Properties.OnInitPopup = cbProvinciaPropertiesInitPopup
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 7
+      Width = 80
+    end
+    object cbPoblacion: TcxDBComboBox
+      Left = 117
+      Top = 304
+      DataBinding.DataField = 'POBLACION'
+      DataBinding.DataSource = DADataSource
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.PostPopupValueOnTab = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 9
+      Width = 223
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -397,7 +410,6 @@ inherited frViewEmpresa: TfrViewEmpresa
         object dxLayoutControl1Group1: TdxLayoutGroup
           AutoAligns = []
           AlignHorz = ahClient
-          AlignVert = avClient
           Caption = 'Datos generales'
           object dxLayoutControl1Item13: TdxLayoutItem
             Caption = 'Nombre:'
@@ -447,25 +459,34 @@ inherited frViewEmpresa: TfrViewEmpresa
           object dxLayoutControl1Group8: TdxLayoutGroup
             ShowCaption = False
             Hidden = True
-            LayoutDirection = ldHorizontal
             ShowBorder = False
+            object dxLayoutControl1Group15: TdxLayoutGroup
+              ShowCaption = False
+              Hidden = True
+              LayoutDirection = ldHorizontal
+              ShowBorder = False
+              object dxLayoutControl1Item22: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Caption = 'Provincia:'
+                Control = cbProvincia
+                ControlOptions.ShowBorder = False
+              end
+              object dxLayoutControl1Item4: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahRight
+                Caption = 'C'#243'd. postal:'
+                Control = eCodigoPostal
+                ControlOptions.ShowBorder = False
+              end
+            end
             object dxLayoutControl1Item3: TdxLayoutItem
               AutoAligns = [aaVertical]
               AlignHorz = ahClient
               Caption = 'Poblaci'#243'n:'
-              Control = ePoblacion
+              Control = cbPoblacion
               ControlOptions.ShowBorder = False
             end
-            object dxLayoutControl1Item4: TdxLayoutItem
-              Caption = 'C'#243'd. postal:'
-              Control = eCodigoPostal
-              ControlOptions.ShowBorder = False
-            end
-          end
-          object dxLayoutControl1Item2: TdxLayoutItem
-            Caption = 'Provincia:'
-            Control = eProvincia
-            ControlOptions.ShowBorder = False
           end
         end
         object dxLayoutControl1Group7: TdxLayoutGroup
diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas
index adaa9308..91ee2960 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas
+++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas
@@ -15,7 +15,8 @@ uses
   dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black,
   dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
   dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters,
-  dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter, cxCurrencyEdit;
+  dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter, cxCurrencyEdit,
+  cxGraphics, cxDropDownEdit;
 
 type
   IViewEmpresa = interface(IViewBase)
@@ -38,10 +39,6 @@ type
     dxLayoutControl1Group7: TdxLayoutGroup;
     dxLayoutControl1Item1: TdxLayoutItem;
     eCalle: TcxDBTextEdit;
-    dxLayoutControl1Item2: TdxLayoutItem;
-    eProvincia: TcxDBTextEdit;
-    dxLayoutControl1Item3: TdxLayoutItem;
-    ePoblacion: TcxDBTextEdit;
     dxLayoutControl1Item4: TdxLayoutItem;
     eCodigoPostal: TcxDBTextEdit;
     dxLayoutControl1Item5: TdxLayoutItem;
@@ -69,7 +66,6 @@ type
     dxLayoutControl1Group10: TdxLayoutGroup;
     dxLayoutControl1Group9: TdxLayoutGroup;
     dxLayoutControl1Group11: TdxLayoutGroup;
-    dxLayoutControl1Group8: TdxLayoutGroup;
     cxDBSpinEdit1: TcxDBSpinEdit;
     dxLayoutControl1Item16: TdxLayoutItem;
     ActionList1: TActionList;
@@ -89,6 +85,12 @@ type
     eParamMargen: TcxDBSpinEdit;
     dxLayoutControl1Item21: TdxLayoutItem;
     eParamTiempo: TcxDBCurrencyEdit;
+    dxLayoutControl1Item22: TdxLayoutItem;
+    cbProvincia: TcxDBComboBox;
+    dxLayoutControl1Item3: TdxLayoutItem;
+    cbPoblacion: TcxDBComboBox;
+    dxLayoutControl1Group8: TdxLayoutGroup;
+    dxLayoutControl1Group15: TdxLayoutGroup;
     procedure actAnadirExecute(Sender: TObject);
     procedure actEliminarExecute(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
@@ -97,20 +99,27 @@ type
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure eParamMargenPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+    procedure cbProvinciaPropertiesInitPopup(Sender: TObject);
   private
     FEmpresa: IBizEmpresa;
+    FProvincias : TStringList;
+    FPoblaciones : TStringList;
+    procedure CargarProvincias;
+    procedure CargarPoblaciones;
   protected
     function GetEmpresa: IBizEmpresa;
     procedure SetEmpresa(const Value: IBizEmpresa);
   public
     bModificarCatalogo: Boolean;
     constructor Create(AOwner : TComponent); override;
+    destructor Destroy; override;
   end;
 
 implementation
 {$R *.dfm}
 
-uses uROClasses, uROTypes;
+uses
+  uROClasses, uROTypes, uProvinciasPoblacionesController, uStringsUtils;
 
 { TfrViewEmpresas }
 
@@ -166,12 +175,87 @@ begin
 //  (Sender as TAction).Enabled := not cxDBImage1.Picture.Graphic.Empty;
 end;
 
+procedure TfrViewEmpresa.CargarPoblaciones;
+var
+  i : integer;
+  AID : Integer;
+begin
+  AID := StrToInt(FProvincias.Values[cbProvincia.Text]);
+  with TProvinciasPoblacionesController.Create do
+    try
+      FPoblaciones := DarListaPoblaciones(AID);
+
+      with cbPoblacion.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FPoblaciones.Count - 1 do
+            Add(FPoblaciones.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
+procedure TfrViewEmpresa.CargarProvincias;
+var
+  i : integer;
+begin
+  with TProvinciasPoblacionesController.Create do
+    try
+      FProvincias := DarListaProvincias;
+
+      with cbProvincia.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FProvincias.Count - 1 do
+            Add(FProvincias.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
+procedure TfrViewEmpresa.cbProvinciaPropertiesInitPopup(Sender: TObject);
+begin
+  inherited;
+  ShowHourglassCursor;
+  try
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 constructor TfrViewEmpresa.Create(AOwner : TComponent);
 begin
   inherited;
+  FProvincias := NIL;
+  FPoblaciones := NIL;
   bModificarCatalogo := False;
 end;
 
+destructor TfrViewEmpresa.Destroy;
+begin
+  if Assigned(FProvincias) then
+    FreeANDNIL(FProvincias);
+
+  if Assigned(FPoblaciones) then
+    FreeANDNIL(FPoblaciones);
+
+  inherited;
+end;
+
 procedure TfrViewEmpresa.eParamMargenPropertiesValidate(Sender: TObject;
   var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
 begin
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
index 44a179bc..652f9169 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm	
@@ -40,44 +40,44 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
       inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
         inherited ToolBar1: TToolBar
           inherited FontSize: TEdit
-            Width = 58
-            ExplicitWidth = 58
+            Width = 74
+            ExplicitWidth = 74
           end
-          inherited UpDown1: TUpDown [7]
-            Left = 602
-            Top = 0
-            ExplicitLeft = 602
-            ExplicitTop = 0
+          inherited ToolButton13: TToolButton [7]
           end
-          inherited ToolButton13: TToolButton [8]
+          inherited UpDown1: TUpDown [8]
+            Left = 0
+            Top = 27
+            ExplicitLeft = 0
+            ExplicitTop = 27
           end
           inherited ToolButton6: TToolButton
-            Left = 0
-            ExplicitLeft = 0
+            Left = 17
+            ExplicitLeft = 17
           end
           inherited ToolButton7: TToolButton
-            Left = 66
-            ExplicitLeft = 66
+            Left = 83
+            ExplicitLeft = 83
           end
           inherited ToolButton8: TToolButton
-            Left = 133
-            ExplicitLeft = 133
+            Left = 150
+            ExplicitLeft = 150
           end
           inherited ToolButton12: TToolButton
-            Left = 216
-            ExplicitLeft = 216
+            Left = 233
+            ExplicitLeft = 233
           end
           inherited ToolButton9: TToolButton
-            Left = 224
-            ExplicitLeft = 224
+            Left = 241
+            ExplicitLeft = 241
           end
           inherited ToolButton10: TToolButton
-            Left = 369
-            ExplicitLeft = 369
+            Left = 386
+            ExplicitLeft = 386
           end
           inherited ToolButton11: TToolButton
-            Left = 494
-            ExplicitLeft = 494
+            Left = 511
+            ExplicitLeft = 511
           end
         end
         inherited cxGridPopupMenu: TcxGridPopupMenu
@@ -107,16 +107,20 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
   inherited frViewTotales1: TfrViewTotales
     inherited dxLayoutControl1: TdxLayoutControl
       LookAndFeel = dxLayoutOfficeLookAndFeel1
+      inherited Bevel1: TBevel
+        Width = 73
+        ExplicitWidth = 73
+      end
       inherited Bevel3: TBevel
-        Left = 351
+        Left = 331
         Height = 54
-        ExplicitLeft = 351
+        ExplicitLeft = 331
         ExplicitHeight = 54
       end
       inherited Bevel4: TBevel
-        Left = 467
+        Left = 447
         Width = 285
-        ExplicitLeft = 467
+        ExplicitLeft = 447
         ExplicitWidth = 285
       end
       inherited ImporteDto: TcxDBCurrencyEdit
@@ -125,16 +129,16 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
         Width = 151
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 538
+        Left = 518
         Style.IsFontAssigned = True
-        ExplicitLeft = 538
+        ExplicitLeft = 518
         ExplicitWidth = 219
         Width = 219
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 468
+        Left = 448
         Style.IsFontAssigned = True
-        ExplicitLeft = 468
+        ExplicitLeft = 448
         ExplicitWidth = 289
         Width = 289
       end
@@ -142,26 +146,26 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
         Style.IsFontAssigned = True
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 467
+        Left = 447
         Style.IsFontAssigned = True
-        ExplicitLeft = 467
+        ExplicitLeft = 447
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 467
+        Left = 447
         Style.IsFontAssigned = True
-        ExplicitLeft = 467
+        ExplicitLeft = 447
         ExplicitWidth = 290
         Width = 290
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 467
+        Left = 447
         Style.IsFontAssigned = True
-        ExplicitLeft = 467
+        ExplicitLeft = 447
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 538
+        Left = 518
         Style.IsFontAssigned = True
-        ExplicitLeft = 538
+        ExplicitLeft = 518
         ExplicitWidth = 219
         Width = 219
       end
@@ -180,8 +184,8 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
         Width = 84
       end
       inherited bTiposIVA: TButton
-        Left = 203
-        ExplicitLeft = 203
+        Left = 183
+        ExplicitLeft = 183
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         ExplicitWidth = 222
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
index 6b9296aa..b5432ecd 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm	
@@ -15,7 +15,6 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
-    ExplicitWidth = 822
     DesignSize = (
       903
       550)
@@ -42,22 +41,18 @@ 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 = 294
+      Width = 336
     end
     object memObservaciones: TcxDBMemo
       Left = 482
@@ -70,16 +65,12 @@ 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 = 360
+      Width = 399
     end
     object eReferencia: TcxDBTextEdit
       Left = 116
@@ -96,25 +87,21 @@ 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 = 294
+      Width = 336
     end
     inline frViewClienteAlbaran: TfrViewDatosYSeleccionCliente
       Left = 482
       Top = 28
-      Width = 360
+      Width = 399
       Height = 212
       Align = alTop
       AutoSize = True
@@ -128,56 +115,33 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
       ReadOnly = False
       ExplicitLeft = 482
       ExplicitTop = 28
-      ExplicitWidth = 360
+      ExplicitWidth = 399
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 360
+        Width = 399
         Align = alTop
+        ExplicitWidth = 360
         inherited edtlNombre: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 286
-          Width = 286
+          ExplicitWidth = 325
+          Width = 325
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 286
-          Width = 286
+          ExplicitWidth = 325
+          Width = 325
         end
         inherited edtCalle: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 286
-          Width = 286
+          ExplicitWidth = 325
+          Width = 325
         end
         inherited edtPoblacion: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 168
-          Width = 168
+          ExplicitWidth = 207
+          Width = 207
         end
         inherited edtProvincia: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 286
-          Width = 286
+          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
@@ -212,41 +176,14 @@ 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 = 294
-    end
-    object ePoblacion: TcxDBTextEdit
-      Left = 116
-      Top = 251
-      DataBinding.DataField = 'POBLACION'
-      DataBinding.DataSource = DADataSource
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      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 = 9
-      Width = 193
+      Width = 336
     end
     object eCodigoPostal: TcxDBTextEdit
       Left = 387
@@ -258,42 +195,15 @@ 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
-    object eProvincia: TcxDBTextEdit
-      Left = 116
-      Top = 278
-      DataBinding.DataField = 'PROVINCIA'
-      DataBinding.DataSource = DADataSource
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      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 = 11
-      Width = 294
-    end
     object ePersonaContacto: TcxDBTextEdit
       Left = 116
       Top = 305
@@ -305,18 +215,14 @@ 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 = 294
+      Width = 336
     end
     object eTlfTrabajo: TcxDBTextEdit
       Left = 116
@@ -328,18 +234,14 @@ 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 = 294
+      Width = 336
     end
     object bElegirDireccion: TBitBtn
       Left = 280
@@ -371,19 +273,15 @@ 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 = 156
+      Width = 198
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 116
@@ -404,20 +302,16 @@ 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 = 156
+      Width = 198
     end
     object bFormasPago: TButton
       Left = 320
@@ -442,20 +336,16 @@ 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 = 226
+      Width = 265
     end
     object cbConAlmacen: TCheckBox
       Left = 32
@@ -485,20 +375,16 @@ 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 = 193
+      Width = 235
     end
     object eRefFacturaCli: TcxDBTextEdit
       Left = 116
@@ -515,20 +401,16 @@ 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 = 294
+      Width = 336
     end
     object eFechaPrevista: TcxDBDateEdit
       Left = 616
@@ -544,22 +426,18 @@ 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 = 226
+      Width = 265
     end
     object eRefCliente: TcxDBTextEdit
       Left = 116
@@ -575,20 +453,16 @@ 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 = 294
+      Width = 336
     end
     object eFechaEnvio: TcxDBDateEdit
       Left = 616
@@ -604,20 +478,66 @@ 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 = 226
+      Width = 265
+    end
+    object cbProvincia: TcxDBComboBox
+      Left = 116
+      Top = 251
+      DataBinding.DataField = 'PROVINCIA'
+      DataBinding.DataSource = DADataSource
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.PostPopupValueOnTab = True
+      Properties.OnInitPopup = cbProvinciaPropertiesInitPopup
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 9
+      Width = 235
+    end
+    object cbPoblacion: TcxDBComboBox
+      Left = 116
+      Top = 278
+      DataBinding.DataField = 'POBLACION'
+      DataBinding.DataSource = DADataSource
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.PostPopupValueOnTab = True
+      Properties.OnInitPopup = cbPoblacionPropertiesInitPopup
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 11
+      Width = 336
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
@@ -729,8 +649,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
               object dxLayoutControl1Item9: TdxLayoutItem
                 AutoAligns = [aaVertical]
                 AlignHorz = ahClient
-                Caption = 'Poblaci'#243'n:'
-                Control = ePoblacion
+                Caption = 'Provincia:'
+                Control = cbProvincia
                 ControlOptions.ShowBorder = False
               end
               object dxLayoutControl1Item10: TdxLayoutItem
@@ -742,8 +662,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
               end
             end
             object dxLayoutControl1Item11: TdxLayoutItem
-              Caption = 'Provincia:'
-              Control = eProvincia
+              Caption = 'Poblaci'#243'n:'
+              Control = cbPoblacion
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControl1Item12: TdxLayoutItem
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
index 19014478..a8936cc7 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas	
@@ -55,18 +55,13 @@ type
     frViewClienteAlbaran: TfrViewDatosYSeleccionCliente;
     dxLayoutControl1Item8: TdxLayoutItem;
     eCalle: TcxDBTextEdit;
-    dxLayoutControl1Item9: TdxLayoutItem;
-    ePoblacion: TcxDBTextEdit;
     dxLayoutControl1Item10: TdxLayoutItem;
     eCodigoPostal: TcxDBTextEdit;
-    dxLayoutControl1Item11: TdxLayoutItem;
-    eProvincia: TcxDBTextEdit;
     dxLayoutControl1Item12: TdxLayoutItem;
     ePersonaContacto: TcxDBTextEdit;
     dxLayoutControl1Item13: TdxLayoutItem;
     eTlfTrabajo: TcxDBTextEdit;
     dxLayoutControl1Group4: TdxLayoutGroup;
-    dxLayoutControl1Group9: TdxLayoutGroup;
     dxLayoutControl1Item14: TdxLayoutItem;
     bElegirDireccion: TBitBtn;
     ActionList1: TActionList;
@@ -105,6 +100,11 @@ type
     eRefCliente: TcxDBTextEdit;
     dxLayoutControl1Item21: TdxLayoutItem;
     eFechaEnvio: TcxDBDateEdit;
+    dxLayoutControl1Item9: TdxLayoutItem;
+    cbProvincia: TcxDBComboBox;
+    dxLayoutControl1Item11: TdxLayoutItem;
+    cbPoblacion: TcxDBComboBox;
+    dxLayoutControl1Group9: TdxLayoutGroup;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure actElegirDireccionExecute(Sender: TObject);
@@ -124,6 +124,8 @@ type
     procedure frViewClienteAlbaranButton1Click(Sender: TObject);
     procedure frViewClienteAlbaranButton2Click(Sender: TObject);
     procedure frViewClienteAlbaranactAnadirContactoUpdate(Sender: TObject);
+    procedure cbProvinciaPropertiesInitPopup(Sender: TObject);
+    procedure cbPoblacionPropertiesInitPopup(Sender: TObject);
 
   protected
     FAlbaran : IBizAlbaranCliente;
@@ -133,6 +135,10 @@ type
     FViewClienteAlbaran : TfrViewDatosYSeleccionCliente;
     FFormasPago : IBizFormaPago;
     FFormasPagoController : IFormasPagoController;
+    FProvincias : TStringList;
+    FPoblaciones : TStringList;
+    procedure CargarProvincias;
+    procedure CargarPoblaciones;
 
     function GetAlbaran: IBizAlbaranCliente;
     procedure SetAlbaran(const Value: IBizAlbaranCliente); virtual;
@@ -153,7 +159,7 @@ implementation
 uses
   uClientesController, uBizDireccionesContacto, uAlbaranesClienteController,
   schAlbaranesClienteClient_Intf, uBizAlmacenes, uDateUtils,
-  uDialogUtils;
+  uDialogUtils, uProvinciasPoblacionesController, uStringsUtils;
 
 
 procedure TfrViewAlbaranCliente.actElegirDireccionExecute(Sender: TObject);
@@ -215,6 +221,56 @@ begin
      FFormasPagoController.VerTodos(FFormasPago);
 end;
 
+procedure TfrViewAlbaranCliente.CargarPoblaciones;
+var
+  i : integer;
+  AID : Integer;
+begin
+  AID := StrToInt(FProvincias.Values[cbProvincia.Text]);
+  with TProvinciasPoblacionesController.Create do
+    try
+      FPoblaciones := DarListaPoblaciones(AID);
+
+      with cbPoblacion.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FPoblaciones.Count - 1 do
+            Add(FPoblaciones.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
+procedure TfrViewAlbaranCliente.CargarProvincias;
+var
+  i : integer;
+begin
+  with TProvinciasPoblacionesController.Create do
+    try
+      FProvincias := DarListaProvincias;
+
+      with cbProvincia.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FProvincias.Count - 1 do
+            Add(FProvincias.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
 procedure TfrViewAlbaranCliente.cbConAlmacenClick(Sender: TObject);
 begin
   inherited;
@@ -234,9 +290,39 @@ begin
   end;
 end;
 
+procedure TfrViewAlbaranCliente.cbPoblacionPropertiesInitPopup(Sender: TObject);
+begin
+  inherited;
+  ShowHourglassCursor;
+  try
+    FreeANDNIL(FPoblaciones);
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+    if not EsCadenaVacia(cbProvincia.Text) and (FProvincias.IndexOfName(cbProvincia.Text) <> -1) then
+      CargarPoblaciones
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
+procedure TfrViewAlbaranCliente.cbProvinciaPropertiesInitPopup(Sender: TObject);
+begin
+  inherited;
+  ShowHourglassCursor;
+  try
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 procedure TfrViewAlbaranCliente.CustomViewCreate(Sender: TObject);
 begin
   inherited;
+  FProvincias := NIL;
+  FPoblaciones := NIL;
+
   FFormasPago := Nil;
   FFormasPagoController := TFormasPagoController.Create;
 //  FPedidoAsociado := NIL;
@@ -249,6 +335,12 @@ end;
 procedure TfrViewAlbaranCliente.CustomViewDestroy(Sender: TObject);
 begin
   inherited;
+  if Assigned(FProvincias) then
+    FreeANDNIL(FProvincias);
+
+  if Assigned(FPoblaciones) then
+    FreeANDNIL(FPoblaciones);
+  
   FFormasPago := Nil;
   FFormasPagoController := NIL;
   FViewClienteAlbaran := Nil;
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.dfm
index b3209927..6ffdb192 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.dfm	
@@ -1,17 +1,19 @@
 inherited frViewDireccionEntregaAlbaranCliente: TfrViewDireccionEntregaAlbaranCliente
   Width = 337
-  Height = 129
+  Height = 126
   ExplicitWidth = 337
-  ExplicitHeight = 129
+  ExplicitHeight = 126
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
     Width = 337
-    Height = 129
+    Height = 126
     Align = alClient
     ParentBackground = True
     TabOrder = 0
+    TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
+    ExplicitHeight = 129
     object eCalle: TcxDBTextEdit
       Left = 64
       Top = 10
@@ -29,45 +31,7 @@ inherited frViewDireccionEntregaAlbaranCliente: TfrViewDireccionEntregaAlbaranCl
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 0
-      Width = 281
-    end
-    object ePoblacion: TcxDBTextEdit
-      Left = 64
-      Top = 37
-      DataBinding.DataField = 'POBLACION'
-      DataBinding.DataSource = dsAlbaran
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 1
-      Width = 41
-    end
-    object eProvincia: TcxDBTextEdit
-      Left = 64
-      Top = 64
-      DataBinding.DataField = 'PROVINCIA'
-      DataBinding.DataSource = dsAlbaran
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 3
-      Width = 281
+      Width = 263
     end
     object eCodigoPostal: TcxDBTextEdit
       Left = 262
@@ -125,7 +89,57 @@ inherited frViewDireccionEntregaAlbaranCliente: TfrViewDireccionEntregaAlbaranCl
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 4
-      Width = 281
+      Width = 84
+    end
+    object cbProvincia: TcxDBComboBox
+      Left = 64
+      Top = 37
+      DataBinding.DataField = 'PROVINCIA'
+      DataBinding.DataSource = dsAlbaran
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.PostPopupValueOnTab = True
+      Properties.OnInitPopup = cbProvinciaPropertiesInitPopup
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 1
+      Width = 162
+    end
+    object cbPoblacion: TcxDBComboBox
+      Left = 64
+      Top = 64
+      DataBinding.DataField = 'POBLACION'
+      DataBinding.DataSource = dsAlbaran
+      Properties.ImmediatePost = True
+      Properties.ImmediateUpdateText = True
+      Properties.PostPopupValueOnTab = True
+      Properties.OnInitPopup = cbPoblacionPropertiesInitPopup
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 3
+      Width = 263
     end
     object dxLayoutGroup1: TdxLayoutGroup
       ShowCaption = False
@@ -144,7 +158,7 @@ inherited frViewDireccionEntregaAlbaranCliente: TfrViewDireccionEntregaAlbaranCl
           ShowCaption = False
           Hidden = True
           ShowBorder = False
-          object dxLayoutControl1Group5: TdxLayoutGroup
+          object dxLayoutControl1Group2: TdxLayoutGroup
             ShowCaption = False
             Hidden = True
             LayoutDirection = ldHorizontal
@@ -152,8 +166,8 @@ inherited frViewDireccionEntregaAlbaranCliente: TfrViewDireccionEntregaAlbaranCl
             object dxLayoutControl1Item2: TdxLayoutItem
               AutoAligns = [aaVertical]
               AlignHorz = ahClient
-              Caption = 'Poblaci'#243'n:'
-              Control = ePoblacion
+              Caption = 'Provincia:'
+              Control = cbProvincia
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControl1Item4: TdxLayoutItem
@@ -165,8 +179,8 @@ inherited frViewDireccionEntregaAlbaranCliente: TfrViewDireccionEntregaAlbaranCl
             end
           end
           object dxLayoutControl1Item3: TdxLayoutItem
-            Caption = 'Provincia:'
-            Control = eProvincia
+            Caption = 'Poblaci'#243'n:'
+            Control = cbPoblacion
             ControlOptions.ShowBorder = False
           end
         end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.pas
index c857b8eb..f8318e77 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.pas	
@@ -8,7 +8,12 @@ uses
   cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
   cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable,
   ActnList, uAlbaranesClienteController,
-  Buttons, cxDBEdit;
+  Buttons, cxDBEdit, dxSkinsCore, dxSkinBlue, dxSkinCaramel, dxSkinCoffee,
+  dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
+  dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter, uDAInterfaces;
 
 type
   IViewDireccionEntregaAlbaranCliente = interface(IViewBase)
@@ -25,10 +30,6 @@ type
     dsAlmacenes: TDADataSource;
     dxLayoutControl1Item1: TdxLayoutItem;
     eCalle: TcxDBTextEdit;
-    dxLayoutControl1Item2: TdxLayoutItem;
-    ePoblacion: TcxDBTextEdit;
-    dxLayoutControl1Item3: TdxLayoutItem;
-    eProvincia: TcxDBTextEdit;
     dxLayoutControl1Item4: TdxLayoutItem;
     eCodigoPostal: TcxDBTextEdit;
     dxLayoutControl1Item5: TdxLayoutItem;
@@ -36,15 +37,25 @@ type
     dxLayoutControl1Item6: TdxLayoutItem;
     ePersonaContacto: TcxDBTextEdit;
     dxLayoutControl1Group3: TdxLayoutGroup;
-    dxLayoutControl1Group1: TdxLayoutGroup;
-    dxLayoutControl1Group5: TdxLayoutGroup;
     dxLayoutControl1Group4: TdxLayoutGroup;
+    dxLayoutControl1Item2: TdxLayoutItem;
+    cbProvincia: TcxDBComboBox;
+    dxLayoutControl1Group1: TdxLayoutGroup;
+    dxLayoutControl1Item3: TdxLayoutItem;
+    cbPoblacion: TcxDBComboBox;
+    dxLayoutControl1Group2: TdxLayoutGroup;
     procedure cbListaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+    procedure cbProvinciaPropertiesInitPopup(Sender: TObject);
+    procedure cbPoblacionPropertiesInitPopup(Sender: TObject);
   protected
 //    FAlmacenesController : IAlmacenesController;
 //    FAlmacenes: IBizAlmacen;
     FAlbaran : IBizAlbaranCliente;
     FController : IAlbaranesClienteController;
+    FProvincias : TStringList;
+    FPoblaciones : TStringList;
+    procedure CargarProvincias;
+    procedure CargarPoblaciones;
     function GetAlbaranCliente: IBizAlbaranCliente;
     procedure SetAlbaranCliente(const Value: IBizAlbaranCliente);
     procedure RefrescarDireccion;
@@ -59,7 +70,59 @@ implementation
 {$R *.dfm}
 
 uses
-  uEditorRegistryUtils;
+  uEditorRegistryUtils,
+  uProvinciasPoblacionesController, uStringsUtils;
+
+
+procedure TfrViewDireccionEntregaAlbaranCliente.CargarPoblaciones;
+var
+  i : integer;
+  AID : Integer;
+begin
+  AID := StrToInt(FProvincias.Values[cbProvincia.Text]);
+  with TProvinciasPoblacionesController.Create do
+    try
+      FPoblaciones := DarListaPoblaciones(AID);
+
+      with cbPoblacion.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FPoblaciones.Count - 1 do
+            Add(FPoblaciones.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
+procedure TfrViewDireccionEntregaAlbaranCliente.CargarProvincias;
+var
+  i : integer;
+begin
+  with TProvinciasPoblacionesController.Create do
+    try
+      FProvincias := DarListaProvincias;
+
+      with cbProvincia.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FProvincias.Count - 1 do
+            Add(FProvincias.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
 
 procedure TfrViewDireccionEntregaAlbaranCliente.cbListaPropertiesValidate(
   Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
@@ -79,10 +142,41 @@ begin
   end;}
 end;
 
+procedure TfrViewDireccionEntregaAlbaranCliente.cbPoblacionPropertiesInitPopup(
+  Sender: TObject);
+begin
+  inherited;
+  ShowHourglassCursor;
+  try
+    FreeANDNIL(FPoblaciones);
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+    if not EsCadenaVacia(cbProvincia.Text) and (FProvincias.IndexOfName(cbProvincia.Text) <> -1) then
+      CargarPoblaciones
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
+procedure TfrViewDireccionEntregaAlbaranCliente.cbProvinciaPropertiesInitPopup(
+  Sender: TObject);
+begin
+  inherited;
+  ShowHourglassCursor;
+  try
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 constructor TfrViewDireccionEntregaAlbaranCliente.Create(AOwner: TComponent);
 begin
   inherited;
   FAlbaran := NIL;
+  FProvincias := NIL;
+  FPoblaciones := NIL;
 
   {  FController := TAlbaranesClienteController.Create;
   FAlmacenesController := TAlmacenesController.Create;
@@ -98,6 +192,12 @@ begin
   FAlmacenes := Nil;
   FController := NIL;
 }
+  if Assigned(FProvincias) then
+    FreeANDNIL(FProvincias);
+
+  if Assigned(FPoblaciones) then
+    FreeANDNIL(FPoblaciones);
+
   FAlbaran := NIL;
   inherited;
 end;
diff --git a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dpk b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dpk
index f7972965..baea91b5 100644
Binary files a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dpk and b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dpk differ
diff --git a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dproj b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dproj
index f91275d9..35e394bd 100644
--- a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dproj	
+++ b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.dproj	
@@ -44,6 +44,10 @@
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
       <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">AlbaranesProveedor_model.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
@@ -53,15 +57,34 @@
     <DelphiCompile Include="AlbaranesProveedor_model.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="Contactos_model.dcp" />
+    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\Contactos_model.dcp" />
+    <DCCReference Include="..\I.dcp" />
+    <DCCReference Include="..\In.dcp" />
+    <DCCReference Include="..\Inv.dcp" />
+    <DCCReference Include="..\Inve.dcp" />
+    <DCCReference Include="..\Inven.dcp" />
+    <DCCReference Include="..\Invent.dcp" />
+    <DCCReference Include="..\Inventa.dcp" />
+    <DCCReference Include="..\Inventar.dcp" />
+    <DCCReference Include="..\Inventari.dcp" />
+    <DCCReference Include="..\Inventario.dcp" />
+    <DCCReference Include="..\Inventario_.dcp" />
+    <DCCReference Include="..\Inventario_c.dcp" />
+    <DCCReference Include="..\Inventario_co.dcp" />
+    <DCCReference Include="..\Inventario_con.dcp" />
+    <DCCReference Include="..\Inventario_cont.dcp" />
+    <DCCReference Include="..\Inventario_contr.dcp" />
+    <DCCReference Include="..\Inventario_contro.dcp" />
+    <DCCReference Include="..\Inventario_control.dcp" />
+    <DCCReference Include="..\Inventario_controll.dcp" />
+    <DCCReference Include="..\Inventario_controlle.dcp" />
     <DCCReference Include="Data\uIDataModuleAlbaranesProveedor.pas" />
     <DCCReference Include="Data\uIDataModuleAlbaranesProveedorReport.pas" />
     <DCCReference Include="schAlbaranesProveedorClient_Intf.pas" />
     <DCCReference Include="schAlbaranesProveedorServer_Intf.pas" />
     <DCCReference Include="uBizAlbaranesProveedor.pas" />
     <DCCReference Include="uBizDetallesAlbaranProveedor.pas" />
-    <None Include="ModelSupport_AlbaranesProveedor_model\default.txaPackage" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.res b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.res
index 8b251f31..1641339f 100644
Binary files a/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.res and b/Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.res differ
diff --git a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas
index 57aad880..8131c2c5 100644
--- a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas	
@@ -86,7 +86,7 @@ implementation
 
 uses
   SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios,
-  uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App;
+  uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uInventarioController;
 
 { TBizAlbaranProveedor }
 
@@ -183,9 +183,7 @@ begin
   FECHA_ALBARAN := DateOf(Date);
   INCIDENCIAS_ACTIVAS := 0;
   TIPO := CTE_TIPO_ALBARAN;
-  // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-  // ALMACÉN PUESTO A CAPÓN Y PROVISIONAL
-//  ID_ALMACEN := 2;
+  TIPO_ALMACEN := CTE_INV_ALMACEN;
 end;
 
 procedure TBizAlbaranProveedor.IVAOnChange(Sender: TDACustomField);
@@ -208,7 +206,6 @@ end;
 procedure TBizAlbaranProveedor.SetProveedor(AValue: IBizProveedor);
 var
   bEnEdicion : Boolean;
-
 begin
   FProveedor := AValue;
 
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorDireccionEntregaAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorDireccionEntregaAlbaranProveedor.dfm
index e00707ce..61c886f2 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorDireccionEntregaAlbaranProveedor.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorDireccionEntregaAlbaranProveedor.dfm	
@@ -10,6 +10,8 @@ object fEditorDireccionEntregaAlbaranProveedor: TfEditorDireccionEntregaAlbaranP
   OldCreateOrder = True
   Position = poOwnerFormCenter
   OnClose = FormClose
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
   OnShow = FormShow
   DesignSize = (
     453
@@ -32,22 +34,6 @@ object fEditorDireccionEntregaAlbaranProveedor: TfEditorDireccionEntregaAlbaranP
     AutoSize = False
     Caption = 'Direcci'#243'n:'
   end
-  object Label2: TLabel
-    Left = 20
-    Top = 89
-    Width = 110
-    Height = 13
-    AutoSize = False
-    Caption = 'Poblaci'#243'n:'
-  end
-  object Label3: TLabel
-    Left = 20
-    Top = 117
-    Width = 110
-    Height = 13
-    AutoSize = False
-    Caption = 'Provincia:'
-  end
   object Label4: TLabel
     Left = 20
     Top = 143
@@ -72,6 +58,22 @@ object fEditorDireccionEntregaAlbaranProveedor: TfEditorDireccionEntregaAlbaranP
     AutoSize = False
     Caption = 'Tel'#233'fono:'
   end
+  object Label3: TLabel
+    Left = 20
+    Top = 90
+    Width = 110
+    Height = 13
+    AutoSize = False
+    Caption = 'Provincia:'
+  end
+  object Label2: TLabel
+    Left = 21
+    Top = 117
+    Width = 110
+    Height = 13
+    AutoSize = False
+    Caption = 'Poblaci'#243'n:'
+  end
   object OKBtn: TButton
     Left = 370
     Top = 13
@@ -105,24 +107,6 @@ object fEditorDireccionEntregaAlbaranProveedor: TfEditorDireccionEntregaAlbaranP
     DataSource = dsDireccion
     TabOrder = 2
   end
-  object ePoblacion: TDBEdit
-    Left = 135
-    Top = 86
-    Width = 210
-    Height = 21
-    DataField = 'POBLACION'
-    DataSource = dsDireccion
-    TabOrder = 3
-  end
-  object eProvincia: TDBEdit
-    Left = 135
-    Top = 114
-    Width = 210
-    Height = 21
-    DataField = 'PROVINCIA'
-    DataSource = dsDireccion
-    TabOrder = 4
-  end
   object eCodigoPostal: TDBEdit
     Left = 135
     Top = 140
@@ -130,7 +114,7 @@ object fEditorDireccionEntregaAlbaranProveedor: TfEditorDireccionEntregaAlbaranP
     Height = 21
     DataField = 'CODIGO_POSTAL'
     DataSource = dsDireccion
-    TabOrder = 5
+    TabOrder = 3
   end
   object ePersonaContacto: TDBEdit
     Left = 135
@@ -139,7 +123,7 @@ object fEditorDireccionEntregaAlbaranProveedor: TfEditorDireccionEntregaAlbaranP
     Height = 21
     DataField = 'PERSONA_CONTACTO'
     DataSource = dsDireccion
-    TabOrder = 6
+    TabOrder = 4
   end
   object eTelefono: TDBEdit
     Left = 136
@@ -148,7 +132,57 @@ object fEditorDireccionEntregaAlbaranProveedor: TfEditorDireccionEntregaAlbaranP
     Height = 21
     DataField = 'TELEFONO'
     DataSource = dsDireccion
+    TabOrder = 5
+  end
+  object cbProvincia: TcxDBComboBox
+    Left = 136
+    Top = 86
+    DataBinding.DataField = 'PROVINCIA'
+    DataBinding.DataSource = dsDireccion
+    Properties.ImmediatePost = True
+    Properties.ImmediateUpdateText = True
+    Properties.PostPopupValueOnTab = True
+    Properties.OnInitPopup = cbProvinciaPropertiesInitPopup
+    Style.BorderColor = clWindowFrame
+    Style.BorderStyle = ebs3D
+    Style.HotTrack = False
+    Style.LookAndFeel.Kind = lfStandard
+    Style.LookAndFeel.NativeStyle = True
+    Style.ButtonStyle = bts3D
+    Style.PopupBorderStyle = epbsFrame3D
+    StyleDisabled.LookAndFeel.Kind = lfStandard
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.Kind = lfStandard
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.Kind = lfStandard
+    StyleHot.LookAndFeel.NativeStyle = True
+    TabOrder = 6
+    Width = 210
+  end
+  object cbPoblacion: TcxDBComboBox
+    Left = 136
+    Top = 113
+    DataBinding.DataField = 'POBLACION'
+    DataBinding.DataSource = dsDireccion
+    Properties.ImmediatePost = True
+    Properties.ImmediateUpdateText = True
+    Properties.PostPopupValueOnTab = True
+    Properties.OnInitPopup = cbPoblacionPropertiesInitPopup
+    Style.BorderColor = clWindowFrame
+    Style.BorderStyle = ebs3D
+    Style.HotTrack = False
+    Style.LookAndFeel.Kind = lfStandard
+    Style.LookAndFeel.NativeStyle = True
+    Style.ButtonStyle = bts3D
+    Style.PopupBorderStyle = epbsFrame3D
+    StyleDisabled.LookAndFeel.Kind = lfStandard
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.Kind = lfStandard
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.Kind = lfStandard
+    StyleHot.LookAndFeel.NativeStyle = True
     TabOrder = 7
+    Width = 210
   end
   object dsDireccion: TDADataSource
     Left = 16
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorDireccionEntregaAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorDireccionEntregaAlbaranProveedor.pas
index f9699098..7c71f22c 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorDireccionEntregaAlbaranProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorDireccionEntregaAlbaranProveedor.pas	
@@ -6,7 +6,13 @@ uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
   Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit,
   uIEditorDireccionEntregaAlbaranProveedor, uBizAlbaranesProveedor,
-  uDAInterfaces;
+  uDAInterfaces, cxGraphics, dxSkinsCore, dxSkinBlue, dxSkinCaramel,
+  dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue, cxMaskEdit,
+  cxDropDownEdit;
 
 type
   TfEditorDireccionEntregaAlbaranProveedor = class(TForm, IEditorDireccionEntregaAlbaranProveedor)
@@ -14,21 +20,25 @@ type
     CancelBtn: TButton;
     Bevel1: TBevel;
     eDireccion: TDBEdit;
-    ePoblacion: TDBEdit;
-    eProvincia: TDBEdit;
     eCodigoPostal: TDBEdit;
     Label1: TLabel;
-    Label2: TLabel;
-    Label3: TLabel;
     Label4: TLabel;
     dsDireccion: TDADataSource;
     Label6: TLabel;
     ePersonaContacto: TDBEdit;
     Label7: TLabel;
     eTelefono: TDBEdit;
+    Label3: TLabel;
+    cbProvincia: TcxDBComboBox;
+    Label2: TLabel;
+    cbPoblacion: TcxDBComboBox;
 
     procedure FormShow(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure cbProvinciaPropertiesInitPopup(Sender: TObject);
+    procedure cbPoblacionPropertiesInitPopup(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
 
   private
     pDireccion: String;
@@ -37,10 +47,13 @@ type
     pCodigoPostal: String;
     pPersonaContacto: String;
     pTelefono: String;
-
+    FProvincias : TStringList;
+    FPoblaciones : TStringList;
     FAlbaran : IBizAlbaranProveedor;
     function GetAlbaran: IBizAlbaranProveedor;
     procedure SetAlbaran(const Value: IBizAlbaranProveedor);
+    procedure CargarProvincias;
+    procedure CargarPoblaciones;
   public
     property Albaran: IBizAlbaranProveedor read GetAlbaran write SetAlbaran;
   end;
@@ -48,29 +61,124 @@ type
 implementation
 {$R *.dfm}
 
+uses
+  uProvinciasPoblacionesController, uStringsUtils;
 
 { TfEditorDireccionEntrega }
 
+procedure TfEditorDireccionEntregaAlbaranProveedor.CargarPoblaciones;
+var
+  i : integer;
+  AID : Integer;
+begin
+  AID := StrToInt(FProvincias.Values[cbProvincia.Text]);
+  with TProvinciasPoblacionesController.Create do
+    try
+      FPoblaciones := DarListaPoblaciones(AID);
+
+      with cbPoblacion.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FPoblaciones.Count - 1 do
+            Add(FPoblaciones.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
+procedure TfEditorDireccionEntregaAlbaranProveedor.CargarProvincias;
+var
+  i : integer;
+begin
+  with TProvinciasPoblacionesController.Create do
+    try
+      FProvincias := DarListaProvincias;
+
+      with cbProvincia.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FProvincias.Count - 1 do
+            Add(FProvincias.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
+procedure TfEditorDireccionEntregaAlbaranProveedor.cbPoblacionPropertiesInitPopup(
+  Sender: TObject);
+begin
+  ShowHourglassCursor;
+  try
+    FreeANDNIL(FPoblaciones);
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+    if not EsCadenaVacia(cbProvincia.Text) and
+      (FProvincias.IndexOfName(cbProvincia.Text) <> -1) then
+      CargarPoblaciones
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
+procedure TfEditorDireccionEntregaAlbaranProveedor.cbProvinciaPropertiesInitPopup(
+  Sender: TObject);
+begin
+  ShowHourglassCursor;
+  try
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 procedure TfEditorDireccionEntregaAlbaranProveedor.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   //En el caso de cancelar se recuperan los valores iniciales
   if (Self.ModalResult <> mrOk) and (dsDireccion.DataTable.State in dsEditModes) then
   begin
     eDireccion.Field.Value := pDireccion;
-    ePoblacion.Field.Value := pPoblacion;
-    eProvincia.Field.Value := pProvincia;
+    cbPoblacion.DataBinding.Field.Value := pPoblacion;
+    cbProvincia.DataBinding.Field.Value := pProvincia;
     eCodigoPostal.Field.Value := pCodigoPostal;
     ePersonaContacto.Field.Value := pPersonaContacto;
     eTelefono.Field.Value := pTelefono;
   end;
 end;
 
+procedure TfEditorDireccionEntregaAlbaranProveedor.FormCreate(Sender: TObject);
+begin
+  FProvincias := NIL;
+  FPoblaciones := NIL;
+end;
+
+procedure TfEditorDireccionEntregaAlbaranProveedor.FormDestroy(Sender: TObject);
+begin
+  if Assigned(FProvincias) then
+    FreeANDNIL(FProvincias);
+
+  if Assigned(FPoblaciones) then
+    FreeANDNIL(FPoblaciones);
+end;
+
 procedure TfEditorDireccionEntregaAlbaranProveedor.FormShow(Sender: TObject);
 begin
   //Guardamos los valores iniciales por si al final el usuario cancela
   pDireccion := eDireccion.Text;
-  pPoblacion := ePoblacion.Text;
-  pProvincia := eProvincia.Text;
+  pPoblacion := cbPoblacion.Text;
+  pProvincia := cbProvincia.Text;
   pCodigoPostal := eCodigoPostal.Text;
   pPersonaContacto := ePersonaContacto.Text;
   pTelefono := eTelefono.Text;
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm
index 3575aab6..c17dbaca 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm	
@@ -30,19 +30,15 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       Style.Color = clInfoBk
       Style.HotTrack = False
       Style.LookAndFeel.NativeStyle = True
-      Style.LookAndFeel.SkinName = ''
       Style.Shadow = False
       Style.ButtonStyle = bts3D
       Style.ButtonTransparency = ebtNone
       Style.PopupBorderStyle = epbsFrame3D
       StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 2
-      Width = 119
+      Width = 325
     end
     object memObservaciones: TcxDBMemo
       Left = 474
@@ -55,16 +51,12 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       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 = 11
-      Height = 253
-      Width = 186
+      Height = 287
+      Width = 331
     end
     object eReferencia: TcxDBTextEdit
       Left = 119
@@ -80,22 +72,18 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       Style.Color = clWindow
       Style.HotTrack = False
       Style.LookAndFeel.NativeStyle = True
-      Style.LookAndFeel.SkinName = ''
       StyleDisabled.Color = clMenuBar
       StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.SkinName = ''
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 0
-      Width = 143
+      Width = 325
     end
     inline frViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor
       Left = 474
       Top = 28
-      Width = 350
+      Width = 331
       Height = 212
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
@@ -107,54 +95,33 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       ReadOnly = False
       ExplicitLeft = 474
       ExplicitTop = 28
+      ExplicitWidth = 331
       ExplicitHeight = 212
       inherited dxLayoutControl1: TdxLayoutControl
+        Width = 331
+        ExplicitWidth = 331
         inherited edtlNombre: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 224
-          Width = 224
+          ExplicitWidth = 257
+          Width = 257
         end
         inherited edtNIFCIF: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 562
-          Width = 562
+          ExplicitWidth = 257
+          Width = 257
         end
         inherited edtCalle: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 562
-          Width = 562
+          ExplicitWidth = 257
+          Width = 257
         end
         inherited edtPoblacion: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 177
-          Width = 177
+          ExplicitWidth = 139
+          Width = 139
         end
         inherited edtProvincia: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 327
-          Width = 327
+          ExplicitWidth = 257
+          Width = 257
         end
         inherited edtCodigoPostal: TcxDBTextEdit
           Left = 239
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 239
         end
         inherited Button3: TBitBtn
@@ -181,8 +148,8 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
     inline frViewDireccionEntregaAlbaranProv1: TfrViewDireccionEntregaAlbaranProv
       Left = 22
       Top = 249
-      Width = 445
-      Height = 175
+      Width = 422
+      Height = 314
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clWindowText
       Font.Height = -11
@@ -193,28 +160,24 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       ReadOnly = False
       ExplicitLeft = 22
       ExplicitTop = 249
-      ExplicitWidth = 445
-      ExplicitHeight = 175
+      ExplicitWidth = 422
+      ExplicitHeight = 314
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 445
-        Height = 175
-        ExplicitWidth = 445
-        ExplicitHeight = 175
+        Width = 422
+        Height = 314
+        ExplicitWidth = 422
+        ExplicitHeight = 314
         inherited rdxDestino1: TRadioButton
-          Width = 255
-          ExplicitWidth = 255
+          Width = 402
+          ExplicitWidth = 402
         end
         inherited rdxDestino2: TRadioButton
-          Width = 287
-          ExplicitWidth = 287
+          Width = 402
+          ExplicitWidth = 402
         end
         inherited cbLista: TcxDBLookupComboBox
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 425
-          Width = 425
+          ExplicitWidth = 402
+          Width = 402
         end
         inherited bModificar: TBitBtn
           Left = 284
@@ -223,8 +186,18 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
           ExplicitTop = 279
         end
         inherited txtDireccion: TStaticText
-          Height = 110
-          ExplicitHeight = 110
+          Width = 402
+          Height = 140
+          ExplicitWidth = 402
+          ExplicitHeight = 140
+        end
+        inherited cbListaObras: TcxDBLookupComboBox
+          ExplicitWidth = 402
+          Width = 402
+        end
+        inherited RadioButton1: TRadioButton
+          Width = 402
+          ExplicitWidth = 402
         end
       end
       inherited ActionList1: TActionList
@@ -251,20 +224,16 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       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 = 7
-      Width = 90
+      Width = 187
     end
     object bFormasPago: TButton
       Left = 312
@@ -288,19 +257,15 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       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 = 3
-      Width = 122
+      Width = 187
     end
     object Button1: TButton
       Left = 312
@@ -325,20 +290,16 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       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 = 5
-      Width = 216
+      Width = 325
     end
     object eReferenciaProveedor: TcxDBTextEdit
       Left = 119
@@ -353,17 +314,13 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       Style.Color = clWindow
       Style.HotTrack = False
       Style.LookAndFeel.NativeStyle = True
-      Style.LookAndFeel.SkinName = ''
       StyleDisabled.Color = clMenuBar
       StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.SkinName = ''
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 1
-      Width = 170
+      Width = 325
     end
     object eReferenciaFacturaProveedor: TcxDBTextEdit
       Left = 119
@@ -379,20 +336,16 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor
       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 = 6
-      Width = 170
+      Width = 325
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm
index 8c099701..ef5d700f 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm	
@@ -64,7 +64,7 @@ inherited frViewDireccionEntregaAlbaranProv: TfrViewDireccionEntregaAlbaranProv
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 1
-      Width = 750
+      Width = 765
     end
     object bModificar: TBitBtn
       Left = 647
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.pas
index 6b016567..2476c422 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.pas	
@@ -256,7 +256,7 @@ begin
     cbListaObras.Properties.OnValidate := cbListaPropertiesValidate;
 
     {  Para poder inicializar con el almacén por defecto en el caso de un
-       almacén nuevo, antes hay que comprobar que la dirección alternativa
+       albarán nuevo, antes hay que comprobar que la dirección alternativa
        está vacia porque puede ser que el albarán se haya generado
        automáticamente a partir de un pedido a proveedor con una dirección
        que no es un almacén.
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorDireccionEntregaPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorDireccionEntregaPedidoProveedor.dfm
index 2ca03537..47b1c3b1 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorDireccionEntregaPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorDireccionEntregaPedidoProveedor.dfm	
@@ -10,6 +10,8 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
   OldCreateOrder = True
   Position = poOwnerFormCenter
   OnClose = FormClose
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
   OnShow = FormShow
   DesignSize = (
     453
@@ -32,17 +34,9 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
     AutoSize = False
     Caption = 'Direcci'#243'n:'
   end
-  object Label2: TLabel
-    Left = 20
-    Top = 89
-    Width = 110
-    Height = 13
-    AutoSize = False
-    Caption = 'Poblaci'#243'n:'
-  end
   object Label3: TLabel
     Left = 20
-    Top = 117
+    Top = 90
     Width = 110
     Height = 13
     AutoSize = False
@@ -56,6 +50,14 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
     AutoSize = False
     Caption = 'C'#243'digo postal:'
   end
+  object Label2: TLabel
+    Left = 21
+    Top = 117
+    Width = 110
+    Height = 13
+    AutoSize = False
+    Caption = 'Poblaci'#243'n:'
+  end
   object OKBtn: TButton
     Left = 370
     Top = 13
@@ -79,7 +81,7 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
     TabOrder = 1
   end
   object eDireccion: TDBEdit
-    Left = 135
+    Left = 136
     Top = 23
     Width = 210
     Height = 57
@@ -89,32 +91,64 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
     DataSource = dsDireccion
     TabOrder = 2
   end
-  object ePoblacion: TDBEdit
-    Left = 135
-    Top = 86
-    Width = 210
-    Height = 21
-    DataField = 'POBLACION'
-    DataSource = dsDireccion
-    TabOrder = 3
-  end
-  object eProvincia: TDBEdit
-    Left = 135
-    Top = 114
-    Width = 210
-    Height = 21
-    DataField = 'PROVINCIA'
-    DataSource = dsDireccion
-    TabOrder = 4
-  end
   object eCodigoPostal: TDBEdit
-    Left = 135
+    Left = 136
     Top = 140
     Width = 210
     Height = 21
     DataField = 'CODIGO_POSTAL'
     DataSource = dsDireccion
+    TabOrder = 3
+  end
+  object cbProvincia: TcxDBComboBox
+    Left = 136
+    Top = 86
+    DataBinding.DataField = 'PROVINCIA'
+    DataBinding.DataSource = dsDireccion
+    Properties.ImmediatePost = True
+    Properties.ImmediateUpdateText = True
+    Properties.PostPopupValueOnTab = True
+    Properties.OnInitPopup = cbProvinciaPropertiesInitPopup
+    Style.BorderColor = clWindowFrame
+    Style.BorderStyle = ebs3D
+    Style.HotTrack = False
+    Style.LookAndFeel.Kind = lfStandard
+    Style.LookAndFeel.NativeStyle = True
+    Style.ButtonStyle = bts3D
+    Style.PopupBorderStyle = epbsFrame3D
+    StyleDisabled.LookAndFeel.Kind = lfStandard
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.Kind = lfStandard
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.Kind = lfStandard
+    StyleHot.LookAndFeel.NativeStyle = True
+    TabOrder = 4
+    Width = 210
+  end
+  object cbPoblacion: TcxDBComboBox
+    Left = 136
+    Top = 113
+    DataBinding.DataField = 'POBLACION'
+    DataBinding.DataSource = dsDireccion
+    Properties.ImmediatePost = True
+    Properties.ImmediateUpdateText = True
+    Properties.PostPopupValueOnTab = True
+    Properties.OnInitPopup = cbPoblacionPropertiesInitPopup
+    Style.BorderColor = clWindowFrame
+    Style.BorderStyle = ebs3D
+    Style.HotTrack = False
+    Style.LookAndFeel.Kind = lfStandard
+    Style.LookAndFeel.NativeStyle = True
+    Style.ButtonStyle = bts3D
+    Style.PopupBorderStyle = epbsFrame3D
+    StyleDisabled.LookAndFeel.Kind = lfStandard
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.Kind = lfStandard
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.Kind = lfStandard
+    StyleHot.LookAndFeel.NativeStyle = True
     TabOrder = 5
+    Width = 210
   end
   object dsDireccion: TDADataSource
     Left = 16
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorDireccionEntregaPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorDireccionEntregaPedidoProveedor.pas
index 4c697400..bbc6bc4c 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorDireccionEntregaPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorDireccionEntregaPedidoProveedor.pas	
@@ -5,7 +5,13 @@ interface
 uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
   Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit,
-  uIEditorDireccionEntregaPedidoProveedor, uBizPedidosProveedor, uDAInterfaces;
+  uIEditorDireccionEntregaPedidoProveedor, uBizPedidosProveedor, uDAInterfaces,
+  cxGraphics, dxSkinsCore, dxSkinBlue, dxSkinCaramel, dxSkinCoffee,
+  dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky,
+  dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters,
+  dxSkinValentine, dxSkinXmas2008Blue, cxMaskEdit, cxDropDownEdit;
 
 type
   TfEditorDireccionEntregaPedidoProveedor = class(TForm, IEditorDireccionEntregaPedidoProveedor)
@@ -13,25 +19,32 @@ type
     CancelBtn: TButton;
     Bevel1: TBevel;
     eDireccion: TDBEdit;
-    ePoblacion: TDBEdit;
-    eProvincia: TDBEdit;
     eCodigoPostal: TDBEdit;
     Label1: TLabel;
-    Label2: TLabel;
     Label3: TLabel;
     Label4: TLabel;
     dsDireccion: TDADataSource;
+    cbProvincia: TcxDBComboBox;
+    Label2: TLabel;
+    cbPoblacion: TcxDBComboBox;
 
     procedure FormShow(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure cbProvinciaPropertiesInitPopup(Sender: TObject);
+    procedure cbPoblacionPropertiesInitPopup(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
 
   private
     pDireccion: String;
     pPoblacion: String;
     pProvincia: String;
     pCodigoPostal: String;
-
+    FProvincias : TStringList;
+    FPoblaciones : TStringList;
     FPedido : IBizPedidoProveedor;
+    procedure CargarProvincias;
+    procedure CargarPoblaciones;
     function GetPedido: IBizPedidoProveedor;
     procedure SetPedido(const Value: IBizPedidoProveedor);
   public
@@ -41,27 +54,122 @@ type
 implementation
 {$R *.dfm}
 
+uses
+  uProvinciasPoblacionesController, uStringsUtils;
 
 { TfEditorDireccionEntrega }
 
+procedure TfEditorDireccionEntregaPedidoProveedor.CargarPoblaciones;
+var
+  i : integer;
+  AID : Integer;
+begin
+  AID := StrToInt(FProvincias.Values[cbProvincia.Text]);
+  with TProvinciasPoblacionesController.Create do
+    try
+      FPoblaciones := DarListaPoblaciones(AID);
+
+      with cbPoblacion.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FPoblaciones.Count - 1 do
+            Add(FPoblaciones.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
+procedure TfEditorDireccionEntregaPedidoProveedor.CargarProvincias;
+var
+  i : integer;
+begin
+  with TProvinciasPoblacionesController.Create do
+    try
+      FProvincias := DarListaProvincias;
+
+      with cbProvincia.Properties.Items do
+      begin
+        BeginUpdate;
+        try
+          Clear;
+          for i := 0 to FProvincias.Count - 1 do
+            Add(FProvincias.Names[i]);
+        finally
+          EndUpdate;
+        end;
+      end;
+    finally
+      Free;
+    end;
+end;
+
+procedure TfEditorDireccionEntregaPedidoProveedor.cbPoblacionPropertiesInitPopup(
+  Sender: TObject);
+begin
+  ShowHourglassCursor;
+  try
+    FreeANDNIL(FPoblaciones);
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+    if not EsCadenaVacia(cbProvincia.Text) and
+      (FProvincias.IndexOfName(cbProvincia.Text) <> -1) then
+      CargarPoblaciones
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
+procedure TfEditorDireccionEntregaPedidoProveedor.cbProvinciaPropertiesInitPopup(
+  Sender: TObject);
+begin
+  ShowHourglassCursor;
+  try
+    if not Assigned(FProvincias) then
+      CargarProvincias;
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 procedure TfEditorDireccionEntregaPedidoProveedor.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   //En el caso de cancelar se recuperan los valores iniciales
   if (Self.ModalResult <> mrOk) and (dsDireccion.DataTable.State in dsEditModes) then
   begin
     eDireccion.Field.Value := pDireccion;
-    ePoblacion.Field.Value := pPoblacion;
-    eProvincia.Field.Value := pProvincia;
+    cbPoblacion.DataBinding.Field.Value := pPoblacion;
+    cbProvincia.DataBinding.Field.Value := pProvincia;
     eCodigoPostal.Field.Value := pCodigoPostal;
   end;
 end;
 
+procedure TfEditorDireccionEntregaPedidoProveedor.FormCreate(Sender: TObject);
+begin
+  FProvincias := NIL;
+  FPoblaciones := NIL;
+end;
+
+procedure TfEditorDireccionEntregaPedidoProveedor.FormDestroy(Sender: TObject);
+begin
+  if Assigned(FProvincias) then
+    FreeANDNIL(FProvincias);
+
+  if Assigned(FPoblaciones) then
+    FreeANDNIL(FPoblaciones);
+end;
+
 procedure TfEditorDireccionEntregaPedidoProveedor.FormShow(Sender: TObject);
 begin
   //Guardamos los valores iniciales por si al final el usuario cancela
   pDireccion := eDireccion.Text;
-  pPoblacion := ePoblacion.Text;
-  pProvincia := eProvincia.Text;
+  pPoblacion := cbPoblacion.Text;
+  pProvincia := cbProvincia.Text;
   pCodigoPostal := eCodigoPostal.Text;
 end;