git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/branches/D2007-DA5@43 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Build/Build.fbp5

@@ -2968,8 +2968,13 @@ Comments=
                 <Property MultiValue="0" name="ActionDescription" type="string">Contactos</Property>
                 <Property name="ActionTextColor" type="Cardinal">0</Property>
                 <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
+<<<<<<< .mine
+                <Property MultiValue="0" name="Description" type="string">Contactos</Property>
+                <Property name="Enabled" type="WordBool">True</Property>
+=======
                 <Property MultiValue="0" name="Description" type="string">Contactos</Property>
                 <Property name="Enabled" type="WordBool">False</Property>
+>>>>>>> .r42
                 <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
                 <Property name="IgnoreFailure" type="WordBool">False</Property>
                 <Property name="IsAction" type="Boolean">True</Property>

Database/scripts/factuges.sql

@@ -1066,7 +1066,7 @@ SELECT
   PROVEEDORES_DATOS.CERTIFICACION
 FROM
   PROVEEDORES_DATOS
-  INNER JOIN V_CONTACTOS ON (PROVEEDORES_DATOS.ID_PROVEEDOR = V_CONTACTOS.ID)
+  LEFT OUTER JOIN V_CONTACTOS ON (PROVEEDORES_DATOS.ID_PROVEEDOR = V_CONTACTOS.ID)
 WHERE
   V_CONTACTOS.ID_CATEGORIA = 2;
 
@@ -1106,7 +1106,7 @@ SELECT V_CONTACTOS.ID,
   EMPLEADOS_DATOS.EXPERIENCIA
   
 FROM V_CONTACTOS
-INNER JOIN EMPLEADOS_DATOS ON (EMPLEADOS_DATOS.ID_EMPLEADO = V_CONTACTOS.ID)
+LEFT OUTER JOIN EMPLEADOS_DATOS ON (EMPLEADOS_DATOS.ID_EMPLEADO = V_CONTACTOS.ID)
 
 WHERE V_CONTACTOS.ID_CATEGORIA = 3;
 SET TERM ^ ;

Source/GUIBase/GUIBase.dproj

@@ -57,22 +57,22 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Servidor\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="..\Servidor\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="..\Servidor\dxBarD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxBarD10.dcp" />
-    <DCCReference Include="..\Servidor\dxBarExtItemsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxBarExtItemsD10.dcp" />
-    <DCCReference Include="..\Servidor\dxLayoutControlD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD10.dcp" />
-    <DCCReference Include="..\Servidor\dxPScxCommonD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD10.dcp" />
-    <DCCReference Include="..\Servidor\dxPScxGridLnkD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGridLnkD10.dcp" />
-    <DCCReference Include="..\Servidor\dxPsPrVwAdvD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPsPrVwAdvD10.dcp" />
-    <DCCReference Include="..\Servidor\frx10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frx10.dcp" />
-    <DCCReference Include="..\Servidor\frxe10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frxe10.dcp" />
-    <DCCReference Include="..\Servidor\fs10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\fs10.dcp" />
-    <DCCReference Include="..\Servidor\JvAppFrmD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Servidor\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="..\Servidor\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="..\Servidor\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/GUIBase/uViewGrid.dfm

@@ -19,7 +19,7 @@ inherited frViewGrid: TfrViewGrid
     LookAndFeel.Kind = lfOffice11
     LookAndFeel.NativeStyle = True
     object cxGridView: TcxGridDBTableView
-      OnDblClick = cxGridViewDblClick                         
+      OnDblClick = cxGridViewDblClick
       NavigatorButtons.ConfirmDelete = False
       FilterBox.Visible = fvNever
       DataController.DataSource = dsDataSource
@@ -107,6 +107,7 @@ inherited frViewGrid: TfrViewGrid
     SupportedDocks = [dkStandardDock, dkMultiDock]
     TabOrder = 2
     Visible = False
+    ExplicitWidth = 128
     object TBXAlignmentPanel1: TTBXAlignmentPanel
       Left = 0
       Top = 0
@@ -154,7 +155,7 @@ inherited frViewGrid: TfrViewGrid
       PrinterPage.ScaleMode = smFit
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 39296.809313506940000000
+      ReportDocument.CreationDate = 39367.963260995370000000
       StyleManager = dxPrintStyleManager1
       OptionsCards.Shadow.Depth = 0
       OptionsExpanding.ExpandGroupRows = True

Source/GUIBase/uViewGrid.pas

@@ -1,4 +1,4 @@
-{*******************************************************}
+{*******************************************************}
 {                                                       }
 {       Administración de puntos de venta               }
 {                                                       }
@@ -21,7 +21,7 @@ uses
   dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPrnDlg,
   cxIntlPrintSys3, dxPSPrvwAdv, uViewGridBase, cxGridCustomPopupMenu,
   cxGridPopupMenu, uViewFiltroBase, ComCtrls, cxPC, ImgList, PngImageList,
-  TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg;
+  TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg, uDAInterfaces;
 
 type
   IViewGrid = interface(IViewGridBase)

Source/GUIBase/uViewGridBase.pas

@@ -19,7 +19,7 @@ uses
   DBGrids, JvComponent, JvFormAutoSize, dxPSGlbl, dxPSUtl, dxPSEngn,
   dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
   dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPrnDlg,
-  cxIntlPrintSys3, dxPSPrvwAdv, uGridUtils, uViewFiltroBase;
+  cxIntlPrintSys3, dxPSPrvwAdv, uGridUtils, uViewFiltroBase, uDAInterfaces;
 
 type
   IViewGridBase = interface(IViewBase)

Source/Modulos/Contactos/Contactos_Group.groupproj

@@ -0,0 +1,124 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{9e374daa-b130-47db-a2de-c184f072bea0}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Projects Include="..\..\ApplicationBase\ApplicationBase.dproj" />
+    <Projects Include="..\..\Base\Base.dproj" />
+    <Projects Include="..\..\Cliente\FactuGES.dproj" />
+    <Projects Include="..\..\GUIBase\GUIBase.dproj" />
+    <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="Controller\Contactos_controller.dproj" />
+    <Projects Include="Data\Contactos_data.dproj" />
+    <Projects Include="Model\Contactos_model.dproj" />
+    <Projects Include="Plugin\Contactos_plugin.dproj" />
+    <Projects Include="Views\Contactos_view.dproj" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Default.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+  <BorlandProject xmlns=""> <Default.Personality> </Default.Personality> </BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Target Name="Base">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="" />
+  </Target>
+  <Target Name="Base:Clean">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Base:Make">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Make" />
+  </Target>
+  <Target Name="GUIBase">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="" />
+  </Target>
+  <Target Name="GUIBase:Clean">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="GUIBase:Make">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ApplicationBase">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="" />
+  </Target>
+  <Target Name="ApplicationBase:Clean">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ApplicationBase:Make">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Contactos_model">
+    <MSBuild Projects="Model\Contactos_model.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_model:Clean">
+    <MSBuild Projects="Model\Contactos_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_model:Make">
+    <MSBuild Projects="Model\Contactos_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Contactos_data">
+    <MSBuild Projects="Data\Contactos_data.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_data:Clean">
+    <MSBuild Projects="Data\Contactos_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_data:Make">
+    <MSBuild Projects="Data\Contactos_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Contactos_controller">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_controller:Clean">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_controller:Make">
+    <MSBuild Projects="Controller\Contactos_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Contactos_view">
+    <MSBuild Projects="Views\Contactos_view.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_view:Clean">
+    <MSBuild Projects="Views\Contactos_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_view:Make">
+    <MSBuild Projects="Views\Contactos_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Contactos_plugin">
+    <MSBuild Projects="Plugin\Contactos_plugin.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_plugin:Clean">
+    <MSBuild Projects="Plugin\Contactos_plugin.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_plugin:Make">
+    <MSBuild Projects="Plugin\Contactos_plugin.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FactuGES">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES:Clean">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES:Make">
+    <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FactuGES_Server">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES_Server:Clean">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES_Server:Make">
+    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Build">
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Contactos_plugin;FactuGES;FactuGES_Server" />
+  </Target>
+  <Target Name="Clean">
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+  </Target>
+  <Target Name="Make">
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
+  </Target>
+  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
+</Project>

Source/Modulos/Contactos/Controller/Contactos_controller.dpk

@@ -29,6 +29,7 @@ requires
   vcl,
   Base,
   GUIBase,
+  ApplicationBase,
   Contactos_model,
   Contactos_data;
 

Source/Modulos/Contactos/Controller/Contactos_controller.dproj

@@ -43,9 +43,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <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">True</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="D:\MISDOC~1\BORLAN~1\Bpl\JclDebugExpert100.bpl">JCL Debug IDE extension</Excluded_Packages>
       <Excluded_Packages Name="D:\MISDOC~1\BORLAN~1\Bpl\JclProjectAnalysisExpert100.bpl">JCL Project Analyzer</Excluded_Packages>
       <Excluded_Packages Name="D:\MISDOC~1\BORLAN~1\Bpl\JclFavoriteFoldersExpert100.bpl">JCL Open and Save IDE dialogs with favorite folders</Excluded_Packages>
@@ -56,6 +53,7 @@
     <DelphiCompile Include="Contactos_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_data.dcp" />
     <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
@@ -93,7 +91,6 @@
     <None Include="ModelSupport_Contactos_controller\default.txaPackage" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006

Source/Modulos/Contactos/Controller/uContactosController.pas

@@ -63,7 +63,7 @@ implementation
 
 uses
   Dialogs, uEditorRegistryUtils, cxControls, DB, uDAInterfaces, uDataTableUtils,
-  schContactosClient_Intf;
+  schContactosClient_Intf, uFactuGES_App;
 
 { TContactosController }
 
@@ -188,13 +188,29 @@ end;
 
 function TContactosController.Guardar(AContacto: IBizContacto): Boolean;
 var
-  NuevoID : Integer;
+  dtDetails : TList;
+  i : integer;
 begin
   Result := False;
 
   if ValidarContacto(AContacto) then
   begin
     ShowHourglassCursor;
+
+    if AContacto.EsNuevo then
+    begin
+      AContacto.Edit;
+      AContacto.ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
+      AContacto.Post;
+    end;
+
+    dtDetails := AContacto.DataTable.GetDetailDataTables;
+    for i := 0 to dtDetails.Count - 1 do
+    begin
+      if (TDADataTable(dtDetails.Items[i])).State in dsEditModes then
+        (TDADataTable(dtDetails.Items[i])).Post;
+    end;
+
     try
       AContacto.DataTable.ApplyUpdates;
       Result := True;      

Source/Modulos/Contactos/Data/Contactos_data.dpk

@@ -28,6 +28,8 @@ requires
   rtl,
   vcl,
   Base,
+  GUIBase,
+  ApplicationBase,
   Contactos_model;
 
 contains

Source/Modulos/Contactos/Data/uDataModuleClientes.dfm

@@ -10,9 +10,6 @@ inherited DataModuleClientes: TDataModuleClientes
   inherited ds_Contactos: TDADataSource
     DataSet = tbl_Contactos.Dataset
   end
-  inherited ds_ContactosCategorias: TDADataSource
-    DataSet = tbl_ContactosCategorias.Dataset
-  end
   inherited ds_DireccionesContacto: TDADataSource
     DataSet = tbl_DireccionesContacto.Dataset
   end

Source/Modulos/Contactos/Data/uDataModuleClientes.pas

@@ -61,7 +61,6 @@ begin
     Result := Self.GetItems;
     with Result.DataTable.DynamicWhere do
     begin
-      Clear;
       // (ID = :ID)
       Expression := NewBinaryExpression(NewField('', fld_ContactosID),
         NewConstant(ID, datInteger), dboEqual);
@@ -85,7 +84,6 @@ begin
       DatosBancarios := _GetDatosBancarios;
       Direcciones := _GetDirecciones;
       Descuentos := _GetDescuentos;
-      _Categorias := _GetCategorias;
     end;
 
     Result := (AContacto as IBizCliente);

Source/Modulos/Contactos/Data/uDataModuleContactos.dfm

@@ -31,6 +31,7 @@ object DataModuleContactos: TDataModuleContactos
         Name = 'ID'
         DataType = datAutoInc
         GeneratorName = 'GEN_CONTACTOS_ID'
+        ServerAutoRefresh = True
         DictionaryEntry = 'Contactos_ID'
         InPrimaryKey = True
       end
@@ -64,14 +65,14 @@ object DataModuleContactos: TDataModuleContactos
         Name = 'CALLE'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Direcci'#195#179'n'
+        DisplayLabel = 'Direcci'#243'n'
         DictionaryEntry = 'Contactos_CALLE'
       end
       item
         Name = 'POBLACION'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Poblaci'#195#179'n'
+        DisplayLabel = 'Poblaci'#243'n'
         DictionaryEntry = 'Contactos_POBLACION'
       end
       item
@@ -85,7 +86,7 @@ object DataModuleContactos: TDataModuleContactos
         Name = 'CODIGO_POSTAL'
         DataType = datString
         Size = 10
-        DisplayLabel = 'C'#195#179'digo postal'
+        DisplayLabel = 'C'#243'digo postal'
         DictionaryEntry = 'Contactos_CODIGO_POSTAL'
       end
       item
@@ -106,7 +107,7 @@ object DataModuleContactos: TDataModuleContactos
         Name = 'MOVIL_1'
         DataType = datString
         Size = 25
-        DisplayLabel = 'M'#195#179'vil'
+        DisplayLabel = 'M'#243'vil'
         DictionaryEntry = 'Contactos_MOVIL_1'
       end
       item
@@ -159,7 +160,7 @@ object DataModuleContactos: TDataModuleContactos
       item
         Name = 'FECHA_MODIFICACION'
         DataType = datDateTime
-        DisplayLabel = 'Fecha de modificaci'#195#179'n'
+        DisplayLabel = 'Fecha de modificaci'#243'n'
         DictionaryEntry = 'Contactos_FECHA_MODIFICACION'
       end
       item
@@ -196,39 +197,6 @@ object DataModuleContactos: TDataModuleContactos
     Left = 176
     Top = 80
   end
-  object tbl_ContactosCategorias: TDAMemDataTable
-    RemoteUpdatesOptions = []
-    Fields = <
-      item
-        Name = 'ID_CONTACTO'
-        DataType = datInteger
-        InPrimaryKey = True
-      end
-      item
-        Name = 'ID_CATEGORIA'
-        DataType = datInteger
-        InPrimaryKey = True
-      end>
-    Params = <>
-    MasterMappingMode = mmWhere
-    StreamingOptions = [soDisableEventsWhileStreaming]
-    RemoteDataAdapter = rda_Contactos
-    LocalDataStreamer = Bin2DataStreamer
-    MasterSource = ds_Contactos
-    MasterFields = 'ID'
-    DetailFields = 'ID_CONTACTO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
-    LogicalName = 'ContactosCategorias'
-    Left = 296
-    Top = 16
-  end
-  object ds_ContactosCategorias: TDADataSource
-    DataSet = tbl_ContactosCategorias.Dataset
-    DataTable = tbl_ContactosCategorias
-    Left = 296
-    Top = 80
-  end
   object tbl_DireccionesContacto: TDAMemDataTable
     RemoteUpdatesOptions = []
     Fields = <
@@ -236,6 +204,7 @@ object DataModuleContactos: TDataModuleContactos
         Name = 'ID'
         DataType = datAutoInc
         GeneratorName = 'GEN_CONTACTOS_DIR_ID'
+        ServerAutoRefresh = True
         DictionaryEntry = 'DireccionesContacto_ID'
         InPrimaryKey = True
       end
@@ -255,7 +224,7 @@ object DataModuleContactos: TDataModuleContactos
         Name = 'POBLACION'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Poblaci'#195#179'n'
+        DisplayLabel = 'Poblaci'#243'n'
         DictionaryEntry = 'DireccionesContacto_POBLACION'
       end
       item
@@ -269,7 +238,7 @@ object DataModuleContactos: TDataModuleContactos
         Name = 'CODIGO_POSTAL'
         DataType = datString
         Size = 10
-        DisplayLabel = 'C'#195#179'digo postal'
+        DisplayLabel = 'C'#243'digo postal'
         DictionaryEntry = 'DireccionesContacto_CODIGO_POSTAL'
       end
       item
@@ -290,14 +259,14 @@ object DataModuleContactos: TDataModuleContactos
         Name = 'TELEFONO'
         DataType = datString
         Size = 25
-        DisplayLabel = 'Tel'#195#169'fono'
+        DisplayLabel = 'Tel'#233'fono'
         DictionaryEntry = 'DireccionesContacto_TELEFONO'
       end
       item
         Name = 'MOVIL'
         DataType = datString
         Size = 25
-        DisplayLabel = 'M'#195#179'vil'
+        DisplayLabel = 'M'#243'vil'
         DictionaryEntry = 'Contactos_MOVIL_1'
       end
       item

Source/Modulos/Contactos/Data/uDataModuleContactos.pas

@@ -4,24 +4,22 @@ interface
 
 uses
   SysUtils, Classes, DB, DBClient,
-  uDAClientDataModule, uDADataTable, uDABINAdapter,
+  uDADataTable, uDABINAdapter,
   uDAScriptingProvider, uDACDSDataTable, uROWinInetHttpChannel,
-  uROServiceComponent, uRORemoteService, uROClient, uROBinMessage,
+  uRORemoteService, uROClient, uROBinMessage,
-  uBizContactos, uBizContactosDatosBancarios, uBizCategoriasContacto,
+  uBizContactos, uBizContactosDatosBancarios, 
   uBizDireccionesContacto, uIDataModuleEtiquetasContactosReport,
   uIDataModuleContactos, uDADesigntimeCall, uROTypes, uRODynamicRequest,
   uDAInterfaces, uDADataStreamer, uDARemoteDataAdapter, uDABin2DataStreamer,
   uDAMemDataTable;
 
 type
-  TDataModuleContactos = class(TDAClientDataModule, IDataModuleContactos, IDataModuleEtiquetasContactosReport)
+  TDataModuleContactos = class(TDataModule, IDataModuleContactos, IDataModuleEtiquetasContactosReport)
     RORemoteService: TRORemoteService;
     rda_Contactos: TDARemoteDataAdapter;
     Bin2DataStreamer: TDABin2DataStreamer;
     tbl_Contactos: TDAMemDataTable;
     ds_Contactos: TDADataSource;
-    tbl_ContactosCategorias: TDAMemDataTable;
-    ds_ContactosCategorias: TDADataSource;
     tbl_DireccionesContacto: TDAMemDataTable;
     ds_DireccionesContacto: TDADataSource;
     tbl_DatosBancarios: TDAMemDataTable;
@@ -30,7 +28,6 @@ type
   public
     function _GetDatosBancarios : IBizContactosDatosBancarios;
     function _GetDirecciones: IBizDireccionesContacto;
-    function _GetCategorias : IBizCategoriasContacto;
     function _GetItems (IDCategoria : Integer): IBizContacto; virtual;
 
     // Report
@@ -58,25 +55,6 @@ begin
   Result := (RORemoteService as IsrvContactos).GenerateEtiquetasReport(AContactosID);
 end;
 
-function TDataModuleContactos._GetCategorias: IBizCategoriasContacto;
-var
-  ACategorias : TDAMemDataTable;
-begin
-  ShowHourglassCursor;
-  try
-    ACategorias := CloneDataTable(tbl_ContactosCategorias);
-    with ACategorias do
-    begin
-      BusinessRulesID := BIZ_CLIENT_CATEGORIAS_CONTACTO;
-      DetailOptions := DetailOptions -
-        [dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates];
-    end;
-    Result := (ACategorias as IBizCategoriasContacto);
-  finally
-    HideHourglassCursor;
-  end;
-end;
-
 function TDataModuleContactos._GetDatosBancarios: IBizContactosDatosBancarios;
 var
   ADatosBancarios : TDAMemDataTable;
@@ -134,7 +112,6 @@ begin
     begin
       DatosBancarios := _GetDatosBancarios;
       Direcciones := _GetDirecciones;
-      _Categorias := _GetCategorias;
     end;
 
     Result := (AContacto as IBizContacto);

Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm

@@ -2,9 +2,6 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
   inherited ds_Contactos: TDADataSource
     DataSet = tbl_Contactos.Dataset
   end
-  inherited ds_ContactosCategorias: TDADataSource
-    DataSet = tbl_ContactosCategorias.Dataset
-  end
   inherited ds_DireccionesContacto: TDADataSource
     DataSet = tbl_DireccionesContacto.Dataset
   end
@@ -18,6 +15,7 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         Name = 'ID'
         DataType = datAutoInc
         GeneratorName = 'GEN_CONTACTOS_ID'
+        ServerAutoRefresh = True
         DictionaryEntry = 'Contactos_ID'
         InPrimaryKey = True
       end
@@ -53,14 +51,14 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         Name = 'CALLE'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Direcci'#195#179'n'
+        DisplayLabel = 'Direcci'#243'n'
         DictionaryEntry = 'Contactos_CALLE'
       end
       item
         Name = 'POBLACION'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Poblaci'#195#179'n'
+        DisplayLabel = 'Poblaci'#243'n'
         DictionaryEntry = 'Contactos_POBLACION'
       end
       item
@@ -74,7 +72,7 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         Name = 'CODIGO_POSTAL'
         DataType = datString
         Size = 10
-        DisplayLabel = 'C'#195#179'digo postal'
+        DisplayLabel = 'C'#243'digo postal'
         DictionaryEntry = 'Contactos_CODIGO_POSTAL'
       end
       item
@@ -95,7 +93,7 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         Name = 'MOVIL_1'
         DataType = datString
         Size = 25
-        DisplayLabel = 'M'#195#179'vil'
+        DisplayLabel = 'M'#243'vil'
         DictionaryEntry = 'Contactos_MOVIL_1'
       end
       item
@@ -176,7 +174,7 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         Name = 'CATEGORIA'
         DataType = datString
         Size = 255
-        DisplayLabel = 'Categor'#195#173'a'
+        DisplayLabel = 'Categor'#237'a'
         DictionaryEntry = 'Empleados_CATEGORIA'
       end
       item
@@ -188,19 +186,19 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
       item
         Name = 'FORMACION_BASE'
         DataType = datMemo
-        DisplayLabel = 'Formaci'#195#179'n base'
+        DisplayLabel = 'Formaci'#243'n base'
         DictionaryEntry = 'Empleados_FORMACION_BASE'
       end
       item
         Name = 'FORMACION_COMPLE'
         DataType = datMemo
-        DisplayLabel = 'Formaci'#195#179'n complementaria'
+        DisplayLabel = 'Formaci'#243'n complementaria'
         DictionaryEntry = 'Empleados_FORMACION_COMPLE'
       end
       item
         Name = 'FORMACION_RECIBIDA'
         DataType = datMemo
-        DisplayLabel = 'Formaci'#195#179'n recibida'
+        DisplayLabel = 'Formaci'#243'n recibida'
         DictionaryEntry = 'Empleados_FORMACION_RECIBIDA'
       end
       item

Source/Modulos/Contactos/Data/uDataModuleEmpleados.pas

@@ -59,7 +59,6 @@ begin
     Result := Self.GetItems;
     with Result.DataTable.DynamicWhere do
     begin
-      Clear;
       // (ID = :ID)
       Expression := NewBinaryExpression(NewField('', fld_ContactosID),
         NewConstant(ID, datInteger), dboEqual);
@@ -81,7 +80,6 @@ begin
     with TBizEmpleado(AContacto.BusinessEventsObj) do
     begin
       DatosBancarios := _GetDatosBancarios;
-      _Categorias := _GetCategorias;
     end;
 
     Result := (AContacto as IBizEmpleado);

Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm

@@ -4,9 +4,6 @@ inherited DataModuleProveedores: TDataModuleProveedores
   inherited ds_Contactos: TDADataSource
     DataSet = tbl_Contactos.Dataset
   end
-  inherited ds_ContactosCategorias: TDADataSource
-    DataSet = tbl_ContactosCategorias.Dataset
-  end
   inherited ds_DireccionesContacto: TDADataSource
     DataSet = tbl_DireccionesContacto.Dataset
   end

Source/Modulos/Contactos/Data/uDataModuleProveedores.pas

@@ -5,7 +5,7 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, uDataModuleContactos, DB, uDADataTable, uDAScriptingProvider,
-  uDACDSDataTable, uDABINAdapter, uROServiceComponent, uRORemoteService,
+  uDACDSDataTable, uDABINAdapter, uRORemoteService,
   uROClient, uROBinMessage, uROWinInetHttpChannel, uBizGruposProveedor,
 
   uIDataModuleProveedores, uBizContactos, uDADesigntimeCall,
@@ -54,13 +54,12 @@ begin
   ShowHourglassCursor;
   try
     Result := Self.GetItems;
-    with Result.DataTable.Where do
+
+    // (ID = :ID)
+    with Result.DataTable.DynamicWhere do
     begin
-      if NotEmpty then
+      Expression := NewBinaryExpression(NewField('', fld_ContactosID),
-        AddOperator(opAND);
+        NewConstant(ID, datInteger), dboEqual);
-      OpenBraket;
-      AddText(fld_ContactosID + ' = ' + IntToStr(ID));
-      CloseBraket;
     end;
   finally
     HideHourglassCursor;
@@ -80,7 +79,6 @@ begin
     begin
       DatosBancarios := _GetDatosBancarios;
       Direcciones := _GetDirecciones;
-      _Categorias := _GetCategorias;
     end;
 
     Result := (AContacto as IBizProveedor);

Source/Modulos/Contactos/Model/Contactos_model.dpk

@@ -34,7 +34,6 @@ requires
 contains
   uBizContactosDatosBancarios in 'uBizContactosDatosBancarios.pas',
   uBizContactos in 'uBizContactos.pas',
-  uBizCategoriasContacto in 'uBizCategoriasContacto.pas',
   uIDataModuleContactos in 'Data\uIDataModuleContactos.pas',
   uIDataModuleClientes in 'Data\uIDataModuleClientes.pas',
   uIDataModuleProveedores in 'Data\uIDataModuleProveedores.pas',

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

@@ -4,7 +4,7 @@ interface
 
 uses
   SysUtils, Classes,
-  uBizContactos, uBizContactosDatosBancarios, uBizCategoriasContacto;
+  uBizContactos, uBizContactosDatosBancarios;
 
 type
   IDataModuleContactos = interface

Source/Modulos/Contactos/Model/uBizCategoriasContacto.pas

@@ -1,27 +0,0 @@
-unit uBizCategoriasContacto;
-
-interface
-
-uses
-  uDAInterfaces, uDADataTable,
-  schContactosClient_Intf;
-
-const
-  BIZ_CLIENT_CATEGORIAS_CONTACTO = 'Client.CategoriasContacto';
-
-type
-  IBizCategoriasContacto = interface(IContactosCategorias)
-    ['{C056E958-69BE-4819-A6A7-CB7FD6DA0BCB}']
-  end;
-
-  TBizCategoriasContacto = class(TContactosCategoriasDataTableRules, IBizCategoriasContacto)
-  end;
-
-implementation
-
-
-initialization
-  RegisterDataTableRules(BIZ_CLIENT_CATEGORIAS_CONTACTO, TBizCategoriasContacto);
-
-
-end.

Source/Modulos/Contactos/Model/uBizClientesDescuentos.pas

@@ -19,6 +19,7 @@ type
     ContIdAux: Integer;
   protected
     procedure OnNewRecord(Sender: TDADataTable); override;
+    procedure BeforeInsert(Sender: TDADataTable); override;    
   public
     constructor Create(aDataTable: TDADataTable); override;
   end;
@@ -27,6 +28,19 @@ implementation
 
 { TBizClienteDescuentos }
 
+uses
+  DB;
+
+procedure TBizClienteDescuentos.BeforeInsert(Sender: TDADataTable);
+var
+  AMasterTable : TDADataTable;
+begin
+  inherited;
+  AMasterTable := DataTable.GetMasterDataTable;
+  if Assigned(AMasterTable) and (AMasterTable.State in dsEditModes) then
+    AMasterTable.Post;
+end;
+
 constructor TBizClienteDescuentos.Create(aDataTable: TDADataTable);
 begin
   inherited;

Source/Modulos/Contactos/Model/uBizContactos.pas

@@ -4,7 +4,7 @@ interface
 
 uses
   uDAInterfaces, uDADataTable, uROClasses,
-  schContactosClient_Intf, uBizContactosDatosBancarios, uBizCategoriasContacto,
+  schContactosClient_Intf, uBizContactosDatosBancarios, 
   uDBSelectionListUtils, uBizDireccionesContacto, uBizClientesDescuentos;
 
 const
@@ -33,11 +33,6 @@ type
     function GetCategoria : String;
     property Categoria : String read GetCategoria;
 
-    function _GetCategorias: IBizCategoriasContacto;
-    procedure _SetCategorias(const Value: IBizCategoriasContacto);
-    property _Categorias : IBizCategoriasContacto read _GetCategorias
-      write _SetCategorias;
-
     function GetDirecciones: IBizDireccionesContacto;
     procedure SetDirecciones(const Value: IBizDireccionesContacto);
     property Direcciones : IBizDireccionesContacto read GetDirecciones
@@ -180,16 +175,11 @@ type
   protected
     FDatosBancarios : IBizContactosDatosBancarios;
     FDatosBancariosLink : TDADataSource;
-    FCategorias : IBizCategoriasContacto;
-    FCategoriasLink : TDADataSource;
     FDirecciones : IBizDireccionesContacto;
     FDireccionesLink : TDADataSource;
 
     FSeleccionableInterface : ISeleccionable;
 
-    function _GetCategorias: IBizCategoriasContacto;
-    procedure _SetCategorias(const Value: IBizCategoriasContacto);
-
     procedure SetDatosBancarios(AValue : IBizContactosDatosBancarios);
     function GetDatosBancarios : IBizContactosDatosBancarios;
 
@@ -206,9 +196,6 @@ type
     destructor Destroy; override;
     property Categoria : String read GetCategoria;
 
-    property _Categorias : IBizCategoriasContacto read _GetCategorias
-      write _SetCategorias;
-
     property DatosBancarios : IBizContactosDatosBancarios read GetDatosBancarios
       write SetDatosBancarios;
 
@@ -368,9 +355,6 @@ uses
 constructor TBizContacto.Create(aDataTable: TDADataTable);
 begin
   inherited;
-  FCategoriasLink := TDADataSource.Create(NIL);
-  FCategoriasLink.DataTable := aDataTable;
-
   FDatosBancariosLink := TDADataSource.Create(NIL);
   FDatosBancariosLink.DataTable := aDataTable;
 
@@ -382,9 +366,6 @@ end;
 
 destructor TBizContacto.Destroy;
 begin
-  FCategorias := NIL;
-  FCategoriasLink.Free;
-
   FDatosBancarios := NIL;
   FDatosBancariosLink.Free;
 
@@ -444,16 +425,6 @@ begin
   EnlazarMaestroDetalle(FDireccionesLink, FDirecciones);
 end;
 
-function TBizContacto._GetCategorias: IBizCategoriasContacto;
-begin
-  Result := FCategorias;
-end;
-
-procedure TBizContacto._SetCategorias(const Value: IBizCategoriasContacto);
-begin
-  FCategorias := Value;
-  EnlazarMaestroDetalle(FCategoriasLink, FCategorias);
-end;
 
 { TBizCliente }
 

Source/Modulos/Contactos/Model/uBizContactosDatosBancarios.pas

@@ -36,7 +36,7 @@ var
 begin
   inherited;
   AMasterTable := DataTable.GetMasterDataTable;
-  if Assigned(AMasterTable) and (AMasterTable.State = dsInsert) then
+  if Assigned(AMasterTable) and (AMasterTable.State in dsEditModes) then
     AMasterTable.Post;
 end;
 

Source/Modulos/Contactos/Model/uBizContactosServer.pas

@@ -16,11 +16,14 @@ type
     procedure Update_Datos_Contacto(aChange: TDADeltaChange); virtual;
     procedure Delete_Datos_Contacto(aChange: TDADeltaChange); virtual;
 
+    procedure Insert_Categoria_Contacto(aChange: TDADeltaChange); virtual;
+    procedure Update_Categoria_Contacto(aChange: TDADeltaChange); virtual;
+    procedure Delete_Categoria_Contacto(aChange: TDADeltaChange); virtual;
+
     procedure AfterProcessChange(Sender: TDABusinessProcessor;
       aChange: TDADeltaChange; Processed: Boolean;
       var CanRemoveFromDelta: Boolean); override;
 
-
     procedure ProcessError(Sender: TDABusinessProcessor;
       aChangeType: TDAChangeType; aChange: TDADeltaChange;
       const aCommand: IDASQLCommand; var CanRemoveFromDelta: Boolean;
@@ -42,14 +45,46 @@ begin
   inherited;
 
   case aChange.ChangeType of
-    ctInsert: Insert_Datos_Contacto(aChange);
+    ctInsert: begin
-    ctUpdate: Update_Datos_Contacto(aChange);
+                Insert_Categoria_Contacto(aChange);
-    ctDelete: Delete_Datos_Contacto(aChange);
+                Insert_Datos_Contacto(aChange);
+              end;
+    ctUpdate: begin
+                Update_Categoria_Contacto(aChange);
+                Update_Datos_Contacto(aChange);
+              end;
+    ctDelete: begin
+                Delete_Categoria_Contacto(aChange);
+                Delete_Datos_Contacto(aChange);
+              end;
   end;
 
   CanRemoveFromDelta := True;
 end;
 
+procedure TBizContactosServer.Delete_Categoria_Contacto(
+  aChange: TDADeltaChange);
+var
+  ASchema : TDASchema;
+  ACurrentConn : IDAConnection;
+  ACommand : IDASQLCommand;
+begin
+  ASchema := BusinessProcessor.Schema;
+  ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
+
+  ACommand := ASchema.NewCommand(ACurrentConn, 'Delete_ContactosCategorias');
+  try
+    with ACommand do
+    begin
+      ParamByName('OLD_ID_CONTACTO').Value := aChange.OldValueByName[fld_ContactosID];
+      ParamByName('OLD_ID_CATEGORIA').Value := aChange.OldValueByName[fld_ContactosID_CATEGORIA];
+      Execute;
+    end;
+  finally
+    ACommand := NIL;
+  end;
+end;
+
 procedure TBizContactosServer.Delete_Datos_Contacto(aChange: TDADeltaChange);
 var
   ASchema : TDASchema;
@@ -75,6 +110,29 @@ begin
   end;
 end;
 
+procedure TBizContactosServer.Insert_Categoria_Contacto(
+  aChange: TDADeltaChange);
+var
+  ASchema : TDASchema;
+  ACurrentConn : IDAConnection;
+  ACommand : IDASQLCommand;
+begin
+  ASchema := BusinessProcessor.Schema;
+  ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
+
+  ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_ContactosCategorias');
+  try
+    with ACommand do
+    begin
+      ParamByName('ID_CONTACTO').Value := aChange.NewValueByName[fld_ContactosID];
+      ParamByName('ID_CATEGORIA').Value := aChange.NewValueByName[fld_ContactosID_CATEGORIA];
+      Execute;
+    end;
+  finally
+    ACommand := NIL;
+  end;
+end;
+
 procedure TBizContactosServer.Insert_Datos_Contacto(aChange: TDADeltaChange);
 var
   ASchema : TDASchema;
@@ -112,6 +170,33 @@ begin
   raise Exception.Create(Error.Message);
 end;
 
+procedure TBizContactosServer.Update_Categoria_Contacto(
+  aChange: TDADeltaChange);
+var
+  ASchema : TDASchema;
+  ACurrentConn : IDAConnection;
+  ACommand : IDASQLCommand;
+begin
+  ASchema := BusinessProcessor.Schema;
+  ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
+
+//En el caso update nos da igual lo que se quiera modificar así que se queda igual
+  ACommand := ASchema.NewCommand(ACurrentConn, 'Update_ContactosCategorias');
+  try
+    with ACommand do
+    begin
+      ParamByName('ID_CONTACTO').Value := aChange.NewValueByName[fld_ContactosID];
+      ParamByName('OLD_ID_CONTACTO').Value := aChange.OldValueByName[fld_ContactosID];
+
+      ParamByName('ID_CATEGORIA').Value := aChange.NewValueByName[fld_ContactosID_CATEGORIA];
+      ParamByName('OLD_ID_CATEGORIA').Value := aChange.OldValueByName[fld_ContactosID_CATEGORIA];
+      Execute;
+    end;
+  finally
+    ACommand := NIL;
+  end;
+end;
+
 procedure TBizContactosServer.Update_Datos_Contacto(aChange: TDADeltaChange);
 var
   ASchema : TDASchema;

Source/Modulos/Contactos/Model/uBizDireccionesContacto.pas

@@ -36,7 +36,7 @@ var
 begin
   inherited;
   AMasterTable := DataTable.GetMasterDataTable;
-  if Assigned(AMasterTable) and (AMasterTable.State = dsInsert) then
+  if Assigned(AMasterTable) and (AMasterTable.State in dsEditModes) then
     AMasterTable.Post;
 end;
 

Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm

@@ -373,36 +373,6 @@ object srvContactos: TsrvContactos
             DataType = datDateTime
           end>
       end
-      item
-        Params = <>
-        Statements = <
-          item
-            Connection = 'IBX'
-            TargetTable = 'CONTACTOS_CATEGORIAS'
-            StatementType = stAutoSQL
-            ColumnMappings = <
-              item
-                DatasetField = 'ID_CONTACTO'
-                TableField = 'ID_CONTACTO'
-              end
-              item
-                DatasetField = 'ID_CATEGORIA'
-                TableField = 'ID_CATEGORIA'
-              end>
-          end>
-        Name = 'ContactosCategorias'
-        Fields = <
-          item
-            Name = 'ID_CONTACTO'
-            DataType = datInteger
-            InPrimaryKey = True
-          end
-          item
-            Name = 'ID_CATEGORIA'
-            DataType = datInteger
-            InPrimaryKey = True
-          end>
-      end
       item
         Params = <>
         Statements = <
@@ -1647,6 +1617,222 @@ object srvContactos: TsrvContactos
             Size = 255
             DisplayLabel = 'Descripci'#243'n'
           end>
+      end
+      item
+        IsPublic = False
+        Params = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_CONTACTOS_ID'
+            Value = '2'
+            ParamType = daptInput
+          end>
+        Statements = <
+          item
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'CONTACTOS'
+            SQL = 
+              'SELECT '#10'    ID, NIF_CIF, NOMBRE, CALLE, POBLACION, PROVINCIA, CO' +
+              'DIGO_POSTAL, '#10'    TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX,' +
+              ' EMAIL_1, '#10'    EMAIL_2, PAGINA_WEB, NOTAS, FECHA_ALTA, FECHA_MOD' +
+              'IFICACION, '#10'    USUARIO, REFERENCIA, PERSONA_CONTACTO'#10'  FROM'#10'   ' +
+              ' CONTACTOS'#10'  WHERE ID = :ID'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'NIF_CIF'
+                TableField = 'NIF_CIF'
+              end
+              item
+                DatasetField = 'NOMBRE'
+                TableField = 'NOMBRE'
+              end
+              item
+                DatasetField = 'CALLE'
+                TableField = 'CALLE'
+              end
+              item
+                DatasetField = 'POBLACION'
+                TableField = 'POBLACION'
+              end
+              item
+                DatasetField = 'PROVINCIA'
+                TableField = 'PROVINCIA'
+              end
+              item
+                DatasetField = 'CODIGO_POSTAL'
+                TableField = 'CODIGO_POSTAL'
+              end
+              item
+                DatasetField = 'TELEFONO_1'
+                TableField = 'TELEFONO_1'
+              end
+              item
+                DatasetField = 'TELEFONO_2'
+                TableField = 'TELEFONO_2'
+              end
+              item
+                DatasetField = 'MOVIL_1'
+                TableField = 'MOVIL_1'
+              end
+              item
+                DatasetField = 'MOVIL_2'
+                TableField = 'MOVIL_2'
+              end
+              item
+                DatasetField = 'FAX'
+                TableField = 'FAX'
+              end
+              item
+                DatasetField = 'EMAIL_1'
+                TableField = 'EMAIL_1'
+              end
+              item
+                DatasetField = 'EMAIL_2'
+                TableField = 'EMAIL_2'
+              end
+              item
+                DatasetField = 'PAGINA_WEB'
+                TableField = 'PAGINA_WEB'
+              end
+              item
+                DatasetField = 'NOTAS'
+                TableField = 'NOTAS'
+              end
+              item
+                DatasetField = 'FECHA_ALTA'
+                TableField = 'FECHA_ALTA'
+              end
+              item
+                DatasetField = 'FECHA_MODIFICACION'
+                TableField = 'FECHA_MODIFICACION'
+              end
+              item
+                DatasetField = 'USUARIO'
+                TableField = 'USUARIO'
+              end
+              item
+                DatasetField = 'REFERENCIA'
+                TableField = 'REFERENCIA'
+              end
+              item
+                DatasetField = 'PERSONA_CONTACTO'
+                TableField = 'PERSONA_CONTACTO'
+              end>
+          end>
+        Name = 'Contactos_Refresh'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_CONTACTOS_ID'
+            DictionaryEntry = 'Contactos_ID'
+            InPrimaryKey = True
+          end
+          item
+            Name = 'NIF_CIF'
+            DataType = datString
+            Size = 15
+          end
+          item
+            Name = 'NOMBRE'
+            DataType = datString
+            Size = 255
+            Required = True
+          end
+          item
+            Name = 'CALLE'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'POBLACION'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'PROVINCIA'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'CODIGO_POSTAL'
+            DataType = datString
+            Size = 10
+          end
+          item
+            Name = 'TELEFONO_1'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'TELEFONO_2'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'MOVIL_1'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'MOVIL_2'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'FAX'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'EMAIL_1'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'EMAIL_2'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'PAGINA_WEB'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'NOTAS'
+            DataType = datMemo
+          end
+          item
+            Name = 'FECHA_ALTA'
+            DataType = datDateTime
+          end
+          item
+            Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
+          end
+          item
+            Name = 'USUARIO'
+            DataType = datString
+            Size = 30
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'PERSONA_CONTACTO'
+            DataType = datString
+            Size = 255
+          end>
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -1655,7 +1841,8 @@ object srvContactos: TsrvContactos
         Params = <
           item
             Name = 'ID'
-            DataType = datInteger
+            DataType = datAutoInc
+            GeneratorName = 'GEN_CONTACTOS_ID'
             Value = ''
             ParamType = daptInput
           end
@@ -1982,7 +2169,8 @@ object srvContactos: TsrvContactos
         Params = <
           item
             Name = 'ID'
-            DataType = datInteger
+            DataType = datAutoInc
+            GeneratorName = 'GEN_CONTACTOS_DATOS_BANCO_ID'
             Value = ''
             ParamType = daptInput
           end
@@ -2709,7 +2897,8 @@ object srvContactos: TsrvContactos
         Params = <
           item
             Name = 'ID'
-            DataType = datInteger
+            DataType = datAutoInc
+            GeneratorName = 'GEN_CONTACTOS_DIR_ID'
             Value = ''
             ParamType = daptInput
           end
@@ -2954,7 +3143,8 @@ object srvContactos: TsrvContactos
         Params = <
           item
             Name = 'ID'
-            DataType = datInteger
+            DataType = datAutoInc
+            GeneratorName = 'GEN_CLIENTES_DTOS_PROV_ID'
             Value = ''
             ParamType = daptInput
           end
@@ -3246,6 +3436,14 @@ object srvContactos: TsrvContactos
         DetailFields = 'ID_CLIENTE'
         RelationshipType = rtForeignKey
       end
+      item
+        Name = 'FK_DireccionesContacto_Contactos'
+        MasterDatasetName = 'Contactos'
+        MasterFields = 'ID'
+        DetailDatasetName = 'DireccionesContacto'
+        DetailFields = 'ID_CONTACTO'
+        RelationshipType = rtForeignKey
+      end
       item
         Name = 'FK_DatosBancarios_Contactos'
         MasterDatasetName = 'Contactos'
@@ -3255,20 +3453,52 @@ object srvContactos: TsrvContactos
         RelationshipType = rtForeignKey
       end
       item
-        Name = 'FK_ContactosCategorias_Contactos'
+        Name = 'FK_DatosBancarios_Clientes'
-        MasterDatasetName = 'Contactos'
+        MasterDatasetName = 'Clientes'
         MasterFields = 'ID'
-        DetailDatasetName = 'ContactosCategorias'
+        DetailDatasetName = 'DatosBancarios'
         DetailFields = 'ID_CONTACTO'
         RelationshipType = rtForeignKey
       end
       item
-        Name = 'FK_DireccionesContacto_Contactos'
+        Name = 'FK_DireccionesContacto_Clientes'
-        MasterDatasetName = 'Contactos'
+        MasterDatasetName = 'Clientes'
         MasterFields = 'ID'
         DetailDatasetName = 'DireccionesContacto'
         DetailFields = 'ID_CONTACTO'
         RelationshipType = rtForeignKey
+      end
+      item
+        Name = 'FK_DireccionesContacto_Empleados'
+        MasterDatasetName = 'Empleados'
+        MasterFields = 'ID'
+        DetailDatasetName = 'DireccionesContacto'
+        DetailFields = 'ID_CONTACTO'
+        RelationshipType = rtForeignKey
+      end
+      item
+        Name = 'FK_DatosBancarios_Empleados'
+        MasterDatasetName = 'Empleados'
+        MasterFields = 'ID'
+        DetailDatasetName = 'DatosBancarios'
+        DetailFields = 'ID_CONTACTO'
+        RelationshipType = rtForeignKey
+      end
+      item
+        Name = 'FK_DireccionesContacto_Proveedores'
+        MasterDatasetName = 'Proveedores'
+        MasterFields = 'ID'
+        DetailDatasetName = 'DireccionesContacto'
+        DetailFields = 'ID_CONTACTO'
+        RelationshipType = rtForeignKey
+      end
+      item
+        Name = 'FK_DatosBancarios_Proveedores'
+        MasterDatasetName = 'Proveedores'
+        MasterFields = 'ID'
+        DetailDatasetName = 'DatosBancarios'
+        DetailFields = 'ID_CONTACTO'
+        RelationshipType = rtForeignKey
       end>
     UpdateRules = <
       item
@@ -3313,20 +3543,6 @@ object srvContactos: TsrvContactos
         DatasetName = 'DireccionesContacto'
         FailureBehavior = fbRaiseException
       end
-      item
-        Name = 'Insert ContactosCategorias'
-        DoUpdate = False
-        DoDelete = False
-        DatasetName = 'ContactosCategorias'
-        FailureBehavior = fbRaiseException
-      end
-      item
-        Name = 'Update ContactosCategorias'
-        DoInsert = False
-        DoDelete = False
-        DatasetName = 'ContactosCategorias'
-        FailureBehavior = fbRaiseException
-      end
       item
         Name = 'Insert AgentesComisiones'
         DoUpdate = False
@@ -3383,13 +3599,6 @@ object srvContactos: TsrvContactos
         DatasetName = 'DireccionesContacto'
         FailureBehavior = fbRaiseException
       end
-      item
-        Name = 'Delete ContactosCategorias'
-        DoUpdate = False
-        DoInsert = False
-        DatasetName = 'ContactosCategorias'
-        FailureBehavior = fbRaiseException
-      end
       item
         Name = 'Delete Contactos'
         DoUpdate = False
@@ -3874,24 +4083,35 @@ object srvContactos: TsrvContactos
     Left = 126
     Top = 82
     DiagramData = 
-      '<Diagrams>'#13#10'  <Diagram Name="New Diagram" Left="200" Top="200" W' +
+      '<Diagrams>'#13#10'  <Diagram Name="Contactos" Left="200" Top="200" Wid' +
-      'idth="400" Height="300">'#13#10'    <Entity Name="Proveedores" Left="0' +
+      'th="400" Height="300">'#13#10'    <Entity Name="DatosBancarios" Left="' +
-      ',05" Top="0,00" />'#13#10'    <Entity Name="Empleados" Left="414,55" T' +
+      '325,90" Top="0,00" />'#13#10'    <Entity Name="DireccionesContacto" Le' +
-      'op="407,22" />'#13#10'    <Entity Name="DireccionesContacto" Left="669' +
+      'ft="320,90" Top="183,00" />'#13#10'    <Entity Name="Contactos" Left="' +
-      ',09" Top="318,92" />'#13#10'    <Entity Name="DatosBancarios" Left="84' +
+      '0,00" Top="85,50" />'#13#10'  </Diagram>'#13#10'  <Diagram Name="Clientes" L' +
-      '3,11" Top="168,06" />'#13#10'    <Entity Name="ContactosCategorias" Le' +
+      'eft="200" Top="200" Width="400" Height="300">'#13#10'    <Entity Name=' +
-      'ft="194,89" Top="176,37" />'#13#10'    <Entity Name="Contactos" Left="' +
+      '"DatosBancarios" Left="463,00" Top="175,00" />'#13#10'    <Entity Name' +
-      '468,56" Top="175,58" />'#13#10'    <Entity Name="ClientesDescuentos" L' +
+      '="DireccionesContacto" Left="253,00" Top="236,00" />'#13#10'    <Entit' +
-      'eft="241,29" Top="292,88" />'#13#10'    <Entity Name="Clientes" Left="' +
+      'y Name="ClientesDescuentos" Left="438,00" Top="0,00" />'#13#10'    <En' +
-      '0,00" Top="312,03" />'#13#10'  </Diagram>'#13#10'</Diagrams>'#13#10
+      'tity Name="Clientes" Left="0,00" Top="23,00" />'#13#10'  </Diagram>'#13#10' ' +
+      ' <Diagram Name="Empleados" Left="200" Top="200" Width="400" Heig' +
+      'ht="300">'#13#10'    <Entity Name="DatosBancarios" Left="210,50" Top="' +
+      '280,67" />'#13#10'    <Entity Name="DireccionesContacto" Left="295,00"' +
+      ' Top="0,00" />'#13#10'    <Entity Name="Empleados" Left="0,00" Top="42' +
+      ',00" />'#13#10'  </Diagram>'#13#10'  <Diagram Name="Proveedores" Left="200" ' +
+      'Top="200" Width="400" Height="300">'#13#10'    <Entity Name="DatosBanc' +
+      'arios" Left="247,28" Top="242,04" />'#13#10'    <Entity Name="Direccio' +
+      'nesContacto" Left="245,28" Top="0,00" />'#13#10'    <Entity Name="Prov' +
+      'eedores" Left="0,00" Top="115,17" />'#13#10'  </Diagram>'#13#10'</Diagrams>'#13 +
+      #10
   end
   object bpContactos: TDABusinessProcessor
     Schema = schContactos
     InsertCommandName = 'Insert_Contactos'
     DeleteCommandName = 'Delete_Contactos'
     UpdateCommandName = 'Update_Contactos'
+    RefreshDatasetName = 'Contactos_Refresh'
     ReferencedDataset = 'Contactos'
-    ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+    ProcessorOptions = [poPrepareCommands]
     UpdateMode = updWhereKeyOnly
     Left = 224
     Top = 15
@@ -3907,22 +4127,12 @@ object srvContactos: TsrvContactos
     Left = 224
     Top = 79
   end
-  object bpCategoriasContactos: TDABusinessProcessor
-    Schema = schContactos
-    InsertCommandName = 'Insert_ContactosCategorias'
-    DeleteCommandName = 'Delete_ContactosCategorias'
-    UpdateCommandName = 'Update_ContactosCategorias'
-    ReferencedDataset = 'ContactosCategorias'
-    ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
-    UpdateMode = updWhereKeyOnly
-    Left = 224
-    Top = 143
-  end
   object bpEmpleados: TDABusinessProcessor
     Schema = schContactos
     InsertCommandName = 'Insert_Contactos'
     DeleteCommandName = 'Delete_Contactos'
     UpdateCommandName = 'Update_Contactos'
+    RefreshDatasetName = 'Contactos_Refresh'
     ReferencedDataset = 'Empleados'
     ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
     UpdateMode = updWhereKeyOnly
@@ -3934,6 +4144,7 @@ object srvContactos: TsrvContactos
     InsertCommandName = 'Insert_Contactos'
     DeleteCommandName = 'Delete_Contactos'
     UpdateCommandName = 'Update_Contactos'
+    RefreshDatasetName = 'Contactos_Refresh'
     ReferencedDataset = 'Clientes'
     ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
     UpdateMode = updWhereKeyOnly
@@ -3945,6 +4156,7 @@ object srvContactos: TsrvContactos
     InsertCommandName = 'Insert_Contactos'
     DeleteCommandName = 'Delete_Contactos'
     UpdateCommandName = 'Update_Contactos'
+    RefreshDatasetName = 'Contactos_Refresh'
     ReferencedDataset = 'Proveedores'
     ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
     UpdateMode = updWhereKeyOnly

Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas

@@ -25,7 +25,6 @@ type
     Diagrams: TDADiagrams;
     bpContactos: TDABusinessProcessor;
     bpDatosBancarios: TDABusinessProcessor;
-    bpCategoriasContactos: TDABusinessProcessor;
     bpEmpleados: TDABusinessProcessor;
     bpClientes: TDABusinessProcessor;
     bpProveedores: TDABusinessProcessor;
@@ -70,8 +69,7 @@ begin
      (DataSet.Name <> nme_GruposCliente) and
      (DataSet.Name <> nme_GruposProveedor) and
      (DataSet.Name <> nme_GruposEmpleado) and
-     (DataSet.Name <> nme_ClientesDescuentos) and
+     (DataSet.Name <> nme_ClientesDescuentos) then
-     (DataSet.Name <> nme_ContactosCategorias) then
   begin
     { Aquí se asegura que el usuario sólo accede a contactos
       de las empresas a las que tiene permiso para acceder

Source/Modulos/Contactos/Test/Contactos_Tests.dproj

@@ -0,0 +1,603 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{73787cd4-7d26-4f01-9ed5-104e78c03cbc}</ProjectGuid>
+    <MainSource>Contactos_Tests.dpr</MainSource>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <DCC_EnabledPackages>true</DCC_EnabledPackages>
+    <DCC_UsePackage>Base;GUIBase;ApplicationBase;Contactos_model;Contactos_controller;Contactos_view</DCC_UsePackage>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DependencyCheckOutputName>..\..\..\Output\Cliente\Contactos_Tests.exe</DCC_DependencyCheckOutputName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>..\..\..\Output\Cliente</DCC_ExeOutput>
+    <DCC_DcuOutput>.\</DCC_DcuOutput>
+    <DCC_ObjOutput>.\</DCC_ObjOutput>
+    <DCC_HppOutput>.\</DCC_HppOutput>
+    <DCC_DcpOutput>..\..\Lib</DCC_DcpOutput>
+    <DCC_UnitSearchPath>..\..\..\Lib;..\..\Lib</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
+    <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
+    <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
+    <DCC_Define>_CONSOLE_TESTRUNNER;EUREKALOG;EUREKALOG_VER5;RELEASE</DCC_Define>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>..\..\..\Output\Cliente</DCC_ExeOutput>
+    <DCC_DcuOutput>.\</DCC_DcuOutput>
+    <DCC_ObjOutput>.\</DCC_ObjOutput>
+    <DCC_HppOutput>.\</DCC_HppOutput>
+    <DCC_DcpOutput>..\..\Lib</DCC_DcpOutput>
+    <DCC_UnitSearchPath>..\..\..\Lib;..\..\Lib</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
+    <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
+    <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
+    <DCC_Define>_CONSOLE_TESTRUNNER;EUREKALOG;DEBUG;EUREKALOG_VER6</DCC_Define>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
+      <Parameters Name="UseLauncher">False</Parameters>
+      <Parameters Name="LoadAllSymbols">True</Parameters>
+      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
+    </Parameters>
+    <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">Contactos (Test)</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>
+    <Source>
+      <Source Name="MainSource">Contactos_Tests.dpr</Source>
+    </Source>
+    <Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      <Excluded_Packages Name="$(BDS)\bin\vclhie100.bpl">Internet Explorer Hosting Support Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\applet100.bpl">CodeGear Control Panel Applet Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+      <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\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcbie100.bpl">CodeGear C++Builder Internet Explorer 5 Components Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclbcbsmp100.bpl">Borland Sample Controls Design Time Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
+    </Excluded_Packages>
+  </Delphi.Personality> </BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup>
+    <DelphiCompile Include="Contactos_Tests.dpr">
+      <MainSource>MainSource</MainSource>
+    </DelphiCompile>
+    <DCCReference Include="uClientesController_test.pas" />
+    <DCCReference Include="uDataModuleContactos_Test.pas" />
+    <DCCReference Include="uHostMainForm.pas">
+      <Form>HostMainForm</Form>
+    </DCCReference>
+  </ItemGroup>
+</Project>
+
+<!-- EurekaLog First Line
+[Exception Log]
+EurekaLog Version=6006
+Activate=1
+Activate Handle=1
+Save Log File=1
+Foreground Tab=0
+Freeze Activate=0
+Freeze Timeout=0
+SMTP From=eurekalog@email.com
+SMTP Host=
+SMTP Port=25
+SMTP UserID=
+SMTP Password=
+Append to Log=0
+TerminateBtn Operation=1
+Errors Number=32
+Errors Terminate=3
+Email Address=
+Email Object=
+Email Send Options=0
+Output Path=
+Encrypt Password=
+AutoCloseDialogSecs=0
+WebSendMode=0
+SupportULR=
+HTMLLayout Count=15
+HTMLLine0="%3Chtml%3E"
+HTMLLine1="  %3Chead%3E"
+HTMLLine2="  %3C/head%3E"
+HTMLLine3="  %3Cbody TopMargin=10 LeftMargin=10%3E"
+HTMLLine4="    %3Ctable width="100%%" border="0"%3E"
+HTMLLine5="      %3Ctr%3E"
+HTMLLine6="        %3Ctd nowrap%3E"
+HTMLLine7="          %3Cfont face="Lucida Console, Courier" size="2"%3E"
+HTMLLine8="            %3C%%HTML_TAG%%%3E"
+HTMLLine9="          %3C/font%3E"
+HTMLLine10="        %3C/td%3E"
+HTMLLine11="      %3C/tr%3E"
+HTMLLine12="    %3C/table%3E"
+HTMLLine13="  %3C/body%3E"
+HTMLLine14="%3C/html%3E"
+AutoCrashOperation=1
+AutoCrashNumber=10
+AutoCrashMinutes=1
+WebURL=
+WebUserID=
+WebPassword=
+WebPort=0
+AttachedFiles=
+ProxyURL=
+ProxyUser=
+ProxyPassword=
+ProxyPort=8080
+TrakerUser=
+TrakerPassword=
+TrakerAssignTo=
+TrakerProject=
+TrakerCategory=
+TrakerTrialID=
+ZipPassword=
+PreBuildEvent=
+PostSuccessfulBuildEvent=
+PostFailureBuildEvent=
+ExceptionDialogType=2
+Count=0
+EMail Message Line Count=0
+loNoDuplicateErrors=0
+loAppendReproduceText=0
+loDeleteLogAtVersionChange=0
+loAddComputerNameInLogFileName=0
+loSaveModulesAndProcessesSections=1
+loSaveAssemblerAndCPUSections=1
+soAppStartDate=1
+soAppName=1
+soAppVersionNumber=1
+soAppParameters=1
+soAppCompilationDate=1
+soAppUpTime=1
+soExcDate=1
+soExcAddress=1
+soExcModuleName=1
+soExcModuleVersion=1
+soExcType=1
+soExcMessage=1
+soExcID=1
+soExcCount=1
+soExcStatus=1
+soExcNote=1
+soUserID=1
+soUserName=1
+soUserEmail=1
+soUserPrivileges=1
+soUserCompany=1
+soActCtlsFormClass=1
+soActCtlsFormText=1
+soActCtlsControlClass=1
+soActCtlsControlText=1
+soCmpName=1
+soCmpTotalMemory=1
+soCmpFreeMemory=1
+soCmpTotalDisk=1
+soCmpFreeDisk=1
+soCmpSysUpTime=1
+soCmpProcessor=1
+soCmpDisplayMode=1
+soCmpDisplayDPI=1
+soCmpVideoCard=1
+soCmpPrinter=1
+soOSType=1
+soOSBuildN=1
+soOSUpdate=1
+soOSLanguage=1
+soOSCharset=1
+soNetIP=1
+soNetSubmask=1
+soNetGateway=1
+soNetDNS1=1
+soNetDNS2=1
+soNetDHCP=1
+soCustomData=1
+sndShowSendDialog=1
+sndShowSuccessFailureMsg=0
+sndSendEntireLog=0
+sndSendXMLLogCopy=0
+sndSendScreenshot=0
+sndUseOnlyActiveWindow=0
+sndSendLastHTMLPage=1
+sndSendInSeparatedThread=0
+sndAddDateInFileName=0
+sndAddComputerNameInFileName=0
+edoSendErrorReportChecked=1
+edoAttachScreenshotChecked=1
+edoShowCopyToClipOption=1
+edoShowDetailsButton=1
+edoShowInDetailedMode=0
+edoShowInTopMostMode=0
+edoUseEurekaLogLookAndFeel=1
+edoShowSendErrorReportOption=1
+edoShowAttachScreenshotOption=1
+edoShowCustomButton=0
+csoShowDLLs=1
+csoShowBPLs=1
+csoShowBorlandThreads=1
+csoShowWindowsThreads=1
+csoDoNotStoreProcNames=0
+boPauseBorlandThreads=0
+boDoNotPauseMainThread=0
+boPauseWindowsThreads=0
+boUseMainModuleOptions=1
+boCopyLogInCaseOfError=1
+boSaveCompressedCopyInCaseOfError=0
+boHandleSafeCallExceptions=1
+boCallRTLExceptionEvent=0
+boCatchHandledExceptions=0
+loCatchLeaks=0
+loGroupsSonLeaks=1
+loHideBorlandLeaks=1
+loFreeAllLeaks=1
+loCatchLeaksExceptions=1
+cfoReduceFileSize=1
+cfoCheckFileCorruption=0
+Count mtInformationMsgCaption=1
+mtInformationMsgCaption0="Information."
+Count mtQuestionMsgCaption=1
+mtQuestionMsgCaption0="Question."
+Count mtErrorMsgCaption=1
+mtErrorMsgCaption0="Error."
+Count mtDialog_Caption=1
+mtDialog_Caption0="Error."
+Count mtDialog_ErrorMsgCaption=2
+mtDialog_ErrorMsgCaption0="An error has occurred during program execution."
+mtDialog_ErrorMsgCaption1="Please read the following information for further details."
+Count mtDialog_GeneralCaption=1
+mtDialog_GeneralCaption0="General"
+Count mtDialog_GeneralHeader=1
+mtDialog_GeneralHeader0="General Information"
+Count mtDialog_CallStackCaption=1
+mtDialog_CallStackCaption0="Call Stack"
+Count mtDialog_CallStackHeader=1
+mtDialog_CallStackHeader0="Call Stack Information"
+Count mtDialog_ModulesCaption=1
+mtDialog_ModulesCaption0="Modules"
+Count mtDialog_ModulesHeader=1
+mtDialog_ModulesHeader0="Modules Information"
+Count mtDialog_ProcessesCaption=1
+mtDialog_ProcessesCaption0="Processes"
+Count mtDialog_ProcessesHeader=1
+mtDialog_ProcessesHeader0="Processes Information"
+Count mtDialog_AsmCaption=1
+mtDialog_AsmCaption0="Assembler"
+Count mtDialog_AsmHeader=1
+mtDialog_AsmHeader0="Assembler Information"
+Count mtDialog_CPUCaption=1
+mtDialog_CPUCaption0="CPU"
+Count mtDialog_CPUHeader=1
+mtDialog_CPUHeader0="CPU Information"
+Count mtDialog_OKButtonCaption=1
+mtDialog_OKButtonCaption0="%26OK"
+Count mtDialog_TerminateButtonCaption=1
+mtDialog_TerminateButtonCaption0="%26Terminate"
+Count mtDialog_RestartButtonCaption=1
+mtDialog_RestartButtonCaption0="%26Restart"
+Count mtDialog_DetailsButtonCaption=1
+mtDialog_DetailsButtonCaption0="%26Details"
+Count mtDialog_CustomButtonCaption=1
+mtDialog_CustomButtonCaption0="%26Help"
+Count mtDialog_SendMessage=1
+mtDialog_SendMessage0="%26Send this error via Internet"
+Count mtDialog_ScreenshotMessage=1
+mtDialog_ScreenshotMessage0="%26Attach a Screenshot image"
+Count mtDialog_CopyMessage=1
+mtDialog_CopyMessage0="%26Copy to Clipboard"
+Count mtDialog_SupportMessage=1
+mtDialog_SupportMessage0="Go to the Support Page"
+Count mtMSDialog_ErrorMsgCaption=1
+mtMSDialog_ErrorMsgCaption0="The application has encountered a problem. We are sorry for the inconvenience."
+Count mtMSDialog_RestartCaption=1
+mtMSDialog_RestartCaption0="Restart application."
+Count mtMSDialog_TerminateCaption=1
+mtMSDialog_TerminateCaption0="Terminate application."
+Count mtMSDialog_PleaseCaption=1
+mtMSDialog_PleaseCaption0="Please tell us about this problem."
+Count mtMSDialog_DescriptionCaption=1
+mtMSDialog_DescriptionCaption0="We have created an error report that you can send to us. We will treat this report as confidential and anonymous."
+Count mtMSDialog_SeeDetailsCaption=1
+mtMSDialog_SeeDetailsCaption0="To see what data the error report contains,"
+Count mtMSDialog_SeeClickCaption=1
+mtMSDialog_SeeClickCaption0="click here."
+Count mtMSDialog_HowToReproduceCaption=1
+mtMSDialog_HowToReproduceCaption0="What were you doing when the problem happended (optional)?"
+Count mtMSDialog_EmailCaption=1
+mtMSDialog_EmailCaption0="Email address (optional):"
+Count mtMSDialog_SendButtonCaption=1
+mtMSDialog_SendButtonCaption0="%26Send Error Report"
+Count mtMSDialog_NoSendButtonCaption=1
+mtMSDialog_NoSendButtonCaption0="%26Don't Send"
+Count mtLog_AppHeader=1
+mtLog_AppHeader0="Application"
+Count mtLog_AppStartDate=1
+mtLog_AppStartDate0="Start Date"
+Count mtLog_AppName=1
+mtLog_AppName0="Name/Description"
+Count mtLog_AppVersionNumber=1
+mtLog_AppVersionNumber0="Version Number"
+Count mtLog_AppParameters=1
+mtLog_AppParameters0="Parameters"
+Count mtLog_AppCompilationDate=1
+mtLog_AppCompilationDate0="Compilation Date"
+Count mtLog_AppUpTime=1
+mtLog_AppUpTime0="Up Time"
+Count mtLog_ExcHeader=1
+mtLog_ExcHeader0="Exception"
+Count mtLog_ExcDate=1
+mtLog_ExcDate0="Date"
+Count mtLog_ExcAddress=1
+mtLog_ExcAddress0="Address"
+Count mtLog_ExcModuleName=1
+mtLog_ExcModuleName0="Module Name"
+Count mtLog_ExcModuleVersion=1
+mtLog_ExcModuleVersion0="Module Version"
+Count mtLog_ExcType=1
+mtLog_ExcType0="Type"
+Count mtLog_ExcMessage=1
+mtLog_ExcMessage0="Message"
+Count mtLog_ExcID=1
+mtLog_ExcID0="ID"
+Count mtLog_ExcCount=1
+mtLog_ExcCount0="Count"
+Count mtLog_ExcStatus=1
+mtLog_ExcStatus0="Status"
+Count mtLog_ExcNote=1
+mtLog_ExcNote0="Note"
+Count mtLog_UserHeader=1
+mtLog_UserHeader0="User"
+Count mtLog_UserID=1
+mtLog_UserID0="ID"
+Count mtLog_UserName=1
+mtLog_UserName0="Name"
+Count mtLog_UserEmail=1
+mtLog_UserEmail0="Email"
+Count mtLog_UserCompany=1
+mtLog_UserCompany0="Company"
+Count mtLog_UserPrivileges=1
+mtLog_UserPrivileges0="Privileges"
+Count mtLog_ActCtrlsHeader=1
+mtLog_ActCtrlsHeader0="Active Controls"
+Count mtLog_ActCtrlsFormClass=1
+mtLog_ActCtrlsFormClass0="Form Class"
+Count mtLog_ActCtrlsFormText=1
+mtLog_ActCtrlsFormText0="Form Text"
+Count mtLog_ActCtrlsControlClass=1
+mtLog_ActCtrlsControlClass0="Control Class"
+Count mtLog_ActCtrlsControlText=1
+mtLog_ActCtrlsControlText0="Control Text"
+Count mtLog_CmpHeader=1
+mtLog_CmpHeader0="Computer"
+Count mtLog_CmpName=1
+mtLog_CmpName0="Name"
+Count mtLog_CmpTotalMemory=1
+mtLog_CmpTotalMemory0="Total Memory"
+Count mtLog_CmpFreeMemory=1
+mtLog_CmpFreeMemory0="Free Memory"
+Count mtLog_CmpTotalDisk=1
+mtLog_CmpTotalDisk0="Total Disk"
+Count mtLog_CmpFreeDisk=1
+mtLog_CmpFreeDisk0="Free Disk"
+Count mtLog_CmpSystemUpTime=1
+mtLog_CmpSystemUpTime0="System Up Time"
+Count mtLog_CmpProcessor=1
+mtLog_CmpProcessor0="Processor"
+Count mtLog_CmpDisplayMode=1
+mtLog_CmpDisplayMode0="Display Mode"
+Count mtLog_CmpDisplayDPI=1
+mtLog_CmpDisplayDPI0="Display DPI"
+Count mtLog_CmpVideoCard=1
+mtLog_CmpVideoCard0="Video Card"
+Count mtLog_CmpPrinter=1
+mtLog_CmpPrinter0="Printer"
+Count mtLog_OSHeader=1
+mtLog_OSHeader0="Operating System"
+Count mtLog_OSType=1
+mtLog_OSType0="Type"
+Count mtLog_OSBuildN=1
+mtLog_OSBuildN0="Build #"
+Count mtLog_OSUpdate=1
+mtLog_OSUpdate0="Update"
+Count mtLog_OSLanguage=1
+mtLog_OSLanguage0="Language"
+Count mtLog_OSCharset=1
+mtLog_OSCharset0="Charset"
+Count mtLog_NetHeader=1
+mtLog_NetHeader0="Network"
+Count mtLog_NetIP=1
+mtLog_NetIP0="IP Address"
+Count mtLog_NetSubmask=1
+mtLog_NetSubmask0="Submask"
+Count mtLog_NetGateway=1
+mtLog_NetGateway0="Gateway"
+Count mtLog_NetDNS1=1
+mtLog_NetDNS10="DNS 1"
+Count mtLog_NetDNS2=1
+mtLog_NetDNS20="DNS 2"
+Count mtLog_NetDHCP=1
+mtLog_NetDHCP0="DHCP"
+Count mtLog_CustInfoHeader=1
+mtLog_CustInfoHeader0="Custom Information"
+Count mtCallStack_Address=1
+mtCallStack_Address0="Address"
+Count mtCallStack_Name=1
+mtCallStack_Name0="Module"
+Count mtCallStack_Unit=1
+mtCallStack_Unit0="Unit"
+Count mtCallStack_Class=1
+mtCallStack_Class0="Class"
+Count mtCallStack_Procedure=1
+mtCallStack_Procedure0="Procedure/Method"
+Count mtCallStack_Line=1
+mtCallStack_Line0="Line"
+Count mtCallStack_MainThread=1
+mtCallStack_MainThread0="Main"
+Count mtCallStack_ExceptionThread=1
+mtCallStack_ExceptionThread0="Exception Thread"
+Count mtCallStack_RunningThread=1
+mtCallStack_RunningThread0="Running Thread"
+Count mtCallStack_CallingThread=1
+mtCallStack_CallingThread0="Calling Thread"
+Count mtCallStack_ThreadID=1
+mtCallStack_ThreadID0="ID"
+Count mtCallStack_ThreadPriority=1
+mtCallStack_ThreadPriority0="Priority"
+Count mtCallStack_ThreadClass=1
+mtCallStack_ThreadClass0="Class"
+Count mtCallStack_LeakCaption=1
+mtCallStack_LeakCaption0="Memory Leak"
+Count mtCallStack_LeakData=1
+mtCallStack_LeakData0="Data"
+Count mtCallStack_LeakType=1
+mtCallStack_LeakType0="Type"
+Count mtCallStack_LeakSize=1
+mtCallStack_LeakSize0="Total size"
+Count mtCallStack_LeakCount=1
+mtCallStack_LeakCount0="Count"
+Count mtSendDialog_Caption=1
+mtSendDialog_Caption0="Send."
+Count mtSendDialog_Message=1
+mtSendDialog_Message0="Message"
+Count mtSendDialog_Resolving=1
+mtSendDialog_Resolving0="Resolving DNS..."
+Count mtSendDialog_Login=1
+mtSendDialog_Login0="Login..."
+Count mtSendDialog_Connecting=1
+mtSendDialog_Connecting0="Connecting with server..."
+Count mtSendDialog_Connected=1
+mtSendDialog_Connected0="Connected with server."
+Count mtSendDialog_Sending=1
+mtSendDialog_Sending0="Sending message..."
+Count mtSendDialog_Sent=1
+mtSendDialog_Sent0="Message sent."
+Count mtSendDialog_SelectProject=1
+mtSendDialog_SelectProject0="Select project..."
+Count mtSendDialog_Searching=1
+mtSendDialog_Searching0="Searching..."
+Count mtSendDialog_Modifying=1
+mtSendDialog_Modifying0="Modifying..."
+Count mtSendDialog_Disconnecting=1
+mtSendDialog_Disconnecting0="Disconnecting..."
+Count mtSendDialog_Disconnected=1
+mtSendDialog_Disconnected0="Disconnected."
+Count mtReproduceDialog_Caption=1
+mtReproduceDialog_Caption0="Request"
+Count mtReproduceDialog_Request=1
+mtReproduceDialog_Request0="Please describe the steps to reproduce the error:"
+Count mtReproduceDialog_OKButtonCaption=1
+mtReproduceDialog_OKButtonCaption0="%26OK"
+Count mtModules_Handle=1
+mtModules_Handle0="Handle"
+Count mtModules_Name=1
+mtModules_Name0="Name"
+Count mtModules_Description=1
+mtModules_Description0="Description"
+Count mtModules_Version=1
+mtModules_Version0="Version"
+Count mtModules_Size=1
+mtModules_Size0="Size"
+Count mtModules_LastModified=1
+mtModules_LastModified0="Modified"
+Count mtModules_Path=1
+mtModules_Path0="Path"
+Count mtProcesses_ID=1
+mtProcesses_ID0="ID"
+Count mtProcesses_Name=1
+mtProcesses_Name0="Name"
+Count mtProcesses_Description=1
+mtProcesses_Description0="Description"
+Count mtProcesses_Version=1
+mtProcesses_Version0="Version"
+Count mtProcesses_Memory=1
+mtProcesses_Memory0="Memory"
+Count mtProcesses_Priority=1
+mtProcesses_Priority0="Priority"
+Count mtProcesses_Threads=1
+mtProcesses_Threads0="Threads"
+Count mtProcesses_Path=1
+mtProcesses_Path0="Path"
+Count mtCPU_Registers=1
+mtCPU_Registers0="Registers"
+Count mtCPU_Stack=1
+mtCPU_Stack0="Stack"
+Count mtCPU_MemoryDump=1
+mtCPU_MemoryDump0="Memory Dump"
+Count mtSend_SuccessMsg=1
+mtSend_SuccessMsg0="The message was sent successfully."
+Count mtSend_FailureMsg=1
+mtSend_FailureMsg0="Sorry, sending the message didn't work."
+Count mtSend_BugClosedMsg=2
+mtSend_BugClosedMsg0="These BUG is just closed."
+mtSend_BugClosedMsg1="Contact the program support to obtain an update."
+Count mtSend_UnknownErrorMsg=1
+mtSend_UnknownErrorMsg0="Unknown error."
+Count mtSend_InvalidLoginMsg=1
+mtSend_InvalidLoginMsg0="Invalid login request."
+Count mtSend_InvalidSearchMsg=1
+mtSend_InvalidSearchMsg0="Invalid search request."
+Count mtSend_InvalidSelectionMsg=1
+mtSend_InvalidSelectionMsg0="Invalid selection request."
+Count mtSend_InvalidInsertMsg=1
+mtSend_InvalidInsertMsg0="Invalid insert request."
+Count mtSend_InvalidModifyMsg=1
+mtSend_InvalidModifyMsg0="Invalid modify request."
+Count mtFileCrackedMsg=2
+mtFileCrackedMsg0="This file is cracked."
+mtFileCrackedMsg1="The application will be closed."
+Count mtException_LeakMultiFree=1
+mtException_LeakMultiFree0="Multi Free memory leak."
+Count mtException_LeakMemoryOverrun=1
+mtException_LeakMemoryOverrun0="Memory Overrun leak."
+Count mtException_AntiFreeze=1
+mtException_AntiFreeze0="The application seems to be frozen."
+Count mtInvalidEmailMsg=1
+mtInvalidEmailMsg0="Invalid email."
+TextsCollection=English
+EurekaLog Last Line -->

Source/Modulos/Contactos/Views/Contactos_view.dpk

@@ -29,6 +29,7 @@ requires
   vcl,
   Base,
   GUIBase,
+  ApplicationBase,
   FormasPago_model,
   FormasPago_controller,
   TiposIVA_model,

Source/Modulos/Contactos/Views/uEditorClientes.pas

@@ -12,7 +12,7 @@ uses
   uViewBase, uViewBarraSeleccion, ExtCtrls, pngimage, JvComponentBase,
 
   uIEditorClientes, uViewGridBase, uViewGrid, uViewContactos, uViewClientes,
-  TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog;
+  TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces;
 
 type
   TfEditorClientes = class(TfEditorContactos, IEditorClientes)
@@ -159,7 +159,8 @@ procedure TfEditorClientes.PonerTitulos(const ATitulo: string);
 var
   FTitulo : String;
 begin
-  FTitulo := 'Lista de clientes - ' + dmUsuarios.EmpresaActual.NOMBRE;
+  // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+//  FTitulo := 'Lista de clientes - ' + dmUsuarios.EmpresaActual.NOMBRE;
   inherited PonerTitulos(FTitulo);
 end;
 

Source/Modulos/Contactos/Views/uEditorContacto.dfm

@@ -7,7 +7,7 @@ inherited fEditorContacto: TfEditorContacto
   ClientWidth = 632
   Scaled = False
   ExplicitWidth = 640
-  ExplicitHeight = 240
+  ExplicitHeight = 488
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/Modulos/Contactos/Views/uEditorContacto.pas

@@ -13,7 +13,8 @@ uses
   JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase,
 
   uIEditorContacto, uContactosController, TBXStatusBars, JvExComCtrls,
-  JvStatusBar, uViewContactoDatosBancarios, dxLayoutLookAndFeels, JvLabel;
+  JvStatusBar, uViewContactoDatosBancarios, dxLayoutLookAndFeels, JvLabel,
+  uDAInterfaces;
 
 type
   TfEditorContacto = class(TfEditorDBItem, IEditorContacto)
@@ -101,7 +102,8 @@ begin
 
   inherited PonerTitulos(FTitulo);
 
-  Self.Caption := FTitulo + ' (' + dmUsuarios.EmpresaActual.NOMBRE + ')';
+// OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+//  Self.Caption := FTitulo + ' (' + dmUsuarios.EmpresaActual.NOMBRE + ')';
 end;
 
 procedure TfEditorContacto.SetContacto(const Value: IBizContacto);

Source/Modulos/Contactos/Views/uEditorContactos.dfm

@@ -2,8 +2,7 @@ inherited fEditorContactos: TfEditorContactos
   Left = 285
   Top = 448
   Caption = 'Lista de contactos'
-  ExplicitWidth = 320
+  ExplicitHeight = 471
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/Modulos/Contactos/Views/uEditorContactos.pas

@@ -46,7 +46,7 @@ implementation
 
 uses
   uCustomEditor, uDataModuleContactos,
-  uEditorDBBase, 
+  uEditorDBBase, uFactuGES_App, 
   cxGrid, cxGridCustomTableView, uDBSelectionListUtils;
 
 {$R *.dfm}
@@ -101,8 +101,9 @@ var
   FTitulo : String;
 begin
   FTitulo := ATitulo;
-  if FTitulo = '' then
+  // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-    FTitulo := 'Lista de contactos - ' + dmUsuarios.EmpresaActual.NOMBRE;
+{  if FTitulo = '' then
+    FTitulo := 'Lista de contactos - ' + dmUsuarios.EmpresaActual.NOMBRE;}
   inherited PonerTitulos(FTitulo);
 end;
 

Source/Modulos/Contactos/Views/uEditorEmpleados.dfm

@@ -1,6 +1,5 @@
 inherited fEditorEmpleados: TfEditorEmpleados
   Caption = 'fEditorEmpleados'
-  ExplicitWidth = 551
   ExplicitHeight = 478
   PixelsPerInch = 96
   TextHeight = 13

Source/Modulos/Contactos/Views/uEditorEmpleados.pas

@@ -10,7 +10,7 @@ uses
   TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
   JvExControls, JvComponent, JvNavigationPane, uViewGridBase, uViewGrid,
   uViewContactos, uViewEmpleados, uIEditorEmpleados, pngimage, TBXStatusBars,
-  JvExComCtrls, JvStatusBar, JSDialog, uContactosController;
+  JvExComCtrls, JvStatusBar, JSDialog, uContactosController, uDAInterfaces;
 
 type
   TfEditorEmpleados = class(TfEditorContactos, IEditorEmpleados)
@@ -139,7 +139,8 @@ procedure TfEditorEmpleados.PonerTitulos(const ATitulo: string);
 var
   FTitulo : String;
 begin
-  FTitulo := 'Lista de empleados - ' + dmUsuarios.EmpresaActual.NOMBRE;
+// ojooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
+//  FTitulo := 'Lista de empleados - ' + dmUsuarios.EmpresaActual.NOMBRE;
   inherited PonerTitulos(FTitulo);
 end;
 

Source/Modulos/Contactos/Views/uEditorProveedor.dfm

@@ -3,7 +3,7 @@ inherited fEditorProveedor: TfEditorProveedor
   ClientHeight = 590
   ClientWidth = 648
   ExplicitWidth = 656
-  ExplicitHeight = 624
+  ExplicitHeight = 617
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -148,6 +148,24 @@ inherited fEditorProveedor: TfEditorProveedor
             ExplicitWidth = 310
             Width = 310
           end
+          inherited cxDBCheckBox2: TcxDBCheckBox
+            Top = 189
+            ExplicitTop = 189
+            ExplicitWidth = 326
+            Width = 326
+          end
+          inherited eCertificaciones: TcxDBTextEdit
+            Top = 216
+            ExplicitTop = 216
+            ExplicitWidth = 227
+            Width = 227
+          end
+          inherited cbGrupoProveedor: TcxDBComboBox
+            Top = 138
+            ExplicitTop = 138
+            ExplicitWidth = 227
+            Width = 227
+          end
           inherited eTlfParticular: TcxDBTextEdit
             Left = 486
             Top = 57
@@ -164,6 +182,18 @@ inherited fEditorProveedor: TfEditorProveedor
             ExplicitWidth = 172
             Width = 172
           end
+          inherited eDescripcionProveedor: TcxDBTextEdit
+            Top = 84
+            ExplicitTop = 84
+            ExplicitWidth = 221
+            Width = 221
+          end
+          inherited eCodigoAsignado: TcxDBTextEdit
+            Top = 111
+            ExplicitTop = 111
+            ExplicitWidth = 221
+            Width = 221
+          end
           inherited eTlfMovil: TcxDBTextEdit
             Left = 486
             Top = 84
@@ -186,24 +216,6 @@ inherited fEditorProveedor: TfEditorProveedor
             ExplicitWidth = 263
             Width = 263
           end
-          inherited cxDBCheckBox2: TcxDBCheckBox
-            Top = 189
-            ExplicitTop = 189
-            ExplicitWidth = 326
-            Width = 326
-          end
-          inherited eCertificaciones: TcxDBTextEdit
-            Top = 216
-            ExplicitTop = 216
-            ExplicitWidth = 227
-            Width = 227
-          end
-          inherited cbGrupoProveedor: TcxDBComboBox
-            Top = 138
-            ExplicitTop = 138
-            ExplicitWidth = 227
-            Width = 227
-          end
           inherited eNIFCIF: TcxDBTextEdit
             Left = 210
             Top = 30
@@ -230,18 +242,6 @@ inherited fEditorProveedor: TfEditorProveedor
             ExplicitWidth = 165
             Width = 165
           end
-          inherited eDescripcionProveedor: TcxDBTextEdit
-            Top = 84
-            ExplicitTop = 84
-            ExplicitWidth = 221
-            Width = 221
-          end
-          inherited eCodigoAsignado: TcxDBTextEdit
-            Top = 111
-            ExplicitTop = 111
-            ExplicitWidth = 221
-            Width = 221
-          end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
             Left = 486
             Top = 217
@@ -259,8 +259,8 @@ inherited fEditorProveedor: TfEditorProveedor
           inherited ePersonaContacto: TcxDBTextEdit
             Top = 267
             ExplicitTop = 267
-            ExplicitWidth = 256
+            ExplicitWidth = 253
-            Width = 256
+            Width = 253
           end
         end
       end
@@ -277,10 +277,6 @@ inherited fEditorProveedor: TfEditorProveedor
           Width = 640
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 640
-          inherited eEntidad: TcxDBTextEdit
-            ExplicitWidth = 114
-            Width = 114
-          end
           inherited eSucursal: TcxDBTextEdit
             Left = 325
             ExplicitLeft = 325
@@ -322,50 +318,36 @@ inherited fEditorProveedor: TfEditorProveedor
           LookAndFeel = dxLayoutOfficeLookAndFeel
           ExplicitWidth = 640
           inherited Label1: TLabel
-            Left = 416
+            Left = 415
             Top = 30
-            Width = 190
+            ExplicitLeft = 415
-            ExplicitLeft = 416
             ExplicitTop = 30
-            ExplicitWidth = 190
           end
           inherited cbRegimenIVA: TcxDBComboBox
             Top = 30
             ExplicitTop = 30
-            ExplicitWidth = 121
-            Width = 121
           end
           inherited cbFormaPago: TcxDBLookupComboBox
             Top = 57
             ExplicitTop = 57
-            ExplicitWidth = 121
-            Width = 121
           end
           inherited bFormasPago: TButton
-            Left = 256
             Top = 57
-            ExplicitLeft = 256
             ExplicitTop = 57
           end
           inherited eIVA: TcxDBLookupComboBox
             Top = 84
             ExplicitTop = 84
-            ExplicitWidth = 121
-            Width = 121
           end
           inherited bTiposIVA: TButton
-            Left = 256
             Top = 84
-            ExplicitLeft = 256
             ExplicitTop = 84
           end
           inherited eDescuento: TcxDBSpinEdit
-            Left = 460
+            Left = 459
             Top = 62
-            ExplicitLeft = 460
+            ExplicitLeft = 459
             ExplicitTop = 62
-            ExplicitWidth = 73
-            Width = 73
           end
         end
       end

Source/Modulos/Contactos/Views/uEditorProveedor.pas

@@ -13,7 +13,8 @@ uses
   uIEditorProveedor, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit,
   cxSpinEdit, cxDBEdit, pngimage, TBXStatusBars, JvExComCtrls, JvStatusBar,
   dxLayoutLookAndFeels, uViewContactoDatosBancarios, uBizContactos,
-  uViewProveedorDatosComerciales, uViewDetallesGenerico, uViewDireccionesEntrega;
+  uViewProveedorDatosComerciales, uViewDetallesGenerico, uViewDireccionesEntrega,
+  uDAInterfaces;
 
 type
   TfEditorProveedor = class(TfEditorContacto, IEditorProveedor)

Source/Modulos/Contactos/Views/uEditorProveedores.dfm

@@ -1,5 +1,7 @@
 inherited fEditorProveedores: TfEditorProveedores
   Caption = 'fEditorProveedores'
+  ExplicitWidth = 320
+  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/Modulos/Contactos/Views/uEditorProveedores.pas

@@ -11,7 +11,7 @@ uses
   JvExControls, JvComponent, JvNavigationPane,
 
   uIEditorProveedores, uViewGridBase, uViewGrid, uViewContactos, uViewProveedores,
-  pngimage, TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog;  
+  pngimage, TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces;  
 
 type
   TfEditorProveedores = class(TfEditorContactos, IEditorProveedores)
@@ -138,7 +138,8 @@ procedure TfEditorProveedores.PonerTitulos(const ATitulo: string);
 var
   FTitulo : String;
 begin
-  FTitulo := 'Lista de proveedores - ' + dmUsuarios.EmpresaActual.NOMBRE;
+//  OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+//  FTitulo := 'Lista de proveedores - ' + dmUsuarios.EmpresaActual.NOMBRE;
   inherited PonerTitulos(FTitulo);
 end;
 

Source/Modulos/Contactos/Views/uViewClientes.dfm

@@ -62,25 +62,8 @@ inherited frViewClientes: TfrViewClientes
       end
     end
   end
-  inherited frViewFiltroBase1: TfrViewFiltroBase
-    inherited TBXDockablePanel1: TTBXDockablePanel
-      inherited dxLayoutControl1: TdxLayoutControl
-        inherited txtFiltroTodo: TcxTextEdit
-          ExplicitWidth = 273
-          Width = 273
-        end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          ExplicitWidth = 121
-          Width = 121
-        end
-        inherited edtFechaFinFiltro: TcxDateEdit
-          ExplicitWidth = 201
-          Width = 201
-        end
-      end
-    end
-  end
   inherited pnlAgrupaciones: TTBXDockablePanel
+    ExplicitWidth = 128
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
       inherited TBXToolbar1: TTBXToolbar
         object TBXItem2: TTBXItem

Source/Modulos/Contactos/Views/uViewClientes.pas

@@ -13,7 +13,8 @@ uses
   dxPSFillPatterns, dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore,
   dxPScxCommon, cxImageComboBox, cxGridCustomPopupMenu, cxGridPopupMenu,
   dxPScxGridLnk, ExtCtrls, JvComponentBase, JvBalloonHint, JvHint,
-  uViewFiltroBase, dxPgsDlg, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock;
+  uViewFiltroBase, dxPgsDlg, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock,
+  uDAInterfaces;
 
 type
   IViewClientes = interface(IViewContactos)

Source/Modulos/Contactos/Views/uViewContactos.dfm

@@ -12,7 +12,7 @@ inherited frViewContactos: TfrViewContactos
       DataController.KeyFieldNames = 'ID'
       DataController.Summary.FooterSummaryItems = <
         item
-          Format = '0 clientes'                               
+          Format = '0 clientes'
           Kind = skCount
           FieldName = 'ID'
           Column = cxGridViewNOMBRE
@@ -98,23 +98,17 @@ inherited frViewContactos: TfrViewContactos
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 557
         ExplicitWidth = 557
-        inherited txtFiltroTodo: TcxTextEdit
-          ExplicitWidth = 273
-          Width = 273
-        end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          ExplicitWidth = 121
-          Width = 121
-        end
         inherited edtFechaFinFiltro: TcxDateEdit
-          ExplicitWidth = 201
+          ExplicitWidth = 284
-          Width = 201
+          Width = 284
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 557
+        ExplicitWidth = 557
         inherited tbxBotones: TTBXToolbar
           Width = 547
+          ExplicitWidth = 547
         end
       end
     end

Source/Modulos/Contactos/Views/uViewContactos.pas

@@ -13,7 +13,8 @@ uses
   dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
   dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk,
   udatamoduleclientes, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase,
-  ComCtrls, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg;
+  ComCtrls, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg,
+  uDAInterfaces;
 
 type
   IViewContactos = interface(IViewGrid)

Source/Modulos/Contactos/Views/uViewEmpleados.dfm

@@ -31,21 +31,20 @@ inherited frViewEmpleados: TfrViewEmpleados
   inherited frViewFiltroBase1: TfrViewFiltroBase
     inherited TBXDockablePanel1: TTBXDockablePanel
       inherited dxLayoutControl1: TdxLayoutControl
-        inherited txtFiltroTodo: TcxTextEdit
-          ExplicitWidth = 457
-          Width = 457
-        end
         inherited edtFechaIniFiltro: TcxDateEdit
           ExplicitWidth = 239
           Width = 239
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          ExplicitWidth = 219
+          ExplicitWidth = 207
-          Width = 219
+          Width = 207
         end
       end
     end
   end
+  inherited pnlAgrupaciones: TTBXDockablePanel
+    ExplicitWidth = 128
+  end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
       ReportDocument.CreationDate = 39211.791248726860000000

Source/Modulos/Contactos/Views/uViewEmpleados.pas

@@ -11,7 +11,7 @@ uses
   cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, uDADataTable,
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
-  TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase;
+  TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, uDAInterfaces;
 
 type
   IViewEmpleados = interface(IViewContactos)

Source/Modulos/Contactos/Views/uViewProveedor.dfm

@@ -7,16 +7,16 @@ inherited frViewProveedor: TfrViewProveedor
     Height = 454
     ExplicitHeight = 454
     inherited PngSpeedButton1: TPngSpeedButton
-      Left = 612
+      Left = 613
-      ExplicitLeft = 612
+      ExplicitLeft = 613
     end
     inherited PngSpeedButton2: TPngSpeedButton
-      Left = 612
+      Left = 613
-      ExplicitLeft = 612
+      ExplicitLeft = 613
     end
     inherited PngSpeedButton3: TPngSpeedButton
-      Left = 612
+      Left = 613
-      ExplicitLeft = 612
+      ExplicitLeft = 613
     end
     object Label1: TLabel [3]
       Left = 366
@@ -94,21 +94,7 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 20
       Width = 310
     end
-    inherited eTlfParticular: TcxDBTextEdit
+    object cxDBCheckBox2: TcxDBCheckBox [10]
-      Left = 461
-      TabOrder = 14
-      ExplicitLeft = 461
-      ExplicitWidth = 91
-      Width = 91
-    end
-    inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 461
-      TabOrder = 13
-      ExplicitLeft = 461
-      ExplicitWidth = 127
-      Width = 127
-    end
-    object cxDBCheckBox2: TcxDBCheckBox [12]
       Left = 22
       Top = 193
       Caption = 'El proveedor est'#225' homologado'
@@ -132,7 +118,7 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 6
       Width = 326
     end
-    object eCertificaciones: TcxDBTextEdit [13]
+    object eCertificaciones: TcxDBTextEdit [11]
       Left = 124
       Top = 220
       DataBinding.DataField = 'CERTIFICACION'
@@ -151,7 +137,7 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 7
       Width = 227
     end
-    object cbGrupoProveedor: TcxDBComboBox [14]
+    object cbGrupoProveedor: TcxDBComboBox [12]
       Left = 124
       Top = 136
       DataBinding.DataField = 'GRUPO_PROVEEDOR'
@@ -175,27 +161,17 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 5
       Width = 227
     end
-    inherited eTlfMovil: TcxDBTextEdit
+    inherited eTlfParticular: TcxDBTextEdit
       Left = 461
-      TabOrder = 15
+      TabOrder = 14
       ExplicitLeft = 461
-      ExplicitWidth = 155
-      Width = 155
     end
-    inherited eFax: TcxDBTextEdit
+    inherited eTlfTrabajo: TcxDBTextEdit
       Left = 461
-      TabOrder = 16
+      TabOrder = 13
       ExplicitLeft = 461
-      ExplicitWidth = 121
-      Width = 121
     end
-    inherited eNombre: TcxDBTextEdit
+    object eDescripcionProveedor: TcxDBTextEdit [15]
-      Left = 124
-      ExplicitLeft = 124
-      ExplicitWidth = 221
-      Width = 221
-    end
-    object eDescripcionProveedor: TcxDBTextEdit [18]
       Left = 124
       Top = 82
       DataBinding.DataField = 'DESCRIPCION_PROVEEDOR'
@@ -214,7 +190,7 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 3
       Width = 221
     end
-    object eCodigoAsignado: TcxDBTextEdit [19]
+    object eCodigoAsignado: TcxDBTextEdit [16]
       Left = 124
       Top = 109
       DataBinding.DataField = 'CODIGO_ASIGNADO'
@@ -233,6 +209,20 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 4
       Width = 221
     end
+    inherited eTlfMovil: TcxDBTextEdit
+      Left = 461
+      TabOrder = 15
+      ExplicitLeft = 461
+    end
+    inherited eFax: TcxDBTextEdit
+      Left = 461
+      TabOrder = 16
+      ExplicitLeft = 461
+    end
+    inherited eNombre: TcxDBTextEdit
+      Left = 124
+      ExplicitLeft = 124
+    end
     inherited eNIFCIF: TcxDBTextEdit
       Left = 197
       ExplicitLeft = 197
@@ -244,29 +234,21 @@ inherited frViewProveedor: TfrViewProveedor
       Properties.Prefix = 'mailto:'
       TabOrder = 17
       ExplicitLeft = 461
-      ExplicitWidth = 133
-      Width = 133
     end
     inherited eMailParticular: TcxDBHyperLinkEdit
       Left = 461
       Properties.Prefix = 'mailto:'
       TabOrder = 18
       ExplicitLeft = 461
-      ExplicitWidth = 133
-      Width = 133
     end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
       Left = 461
       TabOrder = 19
       ExplicitLeft = 461
-      ExplicitWidth = 133
-      Width = 133
     end
     inherited eReferencia: TcxDBTextEdit
       Left = 124
       ExplicitLeft = 124
-      ExplicitWidth = 38
-      Width = 38
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 124
@@ -274,8 +256,6 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 8
       ExplicitLeft = 124
       ExplicitTop = 277
-      ExplicitWidth = 256
-      Width = 256
     end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       inherited dxLayoutControlContactoGroup9: TdxLayoutGroup

Source/Modulos/Contactos/Views/uViewProveedor.pas

@@ -8,7 +8,7 @@ uses
   dxLayoutControl, cxMemo, cxDBEdit, cxContainer, cxEdit, cxTextEdit, cxControls,
   cxMaskEdit, cxSpinEdit, ImgList, PngImageList, ActnList, cxHyperLinkEdit,
   Buttons, PngSpeedButton, StdCtrls, cxCheckBox, cxGraphics, cxDropDownEdit,
-  uGruposProveedorController;
+  uGruposProveedorController, uDAInterfaces;
 
 type
   IViewProveedor = interface(IViewContacto)

Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.pas

@@ -7,7 +7,8 @@ uses
   Dialogs, uViewBase, cxGraphics, DB, uDADataTable, dxLayoutControl,
   cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
   cxDBLookupEdit, cxDBLookupComboBox, cxControls, cxSpinEdit, cxDBEdit,
-  uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController;
+  uBizContactos, cxCheckBox, StdCtrls, uFormasPagoController, uTiposIVAController,
+  uDAInterfaces;
 
 type
   IViewProveedorDatosComerciales = interface(IViewBase)

Source/Modulos/Contactos/Views/uViewProveedores.dfm

@@ -51,8 +51,8 @@ inherited frViewProveedores: TfrViewProveedores
         Width = 483
         ExplicitWidth = 483
         inherited edtFechaFinFiltro: TcxDateEdit
-          ExplicitWidth = 149
+          ExplicitWidth = 206
-          Width = 149
+          Width = 206
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel

Source/Modulos/Contactos/Views/uViewProveedores.pas

@@ -11,7 +11,8 @@ uses
   cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, uDADataTable,
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
-  TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox;
+  TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox,
+  uDAInterfaces;
 
 type
   IViewProveedores = interface(IViewContactos)

Source/Modulos/Tipos de IVA/Data/TiposIVA_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\uDataModuleTiposIVA.DFM */
+/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\uDataModuleTiposIVA.dfm */
 /* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.res */
-/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1E.tmp */

Source/Modulos/Tipos de IVA/Data/uDataModuleTiposIVA.pas

@@ -93,7 +93,6 @@ begin
     // (ID = :ID)
     with Result.DataTable.DynamicWhere do
     begin
-      Clear;
       Expression := NewBinaryExpression(NewField('', fld_TiposIVAID),
         NewConstant(ID, datInteger), dboEqual);
     end;

Source/Modulos/Tipos de IVA/Model/TiposIVA_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.res */
-/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1C.tmp */

Source/Servidor/FactuGES_Server.dproj

@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
+  <PropertyGroup>
-		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-		<MainSource>FactuGES_Server.dpr</MainSource>
+    <MainSource>FactuGES_Server.dpr</MainSource>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-	</PropertyGroup>
+  </PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<Version>7.0</Version>
+    <Version>7.0</Version>
-		<DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
-		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-		<DCC_MapFile>3</DCC_MapFile>
+    <DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-		<DCC_Define>RELEASE</DCC_Define>
+    <DCC_Define>RELEASE</DCC_Define>
-	</PropertyGroup>
+  </PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<Version>7.0</Version>
+    <Version>7.0</Version>
-		<DCC_MapFile>3</DCC_MapFile>
+    <DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-		<DCC_Define>DEBUG;</DCC_Define>
+    <DCC_Define>DEBUG;</DCC_Define>
-		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-	</PropertyGroup>
+  </PropertyGroup>
-	<ProjectExtensions>
+  <ProjectExtensions>
-		<Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
-		<Borland.ProjectType/>
+    <Borland.ProjectType />
-		<BorlandProject>
+    <BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</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">3.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">3.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">domingo, 30 de septiembre de 2007 20:47</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</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">3.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">3.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">domingo, 30 de septiembre de 2007 20:47</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\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
-					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+    </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-	</ProjectExtensions>
+  </ProjectExtensions>
-	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-	<ItemGroup>
+  <ItemGroup>
-		<DelphiCompile Include="FactuGES_Server.dpr">
+    <DelphiCompile Include="FactuGES_Server.dpr">
-			<MainSource>MainSource</MainSource>
+      <MainSource>MainSource</MainSource>
-		</DelphiCompile>
+    </DelphiCompile>
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-			<Form>srvEmpresas</Form>
+      <Form>srvEmpresas</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas"/>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-			<Form>srvContactos</Form>
+      <Form>srvContactos</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas" />
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas" />
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas"/>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas" />
-		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-			<Form>srvConfiguracion</Form>
+      <Form>srvConfiguracion</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Configuracion\uConexionBD.pas">
+    <DCCReference Include="Configuracion\uConexionBD.pas">
-			<Form>frConexionBD</Form>
+      <Form>frConexionBD</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Configuracion\uConfGeneral.pas">
+    <DCCReference Include="Configuracion\uConfGeneral.pas">
-			<Form>frConfGeneral</Form>
+      <Form>frConfGeneral</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Configuracion\uConfiguracion.pas">
+    <DCCReference Include="Configuracion\uConfiguracion.pas">
-			<Form>fConfiguracion</Form>
+      <Form>fConfiguracion</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-			<Form>FrameConfiguracion</Form>
+      <Form>FrameConfiguracion</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="srvLogin_Impl.pas">
+    <DCCReference Include="srvLogin_Impl.pas">
-			<Form>srvLogin</Form>
+      <Form>srvLogin</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uAcercaDe.pas">
+    <DCCReference Include="uAcercaDe.pas">
-			<Form>fAcercaDe</Form>
+      <Form>fAcercaDe</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uDataModuleServer.pas">
+    <DCCReference Include="uDataModuleServer.pas">
-			<Form>dmServer</Form>
+      <Form>dmServer</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uServerMainForm.pas">
+    <DCCReference Include="uServerMainForm.pas">
-			<Form>fServerForm</Form>
+      <Form>fServerForm</Form>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Utiles\RegExpr.pas"/>
+    <DCCReference Include="Utiles\RegExpr.pas" />
-		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-	</ItemGroup>
+  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]