Version 2.2.3:

- a partir de ahora se añade en los asientos de caja y banco la referencia de la factura de proveedor y su nombre, además de la referencia de la factura de proveedor en FactuGES
- se añade columna de procedencia en presupuestos, facturas de cliente.
- se añade la posibilidad de filtrar por dos campos a la vez en clientes, presupuestos y facturas

git-svn-id: https://192.168.0.254/svn/Proyectos.AlonsoYSal_FactuGES2/trunk@28 40301925-124e-1c4e-b97d-170ad7a8785b
This commit is contained in:
roberto 2022-03-31 09:03:49 +00:00
parent 6958e045e7
commit d2aa26662f
175 changed files with 961 additions and 229 deletions

Binary file not shown.

View File

@ -65,55 +65,55 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Formas de pago\adortl.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\designide.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\dsnap.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\dxCoreD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\Jcl.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\rtl.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\vcl.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\vcldb.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\vclx.dcp" />
<DCCReference Include="..\Modulos\Formas de pago\xmlrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxCoreD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>

View File

@ -52,7 +52,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">2</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">2</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.2.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES v2</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES v2</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<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">2</VersionInfo><VersionInfo Name="Release">3</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.2.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES v2</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES v2</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

Binary file not shown.

View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\Base.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\frx11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\frxe11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\fs11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
<DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form>
</DCCReference>

View File

@ -5,7 +5,7 @@ inherited fEditorDBBase: TfEditorDBBase
ClientHeight = 454
ClientWidth = 646
ExplicitWidth = 654
ExplicitHeight = 488
ExplicitHeight = 492
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader

View File

@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem
Width = 650
ExplicitWidth = 650
inherited tbxMain: TTBXToolbar
ExplicitWidth = 605
ExplicitWidth = 650
inherited TBXItem26: TTBXItem
Visible = False
end
@ -77,14 +77,14 @@ inherited fEditorDBItem: TfEditorDBItem
object pgPaginas: TPageControl [3]
AlignWithMargins = True
Left = 3
Top = 109
Top = 112
Width = 644
Height = 328
Height = 325
ActivePage = pagGeneral
Align = alClient
TabOrder = 2
ExplicitTop = 118
ExplicitHeight = 319
ExplicitTop = 109
ExplicitHeight = 328
object pagGeneral: TTabSheet
Caption = 'General'
ExplicitLeft = 0
@ -95,7 +95,7 @@ inherited fEditorDBItem: TfEditorDBItem
end
object PnlComentario: TPanel [4]
Left = 0
Top = 76
Top = 79
Width = 650
Height = 30
Align = alTop
@ -105,7 +105,7 @@ inherited fEditorDBItem: TfEditorDBItem
ParentBackground = False
TabOrder = 4
VerticalAlignment = taAlignTop
ExplicitTop = 85
ExplicitTop = 76
object lbComentario: TLabel
AlignWithMargins = True
Left = 6

View File

@ -6,7 +6,7 @@ inherited fEditorGridBase: TfEditorGridBase
ClientWidth = 543
OnDestroy = CustomEditorDestroy
ExplicitWidth = 551
ExplicitHeight = 478
ExplicitHeight = 482
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@ -22,15 +22,15 @@ inherited fEditorGridBase: TfEditorGridBase
inherited TBXDock: TTBXDock
Top = 27
Width = 543
Height = 75
Height = 79
ExplicitTop = 27
ExplicitWidth = 543
ExplicitHeight = 75
ExplicitHeight = 79
inherited tbxMain: TTBXToolbar
DockPos = 0
DragHandleStyle = dhDouble
TabOrder = 1
ExplicitWidth = 543
ExplicitWidth = 513
inherited TBXItem29: TTBXItem
Visible = False
end
@ -76,7 +76,7 @@ inherited fEditorGridBase: TfEditorGridBase
end
object tbxFiltro: TTBXToolbar [1]
Left = 0
Top = 49
Top = 52
Align = alRight
CloseButton = False
DefaultDock = TBXDock
@ -104,7 +104,7 @@ inherited fEditorGridBase: TfEditorGridBase
Caption = 'Filtrar:'
end
object tbxEditFiltro: TTBXEditItem
EditWidth = 200
EditWidth = 125
ImageIndex = 10
EditorFontSettings.Italic = tsTrue
ExtendedAccept = True
@ -112,6 +112,17 @@ inherited fEditorGridBase: TfEditorGridBase
ShowImage = True
OnChange = tbxEditFiltroChange
end
object tbxEditFiltro2: TTBXEditItem
EditWidth = 125
Enabled = False
ImageIndex = 10
Visible = False
EditorFontSettings.Italic = tsTrue
ExtendedAccept = True
Images = SmallImages
ShowImage = True
OnChange = tbxEditFiltro2Change
end
object TBXItem34: TTBXItem
Action = actQuitarFiltro
end
@ -168,8 +179,8 @@ inherited fEditorGridBase: TfEditorGridBase
end
end
object TBXTMain2: TTBXToolbar
Left = 337
Top = 49
Left = 334
Top = 52
Caption = 'tbxMain'
ChevronHint = 'M'#225's botones|'
DockMode = dmCannotFloatOrChangeDocks
@ -243,6 +254,8 @@ inherited fEditorGridBase: TfEditorGridBase
object actExportarExcel: TAction
Category = 'Archivo'
Caption = 'Exportar a fichero Excel...'
Enabled = False
Visible = False
OnExecute = actExportarExcelExecute
OnUpdate = actExportarExcelUpdate
end

View File

@ -67,7 +67,9 @@ type
lblAno: TTBXLabelItem;
cbxListaAnos: TTBXComboBoxItem;
sepAno: TTBXSeparatorItem;
tbxEditFiltro2: TTBXEditItem;
procedure tbxEditFiltroChange(Sender: TObject; const Text: String);
procedure tbxEditFiltro2Change(Sender: TObject; const Text: string);
procedure FormShow(Sender: TObject);
procedure actQuitarFiltroExecute(Sender: TObject);
procedure actDuplicarUpdate(Sender: TObject);
@ -81,6 +83,7 @@ type
procedure CustomEditorDestroy(Sender: TObject);
procedure actExportarExcelExecute(Sender: TObject);
procedure actExportarExcelUpdate(Sender: TObject);
protected
FListaAnos: TStringList;
FViewGrid : IViewGridBase;
@ -224,6 +227,18 @@ begin
end;
end;
procedure TfEditorGridBase.tbxEditFiltro2Change(Sender: TObject;
const Text: string);
begin
if Assigned(ViewGrid) then
begin
if Length(Text) > 0 then
ViewGrid.Filter2 := Text
else
actQuitarFiltro.Execute;
end;
end;
procedure TfEditorGridBase.tbxEditFiltroChange(Sender: TObject; const Text: String);
begin
if Assigned(ViewGrid) then
@ -281,6 +296,7 @@ begin
if ViewGrid.ViewFiltros.VerFiltros then
begin
tbxEditFiltro.Visible := False;
tbxEditFiltro2.Visible := False;
TBXItem7.Visible := False;
end
else
@ -288,6 +304,12 @@ begin
tbxEditFiltro.Text := '';
tbxEditFiltro.Visible := True;
TBXItem7.Visible := True;
if (tbxEditFiltro2.Enabled) then
begin
tbxEditFiltro2.Text := '';
tbxEditFiltro2.Visible := True;
end;
end;
end;
@ -326,6 +348,8 @@ begin
begin
tbxEditFiltro.Text := '';
ViewGrid.Filter := '';
tbxEditFiltro2.Text := '';
ViewGrid.Filter2 := '';
end;
end;

View File

@ -1,8 +1,8 @@
inherited frViewFiltroBase: TfrViewFiltroBase
Width = 565
Width = 533
Height = 163
Visible = False
ExplicitWidth = 565
ExplicitWidth = 533
ExplicitHeight = 163
object TBXDockablePanel1: TTBXDockablePanel
Left = 0
@ -19,16 +19,18 @@ inherited frViewFiltroBase: TfrViewFiltroBase
ShowCaptionWhenDocked = False
SupportedDocks = [dkStandardDock, dkMultiDock]
TabOrder = 0
ExplicitWidth = 565
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
Width = 565
Width = 533
Height = 133
Align = alClient
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 565
object txtFiltroTodo: TcxTextEdit
Left = 87
Top = 10
@ -49,7 +51,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 0
Width = 273
Width = 200
end
object edtFechaIniFiltro: TcxDateEdit
Left = 87
@ -72,7 +74,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 1
TabOrder = 2
Width = 200
end
object edtFechaFinFiltro: TcxDateEdit
@ -96,7 +98,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 2
TabOrder = 3
Width = 200
end
object edtFecha2FinFiltro: TcxDateEdit
@ -121,7 +123,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 4
TabOrder = 5
Width = 200
end
object edtFecha2IniFiltro: TcxDateEdit
@ -146,7 +148,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 3
TabOrder = 4
Width = 200
end
object edtFecha3IniFiltro: TcxDateEdit
@ -171,7 +173,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 5
TabOrder = 6
Width = 200
end
object edtFecha3FinFiltro: TcxDateEdit
@ -196,19 +198,60 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 6
TabOrder = 7
Width = 200
end
object txtFiltroTodo2: TcxTextEdit
Left = 315
Top = 10
Enabled = False
Properties.OnChange = OnCamposFiltroChange
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 1
Width = 200
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
Hidden = True
ShowBorder = False
object dxLayoutControl1Group3: TdxLayoutGroup
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item1: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Que contenga:'
Control = txtFiltroTodo
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item8: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'y'
Enabled = False
Visible = False
Control = txtFiltroTodo2
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Group1: TdxLayoutGroup
AutoAligns = [aaVertical]
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
@ -255,11 +298,13 @@ inherited frViewFiltroBase: TfrViewFiltroBase
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item6: TdxLayoutItem
AutoAligns = [aaVertical]
Caption = 'Entre fecha 3:'
Control = edtFecha3IniFiltro
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item7: TdxLayoutItem
AutoAligns = [aaVertical]
Caption = 'y '
Control = edtFecha3FinFiltro
ControlOptions.ShowBorder = False
@ -270,15 +315,16 @@ inherited frViewFiltroBase: TfrViewFiltroBase
object TBXAlignmentPanel1: TTBXAlignmentPanel
Left = 0
Top = 133
Width = 565
Width = 533
Height = 30
Margins.Left = 10
Align = alBottom
TabOrder = 1
ExplicitWidth = 565
object tbxBotones: TTBXToolbar
Left = 10
Top = 0
Width = 555
Width = 523
Height = 30
Align = alTop
AutoResize = False
@ -292,6 +338,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
ParentShowHint = False
ShowHint = True
TabOrder = 0
ExplicitWidth = 555
object TBXItem2: TTBXItem
Action = actQuitarFiltro
DisplayMode = nbdmImageAndText

View File

@ -24,6 +24,10 @@ type
function GetTexto: String;
procedure SetTexto(const Value: String);
property Texto: String read GetTexto write SetTexto;
function GetTexto2: String;
procedure SetTexto2(const Value: String);
property Texto2: String read GetTexto2 write SetTexto2;
end;
TfrViewFiltroBase = class(TfrViewBase, IViewFiltroBase)
@ -54,6 +58,9 @@ type
dxLayoutControl1Item7: TdxLayoutItem;
edtFecha3FinFiltro: TcxDateEdit;
dxLayoutControl1Group2: TdxLayoutGroup;
dxLayoutControl1Item8: TdxLayoutItem;
txtFiltroTodo2: TcxTextEdit;
dxLayoutControl1Group3: TdxLayoutGroup;
procedure OnCamposFiltroChange(Sender: TObject);
procedure actQuitarFiltroExecute(Sender: TObject);
@ -66,6 +73,8 @@ type
procedure SetVerFiltros(const Value: Boolean);
function GetTexto: String;
procedure SetTexto(const Value: String);
function GetTexto2: String;
procedure SetTexto2(const Value: String);
protected
procedure LimpiarCampos; virtual;
@ -77,6 +86,7 @@ type
property OnFiltrosChange: TNotifyEvent read GetFiltrosChange write SetFiltrosChange;
property VerFiltros: Boolean read GetVerFiltros write SetVerFiltros;
property Texto: String read GetTexto write SetTexto;
property Texto2: String read GetTexto2 write SetTexto2;
end;
implementation
@ -116,6 +126,7 @@ end;
procedure TfrViewFiltroBase.LimpiarCampos;
begin
txtFiltroTodo.Clear;
txtFiltroTodo2.Clear;
edtFechaIniFiltro.Clear;
edtFechaFinFiltro.Clear;
edtFecha2IniFiltro.Clear;
@ -179,9 +190,19 @@ begin
Result := txtFiltroTodo.Text;
end;
function TfrViewFiltroBase.GetTexto2: String;
begin
Result := txtFiltroTodo2.Text;
end;
procedure TfrViewFiltroBase.SetTexto(const Value: String);
begin
txtFiltroTodo.Text := Value;
end;
procedure TfrViewFiltroBase.SetTexto2(const Value: String);
begin
txtFiltroTodo2.Text := Value;
end;
end.

View File

@ -5,13 +5,15 @@ inherited frViewGrid: TfrViewGrid
ExplicitHeight = 594
object cxGrid: TcxGrid [0]
Left = 0
Top = 102
Top = 105
Width = 554
Height = 466
Height = 463
Align = alClient
TabOrder = 0
LookAndFeel.Kind = lfOffice11
LookAndFeel.NativeStyle = True
ExplicitTop = 120
ExplicitHeight = 448
object cxGridView: TcxGridDBTableView
OnDblClick = cxGridViewDblClick
NavigatorButtons.ConfirmDelete = False
@ -61,7 +63,7 @@ inherited frViewGrid: TfrViewGrid
Left = 0
Top = 0
Width = 554
Height = 102
Height = 105
Align = alTop
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -73,58 +75,108 @@ inherited frViewGrid: TfrViewGrid
Visible = False
ReadOnly = False
ExplicitWidth = 554
ExplicitHeight = 102
ExplicitHeight = 105
inherited TBXDockablePanel1: TTBXDockablePanel
ExplicitWidth = 554
ExplicitHeight = 102
ExplicitHeight = 120
inherited dxLayoutControl1: TdxLayoutControl
Width = 554
Height = 72
Height = 75
ExplicitWidth = 554
ExplicitHeight = 72
ExplicitHeight = 90
inherited txtFiltroTodo: TcxTextEdit
Top = -10
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 457
Width = 457
ExplicitTop = -10
ExplicitWidth = 273
Width = 273
end
inherited edtFechaIniFiltro: TcxDateEdit
Top = 17
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 240
Width = 240
ExplicitTop = 17
ExplicitWidth = 200
Width = 200
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 344
Left = 317
Top = 17
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 344
ExplicitLeft = 317
ExplicitTop = 17
ExplicitWidth = 200
Width = 200
end
inherited edtFecha2FinFiltro: TcxDateEdit
Left = 317
Top = 44
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 317
ExplicitTop = 44
ExplicitWidth = 200
Width = 200
end
inherited edtFecha2IniFiltro: TcxDateEdit
Top = 44
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 44
ExplicitWidth = 200
Width = 200
end
inherited edtFecha3IniFiltro: TcxDateEdit
Top = 71
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 71
ExplicitWidth = 200
Width = 200
end
inherited edtFecha3FinFiltro: TcxDateEdit
Left = 318
Top = 71
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 318
ExplicitTop = 71
ExplicitWidth = 200
Width = 200
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 308
Top = -10
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 308
ExplicitTop = -10
ExplicitWidth = 275
Width = 275
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Top = 72
Top = 75
Width = 554
ExplicitTop = 72
ExplicitTop = 90
ExplicitWidth = 554
inherited tbxBotones: TTBXToolbar
Width = 544
@ -192,7 +244,7 @@ inherited frViewGrid: TfrViewGrid
PrinterPage.ScaleMode = smFit
PrinterPage._dxMeasurementUnits_ = 0
PrinterPage._dxLastMU_ = 2
ReportDocument.CreationDate = 43888.650270717590000000
ReportDocument.CreationDate = 44650.486065104170000000
StyleManager = dmBase.dxPrintStyleManager1
OptionsCards.Shadow.Depth = 0
OptionsExpanding.ExpandGroupRows = True

View File

@ -65,6 +65,10 @@ type
function GetFilter: string;
property Filter: string read GetFilter write SetFilter;
procedure SetFilter2(const Value: string);
function GetFilter2: string;
property Filter2: string read GetFilter2 write SetFilter2;
function GetFiltered: Boolean;
property Filtered : Boolean read GetFiltered;
@ -87,6 +91,7 @@ type
private
FViewFiltros: IViewFiltroBase;
FFilter: string;
FFilter2: string;
FOnFilterChanged : TNotifyEvent;
FGridStatus : TcxGridStatus;
procedure BestFitAllColumns;
@ -105,13 +110,16 @@ type
function getNumSeleccionados: Integer;
procedure SetFilter(const Value: string); virtual;
procedure SetFilter2(const Value: string); virtual;
procedure RefrescarFiltro;
function GetFilter: string; virtual;
function GetFilter2: string; virtual;
function GetFiltered: Boolean; virtual;
procedure FiltrarGrid(TextoFiltro : String); virtual;
function GetViewFiltros: IViewFiltroBase;
procedure SetViewFiltros(const Value: IViewFiltroBase); virtual;
procedure FilterChanged(Sender : TObject); virtual;
procedure FiltrarGrid(TextoFiltro : String); overload; virtual;
procedure FiltrarGrid(TextoFiltro1, TextoFiltro2: String); overload; virtual;
public
constructor Create(AOwner: TComponent); override;
@ -148,6 +156,7 @@ type
const APartialCompare: Boolean = False) : Boolean;}
property Filter: string read GetFilter write SetFilter;
property Filter2: string read GetFilter2 write SetFilter2;
property Filtered : Boolean read GetFiltered;
procedure AnadirOtrosFiltros; virtual;
@ -225,6 +234,7 @@ constructor TfrViewGridBase.Create(AOwner: TComponent);
begin
inherited;
FFilter := '';
FFilter2 := '';
FOnFilterChanged := FilterChanged;
FPopupMenu := nil;
FOnDblClick := nil;
@ -261,6 +271,11 @@ begin
Result := FFilter;
end;
function TfrViewGridBase.GetFilter2: string;
begin
Result := FFilter2;
end;
function TfrViewGridBase.GetFiltered: Boolean;
begin
//Los niveles de los grid no se consideran filtros
@ -333,7 +348,10 @@ procedure TfrViewGridBase.RefrescarFiltro;
begin
//De esta forma obligaremos a que se creen nuevamente todos los filtros, cuando llamemos a este metodo
if Assigned(ViewFiltros) then
begin
Filter := ViewFiltros.Texto;
Filter2 := ViewFiltros.Texto2;
end;
end;
procedure TfrViewGridBase.RestoreFromIniFile;
@ -391,7 +409,24 @@ begin
if Assigned(ViewFiltros) then
ViewFiltros.Texto := FFilter;
FiltrarGrid(FFilter);
FiltrarGrid(FFilter, FFilter2);
//Obliga a generar todos los filtros de las vista hija
AnadirOtrosFiltros;
if Assigned(FOnFilterChanged) then
FOnFilterChanged(Self);
end;
procedure TfrViewGridBase.SetFilter2(const Value: string);
begin
FFilter2 := Value;
//Así tendremos el mismo valor en el filtro simple que en el filtro en detalle
if Assigned(ViewFiltros) then
ViewFiltros.Texto2 := FFilter2;
FiltrarGrid(FFilter, FFilter2);
//Obliga a generar todos los filtros de las vista hija
AnadirOtrosFiltros;
@ -502,6 +537,52 @@ begin
//
end;
procedure TfrViewGridBase.FiltrarGrid(TextoFiltro1, TextoFiltro2: String);
var
Columna: TcxGridDBColumn;
i: Integer;
AItemList: TcxFilterCriteriaItemList;
begin
with _FocusedView.DataController.Filter do
begin
BeginUpdate;
try
Options := [fcoCaseInsensitive, fcoSoftCompare];
Root.Clear;
if Length(TextoFiltro1) > 0 then
begin
AItemList := Root.AddItemList(fboAnd);
AItemList.BoolOperatorKind := fboOr;
for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do
begin
Columna := (_FocusedView as TcxGridDBTableView).Columns[i];
if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then
AItemList.AddItem(Columna, foLike, '%'+TextoFiltro1+'%', IntToStr(i));
end;
end;
if Length(TextoFiltro2) > 0 then
begin
AItemList := Root.AddItemList(fboAnd);
AItemList.BoolOperatorKind := fboOr;
for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do
begin
Columna := (_FocusedView as TcxGridDBTableView).Columns[i];
if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then
AItemList.AddItem(Columna, foLike, '%'+TextoFiltro2+'%', IntToStr(i));
end;
end;
if ((Length(TextoFiltro1) > 0) or (Length(TextoFiltro2) > 0)) then
Active := True
else
Active := False;
finally
EndUpdate;
end;
end;
end;
destructor TfrViewGridBase.Destroy;
begin
FOnFilterChanged := Nil;

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -52,16 +52,23 @@ inherited fEditorClientes: TfEditorClientes
Width = 786
ExplicitWidth = 786
inherited tbxMain: TTBXToolbar
ExplicitWidth = 775
ExplicitWidth = 632
end
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 319
inherited tbxEditFiltro2: TTBXEditItem
Enabled = True
Visible = True
end
end
inherited tbxMenu: TTBXToolbar
ExplicitWidth = 786
end
inherited TBXTMain2: TTBXToolbar
Left = 275
Left = 319
DockPos = 275
Visible = True
ExplicitLeft = 275
ExplicitLeft = 319
ExplicitWidth = 67
object TBXItem38: TTBXItem
Action = actLOPD
@ -94,10 +101,16 @@ inherited fEditorClientes: TfEditorClientes
ExplicitHeight = 398
inherited cxGrid: TcxGrid
Width = 786
Height = 270
Height = 267
ExplicitWidth = 786
ExplicitHeight = 270
ExplicitHeight = 267
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
Format = '0 clientes'
Kind = skCount
Column = frViewClientes1.cxGridViewNOMBRE
end>
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
@ -146,6 +159,28 @@ inherited fEditorClientes: TfEditorClientes
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha3IniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha3FinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 511
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 511
ExplicitWidth = 275
Width = 275
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 786

View File

@ -5,9 +5,10 @@ inherited frViewClientes: TfrViewClientes
ExplicitHeight = 504
inherited cxGrid: TcxGrid
Width = 633
Height = 376
Height = 373
ExplicitTop = 105
ExplicitWidth = 633
ExplicitHeight = 376
ExplicitHeight = 373
inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = <
item
@ -86,6 +87,10 @@ inherited frViewClientes: TfrViewClientes
VisibleForCustomization = False
Width = 90
end
object cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn
Caption = 'Procedencia'
DataBinding.FieldName = 'PROCEDENCIA_CLIENTE'
end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
@ -134,9 +139,41 @@ inherited frViewClientes: TfrViewClientes
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha3IniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha3FinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 555
Enabled = True
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 555
ExplicitWidth = 275
Width = 275
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup
inherited dxLayoutControl1Item8: TdxLayoutItem
Enabled = True
Visible = True
end
end
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 633
ExplicitTop = 75
ExplicitWidth = 633
inherited tbxBotones: TTBXToolbar
Width = 623

View File

@ -28,6 +28,7 @@ type
cxGridViewPERSONA_CONTACTO: TcxGridDBColumn;
cxGridViewFECHA_ALTA: TcxGridDBColumn;
cxGridViewLISTA_NOMBRES: TcxGridDBColumn;
cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn;
procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView;
ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
var ADone: Boolean);

View File

@ -368,6 +368,11 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente
Name = 'CAMPO_LIBRE'
DataType = datString
Size = 255
end
item
Name = 'PROCEDENCIA_CLIENTE'
DataType = datString
Size = 255
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]

View File

@ -9,13 +9,13 @@ 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_Valores = '{0549BE41-8DC9-4C9D-812F-6D146575E4B4}';
RID_Propiedades = '{A65EEF12-2395-4143-9DA6-F23FFF505ADF}';
RID_ListaAnosContratos = '{D47DCD2C-5EED-4423-A22A-1CC3F1347D27}';
RID_ContratosClienteBeneficios = '{6B12BAFF-EBC0-4A87-A7EA-CEF5B669B735}';
RID_ContratosCliente = '{0BA8D712-E5F9-4808-B8C1-251F0007E42F}';
RID_TiposCapitulos = '{AE2C99EF-A3DF-41B8-A583-3D4D2146EFDF}';
RID_ContratosCliente_Detalles = '{A3A68389-EC21-4034-9751-29C596223D59}';
RID_Valores = '{AEE43CFA-1BB9-4CAC-8556-BFFC8FCEC733}';
RID_Propiedades = '{B0855CF2-8ED5-4024-AEF7-D177FF322892}';
RID_ListaAnosContratos = '{7E058AD2-196F-4A8A-AC1D-8DE9CBA5C393}';
RID_ContratosClienteBeneficios = '{0EFEC438-3D7F-4359-BCCA-04AB52950321}';
RID_ContratosCliente = '{00CCC87B-31E8-4640-BD5A-80EA152531B1}';
RID_TiposCapitulos = '{FDAC7B98-87A1-41D6-A1C8-1FF22B060EBD}';
RID_ContratosCliente_Detalles = '{68294EF3-4491-4A62-BCB2-E2FCE40EC48F}';
{ Data table names }
nme_Valores = 'Valores';
@ -141,6 +141,7 @@ const
fld_ContratosClienteFACTURA_ASOCIADA = 'FACTURA_ASOCIADA';
fld_ContratosClienteFECHA_PREVISTA_MONTAJE = 'FECHA_PREVISTA_MONTAJE';
fld_ContratosClienteCAMPO_LIBRE = 'CAMPO_LIBRE';
fld_ContratosClientePROCEDENCIA_CLIENTE = 'PROCEDENCIA_CLIENTE';
{ ContratosCliente field indexes }
idx_ContratosClienteID = 0;
@ -197,6 +198,7 @@ const
idx_ContratosClienteFACTURA_ASOCIADA = 51;
idx_ContratosClienteFECHA_PREVISTA_MONTAJE = 52;
idx_ContratosClienteCAMPO_LIBRE = 53;
idx_ContratosClientePROCEDENCIA_CLIENTE = 54;
{ TiposCapitulos fields }
fld_TiposCapitulosID = 'ID';
@ -255,7 +257,7 @@ const
type
{ IValores }
IValores = interface(IDAStronglyTypedDataTable)
['{456DE31B-603C-49A6-B24F-F8F67E7BA1D9}']
['{B7DEBA9E-BCE7-44A0-A0D2-208F8F26EC42}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -314,7 +316,7 @@ type
{ IPropiedades }
IPropiedades = interface(IDAStronglyTypedDataTable)
['{B20DDA26-6EF1-49DF-8C3F-3C113EC3A75A}']
['{6063DDB1-1BC1-4242-A704-513F0F3137A7}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -373,7 +375,7 @@ type
{ IListaAnosContratos }
IListaAnosContratos = interface(IDAStronglyTypedDataTable)
['{EDC46A9F-5445-43F2-8B16-2C80FA55312C}']
['{7AE79F64-046B-478B-A184-60A42E6CEC14}']
{ Property getters and setters }
function GetANOValue: String;
procedure SetANOValue(const aValue: String);
@ -408,7 +410,7 @@ type
{ IContratosClienteBeneficios }
IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
['{6D340200-67CA-469A-924A-B2AD661BF858}']
['{CA71E23E-0E59-4812-BD81-DD1B8C7F72F9}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -611,7 +613,7 @@ type
{ IContratosCliente }
IContratosCliente = interface(IDAStronglyTypedDataTable)
['{FE98EB74-D1A6-4425-8087-F9D05815E895}']
['{57FF1442-BB37-430E-B945-F2BD12A522F4}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -823,6 +825,10 @@ type
procedure SetCAMPO_LIBREValue(const aValue: String);
function GetCAMPO_LIBREIsNull: Boolean;
procedure SetCAMPO_LIBREIsNull(const aValue: Boolean);
function GetPROCEDENCIA_CLIENTEValue: String;
procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String);
function GetPROCEDENCIA_CLIENTEIsNull: Boolean;
procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean);
{ Properties }
@ -934,6 +940,8 @@ type
property FECHA_PREVISTA_MONTAJEIsNull: Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull;
property CAMPO_LIBRE: String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue;
property CAMPO_LIBREIsNull: Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull;
property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue;
property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull;
end;
{ TContratosClienteDataTableRules }
@ -1163,6 +1171,10 @@ type
procedure SetCAMPO_LIBREValue(const aValue: String); virtual;
function GetCAMPO_LIBREIsNull: Boolean; virtual;
procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); virtual;
function GetPROCEDENCIA_CLIENTEValue: String; virtual;
procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual;
function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual;
procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
@ -1273,6 +1285,8 @@ type
property FECHA_PREVISTA_MONTAJEIsNull: Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull;
property CAMPO_LIBRE: String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue;
property CAMPO_LIBREIsNull: Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull;
property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue;
property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull;
public
constructor Create(aDataTable: TDADataTable); override;
@ -1285,7 +1299,7 @@ type
}
{ ITiposCapitulos }
ITiposCapitulos = interface(IDAStronglyTypedDataTable)
['{5302F198-C996-421D-9897-7155FFFF5C6C}']
['{A289CB54-D71E-428B-9B81-18A5A7D546DE}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1380,7 +1394,7 @@ type
{ IContratosCliente_Detalles }
IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{45BBDB1C-0E57-4631-A81F-17286C3F0225}']
['{DABADFCD-EEA9-4ACB-919D-9F2239F1912B}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -3296,6 +3310,27 @@ begin
DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].AsVariant := Null;
end;
function TContratosClienteDataTableRules.GetPROCEDENCIA_CLIENTEValue: String;
begin
result := DataTable.Fields[idx_ContratosClientePROCEDENCIA_CLIENTE].AsString;
end;
procedure TContratosClienteDataTableRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String);
begin
DataTable.Fields[idx_ContratosClientePROCEDENCIA_CLIENTE].AsString := aValue;
end;
function TContratosClienteDataTableRules.GetPROCEDENCIA_CLIENTEIsNull: boolean;
begin
result := DataTable.Fields[idx_ContratosClientePROCEDENCIA_CLIENTE].IsNull;
end;
procedure TContratosClienteDataTableRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_ContratosClientePROCEDENCIA_CLIENTE].AsVariant := Null;
end;
{ TTiposCapitulosDataTableRules }
constructor TTiposCapitulosDataTableRules.Create(aDataTable: TDADataTable);

View File

@ -9,18 +9,18 @@ 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_ValoresDelta = '{406066CE-3BB3-42F3-B7FC-493C9BA814E8}';
RID_PropiedadesDelta = '{F16E429C-3CD8-4458-8312-208C5A37AFD6}';
RID_ListaAnosContratosDelta = '{524A7663-3184-41AC-98BC-61A438830141}';
RID_ContratosClienteBeneficiosDelta = '{30858076-5CCE-49DC-8A00-C7B87CE73B2A}';
RID_ContratosClienteDelta = '{1F8826C9-2B51-4454-B6D7-CF7879E483EF}';
RID_TiposCapitulosDelta = '{962F7FF0-8B19-4D5F-9F87-108CA74B52C9}';
RID_ContratosCliente_DetallesDelta = '{E8242C5E-E9FE-492B-A51C-A9387B2E4765}';
RID_ValoresDelta = '{7C597F28-9CAB-4563-AB03-5109CCD1E4FD}';
RID_PropiedadesDelta = '{AEAD2B1C-5693-4333-B72F-D7FCB996C77C}';
RID_ListaAnosContratosDelta = '{5420790C-645C-4AAD-84FB-8194E39EC4DC}';
RID_ContratosClienteBeneficiosDelta = '{C92FEDD1-D568-4200-A088-37BAFD5C3BBE}';
RID_ContratosClienteDelta = '{026E716F-C412-4A7B-BA3A-1D689117FC73}';
RID_TiposCapitulosDelta = '{3515E5DD-2CF2-4ED9-A717-1FE908B2D252}';
RID_ContratosCliente_DetallesDelta = '{04D0B422-F0D9-4FF9-8BFA-67148A8EA383}';
type
{ IValoresDelta }
IValoresDelta = interface(IValores)
['{406066CE-3BB3-42F3-B7FC-493C9BA814E8}']
['{7C597F28-9CAB-4563-AB03-5109CCD1E4FD}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_PROPIEDADValue : Integer;
@ -78,7 +78,7 @@ type
{ IPropiedadesDelta }
IPropiedadesDelta = interface(IPropiedades)
['{F16E429C-3CD8-4458-8312-208C5A37AFD6}']
['{AEAD2B1C-5693-4333-B72F-D7FCB996C77C}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -136,7 +136,7 @@ type
{ IListaAnosContratosDelta }
IListaAnosContratosDelta = interface(IListaAnosContratos)
['{524A7663-3184-41AC-98BC-61A438830141}']
['{5420790C-645C-4AAD-84FB-8194E39EC4DC}']
{ Property getters and setters }
function GetOldANOValue : String;
@ -170,7 +170,7 @@ type
{ IContratosClienteBeneficiosDelta }
IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
['{30858076-5CCE-49DC-8A00-C7B87CE73B2A}']
['{C92FEDD1-D568-4200-A088-37BAFD5C3BBE}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldREFERENCIAValue : String;
@ -372,7 +372,7 @@ type
{ IContratosClienteDelta }
IContratosClienteDelta = interface(IContratosCliente)
['{1F8826C9-2B51-4454-B6D7-CF7879E483EF}']
['{026E716F-C412-4A7B-BA3A-1D689117FC73}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -428,6 +428,7 @@ type
function GetOldFACTURA_ASOCIADAValue : String;
function GetOldFECHA_PREVISTA_MONTAJEValue : DateTime;
function GetOldCAMPO_LIBREValue : String;
function GetOldPROCEDENCIA_CLIENTEValue : String;
{ Properties }
property OldID : Integer read GetOldIDValue;
@ -484,6 +485,7 @@ type
property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue;
property OldFECHA_PREVISTA_MONTAJE : DateTime read GetOldFECHA_PREVISTA_MONTAJEValue;
property OldCAMPO_LIBRE : String read GetOldCAMPO_LIBREValue;
property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue;
end;
{ TContratosClienteBusinessProcessorRules }
@ -821,6 +823,12 @@ type
function GetOldCAMPO_LIBREIsNull: Boolean; virtual;
procedure SetCAMPO_LIBREValue(const aValue: String); virtual;
procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); virtual;
function GetPROCEDENCIA_CLIENTEValue: String; virtual;
function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual;
function GetOldPROCEDENCIA_CLIENTEValue: String; virtual;
function GetOldPROCEDENCIA_CLIENTEIsNull: Boolean; virtual;
procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual;
procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID : Integer read GetIDValue write SetIDValue;
@ -1039,6 +1047,10 @@ type
property CAMPO_LIBREIsNull : Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull;
property OldCAMPO_LIBRE : String read GetOldCAMPO_LIBREValue;
property OldCAMPO_LIBREIsNull : Boolean read GetOldCAMPO_LIBREIsNull;
property PROCEDENCIA_CLIENTE : String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue;
property PROCEDENCIA_CLIENTEIsNull : Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull;
property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue;
property OldPROCEDENCIA_CLIENTEIsNull : Boolean read GetOldPROCEDENCIA_CLIENTEIsNull;
public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -1048,7 +1060,7 @@ type
{ ITiposCapitulosDelta }
ITiposCapitulosDelta = interface(ITiposCapitulos)
['{962F7FF0-8B19-4D5F-9F87-108CA74B52C9}']
['{3515E5DD-2CF2-4ED9-A717-1FE908B2D252}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldPOSICIONValue : Integer;
@ -1142,7 +1154,7 @@ type
{ IContratosCliente_DetallesDelta }
IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
['{E8242C5E-E9FE-492B-A51C-A9387B2E4765}']
['{04D0B422-F0D9-4FF9-8BFA-67148A8EA383}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTRATOValue : Integer;
@ -3824,6 +3836,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE] := Null;
end;
function TContratosClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE];
end;
function TContratosClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE]);
end;
function TContratosClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE];
end;
function TContratosClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE]);
end;
procedure TContratosClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE] := aValue;
end;
procedure TContratosClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE] := Null;
end;
{ TTiposCapitulosBusinessProcessorRules }
constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

View File

@ -498,6 +498,10 @@ object srvContratosCliente: TsrvContratosCliente
item
DatasetField = 'LOPD'
TableField = 'LOPD'
end
item
DatasetField = 'PROCEDENCIA_CLIENTE'
TableField = 'PROCEDENCIA_CLIENTE'
end>
end>
Name = 'ContratosCliente'
@ -794,6 +798,11 @@ object srvContratosCliente: TsrvContratosCliente
Name = 'CAMPO_LIBRE'
DataType = datString
Size = 255
end
item
Name = 'PROCEDENCIA_CLIENTE'
DataType = datString
Size = 255
end>
end
item

View File

@ -126,7 +126,7 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
Width = 1119
ExplicitWidth = 1119
inherited tbxMain: TTBXToolbar
ExplicitWidth = 894
ExplicitWidth = 751
object TBXSubmenuItem3: TTBXSubmenuItem [0]
Caption = 'Nuevo'
DisplayMode = nbdmImageAndText
@ -157,7 +157,7 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
end
end
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 431
ExplicitWidth = 481
inherited lblAno: TTBXLabelItem
Visible = True
end
@ -167,6 +167,10 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
inherited sepAno: TTBXSeparatorItem
Visible = True
end
inherited tbxEditFiltro2: TTBXEditItem
Enabled = True
Visible = True
end
end
inherited tbxMenu: TTBXToolbar
ExplicitWidth = 1119
@ -190,10 +194,10 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
end
end
inherited TBXTMain2: TTBXToolbar
Left = 431
Left = 481
DockPos = 343
Visible = True
ExplicitLeft = 431
ExplicitLeft = 481
ExplicitWidth = 430
object TBXItem50: TTBXItem
Action = actLOPD

View File

@ -123,6 +123,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente
Visible = False
VisibleForCustomization = False
end
object cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn
Caption = 'Procedencia'
DataBinding.FieldName = 'PROCEDENCIA_CLIENTE'
end
object cxGridViewNIF_CIF: TcxGridDBColumn
Caption = 'NIF/CIF'
DataBinding.FieldName = 'NIF_CIF'
@ -211,6 +215,8 @@ inherited frViewContratosCliente: TfrViewContratosCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 146
ExplicitWidth = 273
Width = 273
end
inherited edtFechaIniFiltro: TcxDateEdit
Left = 146
@ -219,8 +225,6 @@ inherited frViewContratosCliente: TfrViewContratosCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 146
ExplicitWidth = 200
Width = 200
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 366
@ -266,7 +270,24 @@ inherited frViewContratosCliente: TfrViewContratosCliente
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 366
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 543
Enabled = True
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 543
ExplicitWidth = 275
Width = 275
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup
inherited dxLayoutControl1Item8: TdxLayoutItem
Enabled = True
Visible = True
end
end
inherited dxLayoutControl1Group2: TdxLayoutGroup
Visible = True
inherited dxLayoutControl1Item5: TdxLayoutItem

View File

@ -62,6 +62,7 @@ type
TBXSeparatorItem1: TTBXSeparatorItem;
TBXSeparatorItem3: TTBXSeparatorItem;
TBXSeparatorItem4: TTBXSeparatorItem;
cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
TcxGridLevel);
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;

View File

@ -334,6 +334,11 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
Size = 255
DisplayLabel = 'Otros nombres'
DictionaryEntry = 'FacturasCliente_LISTA_NOMBRES'
end
item
Name = 'PROCEDENCIA_CLIENTE'
DataType = datString
Size = 255
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]

View File

@ -9,9 +9,9 @@ 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_ListaAnosFacturas = '{5C79DBFB-3749-4E03-8CDE-DE9D4C57D4A9}';
RID_FacturasCliente = '{CED0F94B-8407-4B71-A940-CD9F5546C129}';
RID_FacturasCliente_Detalles = '{09F93CCC-0AC0-4637-9AD7-11A92F660FCB}';
RID_ListaAnosFacturas = '{484D7187-CB40-476A-9513-05D56701D4B9}';
RID_FacturasCliente = '{6D39955F-2046-48A8-A1A0-D1B462E5236E}';
RID_FacturasCliente_Detalles = '{35F0CA37-6ADD-4C61-9D67-0466331C6F62}';
{ Data table names }
nme_ListaAnosFacturas = 'ListaAnosFacturas';
@ -78,6 +78,7 @@ const
fld_FacturasClienteSIN_COMISION = 'SIN_COMISION';
fld_FacturasClienteTIPO_FACTURA = 'TIPO_FACTURA';
fld_FacturasClienteLISTA_NOMBRES = 'LISTA_NOMBRES';
fld_FacturasClientePROCEDENCIA_CLIENTE = 'PROCEDENCIA_CLIENTE';
{ FacturasCliente field indexes }
idx_FacturasClienteID = 0;
@ -133,6 +134,7 @@ const
idx_FacturasClienteSIN_COMISION = 50;
idx_FacturasClienteTIPO_FACTURA = 51;
idx_FacturasClienteLISTA_NOMBRES = 52;
idx_FacturasClientePROCEDENCIA_CLIENTE = 53;
{ FacturasCliente_Detalles fields }
fld_FacturasCliente_DetallesID = 'ID';
@ -169,7 +171,7 @@ const
type
{ IListaAnosFacturas }
IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
['{7BB039B7-6272-44A4-9D97-8C440C2E331D}']
['{538ADACC-485C-464B-84AD-84ADBF7D37E2}']
{ Property getters and setters }
function GetANOValue: String;
procedure SetANOValue(const aValue: String);
@ -204,7 +206,7 @@ type
{ IFacturasCliente }
IFacturasCliente = interface(IDAStronglyTypedDataTable)
['{D08B97D1-FCA0-4F86-85DD-1A1355E36197}']
['{45CA2939-6E07-4742-82AE-4698DB6B3A14}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -417,6 +419,10 @@ type
procedure SetLISTA_NOMBRESValue(const aValue: String);
function GetLISTA_NOMBRESIsNull: Boolean;
procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean);
function GetPROCEDENCIA_CLIENTEValue: String;
procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String);
function GetPROCEDENCIA_CLIENTEIsNull: Boolean;
procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean);
{ Properties }
@ -526,6 +532,8 @@ type
property TIPO_FACTURAIsNull: Boolean read GetTIPO_FACTURAIsNull write SetTIPO_FACTURAIsNull;
property LISTA_NOMBRES: String read GetLISTA_NOMBRESValue write SetLISTA_NOMBRESValue;
property LISTA_NOMBRESIsNull: Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull;
property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue;
property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull;
end;
{ TFacturasClienteDataTableRules }
@ -746,6 +754,10 @@ type
procedure SetLISTA_NOMBRESValue(const aValue: String); virtual;
function GetLISTA_NOMBRESIsNull: Boolean; virtual;
procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); virtual;
function GetPROCEDENCIA_CLIENTEValue: String; virtual;
procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual;
function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual;
procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
@ -854,6 +866,8 @@ type
property TIPO_FACTURAIsNull: Boolean read GetTIPO_FACTURAIsNull write SetTIPO_FACTURAIsNull;
property LISTA_NOMBRES: String read GetLISTA_NOMBRESValue write SetLISTA_NOMBRESValue;
property LISTA_NOMBRESIsNull: Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull;
property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue;
property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull;
public
constructor Create(aDataTable: TDADataTable); override;
@ -863,7 +877,7 @@ type
{ IFacturasCliente_Detalles }
IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{87689EEB-6BF8-4ED2-9742-3AF5F4DDBE64}']
['{75F87DDE-E13B-42B1-8550-89F45849D374}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -2220,6 +2234,27 @@ begin
DataTable.Fields[idx_FacturasClienteLISTA_NOMBRES].AsVariant := Null;
end;
function TFacturasClienteDataTableRules.GetPROCEDENCIA_CLIENTEValue: String;
begin
result := DataTable.Fields[idx_FacturasClientePROCEDENCIA_CLIENTE].AsString;
end;
procedure TFacturasClienteDataTableRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String);
begin
DataTable.Fields[idx_FacturasClientePROCEDENCIA_CLIENTE].AsString := aValue;
end;
function TFacturasClienteDataTableRules.GetPROCEDENCIA_CLIENTEIsNull: boolean;
begin
result := DataTable.Fields[idx_FacturasClientePROCEDENCIA_CLIENTE].IsNull;
end;
procedure TFacturasClienteDataTableRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_FacturasClientePROCEDENCIA_CLIENTE].AsVariant := Null;
end;
{ TFacturasCliente_DetallesDataTableRules }
constructor TFacturasCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable);

View File

@ -9,14 +9,14 @@ 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_ListaAnosFacturasDelta = '{9438FFD8-FD2B-4464-9595-56BBA42ACD21}';
RID_FacturasClienteDelta = '{09E35A03-382A-4D70-8058-B54DCCE256A8}';
RID_FacturasCliente_DetallesDelta = '{EC1C8D93-0843-41B9-9D1C-034145DA9FB5}';
RID_ListaAnosFacturasDelta = '{C9831765-1629-4325-A1FF-1FAE87FC82C2}';
RID_FacturasClienteDelta = '{7FBCB9F2-5A0C-4C4C-9503-27624E85B1F2}';
RID_FacturasCliente_DetallesDelta = '{E532A60C-1259-4F35-B997-18F37616D9FD}';
type
{ IListaAnosFacturasDelta }
IListaAnosFacturasDelta = interface(IListaAnosFacturas)
['{9438FFD8-FD2B-4464-9595-56BBA42ACD21}']
['{C9831765-1629-4325-A1FF-1FAE87FC82C2}']
{ Property getters and setters }
function GetOldANOValue : String;
@ -50,7 +50,7 @@ type
{ IFacturasClienteDelta }
IFacturasClienteDelta = interface(IFacturasCliente)
['{09E35A03-382A-4D70-8058-B54DCCE256A8}']
['{7FBCB9F2-5A0C-4C4C-9503-27624E85B1F2}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -105,6 +105,7 @@ type
function GetOldSIN_COMISIONValue : SmallInt;
function GetOldTIPO_FACTURAValue : String;
function GetOldLISTA_NOMBRESValue : String;
function GetOldPROCEDENCIA_CLIENTEValue : String;
{ Properties }
property OldID : Integer read GetOldIDValue;
@ -160,6 +161,7 @@ type
property OldSIN_COMISION : SmallInt read GetOldSIN_COMISIONValue;
property OldTIPO_FACTURA : String read GetOldTIPO_FACTURAValue;
property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue;
property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue;
end;
{ TFacturasClienteBusinessProcessorRules }
@ -486,6 +488,12 @@ type
function GetOldLISTA_NOMBRESIsNull: Boolean; virtual;
procedure SetLISTA_NOMBRESValue(const aValue: String); virtual;
procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); virtual;
function GetPROCEDENCIA_CLIENTEValue: String; virtual;
function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual;
function GetOldPROCEDENCIA_CLIENTEValue: String; virtual;
function GetOldPROCEDENCIA_CLIENTEIsNull: Boolean; virtual;
procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual;
procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID : Integer read GetIDValue write SetIDValue;
@ -700,6 +708,10 @@ type
property LISTA_NOMBRESIsNull : Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull;
property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue;
property OldLISTA_NOMBRESIsNull : Boolean read GetOldLISTA_NOMBRESIsNull;
property PROCEDENCIA_CLIENTE : String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue;
property PROCEDENCIA_CLIENTEIsNull : Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull;
property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue;
property OldPROCEDENCIA_CLIENTEIsNull : Boolean read GetOldPROCEDENCIA_CLIENTEIsNull;
public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -709,7 +721,7 @@ type
{ IFacturasCliente_DetallesDelta }
IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
['{EC1C8D93-0843-41B9-9D1C-034145DA9FB5}']
['{E532A60C-1259-4F35-B997-18F37616D9FD}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer;
@ -2607,6 +2619,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteLISTA_NOMBRES] := Null;
end;
function TFacturasClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE];
end;
function TFacturasClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE]);
end;
function TFacturasClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE];
end;
function TFacturasClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE]);
end;
procedure TFacturasClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE] := aValue;
end;
procedure TFacturasClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE] := Null;
end;
{ TFacturasCliente_DetallesBusinessProcessorRules }
constructor TFacturasCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

View File

@ -259,6 +259,10 @@ object srvFacturasCliente: TsrvFacturasCliente
item
DatasetField = 'LISTA_NOMBRES'
TableField = 'LISTA_NOMBRES'
end
item
DatasetField = 'PROCEDENCIA_CLIENTE'
TableField = 'PROCEDENCIA_CLIENTE'
end>
end>
Name = 'FacturasCliente'
@ -537,6 +541,11 @@ object srvFacturasCliente: TsrvFacturasCliente
DataType = datString
Size = 255
DictionaryEntry = 'FacturasCliente_LISTA_NOMBRES'
end
item
Name = 'PROCEDENCIA_CLIENTE'
DataType = datString
Size = 255
end>
end
item

View File

@ -38,7 +38,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
Width = 640
ExplicitWidth = 640
inherited tbxMain: TTBXToolbar
ExplicitWidth = 640
ExplicitWidth = 632
object TBXSubmenuItem2: TTBXSubmenuItem [0]
Caption = 'Nuevo'
DisplayMode = nbdmImageAndText
@ -62,7 +62,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
end
end
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 431
ExplicitWidth = 481
inherited lblAno: TTBXLabelItem
Visible = True
end
@ -72,15 +72,19 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
inherited sepAno: TTBXSeparatorItem
Visible = True
end
inherited tbxEditFiltro2: TTBXEditItem
Enabled = True
Visible = True
end
end
inherited tbxMenu: TTBXToolbar
ExplicitWidth = 640
end
inherited TBXTMain2: TTBXToolbar
Left = 431
Left = 481
Visible = True
ExplicitLeft = 431
ExplicitWidth = 209
ExplicitLeft = 481
ExplicitWidth = 159
object TBXItem42: TTBXItem
Action = actCambiarSituacion
DisplayMode = nbdmImageAndText
@ -126,9 +130,9 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
ExplicitHeight = 545
inherited cxGrid: TcxGrid
Width = 640
Height = 417
Height = 414
ExplicitWidth = 640
ExplicitHeight = 417
ExplicitHeight = 414
inherited cxGridView: TcxGridDBTableView
DataController.Summary.DefaultGroupSummaryItems = <
item
@ -246,9 +250,32 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha3IniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha3FinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 436
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 436
ExplicitWidth = 275
Width = 275
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 640
ExplicitTop = 75
ExplicitWidth = 640
inherited tbxBotones: TTBXToolbar
Width = 630

View File

@ -5,11 +5,12 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
ExplicitHeight = 397
inherited cxGrid: TcxGrid
Width = 802
Height = 269
Height = 266
RootLevelOptions.DetailTabsPosition = dtpTop
OnActiveTabChanged = cxGridActiveTabChanged
ExplicitTop = 105
ExplicitWidth = 802
ExplicitHeight = 269
ExplicitHeight = 266
inherited cxGridView: TcxGridDBTableView
DataController.KeyFieldNames = 'ID'
DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded]
@ -187,6 +188,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
Caption = 'Otros nombres'
DataBinding.FieldName = 'LISTA_NOMBRES'
end
object cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn
Caption = 'Procedencia'
DataBinding.FieldName = 'PROCEDENCIA_CLIENTE'
end
end
inherited cxGridLevel: TcxGridLevel
Caption = 'Todas'
@ -214,6 +219,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 273
Width = 273
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
@ -251,19 +258,33 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup
Visible = False
inherited txtFiltroTodo2: TcxTextEdit
Left = 445
Enabled = True
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 445
ExplicitWidth = 275
Width = 275
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup
inherited dxLayoutControl1Item8: TdxLayoutItem
Enabled = True
Visible = True
end
inherited dxLayoutControl1Group4: TdxLayoutGroup
Visible = False
end
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 802
ExplicitTop = 75
ExplicitWidth = 802
inherited tbxBotones: TTBXToolbar
Width = 792
ExplicitWidth = 792
end
end
end

View File

@ -66,6 +66,7 @@ type
cxGridViewVENDEDOR: TcxGridDBColumn;
cxGridViewLISTA_NOMBRES: TcxGridDBColumn;
cxGridViewLOPD: TcxGridDBColumn;
cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
out AStyle: TcxStyle);

View File

@ -1372,7 +1372,8 @@ begin
ARecibos.IMPORTE := AFactura.IMPORTE_TOTAL * (AFormaPago.Plazos.PORCENTAJE / 100);
end;
ARecibos.DESCRIPCION := 'Pago de factura ' + AFactura.REFERENCIA + ': son ' + CifraToLetras(ARecibos.IMPORTE);
// ARecibos.DESCRIPCION := 'Pago de factura ' + AFactura.REFERENCIA + ': son ' + CifraToLetras(ARecibos.IMPORTE);
ARecibos.DESCRIPCION := 'Pago de factura ' + AFactura.REFERENCIA + ' - ' + ARecibos.NOMBRE + ' - Ref. ' + AFactura.REFERENCIA_PROVEEDOR + ': son ' + CifraToLetras(ARecibos.IMPORTE);
ARecibosProveedorController.Guardar(ARecibos);
if (AFormaPago.Plazos.RecordCount < 1) and (not AFormaPago.ID_SUBCUENTAIsNull) then

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More