Se añaden los vendedores

git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@6 f33bb606-9f5c-448d-9c99-757f00063c96

Build/Build.fbp5

@@ -683,12 +683,12 @@ source_path
               <Property name="MajorVersion" type="Integer">1</Property>
               <Property MultiValue="0" name="ManifestFile" type="string"></Property>
               <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-              <Property name="MinorVersion" type="Integer">6</Property>
+              <Property name="MinorVersion" type="Integer">7</Property>
               <Property name="NodeCollapsed" type="Boolean">False</Property>
               <Property name="PauseInterval" type="Cardinal">0</Property>
               <Property MultiValue="0" name="ProjectFile" type="WideString">%source_path%\Servidor\FactuGES_Server.dpr</Property>
               <Property name="RegenerateResource" type="WordBool">True</Property>
-              <Property name="ReleaseVersion" type="Integer">7</Property>
+              <Property name="ReleaseVersion" type="Integer">8</Property>
               <Property MultiValue="0" name="ResourceCompilerOptions" type="string"></Property>
               <Property MultiValue="0" name="ResourceCompilerPath" type="string"></Property>
               <Property name="ResourceCompilerType" type="TFBDelphiResourceCompiler">rcBorland</Property>
@@ -703,15 +703,15 @@ source_path
               <Property name="UseVersionFromDOF" type="Boolean">True</Property>
               <Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=
 FileDescription=
-FileVersion=1.6.7.0
+FileVersion=1.7.8.0
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=
-ProductVersion=1.6.8.0
+ProductVersion=1.7.8.0
 Comments=
-CompileDate=viernes, 27 de febrero de 2009 11:47
+CompileDate=miércoles, 18 de noviembre de 2009 10:47
 ]]>
                 </Property>
               <Property MultiValue="0" name="VersionInfoPropertySetName" type="string"></Property>
@@ -754,7 +754,7 @@ CompileDate=viernes, 27 de febrero de 2009 11:47
                 <Property name="Optimisation" type="WordBool">True</Property>
                 <Property MultiValue="0" name="OutputDir" type="WideString">%output_path%\Servidor</Property>
                 <Property name="OverflowChecking" type="WordBool">False</Property>
-                <Property MultiValue="0" name="Packages" type="WideString">vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeui;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;dbxcommondriver;indycore;indysystem;indyprotocols;vclsmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;remobjects_bpdx_d11;remobjects_rodx_d11;remobjects_indy_d11;remobjects_synapse_d11;remobjects_webbroker_d11;dataabstract_core_d11;dataabstract_dbxdriver_d11;dataabstract_ide_d11;dataabstract_scripting_d11;dataabstract_sdacdriver_d11;sdac105;dac105;dataabstract_sqlitedriver_d11;cxeditorsd10;cxlibraryd10;dxthemed10;cxdatad10;cxexteditorsd10;cxgridd10;cxpagecontrold10;cxschedulerd10;cxtreelistd10;cxverticalgridd10;dxbard10;dxcomnd10;dxbardbnavd10;dxbarextdbitemsd10;dxbarextitemsd10;dxdockingd10;dxlayoutcontrold10;dxnavbard10;dxpscored10;dxsbd10;dxpscxcommond10;dxpslnksd10;vclshlctrls;dxpscxextcommond10;dxpscxgridlnkd10;dxpscxpcprodd10;dxpscxscheduler2lnkd10;dxpscxtllnkd10;dxpsdxlclnkd10;dxpsprvwadvd10;pckmd5;pckucdataconnector;pckusercontrol_rt;pluginsdk_d10r;png_d10;pngcomponentsd10;tb2k_d10;tbx_d10;jclvcl;jcl;jvxpctrlsd11r;jvcored11r;jvsystemd11r;jvstdctrlsd11r;jvappfrmd11r;jvbandsd11r;jvdbd11r;jvdlgsd11r;jvbded11r;jvcmpd11r;jvcryptd11r;jvctrlsd11r;jvcustomd11r;jvdockingd11r;jvdotnetctrlsd11r;jvedid11r;jvglobusd11r;jvhmid11r;jvinterpreterd11r;jvjansd11r;jvmanagedthreadsd11r;jvmmd11r;jvnetd11r;jvpagecompsd11r;jvplugind11r;jvprintpreviewd11r;jvruntimedesignd11r;jvtimeframeworkd11r;jvuibd11r;jvvalidatorsd11r;jvwizardd11r;pckucadoconn;pckucbdeconn;pckucibxconn;pckucmidasconn;cxintlprintsys3d10;cxexportd10;cxintl5d10;guisdk_d11;ccpackd11;jsdialog100;fstee11;fs11;frx11;frxado11;frxbde11;frxdb11;frxdbx11;frxe11;frxibx11;frxtee11;fsado11;fsbde11;fsdb11;fsibx11;websnap;soaprtl;intrawebdb_90_100;intraweb_90_100</Property>
+                <Property MultiValue="0" name="Packages" type="WideString">vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeui;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;dbxcommondriver;indycore;indysystem;indyprotocols;vclsmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;remobjects_bpdx_d11;remobjects_rodx_d11;remobjects_indy_d11;remobjects_synapse_d11;remobjects_webbroker_d11;dataabstract_core_d11;dataabstract_dbxdriver_d11;dataabstract_ide_d11;dataabstract_scripting_d11;dataabstract_sdacdriver_d11;sdac105;dac105;dataabstract_sqlitedriver_d11;cxeditorsd10;cxlibraryd10;dxthemed10;cxdatad10;cxexteditorsd10;cxgridd10;cxpagecontrold10;cxschedulerd10;cxtreelistd10;cxverticalgridd10;dxbard10;dxcomnd10;dxbardbnavd10;dxbarextdbitemsd10;dxbarextitemsd10;dxdockingd10;dxlayoutcontrold10;dxnavbard10;dxpscored10;dxsbd10;dxpscxcommond10;dxpslnksd10;vclshlctrls;dxpscxextcommond10;dxpscxgridlnkd10;dxpscxpcprodd10;dxpscxscheduler2lnkd10;dxpscxtllnkd10;dxpsdxlclnkd10;dxpsprvwadvd10;pckmd5;pckucdataconnector;pckusercontrol_rt;pluginsdk_d10r;png_d10;pngcomponentsd10;tb2k_d10;tbx_d10;jclvcl;jcl;jvxpctrlsd11r;jvcored11r;jvsystemd11r;jvstdctrlsd11r;jvappfrmd11r;jvbandsd11r;jvdbd11r;jvdlgsd11r;jvbded11r;jvcmpd11r;jvcryptd11r;jvctrlsd11r;jvcustomd11r;jvdockingd11r;jvdotnetctrlsd11r;jvedid11r;jvglobusd11r;jvhmid11r;jvinterpreterd11r;jvjansd11r;jvmanagedthreadsd11r;jvmmd11r;jvnetd11r;jvpagecompsd11r;jvplugind11r;jvprintpreviewd11r;jvruntimedesignd11r;jvtimeframeworkd11r;jvuibd11r;jvvalidatorsd11r;jvwizardd11r;pckucadoconn;pckucbdeconn;pckucibxconn;pckucmidasconn;cxintlprintsys3d10;cxexportd10;cxintl5d10;guisdk_d11r;ccpackd11;jsdialog100;fstee11;fs11;frx11;frxado11;frxbde11;frxdb11;frxdbx11;frxe11;frxibx11;frxtee11;fsado11;fsbde11;fsdb11;fsibx11;websnap;soaprtl;intrawebdb_90_100;intraweb_90_100</Property>
                 <Property name="RangeChecking" type="WordBool">False</Property>
                 <Property name="RecordFieldAlign" type="TFieldAlign">fa8</Property>
                 <Property name="ReferenceInfo" type="WordBool">False</Property>
@@ -830,14 +830,14 @@ CompileDate=viernes, 27 de febrero de 2009 11:47
             <Property name="ActionTextColor" type="Cardinal">8388736</Property>
             <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
             <Property MultiValue="0" name="Description" type="string">Base</Property>
-            <Property name="Enabled" type="WordBool">False</Property>
+            <Property name="Enabled" type="WordBool">True</Property>
             <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
             <Property name="IgnoreFailure" type="WordBool">False</Property>
             <Property name="IsAction" type="Boolean">True</Property>
             <Property name="IsBreakPoint" type="WordBool">False</Property>
             <Property MultiValue="0" name="LogToVariable" type="string"></Property>
             <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-            <Property name="NodeCollapsed" type="Boolean">True</Property>
+            <Property name="NodeCollapsed" type="Boolean">False</Property>
             <Property name="PauseInterval" type="Cardinal">0</Property>
             <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
             <Property name="SuppressStatusMessages" type="Boolean">False</Property>
@@ -1227,14 +1227,14 @@ Comments=
             <Property name="ActionTextColor" type="Cardinal">0</Property>
             <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
             <Property MultiValue="0" name="Description" type="string">Módulos</Property>
-            <Property name="Enabled" type="WordBool">False</Property>
+            <Property name="Enabled" type="WordBool">True</Property>
             <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
             <Property name="IgnoreFailure" type="WordBool">False</Property>
             <Property name="IsAction" type="Boolean">True</Property>
             <Property name="IsBreakPoint" type="WordBool">False</Property>
             <Property MultiValue="0" name="LogToVariable" type="string"></Property>
             <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-            <Property name="NodeCollapsed" type="Boolean">True</Property>
+            <Property name="NodeCollapsed" type="Boolean">False</Property>
             <Property name="PauseInterval" type="Cardinal">0</Property>
             <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
             <Property name="SuppressStatusMessages" type="Boolean">False</Property>
@@ -19208,7 +19208,7 @@ Comments=
             <Property name="ActionTextColor" type="Cardinal">0</Property>
             <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
             <Property MultiValue="0" name="Description" type="string">Cliente</Property>
-            <Property name="Enabled" type="WordBool">False</Property>
+            <Property name="Enabled" type="WordBool">True</Property>
             <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
             <Property name="IgnoreFailure" type="WordBool">False</Property>
             <Property name="IsAction" type="Boolean">True</Property>
@@ -19259,7 +19259,7 @@ Comments=
               <Property name="MajorVersion" type="Integer">1</Property>
               <Property MultiValue="0" name="ManifestFile" type="string"></Property>
               <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-              <Property name="MinorVersion" type="Integer">6</Property>
+              <Property name="MinorVersion" type="Integer">7</Property>
               <Property name="NodeCollapsed" type="Boolean">False</Property>
               <Property name="PauseInterval" type="Cardinal">0</Property>
               <Property MultiValue="0" name="ProjectFile" type="WideString">%source_path%\Cliente\FactuGES.dpr</Property>
@@ -19279,13 +19279,13 @@ Comments=
               <Property name="UseVersionFromDOF" type="Boolean">False</Property>
               <Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=Rodax Software S.L.
 FileDescription=
-FileVersion=1.6.8.0
+FileVersion=1.7.8.0
 InternalName=FactuGES
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=FactuGES
-ProductVersion=1.6.8.0
+ProductVersion=1.7.8.0
 Comments=
 ]]>
                 </Property>

Build/Build.fbv

@@ -1 +1 @@
-<variables><project_path><![CDATA[C:\Codigo Tecsitel]]></project_path></variables>
+<variables><project_path><![CDATA[C:\Codigo Noviseda]]></project_path></variables>

Database/scripts/factuges.sql

@@ -79,9 +79,6 @@ VARCHAR(30);
 /****                              Generators                              ****/
 /******************************************************************************/
 
-CREATE GENERATOR GEN_AGENTES_COMISIONES_ID;
-SET GENERATOR GEN_AGENTES_COMISIONES_ID TO 1;
-
 CREATE GENERATOR GEN_ALBARANES_CLI_DETALLES_ID;
 SET GENERATOR GEN_ALBARANES_CLI_DETALLES_ID TO 1;
 
@@ -112,6 +109,9 @@ SET GENERATOR GEN_CLIENTES_DTOS_PROV_ID TO 1;
 CREATE GENERATOR GEN_CLIENTES_GRUPOS_ID;
 SET GENERATOR GEN_CLIENTES_GRUPOS_ID TO 1;
 
+CREATE GENERATOR GEN_COMISIONES_VENDEDORES_ID;
+SET GENERATOR GEN_COMISIONES_VENDEDORES_ID TO 1;
+
 CREATE GENERATOR GEN_COMISIONES_LIQUID_ID;
 SET GENERATOR GEN_COMISIONES_LIQUID_ID TO 1;
 
@@ -253,15 +253,6 @@ SET GENERATOR GEN_USUARIOS_ID TO 1;
 /****                                Tables                                ****/
 /******************************************************************************/
 
-
-
-CREATE TABLE AGENTES_COMISIONES (
-    ID            TIPO_ID NOT NULL,
-    ID_AGENTE     TIPO_ID DEFAULT 0 NOT NULL,
-    ID_PROVEEDOR  SMALLINT DEFAULT 0 NOT NULL,
-    COMISION      TIPO_PORCENTAJE DEFAULT 0
-);
-
 CREATE TABLE ALBARANES_CLIENTE (
     ID                    TIPO_ID NOT NULL,
     ID_EMPRESA            TIPO_ID,
@@ -581,6 +572,11 @@ CREATE TABLE EMPLEADOS_GRUPOS (
     DESCRIPCION  VARCHAR(255)
 );
 
+CREATE TABLE VENDEDORES_DATOS(
+	ID_VENDEDOR TIPO_ID NOT NULL,
+	COMISION TIPO_PORCENTAJE,
+	ID_USUARIO TIPO_ID);
+
 CREATE TABLE EMPRESAS (
     ID                  TIPO_ID NOT NULL,
     NIF_CIF             VARCHAR(15),
@@ -1886,6 +1882,65 @@ INNER JOIN EMPLEADOS_DATOS ON (EMPLEADOS_DATOS.ID_EMPLEADO = V_CONTACTOS.ID)
 WHERE V_CONTACTOS.ID_CATEGORIA = 3
 ;
 
+/* View: V_VENDEDORES */
+CREATE VIEW V_VENDEDORES(
+ID,
+ID_CATEGORIA,
+NIF_CIF,
+NOMBRE,
+PERSONA_CONTACTO,
+CALLE,
+POBLACION,
+PROVINCIA,
+CODIGO_POSTAL,
+TELEFONO_1,
+TELEFONO_2,
+MOVIL_1,
+MOVIL_2,
+FAX,
+EMAIL_1,
+EMAIL_2,
+PAGINA_WEB,
+NOTAS,
+FECHA_ALTA,
+FECHA_MODIFICACION,
+USUARIO,
+ID_EMPRESA,
+REFERENCIA,
+COMISION,
+ID_USUARIO)
+ AS 
+SELECT V_CONTACTOS.ID,
+  V_CONTACTOS.ID_CATEGORIA,
+  V_CONTACTOS.NIF_CIF,
+  V_CONTACTOS.NOMBRE,
+  V_CONTACTOS.PERSONA_CONTACTO,
+  V_CONTACTOS.CALLE,
+  V_CONTACTOS.POBLACION,
+  V_CONTACTOS.PROVINCIA,
+  V_CONTACTOS.CODIGO_POSTAL,
+  V_CONTACTOS.TELEFONO_1,
+  V_CONTACTOS.TELEFONO_2,
+  V_CONTACTOS.MOVIL_1,
+  V_CONTACTOS.MOVIL_2,
+  V_CONTACTOS.FAX,
+  V_CONTACTOS.EMAIL_1,
+  V_CONTACTOS.EMAIL_2,
+  V_CONTACTOS.PAGINA_WEB,
+  V_CONTACTOS.NOTAS,
+  V_CONTACTOS.FECHA_ALTA,
+  V_CONTACTOS.FECHA_MODIFICACION,
+  V_CONTACTOS.USUARIO,
+  V_CONTACTOS.ID_EMPRESA, 
+  V_CONTACTOS.REFERENCIA,
+  VENDEDORES_DATOS.COMISION,
+  VENDEDORES_DATOS.ID_USUARIO
+  
+FROM V_CONTACTOS
+INNER JOIN VENDEDORES_DATOS ON (VENDEDORES_DATOS.ID_VENDEDOR = V_CONTACTOS.ID)
+
+WHERE V_CONTACTOS.ID_CATEGORIA = 3;
+;
 
 
 /* View: V_REC_FAC_CLI */
@@ -3456,7 +3511,6 @@ GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
 /****                             Primary Keys                             ****/
 /******************************************************************************/
 
-ALTER TABLE AGENTES_COMISIONES ADD CONSTRAINT PK_AGENTES_COMISIONES PRIMARY KEY (ID);
 ALTER TABLE ALBARANES_CLIENTE ADD CONSTRAINT PK_ALBARAN_CLIENTE PRIMARY KEY (ID);
 ALTER TABLE ALBARANES_CLIENTE_DETALLES ADD CONSTRAINT PK_ALBARANES_CLIENTE_DETALLES PRIMARY KEY (ID);
 ALTER TABLE ALBARANES_PROVEEDOR ADD CONSTRAINT PK_ALBARAN_PROVEEDOR PRIMARY KEY (ID);
@@ -3477,6 +3531,7 @@ ALTER TABLE CONTACTOS_DATOS_PERSONAL ADD CONSTRAINT PK_CONTACTOS_DATOS_PER PRIMA
 ALTER TABLE CONTACTOS_DIRECCIONES ADD CONSTRAINT PK_CONTACTOS_DIR PRIMARY KEY (ID);
 ALTER TABLE EMPLEADOS_DATOS ADD CONSTRAINT PK_EMPLEADOS_DATOS PRIMARY KEY (ID_EMPLEADO);
 ALTER TABLE EMPLEADOS_GRUPOS ADD CONSTRAINT PK_EMPLEADOS_GRUPOS PRIMARY KEY (ID);
+ALTER TABLE VENDEDORES_DATOS ADD CONSTRAINT PK_VENDEDORES_DATOS PRIMARY KEY (ID_VENDEDOR);
 ALTER TABLE EMPRESAS ADD CONSTRAINT PK_EMPRESAS PRIMARY KEY (ID);
 ALTER TABLE EMPRESAS_CONTACTOS ADD CONSTRAINT PK_EMPRESAS_CONTACTOS PRIMARY KEY (ID);
 ALTER TABLE EMPRESAS_DATOS_BANCO ADD CONSTRAINT PK_EMPRESAS_DATOS_BANCO PRIMARY KEY (ID);
@@ -3569,8 +3624,6 @@ ALTER TABLE TIENDA_WEB ADD CONSTRAINT FK_EMPRESAS_TIENDA_WEB FOREIGN KEY (ID_EMP
 /****                               Indices                                ****/
 /******************************************************************************/
 
-CREATE INDEX IDX_AGENTES_COMISIONES1 ON AGENTES_COMISIONES (ID_AGENTE);
-CREATE INDEX IDX_AGENTES_COMISIONES2 ON AGENTES_COMISIONES (ID_PROVEEDOR);
 CREATE INDEX IDX_ALBARANES_CLIENTE1 ON ALBARANES_CLIENTE (ID_FORMA_PAGO);
 CREATE INDEX IDX_ALBARANES_CLIENTE2 ON ALBARANES_CLIENTE (TIPO);
 CREATE INDEX ALBARANES_CLIENTE_IDX1 ON ALBARANES_CLIENTE (ID_ALMACEN);

Source/ApplicationBase/uFactuGES_App.pas

@@ -150,6 +150,7 @@ var
   AppFactuGES : IAppFactuGES = nil;
 
 implementation
+{$INCLUDE ..\FactuGES.inc}
 
 uses
   Windows, Dialogs, JSDialog, JSDialogs, uDialogUtils, cxControls, uUsuariosViewRegister,
@@ -400,9 +401,13 @@ begin
     end;
     AEmpresas.DataTable.First;
 
+    {$IFDEF MULTIEMPRESA}
     if JsDialog.Execute <> IDCANCEL then
        if JsDialog.CustomButtonResult > 0 then
           CambiarEmpresa(JsDialog.CustomButtonResult);
+    {$ELSE}
+    CambiarEmpresa(AEmpresas.ID);
+    {$ENDIF}
 
   finally
     FreeAndNIL(JsDialog);

Source/Base/Base.dpk

@@ -77,7 +77,8 @@ requires
   dxPSCoreD11,
   cxIntl6D11,
   cxIntlPrintSys3D11,
-  RemObjects_Indy_D11;
+  RemObjects_Indy_D11,
+  dxCoreD11;
 
 contains
   uDataTableUtils in 'Utiles\uDataTableUtils.pas',
@@ -114,6 +115,7 @@ contains
   uReferenciasUtils in 'Utiles\uReferenciasUtils.pas',
   uEMailUtils in 'Utiles\uEMailUtils.pas',
   uSaveClipboard in 'Utiles\uSaveClipboard.pas',
-  MidasSpeedFix in 'Utiles\MidasSpeedFix.pas';
+  MidasSpeedFix in 'Utiles\MidasSpeedFix.pas',
+  uGridUtils in 'Utiles\uGridUtils.pas';
 
 end.

Source/Base/Base.dproj

@@ -54,57 +54,6 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contactos\Model\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxIntl6D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\designide.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
@@ -129,13 +78,58 @@
       <Form>dmBase</Form>
       <DesignClass>TDataModule</DesignClass>
     </DCCReference>
+    <DCCReference Include="Utiles\adortl.dcp" />
     <DCCReference Include="Utiles\ClassRegistry\uClassRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uEditorRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uInformeRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClipboardUtils.pas" />
     <DCCReference Include="Utiles\Ctltortf.pas" />
+    <DCCReference Include="Utiles\cxDataD11.dcp" />
+    <DCCReference Include="Utiles\cxEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxExportD11.dcp" />
+    <DCCReference Include="Utiles\cxExtEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxGridD11.dcp" />
+    <DCCReference Include="Utiles\cxIntl6D11.dcp" />
+    <DCCReference Include="Utiles\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="Utiles\cxLibraryD11.dcp" />
+    <DCCReference Include="Utiles\cxPageControlD11.dcp" />
+    <DCCReference Include="Utiles\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="Utiles\dbrtl.dcp" />
+    <DCCReference Include="Utiles\dclIndyCore.dcp" />
+    <DCCReference Include="Utiles\designide.dcp" />
+    <DCCReference Include="Utiles\dsnap.dcp" />
+    <DCCReference Include="Utiles\dxCoreD11.dcp" />
+    <DCCReference Include="Utiles\dxGDIPlusD11.dcp" />
+    <DCCReference Include="Utiles\dxPSCoreD11.dcp" />
+    <DCCReference Include="Utiles\dxThemeD11.dcp" />
+    <DCCReference Include="Utiles\GUISDK_D11R.dcp" />
+    <DCCReference Include="Utiles\IndyCore.dcp" />
+    <DCCReference Include="Utiles\IndyProtocols.dcp" />
+    <DCCReference Include="Utiles\IndySystem.dcp" />
+    <DCCReference Include="Utiles\Jcl.dcp" />
+    <DCCReference Include="Utiles\JclVcl.dcp" />
+    <DCCReference Include="Utiles\JSDialog100.dcp" />
+    <DCCReference Include="Utiles\JvCmpD11R.dcp" />
+    <DCCReference Include="Utiles\JvCoreD11R.dcp" />
+    <DCCReference Include="Utiles\JvCtrlsD11R.dcp" />
+    <DCCReference Include="Utiles\JvDlgsD11R.dcp" />
+    <DCCReference Include="Utiles\JvMMD11R.dcp" />
+    <DCCReference Include="Utiles\JvNetD11R.dcp" />
+    <DCCReference Include="Utiles\JvPageCompsD11R.dcp" />
+    <DCCReference Include="Utiles\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="Utiles\JvSystemD11R.dcp" />
     <DCCReference Include="Utiles\MidasSpeedFix.pas" />
+    <DCCReference Include="Utiles\pckMD5.dcp" />
+    <DCCReference Include="Utiles\pckUCDataConnector.dcp" />
+    <DCCReference Include="Utiles\pckUserControl_RT.dcp" />
+    <DCCReference Include="Utiles\PngComponentsD10.dcp" />
+    <DCCReference Include="Utiles\PNG_D10.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="Utiles\rtl.dcp" />
+    <DCCReference Include="Utiles\TB2k_D10.dcp" />
+    <DCCReference Include="Utiles\tbx_d10.dcp" />
     <DCCReference Include="Utiles\uAppInfoUtils.pas" />
     <DCCReference Include="Utiles\uCalculosUtils.pas" />
     <DCCReference Include="Utiles\uDataTableUtils.pas" />
@@ -145,6 +139,7 @@
     <DCCReference Include="Utiles\uEMailUtils.pas" />
     <DCCReference Include="Utiles\uGridClipboardUtils.pas" />
     <DCCReference Include="Utiles\uGridStatusUtils.pas" />
+    <DCCReference Include="Utiles\uGridUtils.pas" />
     <DCCReference Include="Utiles\uInfoProjectUtils.pas" />
     <DCCReference Include="Utiles\uIntegerListUtils.pas" />
     <DCCReference Include="Utiles\uMD5.pas" />
@@ -155,6 +150,13 @@
     <DCCReference Include="Utiles\uSaveClipboard.pas" />
     <DCCReference Include="Utiles\uSistemaFunc.pas" />
     <DCCReference Include="Utiles\uStringsUtils.pas" />
+    <DCCReference Include="Utiles\vcl.dcp" />
+    <DCCReference Include="Utiles\vclactnband.dcp" />
+    <DCCReference Include="Utiles\vcldb.dcp" />
+    <DCCReference Include="Utiles\vcljpg.dcp" />
+    <DCCReference Include="Utiles\VclSmp.dcp" />
+    <DCCReference Include="Utiles\vclx.dcp" />
+    <DCCReference Include="Utiles\xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Cliente/FactuGES.dproj

@@ -53,7 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">8</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.7.8.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.7.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>

Source/Cliente/FactuGES.drc

@@ -12,10 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
+/* c:\archivos de programa\codegear\rad studio\5.0\lib\WindowsXP.res */
-/* C:\Codigo Tecsitel\Lib\JVCL\JvXPCore.res */
+/* C:\Codigo Noviseda\Lib\JVCL\JvXPCore.res */
-/* C:\Codigo Tecsitel\Source\Cliente\uSplash.dfm */
+/* C:\Codigo Noviseda\Source\Cliente\uSplash.dfm */
-/* C:\Codigo Tecsitel\Source\Cliente\uAcercaDe.dfm */
+/* C:\Codigo Noviseda\Source\Cliente\uAcercaDe.dfm */
-/* C:\Codigo Tecsitel\Source\Cliente\uPantallaPrincipal.dfm */
+/* C:\Codigo Noviseda\Source\Cliente\uPantallaPrincipal.dfm */
-/* C:\Codigo Tecsitel\Source\Cliente\FactuGES.res */
+/* C:\Codigo Noviseda\Source\Cliente\FactuGES.res */
-/* E:\temp\dtf10F.tmp */
+/* C:\Codigo Noviseda\Source\Cliente\FactuGES.drf */

Source/Cliente/FactuGES.rc

@@ -1,4 +1,4 @@
-MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
+MAINICON ICON "C:\Codigo Noviseda\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
 FILEVERSION 1,7,8,0
 PRODUCTVERSION 1,7,8,0

Source/Cliente/uBootStrap.pas

@@ -33,25 +33,25 @@ begin
     LoadModule('Obras_plugin.bpl');    
     LoadModule('Articulos_plugin.bpl');
 
-    LoadModule(MODULENAME_PRESUPUESTOS_CLIENTE);
+//    LoadModule(MODULENAME_PRESUPUESTOS_CLIENTE);
-    LoadModule(MODULENAME_ALBARANES_CLIENTE);
+//    LoadModule(MODULENAME_ALBARANES_CLIENTE);
 
-    LoadModule('RecibosCliente_plugin.bpl');
+//    LoadModule('RecibosCliente_plugin.bpl');
-    LoadModule(MODULENAME_FACTURAS_CLIENTE);
+//    LoadModule(MODULENAME_FACTURAS_CLIENTE);
 
-    LoadModule(MODULENAME_PEDIDOS_PROVEEDOR);
+//    LoadModule(MODULENAME_PEDIDOS_PROVEEDOR);
-    LoadModule(MODULENAME_ALBARANES_PROVEEDOR);
+//    LoadModule(MODULENAME_ALBARANES_PROVEEDOR);
 
-    LoadModule(MODULENAME_RECIBOS_PROVEEDOR);
+//    LoadModule(MODULENAME_RECIBOS_PROVEEDOR);
-    LoadModule(MODULENAME_FACTURAS_PROVEEDOR);
+//    LoadModule(MODULENAME_FACTURAS_PROVEEDOR);
 
-    LoadModule('RemesasCliente_plugin.bpl');
+//    LoadModule('RemesasCliente_plugin.bpl');
-    LoadModule('RemesasProveedor_plugin.bpl');
+//    LoadModule('RemesasProveedor_plugin.bpl');
 
-    LoadModule('Inventario_plugin.bpl');
+//    LoadModule('Inventario_plugin.bpl');
-    LoadModule('HistoricoMovimientos_plugin.bpl');
+//    LoadModule('HistoricoMovimientos_plugin.bpl');
 
-    LoadModule('GestorInformes_plugin.bpl');    
+//    LoadModule('GestorInformes_plugin.bpl');    
   end;
 end;
 

Source/Cliente/uMainMenuController.pas

@@ -14,7 +14,7 @@ type
     FLargeImages: TImageList;
     FSmallImages: TImageList;
     procedure SetMainMenu(const Value: TMainMenu);
-    procedure CambiarEmpresaClick(Sender: TObject);    
+    procedure CambiarEmpresaClick(Sender: TObject);
   public
     procedure RegisterModule(AModuleInfo : TModuleInfo);
     procedure SortMenuByTag;
@@ -75,7 +75,7 @@ var
 begin
     AEmpresaMenu := BuscarMenu(FMainMenu, 'Empresa');
     AListaEmpresasItem := AEmpresaMenu.Find('Lista de empresas');
-    
+
     if Assigned(AListaEmpresasItem) then
     begin
       AEmpresas := AppFactuGES.EmpresasController.BuscarTodos;
@@ -90,7 +90,7 @@ begin
             Tag := AEmpresas.ID;
             AutoCheck := True;
             ShortCut := 0;
-            OnClick := CambiarEmpresaClick; 
+            OnClick := CambiarEmpresaClick;
             HelpContext := 0;
             RadioItem := True;
             Enabled := True;

Source/Cliente/uNavPaneController.pas

@@ -42,6 +42,7 @@ var
   NavPaneController : TNavPaneController;
 
 implementation
+{$INCLUDE ..\FactuGES.inc}
 
 uses
   Dialogs, uModuleController, uAcercaDe, uNavPaneUtils,
@@ -127,8 +128,11 @@ begin
     AEmpresas := AppFactuGES.EmpresasController.BuscarTodos;
     try
       AEmpresas.DataTable.Active := True;
+
+      {$IFDEF MULTIEMPRESA}
       while not AEmpresas.DataTable.EOF do
       begin
+      {$ENDIF}
 
         // Buscar la página si existe
         AIndex := EncontrarPagina(FNavigationPane, AEmpresas.NOMBRE);
@@ -163,8 +167,11 @@ begin
           ASeccion.Height := ASeccion.Height + ADivisor.Height;
         end;
 
+      {$IFDEF MULTIEMPRESA}
         AEmpresas.DataTable.Next;
       end;
+      {$ENDIF}
+
       AEmpresas.DataTable.Active := False;
     finally
       AEmpresas := NIL;

Source/Cliente/uPantallaPrincipal.pas

@@ -142,6 +142,7 @@ var
   fPantallaPrincipal: TfPantallaPrincipal;
 
 implementation
+{$INCLUDE ..\FactuGES.inc}
 
 uses
   uSplash, uAcercaDe, UxTheme, Themes, uMenuUtils, uBizEmpresas,
@@ -333,6 +334,7 @@ begin
     if Assigned(AListaEmpresas) then
     begin
       AListaEmpresas.Active := True;
+
       if AListaEmpresas.RecordCount = 1 then
       begin
         // Oculto la página de inicio para que no parezca
@@ -477,6 +479,12 @@ constructor TfPantallaPrincipal.Create(AOwner: TComponent);
 begin
   inherited;
 
+  {$IFDEF MULTIEMPRESA}
+  {$ELSE}
+     Listadeempresas1_OLD.Destroy;
+  {$ENDIF}
+
+
   FContenido := NIL;
 
   with AppFactuGES.ModuleManager do

Source/GUIBase/GUIBase.drc

@@ -12,30 +12,30 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewBase.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewBase.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uEditorBase.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uEditorBase.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewFiltroBase.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewFiltroBase.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewGridBase.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewGridBase.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uEditorItem.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uEditorItem.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uEditorDBBase.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uEditorDBBase.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uEditorGridBase.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uEditorGridBase.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewPreview.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewPreview.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uEditorPreview.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uEditorPreview.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uEditorDBItem.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uEditorDBItem.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewBarraSeleccion.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewBarraSeleccion.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewFormaPago.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewFormaPago.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewObservaciones.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewObservaciones.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewTotales.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewTotales.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewDetallesBase.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewDetallesBase.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewIncidencias.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewIncidencias.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewDetallesDTO.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewDetallesDTO.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewDetallesGenerico.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewDetallesGenerico.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewGrid2Niveles.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewGrid2Niveles.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uEditorBasico.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uEditorBasico.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uDialogBase.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uDialogBase.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewGrid.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewGrid.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewRichEditor.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewRichEditor.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uDialogElegirEMail.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uDialogElegirEMail.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\uViewDocumentos.dfm */
+/* C:\Codigo Noviseda\Source\GUIBase\uViewDocumentos.dfm */
-/* C:\Codigo Tecsitel\Source\GUIBase\GUIBase.res */
+/* C:\Codigo Noviseda\Source\GUIBase\GUIBase.res */
-/* E:\temp\dtf15.tmp */
+/* C:\Codigo Noviseda\Source\GUIBase\GUIBase.drf */

Source/GUIBase/uEditorDBItem.dfm

@@ -77,6 +77,10 @@ inherited fEditorDBItem: TfEditorDBItem
     TabOrder = 2
     object pagGeneral: TTabSheet
       Caption = 'General'
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
     end
   end
   inherited StatusBar: TJvStatusBar

Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Controller\AlbaranesCliente_controller.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Controller\AlbaranesCliente_controller.res */
-/* E:\temp\dtf9F.tmp */
+/* E:\temp\dtfAB.tmp */

Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Data\uDataModuleAlbaranesCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Data\uDataModuleAlbaranesCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Data\AlbaranesCliente_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Data\AlbaranesCliente_data.res */
-/* E:\temp\dtf9D.tmp */
+/* E:\temp\dtfA9.tmp */

Source/Modulos/Albaranes de cliente/Model/AlbaranesCliente_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Model\AlbaranesCliente_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Model\AlbaranesCliente_model.res */
-/* E:\temp\dtf9B.tmp */
+/* E:\temp\dtfA7.tmp */

Source/Modulos/Albaranes de cliente/Plugin/AlbaranesCliente_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Plugin\uPluginAlbaranesCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Plugin\uPluginAlbaranesCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Plugin\AlbaranesCliente_plugin.res */
-/* E:\temp\dtfF5.tmp */
+/* E:\temp\dtf101.tmp */

Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.drc

@@ -12,20 +12,20 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranesCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranesCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewDetallesAlbaranCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewDetallesAlbaranCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewDireccionEntregaAlbaranCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewDireccionEntregaAlbaranCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewDatosYSeleccionClienteAlbaran.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewDatosYSeleccionClienteAlbaran.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewElegirArticulosAlbaranesCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewElegirArticulosAlbaranesCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorElegirArticulosAlbaranCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uEditorElegirArticulosAlbaranCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesClienteReport.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesClienteReport.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorElegirAlbaranesCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uEditorElegirAlbaranesCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranesDevCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranesDevCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesDevCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranesDevCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranDevCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uViewAlbaranDevCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranDevCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\uEditorAlbaranDevCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.res */
-/* E:\temp\dtfF3.tmp */
+/* E:\temp\dtfFF.tmp */

Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.res */
-/* E:\temp\dtfC9.tmp */
+/* E:\temp\dtfD5.tmp */

Source/Modulos/Albaranes de proveedor/Data/AlbaranesProveedor_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Data\uDataModuleAlbaranesProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Data\uDataModuleAlbaranesProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Data\AlbaranesProveedor_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Data\AlbaranesProveedor_data.res */
-/* E:\temp\dtfC7.tmp */
+/* E:\temp\dtfD3.tmp */

Source/Modulos/Albaranes de proveedor/Model/AlbaranesProveedor_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Model\AlbaranesProveedor_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Model\AlbaranesProveedor_model.res */
-/* E:\temp\dtfC5.tmp */
+/* E:\temp\dtfD1.tmp */

Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Plugin\uPluginAlbaranesProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Plugin\uPluginAlbaranesProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.res */
-/* E:\temp\dtf109.tmp */
+/* E:\temp\dtf115.tmp */

Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.drc

@@ -12,21 +12,21 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uViewAlbaranesProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uViewAlbaranesProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranesProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranesProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uViewDetallesAlbaranProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uViewDetallesAlbaranProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uViewDireccionEntregaAlbaranProv.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uViewDireccionEntregaAlbaranProv.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uViewDatosYSeleccionProveedorAlbaran.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uViewDatosYSeleccionProveedorAlbaran.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uViewAlbaranProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uViewAlbaranProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uViewElegirArticulosAlbaranesProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uViewElegirArticulosAlbaranesProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uEditorElegirArticulosAlbaranProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorElegirArticulosAlbaranProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uEditorDireccionEntregaAlbaranProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorDireccionEntregaAlbaranProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uEditorElegirAlbaranesProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorElegirAlbaranesProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uViewAlbaranesDevProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uViewAlbaranesDevProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranesDevProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranesDevProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uViewAlbaranDevProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uViewAlbaranDevProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranDevProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranDevProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranesProveedorReport.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\uEditorAlbaranesProveedorReport.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Albaranes de proveedor\Views\AlbaranesProveedor_view.res */
+/* C:\Codigo Noviseda\Source\Modulos\Albaranes de proveedor\Views\AlbaranesProveedor_view.res */
-/* E:\temp\dtf107.tmp */
+/* E:\temp\dtf113.tmp */

Source/Modulos/Contactos/Controller/Contactos_controller.dpk

@@ -38,7 +38,17 @@ requires
   vclx,
   vclactnband,
   designide,
-  ccpackD11;
+  ccpackD11,
+  dbrtl,
+  cxLibraryD11,
+  dxThemeD11,
+  dxGDIPlusD11,
+  dxCoreD11,
+  DataAbstract_Core_D11,
+  vcldb,
+  dsnap,
+  adortl,
+  RemObjects_Core_D11;
 
 contains
   uContactosController in 'uContactosController.pas',
@@ -73,6 +83,10 @@ contains
   uIEditorDatoBancarioContacto in 'View\uIEditorDatoBancarioContacto.pas',
   uPersonalContactoController in 'uPersonalContactoController.pas',
   uIEditorPersonalContacto in 'View\uIEditorPersonalContacto.pas',
-  uIEditorElegirPersonaContacto in 'View\uIEditorElegirPersonaContacto.pas';
+  uIEditorElegirPersonaContacto in 'View\uIEditorElegirPersonaContacto.pas',
+  uIEditorVendedores in 'View\uIEditorVendedores.pas',
+  uVendedoresController in 'uVendedoresController.pas',
+  uIEditorVendedor in 'View\uIEditorVendedor.pas',
+  uIEditorElegirVendedores in 'View\uIEditorElegirVendedores.pas';
 
 end.

Source/Modulos/Contactos/Controller/Contactos_controller.dproj

@@ -43,6 +43,18 @@
     <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">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="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>
@@ -65,15 +77,25 @@
     <DCCReference Include="uGruposProveedorController.pas" />
     <DCCReference Include="uPersonalContactoController.pas" />
     <DCCReference Include="uProveedoresController.pas" />
+    <DCCReference Include="uVendedoresController.pas" />
+    <DCCReference Include="View\adortl.dcp" />
     <DCCReference Include="View\ApplicationBase.dcp" />
     <DCCReference Include="View\Base.dcp" />
     <DCCReference Include="View\ccpackD11.dcp" />
     <DCCReference Include="View\cfpack_d11.dcp" />
     <DCCReference Include="View\Contactos_data.dcp" />
     <DCCReference Include="View\Contactos_model.dcp" />
+    <DCCReference Include="View\cxLibraryD11.dcp" />
+    <DCCReference Include="View\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="View\dbrtl.dcp" />
     <DCCReference Include="View\designide.dcp" />
+    <DCCReference Include="View\dsnap.dcp" />
+    <DCCReference Include="View\dxCoreD11.dcp" />
+    <DCCReference Include="View\dxGDIPlusD11.dcp" />
+    <DCCReference Include="View\dxThemeD11.dcp" />
     <DCCReference Include="View\GUIBase.dcp" />
     <DCCReference Include="View\GUISDK_D11R.dcp" />
+    <DCCReference Include="View\RemObjects_Core_D11.dcp" />
     <DCCReference Include="View\rtl.dcp" />
     <DCCReference Include="View\uIEditorCliente.pas" />
     <DCCReference Include="View\uIEditorClientes.pas" />
@@ -86,6 +108,7 @@
     <DCCReference Include="View\uIEditorElegirDireccionEntrega.pas" />
     <DCCReference Include="View\uIEditorElegirPersonaContacto.pas" />
     <DCCReference Include="View\uIEditorElegirProveedores.pas" />
+    <DCCReference Include="View\uIEditorElegirVendedores.pas" />
     <DCCReference Include="View\uIEditorEmpleado.pas" />
     <DCCReference Include="View\uIEditorEmpleados.pas" />
     <DCCReference Include="View\uIEditorEtiquetasContactosPreview.pas" />
@@ -96,8 +119,11 @@
     <DCCReference Include="View\uIEditorPersonalContacto.pas" />
     <DCCReference Include="View\uIEditorProveedor.pas" />
     <DCCReference Include="View\uIEditorProveedores.pas" />
+    <DCCReference Include="View\uIEditorVendedor.pas" />
+    <DCCReference Include="View\uIEditorVendedores.pas" />
     <DCCReference Include="View\vcl.dcp" />
     <DCCReference Include="View\vclactnband.dcp" />
+    <DCCReference Include="View\vcldb.dcp" />
     <DCCReference Include="View\vclx.dcp" />
     <DCCReference Include="View\xmlrtl.dcp" />
     <None Include="ModelSupport_Contactos_controller\default.txaPackage" />

Source/Modulos/Contactos/Controller/Contactos_controller.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Controller\Contactos_controller.res */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Controller\Contactos_controller.res */
-/* E:\temp\dtf45.tmp */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Controller\Contactos_controller.drf */

Source/Modulos/Contactos/Data/Contactos_data.dpk

@@ -30,12 +30,24 @@ requires
   Base,
   GUIBase,
   ApplicationBase,
-  Contactos_model;
+  Contactos_model,
+  dbrtl,
+  cxLibraryD11,
+  dxThemeD11,
+  dxGDIPlusD11,
+  dxCoreD11,
+  vclx,
+  RemObjects_Core_D11,
+  DataAbstract_Core_D11,
+  vcldb,
+  dsnap,
+  adortl;
 
 contains
   uDataModuleContactos in 'uDataModuleContactos.pas' {DataModuleContactos: TDAClientDataModule},
   uDataModuleClientes in 'uDataModuleClientes.pas' {DataModuleClientes: TDAClientDataModule},
   uDataModuleProveedores in 'uDataModuleProveedores.pas' {DataModuleProveedores: TDAClientDataModule},
-  uDataModuleEmpleados in 'uDataModuleEmpleados.pas' {DataModuleEmpleados: TDAClientDataModule};
+  uDataModuleEmpleados in 'uDataModuleEmpleados.pas' {DataModuleEmpleados: TDAClientDataModule},
+  uDataModuleVendedores in 'uDataModuleVendedores.pas' {DataModuleVendedores: TDAClientDataModule};
 
 end.

Source/Modulos/Contactos/Data/Contactos_data.dproj

@@ -42,19 +42,27 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <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><Source><Source Name="MainSource">Contactos_data.dpk</Source></Source></Delphi.Personality></BorlandProject></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">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Contactos_data.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="Contactos_data.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="dxCoreD11.dcp" />
+    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="rtl.dcp" />
     <DCCReference Include="uDataModuleClientes.pas">
       <Form>DataModuleClientes</Form>
       <DesignClass>TDAClientDataModule</DesignClass>
@@ -71,6 +79,13 @@
       <Form>DataModuleProveedores</Form>
       <DesignClass>TDAClientDataModule</DesignClass>
     </DCCReference>
+    <DCCReference Include="uDataModuleVendedores.pas">
+      <Form>DataModuleEmpleados</Form>
+      <DesignClass>TDAClientDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vclx.dcp" />
     <None Include="ModelSupport_Contactos_data\default.txaPackage" />
   </ItemGroup>
 </Project>

Source/Modulos/Contactos/Data/Contactos_data.drc

@@ -12,9 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Data\uDataModuleContactos.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\uDataModuleContactos.DFM */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Data\uDataModuleClientes.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\uDataModuleClientes.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Data\uDataModuleProveedores.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\uDataModuleProveedores.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Data\uDataModuleEmpleados.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\uDataModuleEmpleados.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Data\Contactos_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\uDataModuleVendedores.dfm */
-/* E:\temp\dtf43.tmp */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\Contactos_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Data\Contactos_data.drf */

Source/Modulos/Contactos/Model/Contactos_model.dpk

@@ -29,7 +29,13 @@ requires
   vcl,
   Base,
   GUIBase,
-  ApplicationBase;
+  ApplicationBase,
+  DataAbstract_Core_D11,
+  vcldb,
+  dbrtl,
+  dsnap,
+  adortl,
+  RemObjects_Core_D11;
 
 contains
   uBizContactosDatosBancarios in 'uBizContactosDatosBancarios.pas',
@@ -48,6 +54,7 @@ contains
   uIDataModuleEtiquetasContactosReport in 'Data\uIDataModuleEtiquetasContactosReport.pas',
   schContactosClient_Intf in 'schContactosClient_Intf.pas',
   schContactosServer_Intf in 'schContactosServer_Intf.pas',
-  uBizContactosPersonal in 'uBizContactosPersonal.pas';
+  uBizContactosPersonal in 'uBizContactosPersonal.pas',
+  uIDataModuleVendedores in 'Data\uIDataModuleVendedores.pas';
 
 end.

Source/Modulos/Contactos/Model/Contactos_model.dproj

@@ -50,17 +50,24 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Utiles\uRegimenIVAUtils.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="Data\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="Data\ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="Data\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="Data\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="Data\dbrtl.dcp" />
+    <DCCReference Include="Data\dsnap.dcp" />
+    <DCCReference Include="Data\GUIBase.dcp" />
+    <DCCReference Include="Data\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Data\rtl.dcp" />
     <DCCReference Include="Data\uIDataModuleClientes.pas" />
     <DCCReference Include="Data\uIDataModuleContactos.pas" />
     <DCCReference Include="Data\uIDataModuleEmpleados.pas" />
     <DCCReference Include="Data\uIDataModuleEtiquetasContactosReport.pas" />
     <DCCReference Include="Data\uIDataModuleFichasEmpleadoReport.pas" />
     <DCCReference Include="Data\uIDataModuleProveedores.pas" />
+    <DCCReference Include="Data\uIDataModuleVendedores.pas" />
+    <DCCReference Include="Data\vcl.dcp" />
+    <DCCReference Include="Data\vcldb.dcp" />
     <DCCReference Include="schContactosClient_Intf.pas" />
     <DCCReference Include="schContactosServer_Intf.pas" />
     <DCCReference Include="uBizClientesDescuentos.pas" />

Source/Modulos/Contactos/Model/Contactos_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Model\Contactos_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Model\Contactos_model.res */
-/* E:\temp\dtf41.tmp */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Model\Contactos_model.drf */

Source/Modulos/Contactos/Model/uBizContactos.pas

@@ -12,10 +12,12 @@ const
   BIZ_CLIENT_CLIENTE = 'Client.Cliente';
   BIZ_CLIENT_PROVEEDOR = 'Client.Proveedor';
   BIZ_CLIENT_EMPLEADO = 'Client.Empleado';
+  BIZ_CLIENT_VENDEDOR = 'Client.Vendedor';
 
   CATEGORIA_CLIENTE = 1;
   CATEGORIA_PROVEEDOR = 2;
-  CATEGORIA_EMPLEADO = 3;
+  CATEGORIA_VENDEDOR = 3;
+  CATEGORIA_EMPLEADO = 4;
 
   PROVEEDOR_REGIMEN_IVA = 'General';
   CLIENTE_REGIMEN_IVA = 'General';
@@ -217,7 +219,18 @@ type
     property CAUSA_BAJA: String read GetCAUSA_BAJAValue write SetCAUSA_BAJAValue;
   end;
 
+  IBizVendedor = interface (IBizContacto)
+  ['{1DC56140-3B8D-4EC6-8E7D-9DA5E3F56200}']
 
+    function GetCOMISIONValue: Float;
+    procedure SetCOMISIONValue(const aValue: Float);
+
+    function GetID_USUARIOValue: Integer;
+    procedure SetID_USUARIOValue(const aValue: Integer);
+
+    property COMISION: Float read GetCOMISIONValue write SetCOMISIONValue;
+    property ID_USUARIO: Integer read GetID_USUARIOValue write SetID_USUARIOValue;
+  end;
 
   TBizContacto = class(TContactosDataTableRules, IBizContacto, ISeleccionable)
   protected
@@ -442,6 +455,19 @@ type
     procedure IniciarValoresContactoNuevo; override;
   end;
 
+  TBizVendedor = class(TBizContacto, IBizVendedor)
+  protected
+    function GetCOMISIONValue: Float;
+    procedure SetCOMISIONValue(const aValue: Float);
+
+    function GetID_USUARIOValue: Integer;
+    procedure SetID_USUARIOValue(const aValue: Integer);
+
+  public
+    property COMISION: Float read GetCOMISIONValue write SetCOMISIONValue;
+    property ID_USUARIO: Integer read GetID_USUARIOValue write SetID_USUARIOValue;
+    procedure IniciarValoresContactoNuevo; override;
+  end;
 
 implementation
 
@@ -490,7 +516,8 @@ begin
   case ID_CATEGORIA of
     1   : Result := 'Cliente';
     2   : Result := 'Proveedor';
-    3   : Result := 'Empleado';
+    3   : Result := 'Vendedor';
+    4   : Result := 'Empleado';
   end;
 end;
 
@@ -986,12 +1013,40 @@ begin
   DataTable.Fields[idx_EmpleadosFORMACION_RECIBIDA].AsString := aValue.Text;
 end;
 
+{ TBizVendedor }
+
+function TBizVendedor.GetCOMISIONValue: Float;
+begin
+  result := DataTable.Fields[idx_VendedoresCOMISION].AsFloat;
+end;
+
+function TBizVendedor.GetID_USUARIOValue: Integer;
+begin
+  result := DataTable.Fields[idx_VendedoresID_USUARIO].AsInteger;
+end;
+
+procedure TBizVendedor.IniciarValoresContactoNuevo;
+begin
+  inherited;
+  ID_CATEGORIA := CATEGORIA_VENDEDOR;
+end;
+
+procedure TBizVendedor.SetCOMISIONValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_VendedoresCOMISION].AsFloat := aValue;
+end;
+
+procedure TBizVendedor.SetID_USUARIOValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_VendedoresID_USUARIO].AsInteger := aValue;
+end;
+
 initialization
   RegisterDataTableRules(BIZ_CLIENT_CONTACTO, TBizContacto);
-
   RegisterDataTableRules(BIZ_CLIENT_CLIENTE, TBizCliente);
   RegisterDataTableRules(BIZ_CLIENT_PROVEEDOR, TBizProveedor);
   RegisterDataTableRules(BIZ_CLIENT_EMPLEADO, TBizEmpleado);
+  RegisterDataTableRules(BIZ_CLIENT_VENDEDOR, TBizVendedor);
 
 finalization
 

Source/Modulos/Contactos/Plugin/Contactos_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Plugin\uPluginContactos.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Plugin\uPluginContactos.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Plugin\Contactos_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Plugin\Contactos_plugin.res */
-/* E:\temp\dtf49.tmp */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Plugin\Contactos_plugin.drf */

Source/Modulos/Contactos/Plugin/uPluginContactos.dfm

@@ -250,6 +250,12 @@ object PluginContactos: TPluginContactos
       ImageIndex = 4
       OnExecute = actGruposEmpleadoExecute
     end
+    object actVendedores: TAction
+      Category = 'Ventas'
+      Caption = 'Vendedores'
+      OnExecute = actVendedoresExecute
+      OnUpdate = actVendedoresUpdate
+    end
   end
   object MainMenu: TMainMenu
     Images = SmallImages
@@ -301,6 +307,9 @@ object PluginContactos: TPluginContactos
         Action = actClientes
         SubMenuImages = SmallImages
       end
+      object Vendedores2: TMenuItem
+        Action = actVendedores
+      end
     end
   end
   object SmallImages: TPngImageList

Source/Modulos/Contactos/Plugin/uPluginContactos.pas

@@ -33,6 +33,8 @@ type
     Gruposdeproveedor1: TMenuItem;
     Da1: TMenuItem;
     Empresa1: TMenuItem;
+    actVendedores: TAction;
+    Vendedores2: TMenuItem;
     procedure actClientesExecute(Sender: TObject);
     procedure actProveedoresExecute(Sender: TObject);
     procedure actEmpleadosExecute(Sender: TObject);
@@ -40,6 +42,8 @@ type
     procedure actGruposProveedorExecute(Sender: TObject);
     procedure actGruposEmpleadoExecute(Sender: TObject);
     procedure actEmpleadosUpdate(Sender: TObject);
+    procedure actVendedoresExecute(Sender: TObject);
+    procedure actVendedoresUpdate(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -52,6 +56,7 @@ implementation
 uses
   Forms, Dialogs, uGUIBase, uCustomEditor, SysUtils, uContactosController,
   uClientesController, uProveedoresController, uEmpleadosController,
+  uVendedoresController,
   uGruposClienteController, uBizGruposCliente, uGruposProveedorController,
   uBizGruposProveedor, uGruposEmpleadoController, uBizGruposEmpleado,
   uContactosViewRegister, uBizContactos, uFactuGES_App;
@@ -122,6 +127,21 @@ begin
   AProveedoresController.VerTodos(AProveedores);
 end;
 
+procedure TPluginContactos.actVendedoresExecute(Sender: TObject);
+var
+  AVendedoresController : IVendedoresController;
+  AVendedores : IBizVendedor;
+begin
+  AVendedoresController := TVendedoresController.Create;
+  AVendedores := (AVendedoresController.BuscarTodos as IBizVendedor);
+  AVendedoresController.VerTodos(AVendedores);
+end;
+
+procedure TPluginContactos.actVendedoresUpdate(Sender: TObject);
+begin
+  (Sender as TAction).Enabled := Assigned(AppFactuGES.EmpresaActiva)
+end;
+
 procedure TPluginContactos.actEmpleadosExecute(Sender: TObject);
 var
   AEmpleadosController : IEmpleadosController;

Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm

@@ -384,6 +384,267 @@ object srvContactos: TsrvContactos
             DataType = datDateTime
           end>
       end
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'V_VENDEDORES'
+            Name = 'IBX'
+            StatementType = stAutoSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'ID_CATEGORIA'
+                TableField = 'ID_CATEGORIA'
+              end
+              item
+                DatasetField = 'NIF_CIF'
+                TableField = 'NIF_CIF'
+              end
+              item
+                DatasetField = 'NOMBRE'
+                TableField = 'NOMBRE'
+              end
+              item
+                DatasetField = 'PERSONA_CONTACTO'
+                TableField = 'PERSONA_CONTACTO'
+              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 = 'ID_EMPRESA'
+                TableField = 'ID_EMPRESA'
+              end
+              item
+                DatasetField = 'REFERENCIA'
+                TableField = 'REFERENCIA'
+              end
+              item
+                DatasetField = 'COMISION'
+                TableField = 'COMISION'
+              end
+              item
+                DatasetField = 'ID_USUARIO'
+                TableField = 'ID_USUARIO'
+              end>
+          end>
+        Name = 'Vendedores'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_CONTACTOS_ID'
+            ServerAutoRefresh = True
+            DictionaryEntry = 'Vendedores_ID'
+            InPrimaryKey = True
+          end
+          item
+            Name = 'ID_CATEGORIA'
+            DataType = datInteger
+            DictionaryEntry = 'Vendedores_ID_CATEGORIA'
+          end
+          item
+            Name = 'NIF_CIF'
+            DataType = datString
+            Size = 15
+            DictionaryEntry = 'Vendedores_NIF_CIF'
+          end
+          item
+            Name = 'NOMBRE'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Vendedores_NOMBRE'
+          end
+          item
+            Name = 'PERSONA_CONTACTO'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Vendedores_PERSONA_CONTACTO'
+          end
+          item
+            Name = 'CALLE'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Vendedores_CALLE'
+          end
+          item
+            Name = 'POBLACION'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Vendedores_POBLACION'
+          end
+          item
+            Name = 'PROVINCIA'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Vendedores_PROVINCIA'
+          end
+          item
+            Name = 'CODIGO_POSTAL'
+            DataType = datString
+            Size = 10
+            DictionaryEntry = 'Vendedores_CODIGO_POSTAL'
+          end
+          item
+            Name = 'TELEFONO_1'
+            DataType = datString
+            Size = 25
+            DictionaryEntry = 'Vendedores_TELEFONO_1'
+          end
+          item
+            Name = 'TELEFONO_2'
+            DataType = datString
+            Size = 25
+            DictionaryEntry = 'Vendedores_TELEFONO_2'
+          end
+          item
+            Name = 'MOVIL_1'
+            DataType = datString
+            Size = 25
+            DictionaryEntry = 'Vendedores_MOVIL_1'
+          end
+          item
+            Name = 'MOVIL_2'
+            DataType = datString
+            Size = 25
+            DictionaryEntry = 'Vendedores_MOVIL_2'
+          end
+          item
+            Name = 'FAX'
+            DataType = datString
+            Size = 25
+            DictionaryEntry = 'Vendedores_FAX'
+          end
+          item
+            Name = 'EMAIL_1'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Vendedores_EMAIL_1'
+          end
+          item
+            Name = 'EMAIL_2'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Vendedores_EMAIL_2'
+          end
+          item
+            Name = 'PAGINA_WEB'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'Vendedores_PAGINA_WEB'
+          end
+          item
+            Name = 'NOTAS'
+            DataType = datMemo
+            DisplayLabel = 'Observaciones'
+          end
+          item
+            Name = 'FECHA_ALTA'
+            DataType = datDateTime
+            DictionaryEntry = 'Vendedores_FECHA_ALTA'
+          end
+          item
+            Name = 'FECHA_MODIFICACION'
+            DataType = datDateTime
+            DictionaryEntry = 'Vendedores_FECHA_MODIFICACION'
+          end
+          item
+            Name = 'USUARIO'
+            DataType = datString
+            Size = 30
+            DictionaryEntry = 'Vendedores_USUARIO'
+          end
+          item
+            Name = 'ID_EMPRESA'
+            DataType = datInteger
+            DictionaryEntry = 'Vendedores_ID_EMPRESA'
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+            ServerAutoRefresh = True
+            DictionaryEntry = 'Vendedores_REFERENCIA'
+          end
+          item
+            Name = 'COMISION'
+            DataType = datCurrency
+            DictionaryEntry = 'Vendedores_COMISION'
+          end
+          item
+            Name = 'ID_USUARIO'
+            DataType = datInteger
+            DictionaryEntry = 'Vendedores_ID_USUARIO'
+          end>
+      end
       item
         Params = <>
         Statements = <
@@ -2894,6 +3155,91 @@ object srvContactos: TsrvContactos
           end>
         Name = 'Insert_ClientesDatos'
       end
+      item
+        Params = <
+          item
+            Name = 'OLD_ID_VENDEDOR'
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'VENDEDORES_DATOS'
+            Name = 'IBX'
+            SQL = 
+              'DELETE'#10'  FROM'#10'    VENDEDORES_DATOS'#10'  WHERE'#10'    (ID_VENDEDOR = :O' +
+              'LD_ID_VENDEDOR)'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Delete_VendedoresDatos'
+      end
+      item
+        Params = <
+          item
+            Name = 'ID_USUARIO'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COMISION'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'OLD_ID_VENDEDOR'
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'VENDEDORES_DATOS'
+            Name = 'IBX'
+            SQL = 
+              'UPDATE VENDEDORES_DATOS'#10'  SET'#10'    ID_USUARIO = :ID_USUARIO,'#10'    ' +
+              'COMISION = :COMISION'#10'  WHERE'#10'    (ID_VENDEDOR = :OLD_ID_VENDEDOR' +
+              ')'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Update_VendedoresDatos'
+      end
+      item
+        Params = <
+          item
+            Name = 'ID_VENDEDOR'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'ID_USUARIO'
+            DataType = datInteger
+            Value = ''
+          end
+          item
+            Name = 'COMISION'
+            DataType = datCurrency
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'VENDEDORES_DATOS'
+            Name = 'IBX'
+            SQL = 
+              'INSERT'#10'  INTO VENDEDORES_DATOS'#10'    (ID_VENDEDOR, ID_USUARIO, COM' +
+              'ISION)'#10'  VALUES'#10'    (:ID_VENDEDOR, :ID_USUARIO, :COMISION)'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Insert_VendedoresDatos'
+      end
       item
         Params = <
           item
@@ -4765,6 +5111,142 @@ object srvContactos: TsrvContactos
       item
         Name = 'PersonalContacto_FECHA_MODIFICACION'
         DataType = datDateTime
+      end
+      item
+        Name = 'Vendedores_ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_CONTACTOS_ID'
+        DisplayLabel = 'ID'
+        ServerAutoRefresh = True
+      end
+      item
+        Name = 'Vendedores_ID_CATEGORIA'
+        DataType = datInteger
+      end
+      item
+        Name = 'Vendedores_NIF_CIF'
+        DataType = datString
+        Size = 15
+        DisplayLabel = 'NIF/CIF'
+      end
+      item
+        Name = 'Vendedores_NOMBRE'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Nombre'
+      end
+      item
+        Name = 'Vendedores_PERSONA_CONTACTO'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Persona de contacto'
+      end
+      item
+        Name = 'Vendedores_CALLE'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Calle'
+      end
+      item
+        Name = 'Vendedores_POBLACION'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Poblaci'#243'n'
+      end
+      item
+        Name = 'Vendedores_PROVINCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Provincia'
+      end
+      item
+        Name = 'Vendedores_CODIGO_POSTAL'
+        DataType = datString
+        Size = 10
+        DisplayLabel = 'C'#243'digo postal'
+      end
+      item
+        Name = 'Vendedores_TELEFONO_1'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Tlf. trabajo'
+      end
+      item
+        Name = 'Vendedores_TELEFONO_2'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Tlf. particular'
+      end
+      item
+        Name = 'Vendedores_MOVIL_1'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'M'#243'vil'
+      end
+      item
+        Name = 'Vendedores_MOVIL_2'
+        DataType = datString
+        Size = 25
+      end
+      item
+        Name = 'Vendedores_FAX'
+        DataType = datString
+        Size = 25
+        DisplayLabel = 'Fax'
+      end
+      item
+        Name = 'Vendedores_EMAIL_1'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'E-mail trabajo'
+      end
+      item
+        Name = 'Vendedores_EMAIL_2'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'E-mail particular'
+      end
+      item
+        Name = 'Vendedores_PAGINA_WEB'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Web'
+      end
+      item
+        Name = 'Vendedores_NOTAS'
+        DataType = datMemo
+      end
+      item
+        Name = 'Vendedores_FECHA_ALTA'
+        DataType = datDateTime
+      end
+      item
+        Name = 'Vendedores_FECHA_MODIFICACION'
+        DataType = datDateTime
+      end
+      item
+        Name = 'Vendedores_USUARIO'
+        DataType = datString
+        Size = 30
+      end
+      item
+        Name = 'Vendedores_ID_EMPRESA'
+        DataType = datInteger
+      end
+      item
+        Name = 'Vendedores_REFERENCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Referencia'
+        ServerAutoRefresh = True
+      end
+      item
+        Name = 'Vendedores_COMISION'
+        DataType = datCurrency
+      end
+      item
+        Name = 'Vendedores_ID_USUARIO'
+        DataType = datInteger
       end>
     Left = 126
     Top = 14
@@ -4870,4 +5352,16 @@ object srvContactos: TsrvContactos
     Left = 224
     Top = 143
   end
+  object bpVendedores: TDABusinessProcessor
+    Schema = schContactos
+    InsertCommandName = 'Insert_Contactos'
+    DeleteCommandName = 'Delete_Contactos'
+    UpdateCommandName = 'Update_Contactos'
+    RefreshDatasetName = 'Contactos_Refresh'
+    ReferencedDataset = 'Vendedores'
+    ProcessorOptions = [poPrepareCommands]
+    UpdateMode = updWhereKeyOnly
+    Left = 344
+    Top = 271
+  end
 end

Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas

@@ -34,6 +34,7 @@ type
     bpPersonalContacto: TDABusinessProcessor;
     schContactos: TDASchema;
     DataDictionary: TDADataDictionary;
+    bpVendedores: TDABusinessProcessor;
     procedure DARemoteServiceBeforeGetDatasetData(const Dataset: IDADataset;
       const IncludeSchema: Boolean; const MaxRecords: Integer);
     procedure DARemoteServiceCreate(Sender: TObject);
@@ -52,7 +53,7 @@ implementation
 uses
   {Generated:} FactuGES_Invk, Dialogs, uBizContactosServer,
   uDataModuleServer, uDatabaseUtils, uUsersManager,
-  schContactosClient_Intf, uBizEmpleadosServer,
+  schContactosClient_Intf, uBizEmpleadosServer, uBizVendedoresServer,
   uBizClientesServer, uBizProveedoresServer, uRestriccionesUsuarioUtils,
   uStringsUtils, Variants,
   uRptFichasEmpleado_Server, uRptEtiquetasContacto_Server;
@@ -85,6 +86,7 @@ begin
   bpEmpleados.BusinessRulesID := BIZ_SERVER_EMPLEADO;
   bpClientes.BusinessRulesID := BIZ_SERVER_CLIENTE;
   bpProveedores.BusinessRulesID := BIZ_SERVER_PROVEEDOR;
+  bpVendedores.BusinessRulesID := BIZ_SERVER_VENDEDOR;
 end;
 
 function TsrvContactos.DarListaContratosEmpleados: String;

Source/Modulos/Contactos/Views/Contactos_view.dpk

@@ -70,7 +70,18 @@ requires
   JvStdCtrlsD11R,
   JvCtrlsD11R,
   dxLayoutControlD11,
-  dxComnD11;
+  dxComnD11,
+  tb2k_d10,
+  tbx_d10,
+  JSDialog100,
+  dxCoreD11,
+  JvPageCompsD11R,
+  dxPSCoreD11,
+  dxPScxCommonD11,
+  dxPSLnksD11,
+  vclshlctrls,
+  dxPScxGrid6LnkD11,
+  dclcxLibraryD11;
 
 contains
   uContactosViewRegister in 'uContactosViewRegister.pas',
@@ -111,6 +122,11 @@ contains
   uEditorPersonal in 'uEditorPersonal.pas' {fEditorPersonal: TCustomEditor},
   uViewPersonalContacto in 'uViewPersonalContacto.pas' {frViewPersonalContacto: TFrame},
   uEditorElegirDireccionEntrega in 'uEditorElegirDireccionEntrega.pas' {fEditorElegirDireccionEntrega: TCustomEditor},
-  uViewDatosYSeleccionClienteBase in 'uViewDatosYSeleccionClienteBase.pas' {frViewDatosYSeleccionClienteBase: TFrame};
+  uViewDatosYSeleccionClienteBase in 'uViewDatosYSeleccionClienteBase.pas' {frViewDatosYSeleccionClienteBase: TFrame},
+  uViewVendedores in 'uViewVendedores.pas' {frViewVendedores: TCustomView},
+  uViewVendedor in 'uViewVendedor.pas' {frViewVendedor: TCustomView},
+  uEditorVendedores in 'uEditorVendedores.pas' {fEditorVendedores: TCustomEditor},
+  uEditorVendedor in 'uEditorVendedor.pas' {fEditorVendedor: TCustomEditor},
+  uEditorElegirVendedores in 'uEditorElegirVendedores.pas' {fEditorElegirVendedores: TCustomEditor};
 
 end.

Source/Modulos/Contactos/Views/Contactos_view.dproj

@@ -49,52 +49,63 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\adortl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\adortl.dcp" />
-    <DCCReference Include="..\ApplicationBase.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\ApplicationBase.dcp" />
-    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\Base.dcp" />
-    <DCCReference Include="..\bdertl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\bdertl.dcp" />
-    <DCCReference Include="..\ccpackD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\ccpackD11.dcp" />
-    <DCCReference Include="..\cfpack_d11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\cfpack_d11.dcp" />
-    <DCCReference Include="..\Contactos_controller.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\Contactos_controller.dcp" />
-    <DCCReference Include="..\Contactos_model.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\Contactos_model.dcp" />
-    <DCCReference Include="..\cxDataD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\cxDataD11.dcp" />
-    <DCCReference Include="..\cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\cxEditorsD11.dcp" />
-    <DCCReference Include="..\cxExportD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\cxExportD11.dcp" />
-    <DCCReference Include="..\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\cxGridD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\cxGridD11.dcp" />
-    <DCCReference Include="..\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\cxLibraryD11.dcp" />
-    <DCCReference Include="..\cxPageControlD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\cxPageControlD11.dcp" />
-    <DCCReference Include="..\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\dbrtl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dbrtl.dcp" />
-    <DCCReference Include="..\designide.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dclcxLibraryD11.dcp" />
-    <DCCReference Include="..\dsnap.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\designide.dcp" />
-    <DCCReference Include="..\dxComnD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dsnap.dcp" />
-    <DCCReference Include="..\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxComnD11.dcp" />
-    <DCCReference Include="..\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxCoreD11.dcp" />
-    <DCCReference Include="..\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\FormasPago_controller.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\FormasPago_model.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\GUIBase.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Jcl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxPSLnksD11.dcp" />
-    <DCCReference Include="..\JclVcl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\dxThemeD11.dcp" />
-    <DCCReference Include="..\JvCoreD11R.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\FormasPago_controller.dcp" />
-    <DCCReference Include="..\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\FormasPago_model.dcp" />
-    <DCCReference Include="..\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\GUIBase.dcp" />
-    <DCCReference Include="..\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\JvSystemD11R.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\Jcl.dcp" />
-    <DCCReference Include="..\PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\JclVcl.dcp" />
-    <DCCReference Include="..\PNG_D10.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\JSDialog100.dcp" />
-    <DCCReference Include="..\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\JvCoreD11R.dcp" />
-    <DCCReference Include="..\rtl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\TiposIVA_controller.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\TiposIVA_model.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\vcl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\vclactnband.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\JvSystemD11R.dcp" />
-    <DCCReference Include="..\vcldb.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\PngComponentsD10.dcp" />
-    <DCCReference Include="..\vcljpg.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\PNG_D10.dcp" />
-    <DCCReference Include="..\vclx.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\xmlrtl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\rtl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\tb2k_d10.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\tbx_d10.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\TiposIVA_controller.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\TiposIVA_model.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\vcl.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\vclactnband.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\vcldb.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\vcljpg.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\vclshlctrls.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\vclx.dcp" />
+    <DCCReference Include="..\..\..\Base\Utiles\xmlrtl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>
@@ -135,6 +146,10 @@
       <Form>fEditorElegirProveedores</Form>
       <DesignClass>TCustomEditor</DesignClass>
     </DCCReference>
+    <DCCReference Include="uEditorElegirVendedores.pas">
+      <Form>fEditorElegirVendedores</Form>
+      <DesignClass>TCustomEditor</DesignClass>
+    </DCCReference>
     <DCCReference Include="uEditorEmpleado.pas">
       <Form>fEditorEmpleado</Form>
       <DesignClass>TCustomEditor</DesignClass>
@@ -175,6 +190,14 @@
       <Form>fEditorProveedores</Form>
       <DesignClass>TCustomEditor</DesignClass>
     </DCCReference>
+    <DCCReference Include="uEditorVendedor.pas">
+      <Form>fEditorVendedor</Form>
+      <DesignClass>TCustomEditor</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uEditorVendedores.pas">
+      <Form>fEditorVendedores</Form>
+      <DesignClass>TCustomEditor</DesignClass>
+    </DCCReference>
     <DCCReference Include="uViewCliente.pas">
       <Form>frViewCliente</Form>
       <DesignClass>TCustomView</DesignClass>
@@ -247,6 +270,14 @@
       <Form>frViewProveedores</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
+    <DCCReference Include="uViewVendedor.pas">
+      <Form>frViewVendedor</Form>
+      <DesignClass>TCustomView</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewVendedores.pas">
+      <Form>frViewVendedores</Form>
+      <DesignClass>TCustomView</DesignClass>
+    </DCCReference>
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Contactos/Views/Contactos_view.drc

@@ -12,43 +12,48 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewContactos.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewContactos.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorContactos.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorContactos.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewClientes.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewClientes.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorClientes.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorClientes.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewProveedores.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewProveedores.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorProveedores.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorProveedores.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewEmpleados.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewEmpleados.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorEmpleados.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorEmpleados.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorElegirClientes.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorElegirClientes.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewContacto.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewContacto.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewContactoDatosBancarios.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewContactoDatosBancarios.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewContactoListaDatosBancarios.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewContactoListaDatosBancarios.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewPersonalContacto.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewPersonalContacto.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorContacto.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorContacto.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewEmpleado.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewEmpleado.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewDireccionesEntrega.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewDireccionesEntrega.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewClienteDescuentos.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewClienteDescuentos.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewClienteDatosComerciales.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewClienteDatosComerciales.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewProveedorDatosComerciales.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewProveedorDatosComerciales.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorEmpleado.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewVendedores.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorElegirProveedores.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorVendedores.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorDireccion.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewVendedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorElegirDireccionEntrega.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorVendedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorGruposCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorElegirVendedores.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorGruposProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorEmpleado.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorGruposEmpleado.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorElegirProveedores.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorFichasEmpleadoReport.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorDireccion.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorEtiquetasContactosReport.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorElegirDireccionEntrega.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorDatoBancario.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorGruposCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorPersonal.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorGruposProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uEditorElegirPersonaContacto.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorGruposEmpleado.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewDatosYSeleccionProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorFichasEmpleadoReport.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewDatosYSeleccionCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorEtiquetasContactosReport.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\uViewDatosYSeleccionClienteBase.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorDatoBancario.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Contactos\Views\Contactos_view.res */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorPersonal.dfm */
-/* E:\temp\dtf47.tmp */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uEditorElegirPersonaContacto.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewDatosYSeleccionProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewDatosYSeleccionCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\uViewDatosYSeleccionClienteBase.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\Contactos_view.res */
+/* C:\Codigo Noviseda\Source\Modulos\Contactos\Views\Contactos_view.drf */

Source/Modulos/Contactos/Views/uContactosViewRegister.pas

@@ -11,7 +11,7 @@ uses
   uEditorRegistryUtils,
   uEditorClientes, uEditorProveedores,
   uEditorEmpleados, uEditorElegirCLientes,
-  uEditorCliente, uEditorProveedor,
+  uEditorCliente, uEditorProveedor, uEditorVendedores, uEditorVendedor, uEditorElegirVendedores,
   uEditorEmpleado, uEditorElegirProveedores, uEditorDireccion,
   uEditorElegirDireccionEntrega, uEditorGruposCliente, uEditorGruposProveedor, uEditorGruposEmpleado,
   uEditorFichasEmpleadoReport, uEditorEtiquetasContactosReport,
@@ -22,13 +22,16 @@ begin
   EditorRegistry.RegisterClass(TfEditorClientes, 'EditorClientes');
   EditorRegistry.RegisterClass(TfEditorProveedores, 'EditorProveedores');
   EditorRegistry.RegisterClass(TfEditorEmpleados, 'EditorEmpleados');
+  EditorRegistry.RegisterClass(TfEditorVendedores, 'EditorVendedores');
 
   EditorRegistry.RegisterClass(TfEditorCliente, 'EditorCliente');
   EditorRegistry.RegisterClass(TfEditorProveedor, 'EditorProveedor');
   EditorRegistry.RegisterClass(TfEditorEmpleado, 'EditorEmpleado');
+  EditorRegistry.RegisterClass(TfEditorVendedor, 'EditorVendedor');
 
   EditorRegistry.RegisterClass(TfEditorElegirClientes, 'EditorElegirClientes');
   EditorRegistry.RegisterClass(TfEditorElegirProveedores, 'EditorElegirProveedores');
+  EditorRegistry.RegisterClass(TfEditorElegirVendedores, 'EditorElegirVendedores');
 
   EditorRegistry.RegisterClass(TfEditorDireccion, 'EditorDireccion');
   EditorRegistry.RegisterClass(TfEditorElegirDireccionEntrega, 'EditorElegirDireccionEntrega');
@@ -52,16 +55,19 @@ begin
   EditorRegistry.UnRegisterClass(TfEditorClientes);
   EditorRegistry.UnRegisterClass(TfEditorProveedores);
   EditorRegistry.UnRegisterClass(TfEditorEmpleados);
+  EditorRegistry.UnRegisterClass(TfEditorVendedores);
 
   EditorRegistry.UnRegisterClass(TfEditorCliente);
   EditorRegistry.UnRegisterClass(TfEditorProveedor);
   EditorRegistry.UnRegisterClass(TfEditorEmpleado);
+  EditorRegistry.UnRegisterClass(TfEditorVendedor);
 
   EditorRegistry.UnRegisterClass(TfEditorElegirClientes);
   EditorRegistry.UnRegisterClass(TfEditorElegirProveedores);
 
   EditorRegistry.UnRegisterClass(TfEditorDireccion);
   EditorRegistry.UnRegisterClass(TfEditorElegirDireccionEntrega);
+    EditorRegistry.UnRegisterClass(TfEditorElegirVendedores);
 
   EditorRegistry.UnRegisterClass(TfEditorPersonal);
 

Source/Modulos/Contactos/Views/uEditorProveedor.dfm

@@ -47,18 +47,22 @@ inherited fEditorProveedor: TfEditorProveedor
     inherited lblDesbloquear: TcxLabel
       Left = 705
       ExplicitLeft = 705
+      AnchorX = 750
+      AnchorY = 14
     end
   end
   inherited TBXDock: TTBXDock
     Width = 830
     ExplicitWidth = 830
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 496
+      ExplicitWidth = 330
       object TBXSubmenuItem2: TTBXSubmenuItem [7]
         Caption = 'Documentos relacionados'
         DisplayMode = nbdmImageAndText
         DropdownCombo = True
+        Enabled = False
         ImageIndex = 22
+        Visible = False
         object TBXItem42: TTBXItem
           Action = actDocumentosPedidos
         end
@@ -84,6 +88,8 @@ inherited fEditorProveedor: TfEditorProveedor
       ExplicitWidth = 830
       object TBXSubmenuItem3: TTBXSubmenuItem [4]
         Caption = 'A&cciones'
+        Enabled = False
+        Visible = False
         object TBXItem7: TTBXItem
           Action = actGruposProveedor
         end
@@ -114,7 +120,7 @@ inherited fEditorProveedor: TfEditorProveedor
   inherited pgPaginas: TPageControl
     Width = 824
     Height = 519
-    ActivePage = pagDatosComerciales
+    ActivePage = pagGeneral
     ExplicitWidth = 824
     ExplicitHeight = 519
     inherited pagGeneral: TTabSheet
@@ -420,10 +426,32 @@ inherited fEditorProveedor: TfEditorProveedor
             ExplicitWidth = 366
             Width = 366
           end
+          inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
+            inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
+              inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
+                inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
+                  inherited dxLayoutControlContactoItem21: TdxLayoutItem
+                    Visible = False
+                  end
+                  inherited dxLayoutControlContactoItem24: TdxLayoutItem
+                    Visible = False
+                  end
+                  inherited dxLayoutControlContactoGroup15: TdxLayoutGroup
+                    Visible = False
+                  end
+                end
+                inherited dxLayoutControlContactoGroup14: TdxLayoutGroup
+                  Visible = False
+                end
+              end
+            end
+          end
         end
       end
     end
     inherited pagDatosBancarios: TTabSheet
+      Enabled = False
+      TabVisible = False
       ExplicitWidth = 816
       ExplicitHeight = 491
       inherited frViewListaDatosBancarios: TfrViewListaDatosBancarios
@@ -457,7 +485,9 @@ inherited fEditorProveedor: TfEditorProveedor
     end
     object pagDatosComerciales: TTabSheet [2]
       Caption = 'Datos comerciales'
+      Enabled = False
       ImageIndex = 2
+      TabVisible = False
       inline frViewProveedorDatosComerciales1: TfrViewProveedorDatosComerciales
         Left = 0
         Top = 0
@@ -581,7 +611,9 @@ inherited fEditorProveedor: TfEditorProveedor
     end
     object pagDirecciones: TTabSheet [3]
       Caption = 'Direcciones'
+      Enabled = False
       ImageIndex = 3
+      TabVisible = False
       inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
         Left = 0
         Top = 0
@@ -611,6 +643,8 @@ inherited fEditorProveedor: TfEditorProveedor
       end
     end
     inherited pagPersonal: TTabSheet
+      Enabled = False
+      TabVisible = False
       ExplicitWidth = 816
       ExplicitHeight = 491
       inherited frViewPersonalContacto1: TfrViewPersonalContacto
@@ -668,31 +702,41 @@ inherited fEditorProveedor: TfEditorProveedor
     object actDocumentosPedidos: TAction
       Category = 'Acciones'
       Caption = 'Pedidos'
+      Enabled = False
       ImageIndex = 23
+      Visible = False
       OnExecute = actDocumentosPedidosExecute
     end
     object actDocumentosAlbaranes: TAction
       Category = 'Acciones'
       Caption = 'Albaranes'
+      Enabled = False
       ImageIndex = 24
+      Visible = False
       OnExecute = actDocumentosAlbaranesExecute
     end
     object actDocumentosDevoluciones: TAction
       Category = 'Acciones'
       Caption = 'Devoluciones'
+      Enabled = False
       ImageIndex = 25
+      Visible = False
       OnExecute = actDocumentosDevolucionesExecute
     end
     object actDocumentosFacturas: TAction
       Category = 'Acciones'
       Caption = 'Facturas'
+      Enabled = False
       ImageIndex = 26
+      Visible = False
       OnExecute = actDocumentosFacturasExecute
     end
     object actDocumentosRecibos: TAction
       Category = 'Acciones'
       Caption = 'Recibos'
+      Enabled = False
       ImageIndex = 27
+      Visible = False
       OnExecute = actDocumentosRecibosExecute
     end
   end

Source/Modulos/Contactos/Views/uEditorProveedores.dfm

@@ -1,6 +1,6 @@
 inherited fEditorProveedores: TfEditorProveedores
   Caption = 'fEditorProveedores'
-  ExplicitWidth = 714
+  ExplicitWidth = 902
   ExplicitHeight = 538
   PixelsPerInch = 96
   TextHeight = 13
@@ -42,7 +42,7 @@ inherited fEditorProveedores: TfEditorProveedores
   end
   inherited TBXDock: TTBXDock
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 706
+      ExplicitWidth = 632
       inherited TBXItem2: TTBXItem
         Images = SmallImages
       end
@@ -50,7 +50,9 @@ inherited fEditorProveedores: TfEditorProveedores
         Caption = 'Documentos relacionados'
         DisplayMode = nbdmImageAndText
         DropdownCombo = True
+        Enabled = False
         ImageIndex = 23
+        Visible = False
         object TBXItem46: TTBXItem
           Action = actDocumentosPedidos
         end
@@ -103,7 +105,7 @@ inherited fEditorProveedores: TfEditorProveedores
   inline frViewProveedores1: TfrViewProveedores [3]
     Left = 0
     Top = 102
-    Width = 706
+    Width = 894
     Height = 383
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
@@ -115,12 +117,12 @@ inherited fEditorProveedores: TfEditorProveedores
     TabOrder = 3
     ReadOnly = False
     ExplicitTop = 102
-    ExplicitWidth = 706
+    ExplicitWidth = 894
     ExplicitHeight = 383
     inherited cxGrid: TcxGrid
-      Width = 706
+      Width = 894
       Height = 255
-      ExplicitWidth = 706
+      ExplicitWidth = 894
       ExplicitHeight = 255
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
@@ -133,13 +135,13 @@ inherited fEditorProveedores: TfEditorProveedores
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
-      Width = 706
+      Width = 894
-      ExplicitWidth = 706
+      ExplicitWidth = 894
       inherited TBXDockablePanel1: TTBXDockablePanel
-        ExplicitWidth = 706
+        ExplicitWidth = 894
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 706
+          Width = 894
-          ExplicitWidth = 706
+          ExplicitWidth = 894
           inherited txtFiltroTodo: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -157,32 +159,32 @@ inherited fEditorProveedores: TfEditorProveedores
             Width = 219
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 323
+            Left = 361
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 323
+            ExplicitLeft = 361
             ExplicitWidth = 210
             Width = 210
           end
           inherited eLista: TcxComboBox
-            Left = 570
+            Left = 637
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 570
+            ExplicitLeft = 637
             ExplicitWidth = 215
             Width = 215
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-          Width = 706
+          Width = 894
-          ExplicitWidth = 706
+          ExplicitWidth = 894
           inherited tbxBotones: TTBXToolbar
-            Width = 696
+            Width = 884
-            ExplicitWidth = 696
+            ExplicitWidth = 884
           end
         end
       end
@@ -190,13 +192,13 @@ inherited fEditorProveedores: TfEditorProveedores
     inherited pnlAgrupaciones: TTBXDockablePanel
       Top = 357
       ExplicitTop = 357
-      ExplicitWidth = 706
+      ExplicitWidth = 894
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 706
+        Width = 894
-        ExplicitWidth = 706
+        ExplicitWidth = 894
         inherited TBXToolbar1: TTBXToolbar
-          Width = 696
+          Width = 884
-          ExplicitWidth = 696
+          ExplicitWidth = 884
         end
       end
     end
@@ -227,38 +229,51 @@ inherited fEditorProveedores: TfEditorProveedores
       Enabled = True
       Visible = True
     end
+    inherited actExportarExcel: TAction
+      Visible = False
+    end
     object actDocumentosPedidos: TAction
       Category = 'Acciones'
       Caption = 'Pedidos'
+      Enabled = False
       ImageIndex = 24
+      Visible = False
       OnExecute = actDocumentosPedidosExecute
       OnUpdate = actDocumentosPedidosUpdate
     end
     object actDocumentosAlbaranes: TAction
       Category = 'Acciones'
       Caption = 'Albaranes'
+      Enabled = False
       ImageIndex = 25
+      Visible = False
       OnExecute = actDocumentosAlbaranesExecute
       OnUpdate = actDocumentosPedidosUpdate
     end
     object actDocumentosDevoluciones: TAction
       Category = 'Acciones'
       Caption = 'Devoluciones'
+      Enabled = False
       ImageIndex = 26
+      Visible = False
       OnExecute = actDocumentosDevolucionesExecute
       OnUpdate = actDocumentosPedidosUpdate
     end
     object actDocumentosFacturas: TAction
       Category = 'Acciones'
       Caption = 'Facturas'
+      Enabled = False
       ImageIndex = 27
+      Visible = False
       OnExecute = actDocumentosFacturasExecute
       OnUpdate = actDocumentosPedidosUpdate
     end
     object actDocumentosRecibos: TAction
       Category = 'Acciones'
       Caption = 'Recibos'
+      Enabled = False
       ImageIndex = 28
+      Visible = False
       OnExecute = actDocumentosRecibosExecute
       OnUpdate = actDocumentosPedidosUpdate
     end

Source/Modulos/Contactos/Views/uViewProveedores.dfm

@@ -72,15 +72,21 @@ inherited frViewProveedores: TfrViewProveedores
           Width = 125
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 229
+          Left = 157
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 229
+          ExplicitLeft = 157
           ExplicitWidth = 244
           Width = 244
         end
+        inherited eLista: TcxComboBox
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+        end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 483

Source/Modulos/Contactos/Views/uViewProveedores.pas

@@ -12,7 +12,7 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
   TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox,
-  uDAInterfaces, Menus;
+  uDAInterfaces, Menus, uCustomView, uViewBase;
 
 type
   IViewProveedores = interface(IViewContactos)

Source/Modulos/Fabricantes/Data/Fabricantes_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Fabricantes\Data\uDataModuleFabricantes.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Fabricantes\Data\uDataModuleFabricantes.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Fabricantes\Data\Fabricantes_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Fabricantes\Data\Fabricantes_data.res */
-/* E:\temp\dtf57.tmp */
+/* E:\temp\dtf63.tmp */

Source/Modulos/Fabricantes/Model/Fabricantes_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Fabricantes\Model\Fabricantes_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Fabricantes\Model\Fabricantes_model.res */
-/* E:\temp\dtf55.tmp */
+/* E:\temp\dtf61.tmp */

Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Controller\FacturasCliente_controller.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Controller\FacturasCliente_controller.res */
-/* E:\temp\dtfA5.tmp */
+/* E:\temp\dtfB1.tmp */

Source/Modulos/Facturas de cliente/Data/FacturasCliente_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Data\uDataModuleFacturasCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Data\uDataModuleFacturasCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Data\FacturasCliente_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Data\FacturasCliente_data.res */
-/* E:\temp\dtfA3.tmp */
+/* E:\temp\dtfAF.tmp */

Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Model\FacturasCliente_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Model\FacturasCliente_model.res */
-/* E:\temp\dtfA1.tmp */
+/* E:\temp\dtfAD.tmp */

Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Plugin\uPluginFacturasCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Plugin\uPluginFacturasCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.res */
-/* E:\temp\dtfF9.tmp */
+/* E:\temp\dtf105.tmp */

Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc

@@ -12,16 +12,16 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uViewFacturasCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewFacturasCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uDialogOpcionesImpresionFacturasCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uDialogOpcionesImpresionFacturasCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorFacturasCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorFacturasCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uViewDatosYSeleccionClienteFacturaCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewDatosYSeleccionClienteFacturaCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uViewFacturaCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewFacturaCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uViewDetallesFacturaCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewDetallesFacturaCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorFacturaCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorFacturaCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorFacturasClienteReport.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorFacturasClienteReport.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uViewElegirArticulosFacturasCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uViewElegirArticulosFacturasCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorElegirArticulosFacturaCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorElegirArticulosFacturaCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorElegirFacturasCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\uEditorElegirFacturasCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\FacturasCliente_view.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de cliente\Views\FacturasCliente_view.res */
-/* E:\temp\dtfF7.tmp */
+/* E:\temp\dtf103.tmp */

Source/Modulos/Facturas de proveedor/Controller/FacturasProveedor_controller.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de proveedor\Controller\FacturasProveedor_controller.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Controller\FacturasProveedor_controller.res */
-/* E:\temp\dtfCF.tmp */
+/* E:\temp\dtfDB.tmp */

Source/Modulos/Facturas de proveedor/Data/FacturasProveedor_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de proveedor\Data\uDataModuleFacturasProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Data\uDataModuleFacturasProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de proveedor\Data\FacturasProveedor_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Data\FacturasProveedor_data.res */
-/* E:\temp\dtfCD.tmp */
+/* E:\temp\dtfD9.tmp */

Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de proveedor\Model\FacturasProveedor_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Model\FacturasProveedor_model.res */
-/* E:\temp\dtfCB.tmp */
+/* E:\temp\dtfD7.tmp */

Source/Modulos/Facturas de proveedor/Plugin/FacturasProveedor_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de proveedor\Plugin\uPluginFacturasProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Plugin\uPluginFacturasProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de proveedor\Plugin\FacturasProveedor_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Facturas de proveedor\Plugin\FacturasProveedor_plugin.res */
-/* E:\temp\dtf10D.tmp */
+/* E:\temp\dtf119.tmp */

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

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Gestion de documentos\Controller\GestorDocumentos_Controller.res */
+/* C:\Codigo Noviseda\Source\Modulos\Gestion de documentos\Controller\GestorDocumentos_Controller.res */
-/* E:\temp\dtf61.tmp */
+/* E:\temp\dtf6D.tmp */

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

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Gestion de documentos\Data\uDataModuleGestorDocumentos.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Gestion de documentos\Data\uDataModuleGestorDocumentos.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Gestion de documentos\Data\GestorDocumentos_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Gestion de documentos\Data\GestorDocumentos_data.res */
-/* E:\temp\dtf5F.tmp */
+/* E:\temp\dtf6B.tmp */

Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Controller\PedidosProveedor_controller.res */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Controller\PedidosProveedor_controller.res */
-/* E:\temp\dtfAB.tmp */
+/* E:\temp\dtfB7.tmp */

Source/Modulos/Pedidos a proveedor/Data/PedidosProveedor_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Data\uDataModulePedidosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Data\uDataModulePedidosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Data\PedidosProveedor_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Data\PedidosProveedor_data.res */
-/* E:\temp\dtfA9.tmp */
+/* E:\temp\dtfB5.tmp */

Source/Modulos/Pedidos a proveedor/Model/PedidosProveedor_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Model\PedidosProveedor_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Model\PedidosProveedor_model.res */
-/* E:\temp\dtfA7.tmp */
+/* E:\temp\dtfB3.tmp */

Source/Modulos/Pedidos a proveedor/Plugin/PedidosProveedor_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Plugin\uPluginPedidosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Plugin\uPluginPedidosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.res */
-/* E:\temp\dtf105.tmp */
+/* E:\temp\dtf111.tmp */

Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.drc

@@ -12,22 +12,22 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uViewPedidosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uViewPedidosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uDialogOpcionesImpresionPedidosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uDialogOpcionesImpresionPedidosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uEditorPedidosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorPedidosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uEditorElegirPersonaContactoPedido.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorElegirPersonaContactoPedido.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uViewDireccionEntregaPedidoProv.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uViewDireccionEntregaPedidoProv.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uViewProveedorPedido.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uViewProveedorPedido.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uViewObraReserva.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uViewObraReserva.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uViewDatosYSeleccionProveedorPedido.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uViewDatosYSeleccionProveedorPedido.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uViewPedidoProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uViewPedidoProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uViewDetallesPedidoProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uViewDetallesPedidoProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uEditorPedidoProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorPedidoProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uEditorPedidosProveedorReport.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorPedidosProveedorReport.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uEditorElegirPedidosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorElegirPedidosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uViewElegirArticulosPedidosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uViewElegirArticulosPedidosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uEditorElegirArticulosPedidoProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorElegirArticulosPedidoProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uEditorDireccionEntregaPedidoProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorDireccionEntregaPedidoProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\uEditorSituacionPedidoProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\uEditorSituacionPedidoProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Pedidos a proveedor\Views\PedidosProveedor_view.res */
+/* C:\Codigo Noviseda\Source\Modulos\Pedidos a proveedor\Views\PedidosProveedor_view.res */
-/* E:\temp\dtf103.tmp */
+/* E:\temp\dtf10F.tmp */

Source/Modulos/Presupuestos de cliente/Controller/PresupuestosCliente_controller.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Controller\PresupuestosCliente_controller.res */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Controller\PresupuestosCliente_controller.res */
-/* E:\temp\dtf99.tmp */
+/* E:\temp\dtfA5.tmp */

Source/Modulos/Presupuestos de cliente/Data/PresupuestosCliente_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Data\uDataModulePresupuestosCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Data\uDataModulePresupuestosCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Data\PresupuestosCliente_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Data\PresupuestosCliente_data.res */
-/* E:\temp\dtf97.tmp */
+/* E:\temp\dtfA3.tmp */

Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Model\PresupuestosCliente_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Model\PresupuestosCliente_model.res */
-/* E:\temp\dtf95.tmp */
+/* E:\temp\dtfA1.tmp */

Source/Modulos/Presupuestos de cliente/Plugin/PresupuestosCliente_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Plugin\uPluginPresupuestosCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Plugin\uPluginPresupuestosCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Plugin\PresupuestosCliente_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Plugin\PresupuestosCliente_plugin.res */
-/* E:\temp\dtfF1.tmp */
+/* E:\temp\dtfFD.tmp */

Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.drc

@@ -12,20 +12,20 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uViewPresupuestosCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uViewPresupuestosCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorFechaDecision.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorFechaDecision.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorPresupuestosCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorPresupuestosCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uViewDireccionEntregaPresupuestoCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uViewDireccionEntregaPresupuestoCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uViewDatosYSeleccionClientePresupuesto.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uViewDatosYSeleccionClientePresupuesto.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uViewPresupuestoCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uViewPresupuestoCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uViewDetallesPresupuestoCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uViewDetallesPresupuestoCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uViewDocumentosPresupuestoCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uViewDocumentosPresupuestoCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uViewTotalesPresupuesto.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uViewTotalesPresupuesto.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorPresupuestoCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorPresupuestoCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorElegirPresupuestosCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorElegirPresupuestosCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uViewElegirArticulosPresupuestosCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uViewElegirArticulosPresupuestosCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorElegirArticulosPresupuestoCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorElegirArticulosPresupuestoCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorPresupuestosClienteReport.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorPresupuestosClienteReport.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\uEditorAsignarDescuento.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\uEditorAsignarDescuento.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Presupuestos de cliente\Views\PresupuestosCliente_view.res */
+/* C:\Codigo Noviseda\Source\Modulos\Presupuestos de cliente\Views\PresupuestosCliente_view.res */
-/* E:\temp\dtfEF.tmp */
+/* E:\temp\dtfFB.tmp */

Source/Modulos/Recibos de cliente/Data/RecibosCliente_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Recibos de cliente\Data\uDataModuleRecibosCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Recibos de cliente\Data\uDataModuleRecibosCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Recibos de cliente\Data\RecibosCliente_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Recibos de cliente\Data\RecibosCliente_data.res */
-/* E:\temp\dtf83.tmp */
+/* E:\temp\dtf8F.tmp */

Source/Modulos/Recibos de cliente/Plugin/RecibosCliente_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Recibos de cliente\Plugin\uPluginRecibosCliente.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Recibos de cliente\Plugin\uPluginRecibosCliente.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Recibos de cliente\Plugin\RecibosCliente_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Recibos de cliente\Plugin\RecibosCliente_plugin.res */
-/* E:\temp\dtf89.tmp */
+/* E:\temp\dtf95.tmp */

Source/Modulos/Recibos de proveedor/Data/RecibosProveedor_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Recibos de proveedor\Data\uDataModuleRecibosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Data\uDataModuleRecibosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Recibos de proveedor\Data\RecibosProveedor_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Data\RecibosProveedor_data.res */
-/* E:\temp\dtfAF.tmp */
+/* E:\temp\dtfBB.tmp */

Source/Modulos/Recibos de proveedor/Plugin/RecibosProveedor_plugin.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Recibos de proveedor\Plugin\uPluginRecibosProveedor.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Plugin\uPluginRecibosProveedor.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Recibos de proveedor\Plugin\RecibosProveedor_plugin.res */
+/* C:\Codigo Noviseda\Source\Modulos\Recibos de proveedor\Plugin\RecibosProveedor_plugin.res */
-/* E:\temp\dtfB5.tmp */
+/* E:\temp\dtfC1.tmp */

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 Noviseda\Source\Modulos\Tipos de IVA\Data\uDataModuleTiposIVA.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Tipos de IVA\Data\TiposIVA_data.res */
-/* E:\temp\dtf25.tmp */
+/* E:\temp\dtf31.tmp */

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

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Tipos de IVA\Model\TiposIVA_model.res */
-/* E:\temp\dtf23.tmp */
+/* E:\temp\dtf2F.tmp */

Source/Modulos/Unidades de medida/Data/UnidadesMedida_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Unidades de medida\Data\uDataModuleUnidadesMedida.dfm */
+/* C:\Codigo Noviseda\Source\Modulos\Unidades de medida\Data\uDataModuleUnidadesMedida.dfm */
-/* C:\Codigo Tecsitel\Source\Modulos\Unidades de medida\Data\UnidadesMedida_data.res */
+/* C:\Codigo Noviseda\Source\Modulos\Unidades de medida\Data\UnidadesMedida_data.res */
-/* E:\temp\dtf39.tmp */
+/* E:\temp\dtf45.tmp */

Source/Modulos/Unidades de medida/Model/UnidadesMedida_model.drc

@@ -12,5 +12,5 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo Tecsitel\Source\Modulos\Unidades de medida\Model\UnidadesMedida_model.res */
+/* C:\Codigo Noviseda\Source\Modulos\Unidades de medida\Model\UnidadesMedida_model.res */
-/* E:\temp\dtf37.tmp */
+/* E:\temp\dtf43.tmp */

Source/Servidor/FactuGES_Server.dpr

@@ -134,6 +134,7 @@ uses
   schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
   schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
   schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
+  uBizVendedoresServer in '..\Modulos\Contactos\Model\uBizVendedoresServer.pas',
   schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
   schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
 

Source/Servidor/FactuGES_Server.dproj

@@ -1,334 +1,337 @@
-<?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>
-		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
-	</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>
-		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-		<DCC_DebugVN>True</DCC_DebugVN>
+    <DCC_DebugVN>True</DCC_DebugVN>
-		<DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-		<DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+    <DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-		<DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+    <DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-		<DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
+    <DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
-	</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 Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">8</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.7.8.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.7.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 18 de noviembre de 2009 10: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 Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</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">2.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">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 17 de diciembre de 2009 12:03</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
+      
-					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+      
-	</ProjectExtensions>
+      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
-	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+    </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-	<ItemGroup>
+  </ProjectExtensions>
-		<DelphiCompile Include="FactuGES_Server.dpr">
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-			<MainSource>MainSource</MainSource>
+  <ItemGroup>
-		</DelphiCompile>
+    <DelphiCompile Include="FactuGES_Server.dpr">
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+      <MainSource>MainSource</MainSource>
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+    </DelphiCompile>
-		<DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas"/>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-			<Form>srvEmpresas</Form>
+    <DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas" />
-			<DesignClass>TDARemoteService</DesignClass>
+    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-		</DCCReference>
+      <Form>srvEmpresas</Form>
-		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+      <DesignClass>TDARemoteService</DesignClass>
-			<Form>srvProvinciasPoblaciones_Impl</Form>
+    </DCCReference>
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-		</DCCReference>
+      <Form>srvProvinciasPoblaciones_Impl</Form>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+      <DesignClass>TDataModule</DesignClass>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-			<Form>srvUsuarios</Form>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-		</DCCReference>
+      <Form>srvUsuarios</Form>
-		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+    <DCCReference Include="..\Base\schBase_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
+    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
+    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
-			<Form>RptAlbaranesCliente</Form>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-		</DCCReference>
+      <Form>RptAlbaranesCliente</Form>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
+      <DesignClass>TDataModule</DesignClass>
-			<Form>RptWordAlbaranCliente</Form>
+    </DCCReference>
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
-		</DCCReference>
+      <Form>RptWordAlbaranCliente</Form>
-		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+      <DesignClass>TDataModule</DesignClass>
-			<Form>srvAlbaranesCliente</Form>
+    </DCCReference>
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-		</DCCReference>
+      <Form>srvAlbaranesCliente</Form>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
-			<Form>RptAlbaranesProveedor</Form>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
-		</DCCReference>
+      <Form>RptAlbaranesProveedor</Form>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
+      <DesignClass>TDataModule</DesignClass>
-			<Form>RptWordAlbaranProveedor</Form>
+    </DCCReference>
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
-		</DCCReference>
+      <Form>RptWordAlbaranProveedor</Form>
-		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+      <DesignClass>TDataModule</DesignClass>
-			<Form>srvAlbaranesProveedor</Form>
+    </DCCReference>
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-		</DCCReference>
+      <Form>srvAlbaranesProveedor</Form>
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
-			<Form>srvAlmacenes</Form>
+    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
-			<DesignClass>TDARemoteService</DesignClass>
+    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-		</DCCReference>
+      <Form>srvAlmacenes</Form>
-		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+      <DesignClass>TDARemoteService</DesignClass>
-		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas"/>
+    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
+    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-			<Form>srvArticulos</Form>
+    <DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas" />
-			<DesignClass>TDARemoteService</DesignClass>
+    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
-		</DCCReference>
+      <Form>srvArticulos</Form>
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+      <DesignClass>TDARemoteService</DesignClass>
-		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
-			<Form>RptEtiquetasContacto</Form>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Contactos\Model\uBizVendedoresServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
+      <Form>RptEtiquetasContacto</Form>
-			<Form>RptFichasEmpleado</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataModule</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
-		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+      <Form>RptFichasEmpleado</Form>
-			<Form>srvContactos</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas"/>
+      <Form>srvContactos</Form>
-		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas"/>
+      <DesignClass>TDARemoteService</DesignClass>
-		<DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
+    </DCCReference>
-			<Form>srvFabricantes</Form>
+    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
+      <Form>srvFabricantes</Form>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
-			<Form>RptFacturasCliente</Form>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
+      <Form>RptFacturasCliente</Form>
-			<Form>RptWordFacturaCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataModule</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
-		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+      <Form>RptWordFacturaCliente</Form>
-			<Form>srvFacturasCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
+      <Form>srvFacturasCliente</Form>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
-			<Form>RptFacturasProveedor</Form>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+      <Form>RptFacturasProveedor</Form>
-			<Form>srvFacturasProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+      <Form>srvFacturasProveedor</Form>
-		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
+    </DCCReference>
-			<Form>srvFamilias</Form>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+      <Form>srvFamilias</Form>
-		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
+    </DCCReference>
-			<Form>srvFormasPago</Form>
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
-		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+      <Form>srvFormasPago</Form>
-			<Form>srvGestorDocumentos</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
-			<DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+      <Form>srvGestorDocumentos</Form>
-			<Form>srvGestorInformes</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
-			<DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
+      <Form>srvGestorInformes</Form>
-		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+    </DCCReference>
-			<Form>srvHistoricoMovimientos</Form>
+    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
+      <Form>srvHistoricoMovimientos</Form>
-		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+    </DCCReference>
-			<Form>srvInventario</Form>
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-		<DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas"/>
+      <Form>srvInventario</Form>
-		<DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
+    <DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas" />
-			<Form>srvObras</Form>
+    <DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
+      <Form>srvObras</Form>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
-			<Form>RptPedidosProveedor</Form>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
+      <Form>RptPedidosProveedor</Form>
-			<Form>RptWordPedidoProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataModule</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
-		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+      <Form>RptWordPedidoProveedor</Form>
-			<Form>srvPedidosProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
+      <Form>srvPedidosProveedor</Form>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
-			<Form>RptPresupuestosCliente</Form>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
+      <Form>RptPresupuestosCliente</Form>
-			<Form>RptWordCertificadoTrabajo</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataModule</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
+      <Form>RptWordCertificadoTrabajo</Form>
-			<Form>RptWordPresupuestoCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataModule</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
-		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+      <Form>RptWordPresupuestoCliente</Form>
-			<Form>srvPresupuestosCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
+      <Form>srvPresupuestosCliente</Form>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+    </DCCReference>
-			<Form>RptRecibosCliente</Form>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+      <Form>RptRecibosCliente</Form>
-			<Form>srvRecibosCliente</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
+      <Form>srvRecibosCliente</Form>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+    </DCCReference>
-			<Form>RptRecibosProveedor</Form>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
-			<DesignClass>TDataModule</DesignClass>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+      <Form>RptRecibosProveedor</Form>
-			<Form>srvRecibosProveedor</Form>
+      <DesignClass>TDataModule</DesignClass>
-			<DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+      <Form>srvRecibosProveedor</Form>
-		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+    </DCCReference>
-			<Form>srvReferencias</Form>
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
+      <Form>srvReferencias</Form>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
-			<Form>srvRemesasCliente</Form>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
+      <Form>srvRemesasCliente</Form>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
+    </DCCReference>
-		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
-			<Form>srvRemesasProveedor</Form>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+      <Form>srvRemesasProveedor</Form>
-		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
+    </DCCReference>
-			<Form>srvTiposIVA</Form>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
-		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+      <Form>srvTiposIVA</Form>
-		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+    </DCCReference>
-			<Form>srvUnidadesMedida</Form>
+    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-		</DCCReference>
+    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+      <Form>srvUnidadesMedida</Form>
-		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+      <DesignClass>TDataAbstractService</DesignClass>
-		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+    </DCCReference>
-			<Form>srvConfiguracion</Form>
+    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-			<DesignClass>TDataAbstractService</DesignClass>
+    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-		</DCCReference>
+    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-		<DCCReference Include="Configuracion\uConexionBD.pas">
+      <Form>srvConfiguracion</Form>
-			<Form>frConexionBD</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
-			<DesignClass>TFrame</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="Configuracion\uConexionBD.pas">
-		<DCCReference Include="Configuracion\uConfGeneral.pas">
+      <Form>frConexionBD</Form>
-			<Form>frConfGeneral</Form>
+      <DesignClass>TFrame</DesignClass>
-			<DesignClass>TFrame</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="Configuracion\uConfGeneral.pas">
-		<DCCReference Include="Configuracion\uConfiguracion.pas">
+      <Form>frConfGeneral</Form>
-			<Form>fConfiguracion</Form>
+      <DesignClass>TFrame</DesignClass>
-			<DesignClass>TForm</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="Configuracion\uConfiguracion.pas">
-		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+      <Form>fConfiguracion</Form>
-			<Form>FrameConfiguracion</Form>
+      <DesignClass>TForm</DesignClass>
-			<DesignClass>TFrame</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-		<DCCReference Include="srvLogin_Impl.pas">
+      <Form>FrameConfiguracion</Form>
-			<Form>srvLogin</Form>
+      <DesignClass>TFrame</DesignClass>
-			<DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="srvLogin_Impl.pas">
-		<DCCReference Include="uAcercaDe.pas">
+      <Form>srvLogin</Form>
-			<Form>fAcercaDe</Form>
+      <DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="uDataModuleServer.pas">
+    <DCCReference Include="uAcercaDe.pas">
-			<Form>dmServer</Form>
+      <Form>fAcercaDe</Form>
-			<DesignClass>TDataModule</DesignClass>
+    </DCCReference>
-		</DCCReference>
+    <DCCReference Include="uDataModuleServer.pas">
-		<DCCReference Include="uServerMainForm.pas">
+      <Form>dmServer</Form>
-			<Form>fServerForm</Form>
+      <DesignClass>TDataModule</DesignClass>
-		</DCCReference>
+    </DCCReference>
-		<DCCReference Include="Utiles\AHWord97.pas"/>
+    <DCCReference Include="uServerMainForm.pas">
-		<DCCReference Include="Utiles\MidasSpeedFix.pas"/>
+      <Form>fServerForm</Form>
-		<DCCReference Include="Utiles\RegExpr.pas"/>
+    </DCCReference>
-		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+    <DCCReference Include="Utiles\AHWord97.pas" />
-		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+    <DCCReference Include="Utiles\MidasSpeedFix.pas" />
-		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+    <DCCReference Include="Utiles\RegExpr.pas" />
-		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-	</ItemGroup>
+    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
+    <DCCReference Include="Utiles\uServerAppUtils.pas" />
+    <DCCReference Include="Utiles\uSesionesUtils.pas" />
+  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]

Source/Servidor/FactuGES_Server.rc

@@ -1,4 +1,4 @@
-MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico"
+MAINICON ICON "C:\Codigo Noviseda\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
 FILEVERSION 1,7,8,0
 PRODUCTVERSION 1,7,8,0
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.7.8.0\0"
               VALUE "ProductVersion", "1.7.8.0\0"
-              VALUE "CompileDate", "miércoles, 25 de noviembre de 2009 13:14\0"
+              VALUE "CompileDate", "jueves, 17 de diciembre de 2009 12:03\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Servidor/uDataModuleServer.dfm

@@ -39,7 +39,7 @@ object dmServer: TdmServer
       item
         Name = 'IBX'
         ConnectionString = 
-          'IBX?Server=localhost;Database=C:\Codigo Tecsitel\Output\Debug\Da' +
+          'IBX?Server=localhost;Database=C:\Codigo Noviseda\Output\Debug\Da' +
           'tabase\FACTUGES.FDB;UserID=sysdba;Password=masterkey;Dialect=3;C' +
           'harset=ISO8859_1;'
         ConnectionType = 'Interbase'