diff --git a/Resources/Iconos/Artículos/16x16/comisionable2.png b/Resources/Iconos/Artículos/16x16/comisionable2.png new file mode 100644 index 0000000..82ee239 Binary files /dev/null and b/Resources/Iconos/Artículos/16x16/comisionable2.png differ diff --git a/Resources/Iconos/Artículos/16x16/nocomisionable.png b/Resources/Iconos/Artículos/16x16/nocomisionable.png new file mode 100644 index 0000000..b334869 Binary files /dev/null and b/Resources/Iconos/Artículos/16x16/nocomisionable.png differ diff --git a/Resources/Iconos/Pedidos de cliente/16x16/Budget-add.png b/Resources/Iconos/Pedidos de cliente/16x16/Budget-add.png new file mode 100644 index 0000000..e08aa10 Binary files /dev/null and b/Resources/Iconos/Pedidos de cliente/16x16/Budget-add.png differ diff --git a/Resources/Iconos/Pedidos de cliente/16x16/Budget-search.png b/Resources/Iconos/Pedidos de cliente/16x16/Budget-search.png new file mode 100644 index 0000000..1e5a69a Binary files /dev/null and b/Resources/Iconos/Pedidos de cliente/16x16/Budget-search.png differ diff --git a/Resources/Iconos/UECKO-BARCELONA.jpg b/Resources/Iconos/UECKO-BARCELONA.jpg new file mode 100644 index 0000000..8bc5715 Binary files /dev/null and b/Resources/Iconos/UECKO-BARCELONA.jpg differ diff --git a/Resources/Iconos/logo-gunni-trentino.jpg b/Resources/Iconos/logo-gunni-trentino.jpg new file mode 100644 index 0000000..e86ff7c Binary files /dev/null and b/Resources/Iconos/logo-gunni-trentino.jpg differ diff --git a/Resources/LOGO-UECKO2.jpg b/Resources/LOGO-UECKO2.jpg new file mode 100644 index 0000000..171de1b Binary files /dev/null and b/Resources/LOGO-UECKO2.jpg differ diff --git a/Resources/SELLOS-CABECERA.jpg b/Resources/SELLOS-CABECERA.jpg new file mode 100644 index 0000000..45bb174 Binary files /dev/null and b/Resources/SELLOS-CABECERA.jpg differ diff --git a/Resources/SELLOS-DOCUMENTACIÓN-CORPORATIVA-tratado.jpg b/Resources/SELLOS-DOCUMENTACIÓN-CORPORATIVA-tratado.jpg new file mode 100644 index 0000000..5f067fc Binary files /dev/null and b/Resources/SELLOS-DOCUMENTACIÓN-CORPORATIVA-tratado.jpg differ diff --git a/Resources/Sello-Operación-Asegurada-Solunion.jpg b/Resources/Sello-Operación-Asegurada-Solunion.jpg new file mode 100644 index 0000000..5d314b1 Binary files /dev/null and b/Resources/Sello-Operación-Asegurada-Solunion.jpg differ diff --git a/Resources/UECKO-BILBAO.jpg b/Resources/UECKO-BILBAO.jpg new file mode 100644 index 0000000..e85ecf5 Binary files /dev/null and b/Resources/UECKO-BILBAO.jpg differ diff --git a/Resources/UECKO-BILBAO2.jpg b/Resources/UECKO-BILBAO2.jpg new file mode 100644 index 0000000..4696f79 Binary files /dev/null and b/Resources/UECKO-BILBAO2.jpg differ diff --git a/Resources/UECKO-CHAMARTIN2.jpg b/Resources/UECKO-CHAMARTIN2.jpg new file mode 100644 index 0000000..8e75a58 Binary files /dev/null and b/Resources/UECKO-CHAMARTIN2.jpg differ diff --git a/Resources/UECKO-DONOSTIA2.jpg b/Resources/UECKO-DONOSTIA2.jpg new file mode 100644 index 0000000..ff4afa7 Binary files /dev/null and b/Resources/UECKO-DONOSTIA2.jpg differ diff --git a/Resources/UECKO-LAS-ROZAS2.jpg b/Resources/UECKO-LAS-ROZAS2.jpg new file mode 100644 index 0000000..ffc2fce Binary files /dev/null and b/Resources/UECKO-LAS-ROZAS2.jpg differ diff --git a/Resources/UECKO-MARBELLA2.jpg b/Resources/UECKO-MARBELLA2.jpg new file mode 100644 index 0000000..7a9b306 Binary files /dev/null and b/Resources/UECKO-MARBELLA2.jpg differ diff --git a/Source/ApplicationBase/Idiomas/Controller/uIdiomasController.dcu b/Source/ApplicationBase/Idiomas/Controller/uIdiomasController.dcu index a73042b..757391e 100644 Binary files a/Source/ApplicationBase/Idiomas/Controller/uIdiomasController.dcu and b/Source/ApplicationBase/Idiomas/Controller/uIdiomasController.dcu differ diff --git a/Source/ApplicationBase/Idiomas/Model/uBizIdiomas.dcu b/Source/ApplicationBase/Idiomas/Model/uBizIdiomas.dcu index 8bd5315..8acd9af 100644 Binary files a/Source/ApplicationBase/Idiomas/Model/uBizIdiomas.dcu and b/Source/ApplicationBase/Idiomas/Model/uBizIdiomas.dcu differ diff --git a/Source/ApplicationBase/Idiomas/Model/uBizIdiomasServer.dcu b/Source/ApplicationBase/Idiomas/Model/uBizIdiomasServer.dcu index b2177b1..fbb6190 100644 Binary files a/Source/ApplicationBase/Idiomas/Model/uBizIdiomasServer.dcu and b/Source/ApplicationBase/Idiomas/Model/uBizIdiomasServer.dcu differ diff --git a/Source/Base/Utiles/uSistemaFunc.pas b/Source/Base/Utiles/uSistemaFunc.pas index c1f9737..ce92e54 100644 --- a/Source/Base/Utiles/uSistemaFunc.pas +++ b/Source/Base/Utiles/uSistemaFunc.pas @@ -48,8 +48,10 @@ function GetSpecialFolderPath(folder : integer) : string; function PreguntarRuta(const ATitulo: String; const AComentario: String; var ARuta: String): Boolean; function PreguntarFicheroWordExportar (var Fichero : String) : Boolean; function PreguntarFicheroExcelExportar (var Fichero : String) : Boolean; +function PreguntarFicheroPDFExportar (var Fichero : String) : Boolean; function EscapeIllegalChars(AFileName: string): string; function FindFile(const filespec: TFileName; attributes: integer = faReadOnly Or faHidden Or faSysFile Or faArchive): TStringList; +function ExecAndWait(sCommandLine: string): Boolean; //Directorios informes: EMPRESA, TIENDA, IDIOMA function DarRutaFichero(const ARutaIni: String; const AFichero: String; const ADirectorio1: String = ''; const ADirectorio2: String = ''; const ADirectorio3: String = ''): Variant; @@ -68,6 +70,36 @@ uses cxLookAndFeels, uStringsUtils; +function ExecAndWait(sCommandLine: string): Boolean; +var + dwExitCode: DWORD; + tpiProcess: TProcessInformation; + tsiStartup: TStartupInfo; +begin + Result := False; + FillChar(tsiStartup, SizeOf(TStartupInfo), 0); + tsiStartup.cb := SizeOf(TStartupInfo); + if CreateProcess(nil, PChar(sCommandLine), nil, nil, False, 0, + nil, nil, tsiStartup, tpiProcess) then + begin + if WAIT_OBJECT_0 = WaitForSingleObject(tpiProcess.hProcess, INFINITE) then + begin + if GetExitCodeProcess(tpiProcess.hProcess, dwExitCode) then + begin + if dwExitCode = 0 then + Result := True + else + SetLastError(dwExitCode + $2000); + end; + end; + dwExitCode := GetLastError; + CloseHandle(tpiProcess.hProcess); + CloseHandle(tpiProcess.hThread); + SetLastError(dwExitCode); + end; +end; + + function GetSpecialFolderPath(folder : integer) : string; const SHGFP_TYPE_CURRENT = 0; @@ -254,6 +286,27 @@ begin end; end; +function PreguntarFicheroPDFExportar (var Fichero : String) : Boolean; +var + DialogoSalvar : TSaveDialog; +begin + DialogoSalvar := TSaveDialog.Create(NIL); + try + with DialogoSalvar do + begin + DefaultExt := 'pdf'; + Filter := 'Documento pdf (*.pdf)|*.pdf'; + FileName := Fichero; + FilterIndex := 0; + Options := [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing]; + end; + Result := DialogoSalvar.Execute; + if Result then + Fichero := DialogoSalvar.FileName; + finally + DialogoSalvar.Free; + end; +end; function DarVersionFichero (Executable : String) : String; var diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index c10decf..e9ec0c3 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4620FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.6.2.0FactuGESFactuGES4.6.2.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4700FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.7.0.0FactuGESFactuGES4.7.0.0 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 28783a4..958a997 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/Informes/1/InfContratoCliente.fr3 b/Source/Informes/1/InfContratoCliente.fr3 index e05b2eb..ef7ca39 100644 --- a/Source/Informes/1/InfContratoCliente.fr3 +++ b/Source/Informes/1/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/Source/Informes/1/InfPresupuestoCliente.fr3 b/Source/Informes/1/InfPresupuestoCliente.fr3 index b7e206e..abd999b 100644 --- a/Source/Informes/1/InfPresupuestoCliente.fr3 +++ b/Source/Informes/1/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/Source/Informes/1/en/InfContratoCliente.fr3 b/Source/Informes/1/en/InfContratoCliente.fr3 index 27b0c11..7fd337e 100644 --- a/Source/Informes/1/en/InfContratoCliente.fr3 +++ b/Source/Informes/1/en/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/Source/Informes/1/en/InfPresupuestoCliente.fr3 b/Source/Informes/1/en/InfPresupuestoCliente.fr3 index 494927e..f6dbe73 100644 --- a/Source/Informes/1/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/1/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/Source/Informes/1/sello.jpg b/Source/Informes/1/sello.jpg new file mode 100644 index 0000000..4884ce8 Binary files /dev/null and b/Source/Informes/1/sello.jpg differ diff --git a/Source/Informes/10/en/InfContratoCliente.fr3 b/Source/Informes/10/en/InfContratoCliente.fr3 index 2f74d5e..72fe188 100644 --- a/Source/Informes/10/en/InfContratoCliente.fr3 +++ b/Source/Informes/10/en/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/Source/Informes/10/en/InfPresupuestoCliente.fr3 b/Source/Informes/10/en/InfPresupuestoCliente.fr3 index c4160b9..7622f7a 100644 --- a/Source/Informes/10/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/10/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -69,7 +69,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/Source/Informes/15/en/InfContratoCliente.fr3 b/Source/Informes/15/en/InfContratoCliente.fr3 index a61e307..63a21d0 100644 --- a/Source/Informes/15/en/InfContratoCliente.fr3 +++ b/Source/Informes/15/en/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/Source/Informes/15/en/InfPresupuestoCliente.fr3 b/Source/Informes/15/en/InfPresupuestoCliente.fr3 index 3c3bcdb..2c5bad1 100644 --- a/Source/Informes/15/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/15/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/Source/Informes/2/4/en/InfContratoCliente.fr3 b/Source/Informes/2/4/en/InfContratoCliente.fr3 index 7dbfb5d..6816f7f 100644 --- a/Source/Informes/2/4/en/InfContratoCliente.fr3 +++ b/Source/Informes/2/4/en/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/Source/Informes/2/4/en/InfPresupuestoCliente.fr3 b/Source/Informes/2/4/en/InfPresupuestoCliente.fr3 index 3978ce2..5fc9751 100644 --- a/Source/Informes/2/4/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/2/4/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/Source/Informes/2/5/en/InfContratoCliente.fr3 b/Source/Informes/2/5/en/InfContratoCliente.fr3 index 7dbfb5d..646c7e7 100644 --- a/Source/Informes/2/5/en/InfContratoCliente.fr3 +++ b/Source/Informes/2/5/en/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/Source/Informes/2/5/en/InfPresupuestoCliente.fr3 b/Source/Informes/2/5/en/InfPresupuestoCliente.fr3 index 3978ce2..efb7226 100644 --- a/Source/Informes/2/5/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/2/5/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/Source/Informes/2/InformeListadoFacturasRecibosCliente.fr3 b/Source/Informes/2/InformeListadoFacturasRecibosCliente.fr3 index e847fea..45aad30 100644 --- a/Source/Informes/2/InformeListadoFacturasRecibosCliente.fr3 +++ b/Source/Informes/2/InformeListadoFacturasRecibosCliente.fr3 @@ -1,18 +1,18 @@ - + - - - - - + + + + + - + - + @@ -25,7 +25,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/Source/Informes/2/sello.jpg b/Source/Informes/2/sello.jpg new file mode 100644 index 0000000..b6f0022 Binary files /dev/null and b/Source/Informes/2/sello.jpg differ diff --git a/Source/Informes/20/en/InfContratoCliente.fr3 b/Source/Informes/20/en/InfContratoCliente.fr3 index 2358d1d..f9dd1d6 100644 --- a/Source/Informes/20/en/InfContratoCliente.fr3 +++ b/Source/Informes/20/en/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/Source/Informes/20/en/InfPresupuestoCliente.fr3 b/Source/Informes/20/en/InfPresupuestoCliente.fr3 index 0c4e91e..7698357 100644 --- a/Source/Informes/20/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/20/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/Source/Informes/30/InfContratoCliente.fr3 b/Source/Informes/30/InfContratoCliente.fr3 new file mode 100644 index 0000000..3e90adc --- /dev/null +++ b/Source/Informes/30/InfContratoCliente.fr3 @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/30/InfPresupuestoCliente.fr3 b/Source/Informes/30/InfPresupuestoCliente.fr3 new file mode 100644 index 0000000..240a8da --- /dev/null +++ b/Source/Informes/30/InfPresupuestoCliente.fr3 @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/30/en/InfContratoCliente.fr3 b/Source/Informes/30/en/InfContratoCliente.fr3 new file mode 100644 index 0000000..2cbb768 --- /dev/null +++ b/Source/Informes/30/en/InfContratoCliente.fr3 @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/30/en/InfPresupuestoCliente.fr3 b/Source/Informes/30/en/InfPresupuestoCliente.fr3 new file mode 100644 index 0000000..03c84c9 --- /dev/null +++ b/Source/Informes/30/en/InfPresupuestoCliente.fr3 @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/6/en/InfContratoCliente.fr3 b/Source/Informes/6/en/InfContratoCliente.fr3 index 20e9a49..654ba63 100644 --- a/Source/Informes/6/en/InfContratoCliente.fr3 +++ b/Source/Informes/6/en/InfContratoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/Source/Informes/6/en/InfPresupuestoCliente.fr3 b/Source/Informes/6/en/InfPresupuestoCliente.fr3 index 3157c98..f529b7a 100644 --- a/Source/Informes/6/en/InfPresupuestoCliente.fr3 +++ b/Source/Informes/6/en/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas index bbf90f7..0975824 100644 --- a/Source/Modulos/Contactos/Controller/uClientesController.pas +++ b/Source/Modulos/Contactos/Controller/uClientesController.pas @@ -571,16 +571,16 @@ begin Post; end; - if (TIENDA_WEB = 1) and (Length(EMAIL_1) = 0) then + if (TIENDA_WEB = 1) and ((Length(DIST_EMAIL) = 0) OR (Length(DIST_PASSWORD) = 0)) then begin {ShowWarningMessage('Acceso a la tienda web', 'Para que el cliente pueda tener acceso a la tienda web es necesario indicar una dirección de e-mail en el campo ''Correo de trabajo''' + #10#13 + #10#13 + 'Por favor, indique una dirección o desactive el acceso a la tienda.'); Result := False;} - raise Exception.Create('Para que el cliente pueda tener acceso a la tienda web es necesario indicar una dirección de e-mail en el campo ''Correo de trabajo''' + + raise Exception.Create('Para que el cliente pueda ser distribuidor es necesario indicar una dirección de e-mail y una contraseña' + #10#13 + #10#13 + - 'Por favor, indique una dirección o desactive el acceso a la tienda.'); + 'Por favor, indique una dirección y contraseña o desactive el acceso de distribuidor.'); end; end; diff --git a/Source/Modulos/Contactos/Controller/uContactosController.pas b/Source/Modulos/Contactos/Controller/uContactosController.pas index 62cb849..af8b980 100644 --- a/Source/Modulos/Contactos/Controller/uContactosController.pas +++ b/Source/Modulos/Contactos/Controller/uContactosController.pas @@ -332,6 +332,13 @@ begin begin AContacto.Edit; AContacto.ID_EMPRESA := AppFactuGES.EmpresaActiva.ID; + AContacto.USUARIO := AppFactuGES.UsuarioActivo.UserName; + AContacto.Post; + end + else + begin + AContacto.Edit; + AContacto.USUARIO := AppFactuGES.UsuarioActivo.UserName; AContacto.Post; end; diff --git a/Source/Modulos/Contactos/Data/Contactos_data.dproj b/Source/Modulos/Contactos/Data/Contactos_data.dproj index 55f209a..1370987 100644 --- a/Source/Modulos/Contactos/Data/Contactos_data.dproj +++ b/Source/Modulos/Contactos/Data/Contactos_data.dproj @@ -49,23 +49,23 @@ MainSource - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
DataModuleClientes
TDAClientDataModule diff --git a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm index 5ecdc7b..1c2af2c 100644 --- a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm +++ b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm @@ -357,6 +357,37 @@ inherited DataModuleClientes: TDataModuleClientes item Name = 'DESCUENTO_CAPITULO' DataType = datFloat + end + item + Name = 'DIST_EMAIL' + DataType = datString + Size = 255 + end + item + Name = 'DIST_PASSWORD' + DataType = datString + Size = 255 + end + item + Name = 'DIST_VALIDEZ' + DataType = datString + Size = 255 + end + item + Name = 'DIST_FORMA_PAGO' + DataType = datMemo + end + item + Name = 'DIST_NOTAS' + DataType = datMemo + end + item + Name = 'DIST_LOPD' + DataType = datMemo + end + item + Name = 'DIST_CONDICIONES' + DataType = datMemo end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas index e29c885..70a2efa 100644 --- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas +++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas @@ -9,24 +9,24 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_DarEmpresasContacto = '{D2260045-5EA2-445E-BD5A-00B439D26E3C}'; - RID_PersonalContacto = '{E7B4A8C5-D0B5-4198-88FB-0FE344B47561}'; - RID_DarTiendaDeUsuario = '{7FDBC141-D073-425E-8B6B-344226FDED8F}'; - RID_SubCuentasContacto = '{6FB220D7-AD68-410D-855E-406CC8B64C5B}'; - RID_Contactos = '{574727E9-E45C-4013-AA7A-D618CFB784D7}'; - RID_GruposCliente = '{7D11D206-A5F2-48D8-BC68-F79BBA326860}'; - RID_DatosBancarios = '{85FB44EA-ADA5-4D36-957C-47D83CB1446A}'; - RID_ContactosDirecciones = '{5AD62CD9-4752-4AF1-9446-2175BE9F0E68}'; - RID_Clientes = '{17B3A1E3-F2CE-4919-B7B8-34ECCFA3D33E}'; - RID_Proveedores = '{05E8549B-18CE-420F-A0DC-0F5E8BF230AC}'; - RID_Comerciales = '{A3E835BE-B037-485E-9B2F-E4764A48A4BB}'; - RID_Instaladores = '{B0A219BC-CE5D-4E2B-9B92-C0457C32D917}'; - RID_Vendedores = '{96E45877-1FF8-48C4-8BD2-4016D06701FC}'; - RID_DireccionesContacto = '{FFF2865B-F57F-4633-A39E-35B8BDDF018F}'; - RID_ClientesDescuentos = '{788242EA-B70E-4C1D-94A0-E7F2F3731BF9}'; - RID_ProcedenciasCliente = '{FDDCA58A-27BC-48D3-90F7-F4086DD3F373}'; - RID_GruposProveedor = '{FCE44575-FFF9-454C-9300-B9BC387FB125}'; - RID_Contactos_Refresh = '{706F2E1D-C4C9-4003-AB7F-0894C9EC4465}'; + RID_DarEmpresasContacto = '{4117686A-A758-413B-B33F-823F0F223874}'; + RID_PersonalContacto = '{D86CE99D-0742-4C8A-8718-E5496F79C80C}'; + RID_DarTiendaDeUsuario = '{38CBB232-AEFD-4FCB-9047-6C53966235F2}'; + RID_SubCuentasContacto = '{73980B77-D54D-42B6-8296-6AD38BF4A287}'; + RID_Contactos = '{3A69B178-6A2C-427E-B26A-04E45823E419}'; + RID_GruposCliente = '{A1C74C09-156D-46B1-A11B-1DCEBAF1BB76}'; + RID_DatosBancarios = '{2141DA3D-CD6D-4CC9-A875-70E47796DEF8}'; + RID_ContactosDirecciones = '{5AD6717B-F60C-4EB3-A005-5CED779FA124}'; + RID_Clientes = '{A9FCAF3B-8433-4B0C-93A7-739B857FBB6E}'; + RID_Proveedores = '{69974D53-8241-4EEC-A52E-8790FB7F873B}'; + RID_Comerciales = '{55210549-BE51-409A-88BE-DE48C8EC9FE3}'; + RID_Instaladores = '{45B2F841-BEB7-46CF-8370-1866EA458ABA}'; + RID_Vendedores = '{C6987CB6-8B9E-4F3E-B1C6-60BAE7D1DAF0}'; + RID_DireccionesContacto = '{993CC86B-D192-4A2D-B0C1-63F94673AC27}'; + RID_ClientesDescuentos = '{601EC58E-D643-4D1B-A284-A339CEBD48C6}'; + RID_ProcedenciasCliente = '{C9E5D859-F4D4-49C7-9DAC-BBDEC61606CD}'; + RID_GruposProveedor = '{3066E9B1-D0C4-4A30-A219-29B6244C1071}'; + RID_Contactos_Refresh = '{AA673881-49E3-4DE9-928F-D0C0F6697786}'; { Data table names } nme_DarEmpresasContacto = 'DarEmpresasContacto'; @@ -278,6 +278,13 @@ const fld_ClientesAGENTE = 'AGENTE'; fld_ClientesDELEGACION = 'DELEGACION'; fld_ClientesDESCUENTO_CAPITULO = 'DESCUENTO_CAPITULO'; + fld_ClientesDIST_EMAIL = 'DIST_EMAIL'; + fld_ClientesDIST_PASSWORD = 'DIST_PASSWORD'; + fld_ClientesDIST_VALIDEZ = 'DIST_VALIDEZ'; + fld_ClientesDIST_FORMA_PAGO = 'DIST_FORMA_PAGO'; + fld_ClientesDIST_NOTAS = 'DIST_NOTAS'; + fld_ClientesDIST_LOPD = 'DIST_LOPD'; + fld_ClientesDIST_CONDICIONES = 'DIST_CONDICIONES'; { Clientes field indexes } idx_ClientesID = 0; @@ -331,6 +338,13 @@ const idx_ClientesAGENTE = 48; idx_ClientesDELEGACION = 49; idx_ClientesDESCUENTO_CAPITULO = 50; + idx_ClientesDIST_EMAIL = 51; + idx_ClientesDIST_PASSWORD = 52; + idx_ClientesDIST_VALIDEZ = 53; + idx_ClientesDIST_FORMA_PAGO = 54; + idx_ClientesDIST_NOTAS = 55; + idx_ClientesDIST_LOPD = 56; + idx_ClientesDIST_CONDICIONES = 57; { Proveedores fields } fld_ProveedoresID = 'ID'; @@ -741,7 +755,7 @@ const type { IDarEmpresasContacto } IDarEmpresasContacto = interface(IDAStronglyTypedDataTable) - ['{6DCC6AB5-B946-4656-8122-9CEA4C3561D8}'] + ['{5A42E84A-726A-4C4C-B22D-E980B9E7B359}'] { Property getters and setters } function GetID_EMPRESAValue: Integer; procedure SetID_EMPRESAValue(const aValue: Integer); @@ -776,7 +790,7 @@ type { IPersonalContacto } IPersonalContacto = interface(IDAStronglyTypedDataTable) - ['{0A320E1D-F141-4023-BAB7-8508851D0967}'] + ['{7DC4AEEE-BA0A-4EDC-AEBD-B55F4387967D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -919,7 +933,7 @@ type { IDarTiendaDeUsuario } IDarTiendaDeUsuario = interface(IDAStronglyTypedDataTable) - ['{78C5C14C-0995-4F0D-AE6D-D09EE2EBA5AB}'] + ['{5538F32E-DD6E-485A-BB2C-4626B8FAC737}'] { Property getters and setters } function GetID_TIENDAValue: Integer; procedure SetID_TIENDAValue(const aValue: Integer); @@ -954,7 +968,7 @@ type { ISubCuentasContacto } ISubCuentasContacto = interface(IDAStronglyTypedDataTable) - ['{98FBBB17-C37A-4B62-BC5C-EA3EB4E8D40F}'] + ['{8359AD31-7AAC-47E3-A169-C9419C5DDFA0}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1049,7 +1063,7 @@ type { IContactos } IContactos = interface(IDAStronglyTypedDataTable) - ['{8AD40959-2410-4896-B2F6-0ED92285C5EA}'] + ['{0A502C1B-871E-4A71-816A-7EC57A2FA071}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1408,7 +1422,7 @@ type { IGruposCliente } IGruposCliente = interface(IDAStronglyTypedDataTable) - ['{CA2408DC-3393-4166-A710-C5AFB9800D3F}'] + ['{32C57660-33DF-46CB-8DA6-AF8429274B17}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1455,7 +1469,7 @@ type { IDatosBancarios } IDatosBancarios = interface(IDAStronglyTypedDataTable) - ['{8BCFC161-8278-40D6-A085-01C58E73E6E3}'] + ['{50526541-FBE8-4008-8F43-234E554FDC87}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1610,7 +1624,7 @@ type { IContactosDirecciones } IContactosDirecciones = interface(IDAStronglyTypedDataTable) - ['{99D8DC4D-B704-4B1B-A6EA-3CF7E7016D22}'] + ['{3B309B93-5971-462D-B3D9-85B61CD5A591}'] { Property getters and setters } function GetID_CONTACTOValue: Integer; procedure SetID_CONTACTOValue(const aValue: Integer); @@ -1801,7 +1815,7 @@ type { IClientes } IClientes = interface(IDAStronglyTypedDataTable) - ['{674DFF3A-9F54-48EF-89D6-A6AD544798D1}'] + ['{7135CE4A-8380-4CD6-AB27-7D7E003309CC}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2006,6 +2020,30 @@ type procedure SetDESCUENTO_CAPITULOValue(const aValue: Float); function GetDESCUENTO_CAPITULOIsNull: Boolean; procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean); + function GetDIST_EMAILValue: String; + procedure SetDIST_EMAILValue(const aValue: String); + function GetDIST_EMAILIsNull: Boolean; + procedure SetDIST_EMAILIsNull(const aValue: Boolean); + function GetDIST_PASSWORDValue: String; + procedure SetDIST_PASSWORDValue(const aValue: String); + function GetDIST_PASSWORDIsNull: Boolean; + procedure SetDIST_PASSWORDIsNull(const aValue: Boolean); + function GetDIST_VALIDEZValue: String; + procedure SetDIST_VALIDEZValue(const aValue: String); + function GetDIST_VALIDEZIsNull: Boolean; + procedure SetDIST_VALIDEZIsNull(const aValue: Boolean); + function GetDIST_FORMA_PAGOValue: IROStrings; + function GetDIST_FORMA_PAGOIsNull: Boolean; + procedure SetDIST_FORMA_PAGOIsNull(const aValue: Boolean); + function GetDIST_NOTASValue: IROStrings; + function GetDIST_NOTASIsNull: Boolean; + procedure SetDIST_NOTASIsNull(const aValue: Boolean); + function GetDIST_LOPDValue: IROStrings; + function GetDIST_LOPDIsNull: Boolean; + procedure SetDIST_LOPDIsNull(const aValue: Boolean); + function GetDIST_CONDICIONESValue: IROStrings; + function GetDIST_CONDICIONESIsNull: Boolean; + procedure SetDIST_CONDICIONESIsNull(const aValue: Boolean); { Properties } @@ -2111,13 +2149,35 @@ type property DELEGACIONIsNull: Boolean read GetDELEGACIONIsNull write SetDELEGACIONIsNull; property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue; property DESCUENTO_CAPITULOIsNull: Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull; + property DIST_EMAIL: String read GetDIST_EMAILValue write SetDIST_EMAILValue; + property DIST_EMAILIsNull: Boolean read GetDIST_EMAILIsNull write SetDIST_EMAILIsNull; + property DIST_PASSWORD: String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue; + property DIST_PASSWORDIsNull: Boolean read GetDIST_PASSWORDIsNull write SetDIST_PASSWORDIsNull; + property DIST_VALIDEZ: String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue; + property DIST_VALIDEZIsNull: Boolean read GetDIST_VALIDEZIsNull write SetDIST_VALIDEZIsNull; + property DIST_FORMA_PAGO: IROStrings read GetDIST_FORMA_PAGOValue; + property DIST_FORMA_PAGOIsNull: Boolean read GetDIST_FORMA_PAGOIsNull write SetDIST_FORMA_PAGOIsNull; + property DIST_NOTAS: IROStrings read GetDIST_NOTASValue; + property DIST_NOTASIsNull: Boolean read GetDIST_NOTASIsNull write SetDIST_NOTASIsNull; + property DIST_LOPD: IROStrings read GetDIST_LOPDValue; + property DIST_LOPDIsNull: Boolean read GetDIST_LOPDIsNull write SetDIST_LOPDIsNull; + property DIST_CONDICIONES: IROStrings read GetDIST_CONDICIONESValue; + property DIST_CONDICIONESIsNull: Boolean read GetDIST_CONDICIONESIsNull write SetDIST_CONDICIONESIsNull; end; { TClientesDataTableRules } TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes) private f_NOTAS: IROStrings; + f_DIST_FORMA_PAGO: IROStrings; + f_DIST_NOTAS: IROStrings; + f_DIST_LOPD: IROStrings; + f_DIST_CONDICIONES: IROStrings; procedure NOTAS_OnChange(Sender: TObject); + procedure DIST_FORMA_PAGO_OnChange(Sender: TObject); + procedure DIST_NOTAS_OnChange(Sender: TObject); + procedure DIST_LOPD_OnChange(Sender: TObject); + procedure DIST_CONDICIONES_OnChange(Sender: TObject); protected { Property getters and setters } function GetIDValue: Integer; virtual; @@ -2323,6 +2383,30 @@ type procedure SetDESCUENTO_CAPITULOValue(const aValue: Float); virtual; function GetDESCUENTO_CAPITULOIsNull: Boolean; virtual; procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean); virtual; + function GetDIST_EMAILValue: String; virtual; + procedure SetDIST_EMAILValue(const aValue: String); virtual; + function GetDIST_EMAILIsNull: Boolean; virtual; + procedure SetDIST_EMAILIsNull(const aValue: Boolean); virtual; + function GetDIST_PASSWORDValue: String; virtual; + procedure SetDIST_PASSWORDValue(const aValue: String); virtual; + function GetDIST_PASSWORDIsNull: Boolean; virtual; + procedure SetDIST_PASSWORDIsNull(const aValue: Boolean); virtual; + function GetDIST_VALIDEZValue: String; virtual; + procedure SetDIST_VALIDEZValue(const aValue: String); virtual; + function GetDIST_VALIDEZIsNull: Boolean; virtual; + procedure SetDIST_VALIDEZIsNull(const aValue: Boolean); virtual; + function GetDIST_FORMA_PAGOValue: IROStrings; virtual; + function GetDIST_FORMA_PAGOIsNull: Boolean; virtual; + procedure SetDIST_FORMA_PAGOIsNull(const aValue: Boolean); virtual; + function GetDIST_NOTASValue: IROStrings; virtual; + function GetDIST_NOTASIsNull: Boolean; virtual; + procedure SetDIST_NOTASIsNull(const aValue: Boolean); virtual; + function GetDIST_LOPDValue: IROStrings; virtual; + function GetDIST_LOPDIsNull: Boolean; virtual; + procedure SetDIST_LOPDIsNull(const aValue: Boolean); virtual; + function GetDIST_CONDICIONESValue: IROStrings; virtual; + function GetDIST_CONDICIONESIsNull: Boolean; virtual; + procedure SetDIST_CONDICIONESIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -2427,6 +2511,20 @@ type property DELEGACIONIsNull: Boolean read GetDELEGACIONIsNull write SetDELEGACIONIsNull; property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue; property DESCUENTO_CAPITULOIsNull: Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull; + property DIST_EMAIL: String read GetDIST_EMAILValue write SetDIST_EMAILValue; + property DIST_EMAILIsNull: Boolean read GetDIST_EMAILIsNull write SetDIST_EMAILIsNull; + property DIST_PASSWORD: String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue; + property DIST_PASSWORDIsNull: Boolean read GetDIST_PASSWORDIsNull write SetDIST_PASSWORDIsNull; + property DIST_VALIDEZ: String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue; + property DIST_VALIDEZIsNull: Boolean read GetDIST_VALIDEZIsNull write SetDIST_VALIDEZIsNull; + property DIST_FORMA_PAGO: IROStrings read GetDIST_FORMA_PAGOValue; + property DIST_FORMA_PAGOIsNull: Boolean read GetDIST_FORMA_PAGOIsNull write SetDIST_FORMA_PAGOIsNull; + property DIST_NOTAS: IROStrings read GetDIST_NOTASValue; + property DIST_NOTASIsNull: Boolean read GetDIST_NOTASIsNull write SetDIST_NOTASIsNull; + property DIST_LOPD: IROStrings read GetDIST_LOPDValue; + property DIST_LOPDIsNull: Boolean read GetDIST_LOPDIsNull write SetDIST_LOPDIsNull; + property DIST_CONDICIONES: IROStrings read GetDIST_CONDICIONESValue; + property DIST_CONDICIONESIsNull: Boolean read GetDIST_CONDICIONESIsNull write SetDIST_CONDICIONESIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -2436,7 +2534,7 @@ type { IProveedores } IProveedores = interface(IDAStronglyTypedDataTable) - ['{7B8EE822-7F3D-4A37-A90C-D614D4EF458E}'] + ['{1716C0C8-11E1-4B43-96EC-283AADB3501E}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2999,7 +3097,7 @@ type { IComerciales } IComerciales = interface(IDAStronglyTypedDataTable) - ['{EF962C82-23DF-4E13-A793-B0CD34816707}'] + ['{C349BA14-A608-41C2-9FD6-7A226C24F935}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3418,7 +3516,7 @@ type { IInstaladores } IInstaladores = interface(IDAStronglyTypedDataTable) - ['{BF609D94-FFC5-4308-B658-5C8B4B4DED81}'] + ['{81BCD723-6AC8-4A24-89C3-0CCEF9FB01CA}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3777,7 +3875,7 @@ type { IVendedores } IVendedores = interface(IDAStronglyTypedDataTable) - ['{D67ABC37-B10F-4ABE-B634-A98DDA6E256D}'] + ['{A447A57D-31CF-4958-87CA-B95067039FEA}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -4160,7 +4258,7 @@ type { IDireccionesContacto } IDireccionesContacto = interface(IDAStronglyTypedDataTable) - ['{B16F0A1B-12F6-4C5C-B1FE-7BE3D6DD3CBC}'] + ['{E55C842A-BECC-460E-8FD4-B836C739AEB7}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -4399,7 +4497,7 @@ type { IClientesDescuentos } IClientesDescuentos = interface(IDAStronglyTypedDataTable) - ['{D7066FC5-59F7-4BC6-9124-509E231ED7E7}'] + ['{ECE3BBFC-67C3-45B9-ABB3-D28790739CD1}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -4482,7 +4580,7 @@ type { IProcedenciasCliente } IProcedenciasCliente = interface(IDAStronglyTypedDataTable) - ['{AA87B063-67F2-41E0-BCFE-DF911ACA591C}'] + ['{9829BB9A-F968-454A-A415-20A2CAE3AAED}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -4529,7 +4627,7 @@ type { IGruposProveedor } IGruposProveedor = interface(IDAStronglyTypedDataTable) - ['{74599997-1812-4EEE-8C27-45A8449C66B0}'] + ['{64F28702-F5B8-462D-8A92-6AC3B0E91391}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -4576,7 +4674,7 @@ type { IContactos_Refresh } IContactos_Refresh = interface(IDAStronglyTypedDataTable) - ['{A461B8AD-126F-4F81-AF01-F1474954EF29}'] + ['{1C74F97C-DCEB-49CA-8781-D9909425C395}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -6511,6 +6609,22 @@ begin StrList := TStringList.Create; StrList.OnChange := NOTAS_OnChange; f_NOTAS := NewROStrings(StrList,True); + + StrList := TStringList.Create; + StrList.OnChange := DIST_FORMA_PAGO_OnChange; + f_DIST_FORMA_PAGO := NewROStrings(StrList,True); + + StrList := TStringList.Create; + StrList.OnChange := DIST_NOTAS_OnChange; + f_DIST_NOTAS := NewROStrings(StrList,True); + + StrList := TStringList.Create; + StrList.OnChange := DIST_LOPD_OnChange; + f_DIST_LOPD := NewROStrings(StrList,True); + + StrList := TStringList.Create; + StrList.OnChange := DIST_CONDICIONES_OnChange; + f_DIST_CONDICIONES := NewROStrings(StrList,True); end; destructor TClientesDataTableRules.Destroy; @@ -6523,6 +6637,26 @@ begin if DataTable.Editing then DataTable.Fields[idx_ClientesNOTAS].AsVariant := TStringList(Sender).Text; end; +procedure TClientesDataTableRules.DIST_FORMA_PAGO_OnChange(Sender: TObject); +begin + if DataTable.Editing then DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsVariant := TStringList(Sender).Text; +end; + +procedure TClientesDataTableRules.DIST_NOTAS_OnChange(Sender: TObject); +begin + if DataTable.Editing then DataTable.Fields[idx_ClientesDIST_NOTAS].AsVariant := TStringList(Sender).Text; +end; + +procedure TClientesDataTableRules.DIST_LOPD_OnChange(Sender: TObject); +begin + if DataTable.Editing then DataTable.Fields[idx_ClientesDIST_LOPD].AsVariant := TStringList(Sender).Text; +end; + +procedure TClientesDataTableRules.DIST_CONDICIONES_OnChange(Sender: TObject); +begin + if DataTable.Editing then DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsVariant := TStringList(Sender).Text; +end; + function TClientesDataTableRules.GetIDValue: Integer; begin result := DataTable.Fields[idx_ClientesID].AsInteger; @@ -7590,6 +7724,137 @@ begin DataTable.Fields[idx_ClientesDESCUENTO_CAPITULO].AsVariant := Null; end; +function TClientesDataTableRules.GetDIST_EMAILValue: String; +begin + result := DataTable.Fields[idx_ClientesDIST_EMAIL].AsString; +end; + +procedure TClientesDataTableRules.SetDIST_EMAILValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_EMAIL].AsString := aValue; +end; + +function TClientesDataTableRules.GetDIST_EMAILIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesDIST_EMAIL].IsNull; +end; + +procedure TClientesDataTableRules.SetDIST_EMAILIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesDIST_EMAIL].AsVariant := Null; +end; + +function TClientesDataTableRules.GetDIST_PASSWORDValue: String; +begin + result := DataTable.Fields[idx_ClientesDIST_PASSWORD].AsString; +end; + +procedure TClientesDataTableRules.SetDIST_PASSWORDValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_PASSWORD].AsString := aValue; +end; + +function TClientesDataTableRules.GetDIST_PASSWORDIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesDIST_PASSWORD].IsNull; +end; + +procedure TClientesDataTableRules.SetDIST_PASSWORDIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesDIST_PASSWORD].AsVariant := Null; +end; + +function TClientesDataTableRules.GetDIST_VALIDEZValue: String; +begin + result := DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsString; +end; + +procedure TClientesDataTableRules.SetDIST_VALIDEZValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsString := aValue; +end; + +function TClientesDataTableRules.GetDIST_VALIDEZIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesDIST_VALIDEZ].IsNull; +end; + +procedure TClientesDataTableRules.SetDIST_VALIDEZIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsVariant := Null; +end; + +function TClientesDataTableRules.GetDIST_FORMA_PAGOValue: IROStrings; +begin + result := f_DIST_FORMA_PAGO; + result.Text := DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsString; +end; + +function TClientesDataTableRules.GetDIST_FORMA_PAGOIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].IsNull; +end; + +procedure TClientesDataTableRules.SetDIST_FORMA_PAGOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsVariant := Null; +end; + +function TClientesDataTableRules.GetDIST_NOTASValue: IROStrings; +begin + result := f_DIST_NOTAS; + result.Text := DataTable.Fields[idx_ClientesDIST_NOTAS].AsString; +end; + +function TClientesDataTableRules.GetDIST_NOTASIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesDIST_NOTAS].IsNull; +end; + +procedure TClientesDataTableRules.SetDIST_NOTASIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesDIST_NOTAS].AsVariant := Null; +end; + +function TClientesDataTableRules.GetDIST_LOPDValue: IROStrings; +begin + result := f_DIST_LOPD; + result.Text := DataTable.Fields[idx_ClientesDIST_LOPD].AsString; +end; + +function TClientesDataTableRules.GetDIST_LOPDIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesDIST_LOPD].IsNull; +end; + +procedure TClientesDataTableRules.SetDIST_LOPDIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesDIST_LOPD].AsVariant := Null; +end; + +function TClientesDataTableRules.GetDIST_CONDICIONESValue: IROStrings; +begin + result := f_DIST_CONDICIONES; + result.Text := DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsString; +end; + +function TClientesDataTableRules.GetDIST_CONDICIONESIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesDIST_CONDICIONES].IsNull; +end; + +procedure TClientesDataTableRules.SetDIST_CONDICIONESIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsVariant := Null; +end; + { TProveedoresDataTableRules } constructor TProveedoresDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas index 35076d4..47f6b8a 100644 --- a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas +++ b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas @@ -9,29 +9,29 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_DarEmpresasContactoDelta = '{8E43A352-5534-4ED0-98A0-8B9315B87DC9}'; - RID_PersonalContactoDelta = '{6CEB5C20-52D6-47EB-9E0B-FC1ED530ED57}'; - RID_DarTiendaDeUsuarioDelta = '{27AD499A-FDA3-486D-AED3-6F3C185E0BB7}'; - RID_SubCuentasContactoDelta = '{89060287-0004-4DC6-9B41-CA8BEE15E4FA}'; - RID_ContactosDelta = '{8568C604-4350-40D2-BFF4-63991A810025}'; - RID_GruposClienteDelta = '{2B2FDDCA-B7DC-4E22-837A-CBF4B31EB334}'; - RID_DatosBancariosDelta = '{4B54C2AA-1D6E-4B7C-ABDD-D27AC0EC80E0}'; - RID_ContactosDireccionesDelta = '{96575B97-B9C5-4F98-B022-FB7ED9D2F362}'; - RID_ClientesDelta = '{C370F2E8-BB83-4B2A-B586-616B15393E4B}'; - RID_ProveedoresDelta = '{F4211FE5-B711-4A6F-BD50-1362FBE58A63}'; - RID_ComercialesDelta = '{E1E60EEC-3987-4A5F-945E-3254A717DAF0}'; - RID_InstaladoresDelta = '{9E6D5095-74E3-46F4-A0BD-9978B1764CC3}'; - RID_VendedoresDelta = '{B0DBA7AF-A835-48FD-A7CC-1D0FFCDAF2EC}'; - RID_DireccionesContactoDelta = '{BE093FC9-3ECB-4D20-83E7-C65A2B28F787}'; - RID_ClientesDescuentosDelta = '{971706C8-35EA-4642-A2C2-67D8733848E3}'; - RID_ProcedenciasClienteDelta = '{B1CB95E2-06FE-4612-9DAB-8266C1544841}'; - RID_GruposProveedorDelta = '{C818ADEB-6295-4D86-97A9-0B76F573D404}'; - RID_Contactos_RefreshDelta = '{A915B623-C44A-4698-A8D7-A5EF90EA74C7}'; + RID_DarEmpresasContactoDelta = '{A6C17B0F-9BA6-49DA-95E3-AAE7E126D6C3}'; + RID_PersonalContactoDelta = '{7673EB03-E044-4235-86FD-88C03BF38CA5}'; + RID_DarTiendaDeUsuarioDelta = '{BB04C9C0-C1D6-4217-9E5E-A8DD6066DC18}'; + RID_SubCuentasContactoDelta = '{2264ED20-7CBC-4AAD-AE76-4FA9B5772027}'; + RID_ContactosDelta = '{7272985B-101D-4E77-B186-F540C5A8B9FE}'; + RID_GruposClienteDelta = '{DB5E0AAD-E731-4141-8174-6E90B00E00C9}'; + RID_DatosBancariosDelta = '{EE52BF18-C8DA-4499-93B7-BE8450EBFC0C}'; + RID_ContactosDireccionesDelta = '{A2901211-D93D-47D6-B517-81FFF15339A5}'; + RID_ClientesDelta = '{FED5B468-C66D-4F91-87E5-70C095A17999}'; + RID_ProveedoresDelta = '{606CCCEF-0525-4B8C-AFDF-B69086176948}'; + RID_ComercialesDelta = '{4E7845A8-6516-46DC-8B41-5FC78B1A4D2B}'; + RID_InstaladoresDelta = '{27299B3D-AF60-4409-B0F1-01D3C70B3A78}'; + RID_VendedoresDelta = '{2356F78C-D158-4718-B0D5-7908F364710D}'; + RID_DireccionesContactoDelta = '{586C0AF6-F3F1-4AEF-A20D-538A864F8C9E}'; + RID_ClientesDescuentosDelta = '{E751E876-C504-4667-9E86-3C1C2F6126BE}'; + RID_ProcedenciasClienteDelta = '{8D68A2B8-266F-425C-9C9B-59AB0F2C0536}'; + RID_GruposProveedorDelta = '{79D969BC-F86A-4FED-8F21-89818C75814F}'; + RID_Contactos_RefreshDelta = '{C09DCED2-2FF9-4475-91BA-AAB42A6F40AD}'; type { IDarEmpresasContactoDelta } IDarEmpresasContactoDelta = interface(IDarEmpresasContacto) - ['{8E43A352-5534-4ED0-98A0-8B9315B87DC9}'] + ['{A6C17B0F-9BA6-49DA-95E3-AAE7E126D6C3}'] { Property getters and setters } function GetOldID_EMPRESAValue : Integer; @@ -65,7 +65,7 @@ type { IPersonalContactoDelta } IPersonalContactoDelta = interface(IPersonalContacto) - ['{6CEB5C20-52D6-47EB-9E0B-FC1ED530ED57}'] + ['{7673EB03-E044-4235-86FD-88C03BF38CA5}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -207,7 +207,7 @@ type { IDarTiendaDeUsuarioDelta } IDarTiendaDeUsuarioDelta = interface(IDarTiendaDeUsuario) - ['{27AD499A-FDA3-486D-AED3-6F3C185E0BB7}'] + ['{BB04C9C0-C1D6-4217-9E5E-A8DD6066DC18}'] { Property getters and setters } function GetOldID_TIENDAValue : Integer; @@ -241,7 +241,7 @@ type { ISubCuentasContactoDelta } ISubCuentasContactoDelta = interface(ISubCuentasContacto) - ['{89060287-0004-4DC6-9B41-CA8BEE15E4FA}'] + ['{2264ED20-7CBC-4AAD-AE76-4FA9B5772027}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREF_SUBCUENTAValue : String; @@ -335,7 +335,7 @@ type { IContactosDelta } IContactosDelta = interface(IContactos) - ['{8568C604-4350-40D2-BFF4-63991A810025}'] + ['{7272985B-101D-4E77-B186-F540C5A8B9FE}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -694,7 +694,7 @@ type { IGruposClienteDelta } IGruposClienteDelta = interface(IGruposCliente) - ['{2B2FDDCA-B7DC-4E22-837A-CBF4B31EB334}'] + ['{DB5E0AAD-E731-4141-8174-6E90B00E00C9}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -740,7 +740,7 @@ type { IDatosBancariosDelta } IDatosBancariosDelta = interface(IDatosBancarios) - ['{4B54C2AA-1D6E-4B7C-ABDD-D27AC0EC80E0}'] + ['{EE52BF18-C8DA-4499-93B7-BE8450EBFC0C}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -894,7 +894,7 @@ type { IContactosDireccionesDelta } IContactosDireccionesDelta = interface(IContactosDirecciones) - ['{96575B97-B9C5-4F98-B022-FB7ED9D2F362}'] + ['{A2901211-D93D-47D6-B517-81FFF15339A5}'] { Property getters and setters } function GetOldID_CONTACTOValue : Integer; function GetOldID_DIRECCIONValue : Integer; @@ -1084,7 +1084,7 @@ type { IClientesDelta } IClientesDelta = interface(IClientes) - ['{C370F2E8-BB83-4B2A-B586-616B15393E4B}'] + ['{FED5B468-C66D-4F91-87E5-70C095A17999}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1137,6 +1137,13 @@ type function GetOldAGENTEValue : String; function GetOldDELEGACIONValue : String; function GetOldDESCUENTO_CAPITULOValue : Float; + function GetOldDIST_EMAILValue : String; + function GetOldDIST_PASSWORDValue : String; + function GetOldDIST_VALIDEZValue : String; + function GetOldDIST_FORMA_PAGOValue : IROStrings; + function GetOldDIST_NOTASValue : IROStrings; + function GetOldDIST_LOPDValue : IROStrings; + function GetOldDIST_CONDICIONESValue : IROStrings; { Properties } property OldID : Integer read GetOldIDValue; @@ -1190,13 +1197,28 @@ type property OldAGENTE : String read GetOldAGENTEValue; property OldDELEGACION : String read GetOldDELEGACIONValue; property OldDESCUENTO_CAPITULO : Float read GetOldDESCUENTO_CAPITULOValue; + property OldDIST_EMAIL : String read GetOldDIST_EMAILValue; + property OldDIST_PASSWORD : String read GetOldDIST_PASSWORDValue; + property OldDIST_VALIDEZ : String read GetOldDIST_VALIDEZValue; + property OldDIST_FORMA_PAGO : IROStrings read GetOldDIST_FORMA_PAGOValue; + property OldDIST_NOTAS : IROStrings read GetOldDIST_NOTASValue; + property OldDIST_LOPD : IROStrings read GetOldDIST_LOPDValue; + property OldDIST_CONDICIONES : IROStrings read GetOldDIST_CONDICIONESValue; end; { TClientesBusinessProcessorRules } TClientesBusinessProcessorRules = class(TDABusinessProcessorRules, IClientes, IClientesDelta) private f_NOTAS: IROStrings; + f_DIST_FORMA_PAGO: IROStrings; + f_DIST_NOTAS: IROStrings; + f_DIST_LOPD: IROStrings; + f_DIST_CONDICIONES: IROStrings; procedure NOTAS_OnChange(Sender: TObject); + procedure DIST_FORMA_PAGO_OnChange(Sender: TObject); + procedure DIST_NOTAS_OnChange(Sender: TObject); + procedure DIST_LOPD_OnChange(Sender: TObject); + procedure DIST_CONDICIONES_OnChange(Sender: TObject); protected { Property getters and setters } function GetIDValue: Integer; virtual; @@ -1504,6 +1526,44 @@ type function GetOldDESCUENTO_CAPITULOIsNull: Boolean; virtual; procedure SetDESCUENTO_CAPITULOValue(const aValue: Float); virtual; procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean); virtual; + function GetDIST_EMAILValue: String; virtual; + function GetDIST_EMAILIsNull: Boolean; virtual; + function GetOldDIST_EMAILValue: String; virtual; + function GetOldDIST_EMAILIsNull: Boolean; virtual; + procedure SetDIST_EMAILValue(const aValue: String); virtual; + procedure SetDIST_EMAILIsNull(const aValue: Boolean); virtual; + function GetDIST_PASSWORDValue: String; virtual; + function GetDIST_PASSWORDIsNull: Boolean; virtual; + function GetOldDIST_PASSWORDValue: String; virtual; + function GetOldDIST_PASSWORDIsNull: Boolean; virtual; + procedure SetDIST_PASSWORDValue(const aValue: String); virtual; + procedure SetDIST_PASSWORDIsNull(const aValue: Boolean); virtual; + function GetDIST_VALIDEZValue: String; virtual; + function GetDIST_VALIDEZIsNull: Boolean; virtual; + function GetOldDIST_VALIDEZValue: String; virtual; + function GetOldDIST_VALIDEZIsNull: Boolean; virtual; + procedure SetDIST_VALIDEZValue(const aValue: String); virtual; + procedure SetDIST_VALIDEZIsNull(const aValue: Boolean); virtual; + function GetDIST_FORMA_PAGOValue: IROStrings; virtual; + function GetDIST_FORMA_PAGOIsNull: Boolean; virtual; + function GetOldDIST_FORMA_PAGOValue: IROStrings; virtual; + function GetOldDIST_FORMA_PAGOIsNull: Boolean; virtual; + procedure SetDIST_FORMA_PAGOIsNull(const aValue: Boolean); virtual; + function GetDIST_NOTASValue: IROStrings; virtual; + function GetDIST_NOTASIsNull: Boolean; virtual; + function GetOldDIST_NOTASValue: IROStrings; virtual; + function GetOldDIST_NOTASIsNull: Boolean; virtual; + procedure SetDIST_NOTASIsNull(const aValue: Boolean); virtual; + function GetDIST_LOPDValue: IROStrings; virtual; + function GetDIST_LOPDIsNull: Boolean; virtual; + function GetOldDIST_LOPDValue: IROStrings; virtual; + function GetOldDIST_LOPDIsNull: Boolean; virtual; + procedure SetDIST_LOPDIsNull(const aValue: Boolean); virtual; + function GetDIST_CONDICIONESValue: IROStrings; virtual; + function GetDIST_CONDICIONESIsNull: Boolean; virtual; + function GetOldDIST_CONDICIONESValue: IROStrings; virtual; + function GetOldDIST_CONDICIONESIsNull: Boolean; virtual; + procedure SetDIST_CONDICIONESIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -1710,6 +1770,34 @@ type property DESCUENTO_CAPITULOIsNull : Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull; property OldDESCUENTO_CAPITULO : Float read GetOldDESCUENTO_CAPITULOValue; property OldDESCUENTO_CAPITULOIsNull : Boolean read GetOldDESCUENTO_CAPITULOIsNull; + property DIST_EMAIL : String read GetDIST_EMAILValue write SetDIST_EMAILValue; + property DIST_EMAILIsNull : Boolean read GetDIST_EMAILIsNull write SetDIST_EMAILIsNull; + property OldDIST_EMAIL : String read GetOldDIST_EMAILValue; + property OldDIST_EMAILIsNull : Boolean read GetOldDIST_EMAILIsNull; + property DIST_PASSWORD : String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue; + property DIST_PASSWORDIsNull : Boolean read GetDIST_PASSWORDIsNull write SetDIST_PASSWORDIsNull; + property OldDIST_PASSWORD : String read GetOldDIST_PASSWORDValue; + property OldDIST_PASSWORDIsNull : Boolean read GetOldDIST_PASSWORDIsNull; + property DIST_VALIDEZ : String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue; + property DIST_VALIDEZIsNull : Boolean read GetDIST_VALIDEZIsNull write SetDIST_VALIDEZIsNull; + property OldDIST_VALIDEZ : String read GetOldDIST_VALIDEZValue; + property OldDIST_VALIDEZIsNull : Boolean read GetOldDIST_VALIDEZIsNull; + property DIST_FORMA_PAGO : IROStrings read GetDIST_FORMA_PAGOValue; + property DIST_FORMA_PAGOIsNull : Boolean read GetDIST_FORMA_PAGOIsNull write SetDIST_FORMA_PAGOIsNull; + property OldDIST_FORMA_PAGO : IROStrings read GetOldDIST_FORMA_PAGOValue; + property OldDIST_FORMA_PAGOIsNull : Boolean read GetOldDIST_FORMA_PAGOIsNull; + property DIST_NOTAS : IROStrings read GetDIST_NOTASValue; + property DIST_NOTASIsNull : Boolean read GetDIST_NOTASIsNull write SetDIST_NOTASIsNull; + property OldDIST_NOTAS : IROStrings read GetOldDIST_NOTASValue; + property OldDIST_NOTASIsNull : Boolean read GetOldDIST_NOTASIsNull; + property DIST_LOPD : IROStrings read GetDIST_LOPDValue; + property DIST_LOPDIsNull : Boolean read GetDIST_LOPDIsNull write SetDIST_LOPDIsNull; + property OldDIST_LOPD : IROStrings read GetOldDIST_LOPDValue; + property OldDIST_LOPDIsNull : Boolean read GetOldDIST_LOPDIsNull; + property DIST_CONDICIONES : IROStrings read GetDIST_CONDICIONESValue; + property DIST_CONDICIONESIsNull : Boolean read GetDIST_CONDICIONESIsNull write SetDIST_CONDICIONESIsNull; + property OldDIST_CONDICIONES : IROStrings read GetOldDIST_CONDICIONESValue; + property OldDIST_CONDICIONESIsNull : Boolean read GetOldDIST_CONDICIONESIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -1719,7 +1807,7 @@ type { IProveedoresDelta } IProveedoresDelta = interface(IProveedores) - ['{F4211FE5-B711-4A6F-BD50-1362FBE58A63}'] + ['{606CCCEF-0525-4B8C-AFDF-B69086176948}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -2282,7 +2370,7 @@ type { IComercialesDelta } IComercialesDelta = interface(IComerciales) - ['{E1E60EEC-3987-4A5F-945E-3254A717DAF0}'] + ['{4E7845A8-6516-46DC-8B41-5FC78B1A4D2B}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -2701,7 +2789,7 @@ type { IInstaladoresDelta } IInstaladoresDelta = interface(IInstaladores) - ['{9E6D5095-74E3-46F4-A0BD-9978B1764CC3}'] + ['{27299B3D-AF60-4409-B0F1-01D3C70B3A78}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -3060,7 +3148,7 @@ type { IVendedoresDelta } IVendedoresDelta = interface(IVendedores) - ['{B0DBA7AF-A835-48FD-A7CC-1D0FFCDAF2EC}'] + ['{2356F78C-D158-4718-B0D5-7908F364710D}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -3443,7 +3531,7 @@ type { IDireccionesContactoDelta } IDireccionesContactoDelta = interface(IDireccionesContacto) - ['{BE093FC9-3ECB-4D20-83E7-C65A2B28F787}'] + ['{586C0AF6-F3F1-4AEF-A20D-538A864F8C9E}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -3682,7 +3770,7 @@ type { IClientesDescuentosDelta } IClientesDescuentosDelta = interface(IClientesDescuentos) - ['{971706C8-35EA-4642-A2C2-67D8733848E3}'] + ['{E751E876-C504-4667-9E86-3C1C2F6126BE}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CLIENTEValue : Integer; @@ -3764,7 +3852,7 @@ type { IProcedenciasClienteDelta } IProcedenciasClienteDelta = interface(IProcedenciasCliente) - ['{B1CB95E2-06FE-4612-9DAB-8266C1544841}'] + ['{8D68A2B8-266F-425C-9C9B-59AB0F2C0536}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -3810,7 +3898,7 @@ type { IGruposProveedorDelta } IGruposProveedorDelta = interface(IGruposProveedor) - ['{C818ADEB-6295-4D86-97A9-0B76F573D404}'] + ['{79D969BC-F86A-4FED-8F21-89818C75814F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -3856,7 +3944,7 @@ type { IContactos_RefreshDelta } IContactos_RefreshDelta = interface(IContactos_Refresh) - ['{A915B623-C44A-4698-A8D7-A5EF90EA74C7}'] + ['{C09DCED2-2FF9-4475-91BA-AAB42A6F40AD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldNIF_CIFValue : String; @@ -6523,6 +6611,22 @@ begin StrList := TStringList.Create; StrList.OnChange := NOTAS_OnChange; f_NOTAS := NewROStrings(StrList,True); + + StrList := TStringList.Create; + StrList.OnChange := DIST_FORMA_PAGO_OnChange; + f_DIST_FORMA_PAGO := NewROStrings(StrList,True); + + StrList := TStringList.Create; + StrList.OnChange := DIST_NOTAS_OnChange; + f_DIST_NOTAS := NewROStrings(StrList,True); + + StrList := TStringList.Create; + StrList.OnChange := DIST_LOPD_OnChange; + f_DIST_LOPD := NewROStrings(StrList,True); + + StrList := TStringList.Create; + StrList.OnChange := DIST_CONDICIONES_OnChange; + f_DIST_CONDICIONES := NewROStrings(StrList,True); end; destructor TClientesBusinessProcessorRules.Destroy; @@ -6535,6 +6639,26 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesNOTAS] := TStringList(Sender).Text; end; +procedure TClientesBusinessProcessorRules.DIST_FORMA_PAGO_OnChange(Sender: TObject); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO] := TStringList(Sender).Text; +end; + +procedure TClientesBusinessProcessorRules.DIST_NOTAS_OnChange(Sender: TObject); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_NOTAS] := TStringList(Sender).Text; +end; + +procedure TClientesBusinessProcessorRules.DIST_LOPD_OnChange(Sender: TObject); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_LOPD] := TStringList(Sender).Text; +end; + +procedure TClientesBusinessProcessorRules.DIST_CONDICIONES_OnChange(Sender: TObject); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_CONDICIONES] := TStringList(Sender).Text; +end; + function TClientesBusinessProcessorRules.GetIDValue: Integer; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesID]; @@ -8113,6 +8237,211 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDESCUENTO_CAPITULO] := Null; end; +function TClientesBusinessProcessorRules.GetDIST_EMAILValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_EMAIL]; +end; + +function TClientesBusinessProcessorRules.GetDIST_EMAILIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_EMAIL]); +end; + +function TClientesBusinessProcessorRules.GetOldDIST_EMAILValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_EMAIL]; +end; + +function TClientesBusinessProcessorRules.GetOldDIST_EMAILIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_EMAIL]); +end; + +procedure TClientesBusinessProcessorRules.SetDIST_EMAILValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_EMAIL] := aValue; +end; + +procedure TClientesBusinessProcessorRules.SetDIST_EMAILIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_EMAIL] := Null; +end; + +function TClientesBusinessProcessorRules.GetDIST_PASSWORDValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_PASSWORD]; +end; + +function TClientesBusinessProcessorRules.GetDIST_PASSWORDIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_PASSWORD]); +end; + +function TClientesBusinessProcessorRules.GetOldDIST_PASSWORDValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_PASSWORD]; +end; + +function TClientesBusinessProcessorRules.GetOldDIST_PASSWORDIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_PASSWORD]); +end; + +procedure TClientesBusinessProcessorRules.SetDIST_PASSWORDValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_PASSWORD] := aValue; +end; + +procedure TClientesBusinessProcessorRules.SetDIST_PASSWORDIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_PASSWORD] := Null; +end; + +function TClientesBusinessProcessorRules.GetDIST_VALIDEZValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_VALIDEZ]; +end; + +function TClientesBusinessProcessorRules.GetDIST_VALIDEZIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_VALIDEZ]); +end; + +function TClientesBusinessProcessorRules.GetOldDIST_VALIDEZValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_VALIDEZ]; +end; + +function TClientesBusinessProcessorRules.GetOldDIST_VALIDEZIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_VALIDEZ]); +end; + +procedure TClientesBusinessProcessorRules.SetDIST_VALIDEZValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_VALIDEZ] := aValue; +end; + +procedure TClientesBusinessProcessorRules.SetDIST_VALIDEZIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_VALIDEZ] := Null; +end; + +function TClientesBusinessProcessorRules.GetDIST_FORMA_PAGOValue: IROStrings; +begin + result := f_DIST_FORMA_PAGO; + result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO]; +end; + +function TClientesBusinessProcessorRules.GetDIST_FORMA_PAGOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO]); +end; + +function TClientesBusinessProcessorRules.GetOldDIST_FORMA_PAGOValue: IROStrings; +begin + result := NewROStrings(); + result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_FORMA_PAGO]; +end; + +function TClientesBusinessProcessorRules.GetOldDIST_FORMA_PAGOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_FORMA_PAGO]); +end; + +procedure TClientesBusinessProcessorRules.SetDIST_FORMA_PAGOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO] := Null; +end; + +function TClientesBusinessProcessorRules.GetDIST_NOTASValue: IROStrings; +begin + result := f_DIST_NOTAS; + result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_NOTAS]; +end; + +function TClientesBusinessProcessorRules.GetDIST_NOTASIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_NOTAS]); +end; + +function TClientesBusinessProcessorRules.GetOldDIST_NOTASValue: IROStrings; +begin + result := NewROStrings(); + result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_NOTAS]; +end; + +function TClientesBusinessProcessorRules.GetOldDIST_NOTASIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_NOTAS]); +end; + +procedure TClientesBusinessProcessorRules.SetDIST_NOTASIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_NOTAS] := Null; +end; + +function TClientesBusinessProcessorRules.GetDIST_LOPDValue: IROStrings; +begin + result := f_DIST_LOPD; + result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_LOPD]; +end; + +function TClientesBusinessProcessorRules.GetDIST_LOPDIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_LOPD]); +end; + +function TClientesBusinessProcessorRules.GetOldDIST_LOPDValue: IROStrings; +begin + result := NewROStrings(); + result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_LOPD]; +end; + +function TClientesBusinessProcessorRules.GetOldDIST_LOPDIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_LOPD]); +end; + +procedure TClientesBusinessProcessorRules.SetDIST_LOPDIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_LOPD] := Null; +end; + +function TClientesBusinessProcessorRules.GetDIST_CONDICIONESValue: IROStrings; +begin + result := f_DIST_CONDICIONES; + result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_CONDICIONES]; +end; + +function TClientesBusinessProcessorRules.GetDIST_CONDICIONESIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_CONDICIONES]); +end; + +function TClientesBusinessProcessorRules.GetOldDIST_CONDICIONESValue: IROStrings; +begin + result := NewROStrings(); + result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_CONDICIONES]; +end; + +function TClientesBusinessProcessorRules.GetOldDIST_CONDICIONESIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDIST_CONDICIONES]); +end; + +procedure TClientesBusinessProcessorRules.SetDIST_CONDICIONESIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDIST_CONDICIONES] := Null; +end; + { TProveedoresBusinessProcessorRules } constructor TProveedoresBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Contactos/Model/uBizClientesServer.pas b/Source/Modulos/Contactos/Model/uBizClientesServer.pas index c2d3773..f38113d 100644 --- a/Source/Modulos/Contactos/Model/uBizClientesServer.pas +++ b/Source/Modulos/Contactos/Model/uBizClientesServer.pas @@ -187,7 +187,15 @@ begin ParamByName('DESCUENTO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO]; ParamByName('DESCUENTO_LINEA').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_LINEA]; ParamByName('PRECIO_PUNTO').Value := aChange.NewValueByName[fld_ClientesPRECIO_PUNTO]; - ParamByName('DESCUENTO_CAPITULO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_CAPITULO]; + ParamByName('DESCUENTO_CAPITULO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_CAPITULO]; + + ParamByName('DIST_EMAIL').Value := aChange.NewValueByName[fld_ClientesDIST_EMAIL]; + ParamByName('DIST_PASSWORD').Value := aChange.NewValueByName[fld_ClientesDIST_PASSWORD]; + ParamByName('DIST_VALIDEZ').Value := aChange.NewValueByName[fld_ClientesDIST_VALIDEZ]; + ParamByName('DIST_FORMA_PAGO').Value := aChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO]; + ParamByName('DIST_NOTAS').Value := aChange.NewValueByName[fld_ClientesDIST_NOTAS]; + ParamByName('DIST_LOPD').Value := aChange.NewValueByName[fld_ClientesDIST_LOPD]; + ParamByName('DIST_CONDICIONES').Value := aChange.NewValueByName[fld_ClientesDIST_CONDICIONES]; Execute; end; @@ -246,8 +254,16 @@ begin ParamByName('DESCUENTO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO]; ParamByName('DESCUENTO_LINEA').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_LINEA]; ParamByName('PRECIO_PUNTO').Value := aChange.NewValueByName[fld_ClientesPRECIO_PUNTO]; - ParamByName('DESCUENTO_CAPITULO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_CAPITULO]; + ParamByName('DESCUENTO_CAPITULO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_CAPITULO]; + ParamByName('DIST_EMAIL').Value := aChange.NewValueByName[fld_ClientesDIST_EMAIL]; + ParamByName('DIST_PASSWORD').Value := aChange.NewValueByName[fld_ClientesDIST_PASSWORD]; + ParamByName('DIST_VALIDEZ').Value := aChange.NewValueByName[fld_ClientesDIST_VALIDEZ]; + ParamByName('DIST_FORMA_PAGO').Value := aChange.NewValueByName[fld_ClientesDIST_FORMA_PAGO]; + ParamByName('DIST_NOTAS').Value := aChange.NewValueByName[fld_ClientesDIST_NOTAS]; + ParamByName('DIST_LOPD').Value := aChange.NewValueByName[fld_ClientesDIST_LOPD]; + ParamByName('DIST_CONDICIONES').Value := aChange.NewValueByName[fld_ClientesDIST_CONDICIONES]; + Execute; end; diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas index 4393309..6e1d86c 100644 --- a/Source/Modulos/Contactos/Model/uBizContactos.pas +++ b/Source/Modulos/Contactos/Model/uBizContactos.pas @@ -118,6 +118,28 @@ type function GetPAISValue: String; procedure SetPAISValue(const aValue: String); + function GetDIST_EMAILValue: String; + procedure SetDIST_EMAILValue(const aValue: String); + + function GetDIST_PASSWORDValue: String; + procedure SetDIST_PASSWORDValue(const aValue: String); + + function GetDIST_VALIDEZValue: String; + procedure SetDIST_VALIDEZValue(const Value: String); + + function GetDIST_FORMA_PAGOValue: String; + procedure SetDIST_FORMA_PAGOValue(const aValue: String); + + function GetDIST_LOPDValue: String; + procedure SetDIST_LOPDValue(const aValue: String); + + function GetDIST_NOTASValue: String; + procedure SetDIST_NOTASValue(const aValue: String); + + function GetDIST_CONDICIONESValue: String; + procedure SetDIST_CONDICIONESValue(const aValue: String); + + property Descuentos: IBizClienteDescuentos read GetDescuentos write SetDescuentos; property GRUPO_CLIENTE: String read GetGRUPO_CLIENTEValue write SetGRUPO_CLIENTEValue; property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; @@ -134,13 +156,22 @@ type property TIENDA_WEB: Integer read GetTIENDA_WEBValue write SetTIENDA_WEBValue; property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue; property DESCUENTO_LINEA: Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue; - property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue; + property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue; property PRECIO_PUNTO: Currency read GetPRECIO_PUNTOValue write SetPRECIO_PUNTOValue; property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue; property AGENTE: String read GetAGENTEValue write SetAGENTEValue; property DELEGACION: String read GetDELEGACIONValue write SetDELEGACIONValue; property PAIS: String read GetPAISValue write SetPAISValue; + property DIST_EMAIL: String read GetDIST_EMAILValue write SetDIST_EMAILValue; + property DIST_PASSWORD: String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue; + property DIST_VALIDEZ: String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue; + property DIST_FORMA_PAGO: String read GetDIST_FORMA_PAGOValue write SetDIST_FORMA_PAGOValue; + property DIST_NOTAS: String read GetDIST_NOTASValue write SetDIST_NOTASValue; + property DIST_LOPD: String read GetDIST_LOPDValue write SetDIST_LOPDValue; + property DIST_CONDICIONES: String read GetDIST_CONDICIONESValue write SetDIST_CONDICIONESValue; + + function GetSubCuentas: IBizSubCuentasContacto; procedure SetSubCuentas(const Value: IBizSubCuentasContacto); property SubCuentas : IBizSubCuentasContacto read GetSubCuentas write SetSubCuentas; @@ -384,6 +415,27 @@ type function GetDELEGACIONValue: String; procedure SetDELEGACIONValue(const aValue: String); + function GetDIST_EMAILValue: String; + procedure SetDIST_EMAILValue(const aValue: String); + + function GetDIST_PASSWORDValue: String; + procedure SetDIST_PASSWORDValue(const aValue: String); + + function GetDIST_VALIDEZValue: String; + procedure SetDIST_VALIDEZValue(const aValue: String); + + function GetDIST_FORMA_PAGOValue: String; + procedure SetDIST_FORMA_PAGOValue(const aValue: String); + + function GetDIST_LOPDValue: String; + procedure SetDIST_LOPDValue(const aValue: String); + + function GetDIST_NOTASValue: String; + procedure SetDIST_NOTASValue(const aValue: String); + + function GetDIST_CONDICIONESValue: String; + procedure SetDIST_CONDICIONESValue(const aValue: String); + public procedure IniciarValoresContactoNuevo; override; constructor Create(aDataTable: TDADataTable); override; @@ -407,12 +459,19 @@ type property TIENE_SUBCUENTA: Integer read GetTiene_SubCuenta write SetTiene_Subcuenta; property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue; property DESCUENTO_LINEA: Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue; - property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue; + property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue; property PRECIO_PUNTO: Currency read GetPRECIO_PUNTOValue write SetPRECIO_PUNTOValue; property ID_AGENTE: Integer read GetID_AGENTEValue write SetID_AGENTEValue; property AGENTE: String read GetAGENTEValue write SetAGENTEValue; property DELEGACION: String read GetDELEGACIONValue write SetDELEGACIONValue; - + + property DIST_EMAIL: String read GetDIST_EMAILValue write SetDIST_EMAILValue; + property DIST_PASSWORD: String read GetDIST_PASSWORDValue write SetDIST_PASSWORDValue; + property DIST_VALIDEZ: String read GetDIST_VALIDEZValue write SetDIST_VALIDEZValue; + property DIST_FORMA_PAGO: String read GetDIST_FORMA_PAGOValue write SetDIST_FORMA_PAGOValue; + property DIST_NOTAS: String read GetDIST_NOTASValue write SetDIST_NOTASValue; + property DIST_LOPD: String read GetDIST_LOPDValue write SetDIST_LOPDValue; + property DIST_CONDICIONES: String read GetDIST_CONDICIONESValue write SetDIST_CONDICIONESValue; end; @@ -703,6 +762,41 @@ begin result := DataTable.Fields[idx_ClientesDESCUENTO_LINEA].AsFloat; end; +function TBizCliente.GetDIST_CONDICIONESValue: String; +begin + Result := DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsString; +end; + +function TBizCliente.GetDIST_EMAILValue: String; +begin + Result := DataTable.Fields[idx_ClientesDIST_EMAIL].AsString; +end; + +function TBizCliente.GetDIST_FORMA_PAGOValue: String; +begin + Result := DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsString; +end; + +function TBizCliente.GetDIST_LOPDValue: String; +begin + Result := DataTable.Fields[idx_ClientesDIST_LOPD].AsString; +end; + +function TBizCliente.GetDIST_NOTASValue: String; +begin + Result := DataTable.Fields[idx_ClientesDIST_NOTAS].AsString; +end; + +function TBizCliente.GetDIST_PASSWORDValue: String; +begin + Result := DataTable.Fields[idx_ClientesDIST_PASSWORD].AsString; +end; + +function TBizCliente.GetDIST_VALIDEZValue: String; +begin + Result := DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsString; +end; + function TBizCliente.GetDESCUENTO_CAPITULOValue: Float; begin result := DataTable.Fields[idx_ClientesDESCUENTO_CAPITULO].AsFloat; @@ -784,6 +878,41 @@ begin DataTable.Fields[idx_ClientesDESCUENTO_LINEA].AsFloat := aValue; end; +procedure TBizCliente.SetDIST_CONDICIONESValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_CONDICIONES].AsString := aValue; +end; + +procedure TBizCliente.SetDIST_EMAILValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_EMAIL].AsString := aValue; +end; + +procedure TBizCliente.SetDIST_FORMA_PAGOValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_FORMA_PAGO].AsString := aValue; +end; + +procedure TBizCliente.SetDIST_LOPDValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_LOPD].AsString := aValue; +end; + +procedure TBizCliente.SetDIST_NOTASValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_NOTAS].AsString := aValue; +end; + +procedure TBizCliente.SetDIST_PASSWORDValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_PASSWORD].AsString := aValue; +end; + +procedure TBizCliente.SetDIST_VALIDEZValue(const aValue: String); +begin + DataTable.Fields[idx_ClientesDIST_VALIDEZ].AsString := aValue; +end; + procedure TBizCliente.SetDESCUENTO_CAPITULOValue(const aValue: Float); begin DataTable.Fields[idx_ClientesDESCUENTO_CAPITULO].AsFloat := aValue; diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm index bda3e0e..3f4a3bf 100644 --- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm +++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm @@ -1058,6 +1058,34 @@ object srvContactos: TsrvContactos item DatasetField = 'DESCUENTO_CAPITULO' TableField = 'DESCUENTO_CAPITULO' + end + item + DatasetField = 'DIST_EMAIL' + TableField = 'DIST_EMAIL' + end + item + DatasetField = 'DIST_PASSWORD' + TableField = 'DIST_PASSWORD' + end + item + DatasetField = 'DIST_VALIDEZ' + TableField = 'DIST_VALIDEZ' + end + item + DatasetField = 'DIST_FORMA_PAGO' + TableField = 'DIST_FORMA_PAGO' + end + item + DatasetField = 'DIST_NOTAS' + TableField = 'DIST_NOTAS' + end + item + DatasetField = 'DIST_LOPD' + TableField = 'DIST_LOPD' + end + item + DatasetField = 'DIST_CONDICIONES' + TableField = 'DIST_CONDICIONES' end> end> Name = 'Clientes' @@ -1354,6 +1382,37 @@ object srvContactos: TsrvContactos item Name = 'DESCUENTO_CAPITULO' DataType = datFloat + end + item + Name = 'DIST_EMAIL' + DataType = datString + Size = 255 + end + item + Name = 'DIST_PASSWORD' + DataType = datString + Size = 255 + end + item + Name = 'DIST_VALIDEZ' + DataType = datString + Size = 255 + end + item + Name = 'DIST_FORMA_PAGO' + DataType = datMemo + end + item + Name = 'DIST_NOTAS' + DataType = datMemo + end + item + Name = 'DIST_LOPD' + DataType = datMemo + end + item + Name = 'DIST_CONDICIONES' + DataType = datMemo end> end item @@ -3441,12 +3500,12 @@ object srvContactos: TsrvContactos 'INSERT'#10' INTO CONTACTOS'#10' (ID, NIF_CIF, NOMBRE, PERSONA_CONTAC' + 'TO, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL,'#10' PAIS, IDIOM' + 'A_ISO, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1,'#10' ' + - ' EMAIL_2, PAGINA_WEB, NOTAS, USUARIO, REFERENCIA, ID_TIENDA)'#10 + - ' VALUES'#10' (:ID, :NIF_CIF, :NOMBRE, :PERSONA_CONTACTO, :CALLE,' + - ' :POBLACION, :PROVINCIA,'#10' :CODIGO_POSTAL, :PAIS, :IDIOMA_ISO' + - ', :TELEFONO_1, :TELEFONO_2, :MOVIL_1,'#10' :MOVIL_2, :FAX, :EMAI' + - 'L_1, :EMAIL_2, :PAGINA_WEB, :NOTAS, '#10' :USUARIO, :REFERENCIA,' + - ' :ID_TIENDA)'#10 + ' EMAIL_2, PAGINA_WEB, NOTAS, USUARIO, REFERENCIA, ID_TIENDA, ' + + 'FECHA_ALTA)'#10' VALUES'#10' (:ID, :NIF_CIF, :NOMBRE, :PERSONA_CONTA' + + 'CTO, :CALLE, :POBLACION, :PROVINCIA,'#10' :CODIGO_POSTAL, :PAIS,' + + ' :IDIOMA_ISO, :TELEFONO_1, :TELEFONO_2, :MOVIL_1,'#10' :MOVIL_2,' + + ' :FAX, :EMAIL_1, :EMAIL_2, :PAGINA_WEB, :NOTAS, '#10' :USUARIO, ' + + ':REFERENCIA, :ID_TIENDA, CURRENT_TIMESTAMP)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -3619,7 +3678,8 @@ object srvContactos: TsrvContactos 'OVIL_2 = :MOVIL_2, '#10' FAX = :FAX, '#10' EMAIL_1 = :EMAIL_1, '#10' ' + ' EMAIL_2 = :EMAIL_2, '#10' PAGINA_WEB = :PAGINA_WEB, '#10' NOTAS ' + '= :NOTAS, '#10' USUARIO = :USUARIO,'#10' REFERENCIA = :REFERENCIA,' + - #10' ID_TIENDA = :ID_TIENDA'#10' WHERE'#10' (ID = :OLD_ID)'#10 + #10' ID_TIENDA = :ID_TIENDA,'#10' FECHA_MODIFICACION = CURRENT_TI' + + 'MESTAMP'#10' WHERE'#10' (ID = :OLD_ID)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -4067,6 +4127,44 @@ object srvContactos: TsrvContactos Name = 'DESCUENTO_CAPITULO' DataType = datFloat Value = '' + end + item + Name = 'DIST_EMAIL' + DataType = datString + Size = 255 + Value = '' + end + item + Name = 'DIST_PASSWORD' + DataType = datString + Size = 255 + Value = '' + end + item + Name = 'DIST_VALIDEZ' + DataType = datString + Size = 255 + Value = '' + end + item + Name = 'DIST_FORMA_PAGO' + DataType = datMemo + Value = '' + end + item + Name = 'DIST_NOTAS' + DataType = datMemo + Value = '' + end + item + Name = 'DIST_LOPD' + DataType = datMemo + Value = '' + end + item + Name = 'DIST_CONDICIONES' + DataType = datMemo + Value = '' end> Statements = < item @@ -4079,14 +4177,17 @@ object srvContactos: TsrvContactos 'ODIGO_ASIGNADO, IGNORAR_CONTABILIDAD, PROCEDENCIA_CLIENTE, TIENE' + '_SUBCUENTA,'#10' VENCIMIENTO_FACTURAS_1, VENCIMIENTO_FACTURAS_2,' + ' VENCIMIENTO_FACTURAS_3,'#10' DESCUENTO, DESCUENTO_LINEA, PRECIO' + - '_PUNTO, ID_AGENTE, DESCUENTO_CAPITULO)'#10' VALUES'#10' (:ID_CLIENTE' + - ', :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE_COMERCIAL, :BLO' + - 'QUEADO,'#10' :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_TIPO_IVA, :ID_FO' + - 'RMA_PAGO, :TIENDA_WEB,'#10' :CODIGO_ASIGNADO, :IGNORAR_CONTABILI' + - 'DAD, :PROCEDENCIA_CLIENTE, :TIENE_SUBCUENTA,'#10' :VENCIMIENTO_F' + - 'ACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10' ' + - ' :DESCUENTO, :DESCUENTO_LINEA, :PRECIO_PUNTO, :ID_AGENTE, :DESC' + - 'UENTO_CAPITULO)'#10 + '_PUNTO, ID_AGENTE, DESCUENTO_CAPITULO,'#10' DIST_EMAIL, DIST_PAS' + + 'SWORD, DIST_VALIDEZ, DIST_FORMA_PAGO, DIST_NOTAS, DIST_LOPD, DIS' + + 'T_CONDICIONES)'#10' VALUES'#10' (:ID_CLIENTE, :GRUPO_CLIENTE, :RECAR' + + 'GO_EQUIVALENCIA, :NOMBRE_COMERCIAL, :BLOQUEADO,'#10' :MOTIVO_BLO' + + 'QUEO, :REGIMEN_IVA, :ID_TIPO_IVA, :ID_FORMA_PAGO, :TIENDA_WEB,'#10' ' + + ' :CODIGO_ASIGNADO, :IGNORAR_CONTABILIDAD, :PROCEDENCIA_CLIENT' + + 'E, :TIENE_SUBCUENTA,'#10' :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_' + + 'FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10' :DESCUENTO, :DESCUENTO' + + '_LINEA, :PRECIO_PUNTO, :ID_AGENTE, :DESCUENTO_CAPITULO,'#10' :DI' + + 'ST_EMAIL, :DIST_PASSWORD, :DIST_VALIDEZ, :DIST_FORMA_PAGO, :DIST' + + '_NOTAS, :DIST_LOPD, :DIST_CONDICIONES)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -4230,6 +4331,44 @@ object srvContactos: TsrvContactos DataType = datFloat Value = '' end + item + Name = 'DIST_EMAIL' + DataType = datString + Size = 255 + Value = '' + end + item + Name = 'DIST_PASSWORD' + DataType = datString + Size = 255 + Value = '' + end + item + Name = 'DIST_VALIDEZ' + DataType = datString + Size = 255 + Value = '' + end + item + Name = 'DIST_FORMA_PAGO' + DataType = datMemo + Value = '' + end + item + Name = 'DIST_NOTAS' + DataType = datMemo + Value = '' + end + item + Name = 'DIST_LOPD' + DataType = datMemo + Value = '' + end + item + Name = 'DIST_CONDICIONES' + DataType = datMemo + Value = '' + end item Name = 'OLD_ID_CLIENTE' Value = '' @@ -4253,7 +4392,11 @@ object srvContactos: TsrvContactos 'IMIENTO_FACTURAS_3,'#10' DESCUENTO = :DESCUENTO,'#10' DESCUENTO_LI' + 'NEA = :DESCUENTO_LINEA,'#10' PRECIO_PUNTO = :PRECIO_PUNTO,'#10' ID' + '_AGENTE = :ID_AGENTE,'#10' DESCUENTO_CAPITULO = :DESCUENTO_CAPITU' + - 'LO'#10' WHERE'#10' (ID_CLIENTE = :OLD_ID_CLIENTE)'#10 + 'LO,'#10' DIST_EMAIL = :DIST_EMAIL,'#10' DIST_PASSWORD = :DIST_PASS' + + 'WORD,'#10' DIST_VALIDEZ = :DIST_VALIDEZ,'#10' DIST_FORMA_PAGO = :D' + + 'IST_FORMA_PAGO,'#10' DIST_NOTAS = :DIST_NOTAS,'#10' DIST_LOPD = :D' + + 'IST_LOPD,'#10' DIST_CONDICIONES = :DIST_CONDICIONES'#10' WHERE'#10' (' + + 'ID_CLIENTE = :OLD_ID_CLIENTE)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dpk b/Source/Modulos/Contactos/Views/Contactos_view.dpk index eef0379..1b4be88 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dpk +++ b/Source/Modulos/Contactos/Views/Contactos_view.dpk @@ -137,6 +137,7 @@ contains uEditorElegirComerciales in 'uEditorElegirComerciales.pas' {fEditorElegirComerciales: TCustomEditor}, uViewDatosYSeleccionInstalador in 'uViewDatosYSeleccionInstalador.pas' {frViewDatosYSeleccionInstalador: TFrame}, uEditorElegirInstaladores in 'uEditorElegirInstaladores.pas' {fEditorElegirInstaladores: TCustomEditor}, - uEditorAsignarDescuentoCapitulo in 'uEditorAsignarDescuentoCapitulo.pas' {fEditorAsignarDescuentoCapitulo: TCustomEditor}; + uEditorAsignarDescuentoCapitulo in 'uEditorAsignarDescuentoCapitulo.pas' {fEditorAsignarDescuentoCapitulo: TCustomEditor}, + uViewClienteDatosDistribuidor in 'uViewClienteDatosDistribuidor.pas' {frViewClienteDatosDistribuidor: TFrame}; end. diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj index 25fcd31..9583c6c 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dproj +++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj @@ -47,57 +47,64 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorAsignarComercial
@@ -218,6 +225,10 @@
frViewClienteDatosComerciales
TFrame + +
frViewClienteDatosDistribuidor
+ TFrame +
frViewClienteDescuentos
TFrame @@ -305,13 +316,6 @@
frViewVendedores
TCustomView - - - - - - -