diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index 118c36e0..8fdcabc1 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -651,7 +651,8 @@ CREATE TABLE FACTURAS_CLIENTE (
IMPORTE_PORTE TIPO_IMPORTE,
ID_TIPO_IVA TIPO_ID,
RECARGO_EQUIVALENCIA TIPO_BOOLEANO,
- ID_COMISION_LIQUIDADA TIPO_ID
+ ID_COMISION_LIQUIDADA TIPO_ID,
+ DATOS_BANCARIOS VARCHAR(255)
);
@@ -1911,6 +1912,7 @@ CREATE VIEW V_FACTURAS_CLIENTE(
POBLACION,
PROVINCIA,
CODIGO_POSTAL,
+ DATOS_BANCARIOS,
FECHA_ALTA,
FECHA_MODIFICACION,
USUARIO,
@@ -1945,6 +1947,7 @@ SELECT FACTURAS_CLIENTE.ID,
FACTURAS_CLIENTE.POBLACION,
FACTURAS_CLIENTE.PROVINCIA,
FACTURAS_CLIENTE.CODIGO_POSTAL,
+ FACTURAS_CLIENTE.DATOS_BANCARIOS,
FACTURAS_CLIENTE.FECHA_ALTA,
FACTURAS_CLIENTE.FECHA_MODIFICACION,
FACTURAS_CLIENTE.USUARIO,
diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
index fb39abe5..ca41267f 100644
--- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
+++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
@@ -22,6 +22,7 @@ type
procedure DescartarCambios(AEmpresa : IBizEmpresa);
function Existe(const ID: Integer) : Boolean;
function ToStringList(AEmpresa : IBizEmpresa) : TStringList;
+ function DarListaCuentasBancarias(AEmpresa : IBizEmpresa): TStringList;
end;
TEmpresasController = class(TControllerBase, IEmpresasController)
@@ -45,13 +46,14 @@ type
procedure Ver(AEmpresa : IBizEmpresa); virtual;
procedure VerTodos(AEmpresas: IBizEmpresa); virtual;
function ToStringList(AEmpresa : IBizEmpresa) : TStringList; virtual;
+ function DarListaCuentasBancarias(AEmpresa : IBizEmpresa): TStringList;
end;
implementation
uses
uEditorRegistryUtils, cxControls, DB, uFactuGES_App,
- uDataModuleEmpresas, uIEditorEmpresa;
+ uDataModuleEmpresas, uIEditorEmpresa, uBizEmpresasDatosBancarios;
{ TEmpresasController }
@@ -75,10 +77,42 @@ begin
FDataModule := TDataModuleEmpresas.Create(Nil);
end;
+function TEmpresasController.DarListaCuentasBancarias(
+ AEmpresa: IBizEmpresa): TStringList;
+var
+ ADatosBancarios: IBizEmpresasDatosBancarios;
+ Aux : String;
+begin
+ if not Assigned(AEmpresa) then
+ raise Exception.Create ('Empresa no asignada (DarListaCuentasBancarias)');
+
+ ADatosBancarios := AEmpresa.DatosBancarios;
+ ADatosBancarios.DataTable.Active := True;
+
+ Result := TStringList.Create;
+ ShowHourglassCursor;
+ try
+ with Result do
+ begin
+ ADatosBancarios.DataTable.First;
+ while not ADatosBancarios.DataTable.EOF do
+ begin
+ Aux := Format('%s %s %s %s', [ADatosBancarios.ENTIDAD,
+ ADatosBancarios.SUCURSAL, ADatosBancarios.DC, ADatosBancarios.CUENTA]);
+ Add(Format('%s=%d', [Aux, ADatosBancarios.ID]));
+ ADatosBancarios.DataTable.Next;
+ end;
+ end;
+ finally
+ ADatosBancarios := NIL;
+ HideHourglassCursor;
+ end;
+end;
+
procedure TEmpresasController.DescartarCambios(AEmpresa: IBizEmpresa);
begin
if not Assigned(AEmpresa) then
- raise Exception.Create ('Empresa no asignada');
+ raise Exception.Create ('Empresa no asignada (DescartarCambios)');
ShowHourglassCursor;
try
diff --git a/Source/ApplicationBase/Empresas/Views/uEditorDatosBancariosEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorDatosBancariosEmpresa.dfm
index adc3d192..01b623d8 100644
--- a/Source/ApplicationBase/Empresas/Views/uEditorDatosBancariosEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uEditorDatosBancariosEmpresa.dfm
@@ -99,6 +99,7 @@ object fEditorDatosBancariosEmpresa: TfEditorDatosBancariosEmpresa
Height = 21
DataField = 'ENTIDAD'
DataSource = dsDatosBancarios
+ MaxLength = 4
TabOrder = 1
end
object eCodSucursal: TDBEdit
@@ -108,6 +109,7 @@ object fEditorDatosBancariosEmpresa: TfEditorDatosBancariosEmpresa
Height = 21
DataField = 'SUCURSAL'
DataSource = dsDatosBancarios
+ MaxLength = 4
TabOrder = 2
end
object eDC: TDBEdit
diff --git a/Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.dfm b/Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.dfm
index 0a405dcc..9ffd2041 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.dfm
@@ -48,23 +48,5 @@ inherited frViewDatosBancarios: TfrViewDatosBancarios
inherited ToolBar1: TToolBar
Width = 583
ExplicitWidth = 583
- inherited ToolButton1: TToolButton
- Top = 0
- end
- inherited ToolButton4: TToolButton
- Top = 0
- end
- inherited ToolButton5: TToolButton
- Top = 0
- end
- inherited ToolButton2: TToolButton
- Top = 0
- end
- inherited ToolButton6: TToolButton
- Top = 0
- end
- inherited ToolButton7: TToolButton
- Top = 0
- end
end
end
diff --git a/Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.pas b/Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.pas
index 2a70ebe6..13f2891f 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.pas
+++ b/Source/ApplicationBase/Empresas/Views/uViewDatosBancarios.pas
@@ -10,7 +10,13 @@ uses
cxGridDBBandedTableView, cxClasses, cxControls, cxGridCustomView, cxGrid,
uDADataTable, Grids, DBGrids, ActnList, ImgList, PngImageList, ComCtrls,
ToolWin, cxGridDBTableView, uViewDetallesGenerico, cxCurrencyEdit,
- uDAInterfaces;
+ uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel,
+ dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
+ dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
+ dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+ dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
+ dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue,
+ dxSkinscxPCPainter;
type
TfrViewDatosBancarios = class(TfrViewDetallesGenerico)
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 1641339f..8b251f31 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 10ecab67..ea7e5fa7 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -54,7 +54,31 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1050FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.5.0FactuGESFactuGES1.0.5
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1060FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.6.0FactuGESFactuGES1.0.6.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 56490d16..694e36bc 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
-FILEVERSION 1,0,5,0
-PRODUCTVERSION 1,0,5,0
+FILEVERSION 1,0,6,0
+PRODUCTVERSION 1,0,6,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
- VALUE "FileVersion", "1.0.5.0\0"
+ VALUE "FileVersion", "1.0.6.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "1.0.5\0"
+ VALUE "ProductVersion", "1.0.6.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index add6efae..c47d5564 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 1641339f..8b251f31 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index bed9fcaa..b3222408 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -129,19 +129,19 @@ inherited frViewDetallesBase: TfrViewDetallesBase
end
object ToolButton9: TToolButton
Left = 0
- Top = 52
+ Top = 49
Action = RichEditAlignLeft1
AutoSize = True
end
object ToolButton10: TToolButton
Left = 145
- Top = 52
+ Top = 49
Action = RichEditAlignCenter1
AutoSize = True
end
object ToolButton11: TToolButton
Left = 270
- Top = 52
+ Top = 49
Action = RichEditAlignRight1
AutoSize = True
end
@@ -152,6 +152,12 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Width = 451
Height = 205
Align = alClient
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'Tahoma'
+ Font.Style = []
+ ParentFont = False
TabOrder = 1
LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True
@@ -284,6 +290,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Caption = 'Concepto'
DataBinding.FieldName = 'CONCEPTO'
PropertiesClassName = 'TcxRichEditProperties'
+ Properties.AllowObjects = True
Width = 237
end
object cxGridViewCANTIDAD: TcxGridDBColumn
@@ -917,7 +924,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Color = 13298687
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
- Font.Height = -11
+ Font.Height = -15
Font.Name = 'Tahoma'
Font.Style = [fsBold]
end
@@ -926,7 +933,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Color = 546166271
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
- Font.Height = -12
+ Font.Height = -16
Font.Name = 'Tahoma'
Font.Style = [fsBold]
end
@@ -943,12 +950,22 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Color = 15657963
end
object cxStyle_NORMAL_PAR: TcxStyle
- AssignedValues = [svColor]
+ AssignedValues = [svColor, svFont]
Color = 552923887
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -15
+ Font.Name = 'Tahoma'
+ Font.Style = []
end
object cxStyle_NORMAL_IMPAR: TcxStyle
- AssignedValues = [svColor]
+ AssignedValues = [svColor, svFont]
Color = clWindow
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -15
+ Font.Name = 'Tahoma'
+ Font.Style = []
end
end
object cxGridPopupMenu: TcxGridPopupMenu
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index 55a03403..55209ede 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -619,27 +619,32 @@ begin
begin
ARecord := AItem.FocusedCellViewInfo.GridRecord;
FuentePorDefecto := DarFuentePorDefecto(DarTipoConcepto(ARecord));
- //La primera vez que accedemos al grid entra dos veces y perderiamos el editor
- //dando un pete.
- if not Assigned(CurEdit) then
- begin
- CurEdit := TcxRichEdit(AEdit);
- FontEdit1.Enabled := True;
- RichEditBold1.Enabled := True;
- RichEditItalic1.Enabled := True;
- RichEditUnderline1.Enabled := True;
- RichEditAlignLeft1.Enabled := True;
- RichEditAlignRight1.Enabled := True;
- RichEditAlignCenter1.Enabled := True;
+ try
+ //La primera vez que accedemos al grid entra dos veces y perderiamos el editor
+ //dando un pete.
+ if not Assigned(CurEdit) then
+ begin
+ CurEdit := TcxRichEdit(AEdit);
+ FontEdit1.Enabled := True;
+ RichEditBold1.Enabled := True;
+ RichEditItalic1.Enabled := True;
+ RichEditUnderline1.Enabled := True;
+ RichEditAlignLeft1.Enabled := True;
+ RichEditAlignRight1.Enabled := True;
+ RichEditAlignCenter1.Enabled := True;
- if length(CurEdit.Text) = 0 then
- CurEdit.DefAttributes.Assign(FuentePorDefecto)
- end
- else
- if length(CurEdit.Text) = 0 then
- CurEdit.DefAttributes.Assign(FuentePorDefecto);
-
- FreeAndNil(FuentePorDefecto);
+ if not VarIsNull(AItem.EditValue) and VarIsType(AItem.EditValue, varString) then
+ if Length(AItem.EditValue) = 0 then
+ CurEdit.DefAttributes.Assign(FuentePorDefecto);
+ end
+ else begin
+ if not VarIsNull(AItem.EditValue) and VarIsType(AItem.EditValue, varString) then
+ if Length(AItem.EditValue) = 0 then
+ CurEdit.DefAttributes.Assign(FuentePorDefecto);
+ end;
+ finally
+ FreeAndNil(FuentePorDefecto);
+ end;
end
else
begin
@@ -692,7 +697,7 @@ begin
if ATipo = TIPO_DETALLE_CONCEPTO then
begin
Result.Name := 'Tahoma';
- Result.Size := 9;
+ Result.Size := 11;
Result.Style := [];
end;
@@ -1033,17 +1038,24 @@ end;
procedure TfrViewDetallesBase.actDetallesPegarExecute(Sender: TObject);
begin
- ShowHourglassCursor;
- try
- PegarSeleccionGridDesdePortapapeles(_Grid);
- finally
- HideHourglassCursor;
- end;
+{ if cxGridViewDESCRIPCION.Focused then
+ TcxRichEdit(cxGridViewDESCRIPCION).PasteSpecial
+ else begin}
+ ShowHourglassCursor;
+ try
+ PegarSeleccionGridDesdePortapapeles(_Grid);
+ finally
+ HideHourglassCursor;
+ end;
+// end;
end;
procedure TfrViewDetallesBase.actDetallesPegarUpdate(Sender: TObject);
begin
inherited;
+{ if cxGridViewDESCRIPCION.Focused then
+ (Sender as TAction).Enabled := True
+ else}
(Sender as TAction).Enabled := HayDatosEnPortapapeles;
end;
diff --git a/Source/Informes/InfFacturaCliente.fr3 b/Source/Informes/InfFacturaCliente.fr3
index 6297cac8..12c71a49 100644
--- a/Source/Informes/InfFacturaCliente.fr3
+++ b/Source/Informes/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
-
+
@@ -22,26 +22,27 @@
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
+
diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
index f888a02f..a5d76ccb 100644
--- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
@@ -179,6 +179,13 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
DisplayLabel = 'C'#243'd. postal'
DictionaryEntry = 'FacturasCliente_CODIGO_POSTAL'
end
+ item
+ Name = 'DATOS_BANCARIOS'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Datos bancarios'
+ DictionaryEntry = 'FacturasCliente_DATOS_BANCARIOS'
+ end
item
Name = 'FECHA_ALTA'
DataType = datDateTime
diff --git a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj
index b114d58e..4a51a8f5 100644
--- a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj
+++ b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj
@@ -41,13 +41,7 @@
Delphi.Personality
Package
-FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
-
-
-
-
-
-
+FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
RemObjects Pascal Script - RemObjects SDK 3.0 Integration
EurekaLog 5.1.9
FacturasCliente_model.dpk
@@ -71,7 +65,7 @@
\ No newline at end of file
+EurekaLog Last Line -->
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
index 38b62538..8138e1f3 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
@@ -9,8 +9,8 @@ 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_FacturasCliente = '{95C2DDE4-5EF1-40A4-87CD-E29B422E222D}';
- RID_FacturasCliente_Detalles = '{010F12C4-9C39-4203-B705-9D757B685A11}';
+ RID_FacturasCliente = '{69C46CC4-9C92-48ED-BC5C-F2A9102ECDC2}';
+ RID_FacturasCliente_Detalles = '{67353B9A-3348-4CA5-A9DB-114619721FAC}';
{ Data table names }
nme_FacturasCliente = 'FacturasCliente';
@@ -40,6 +40,7 @@ const
fld_FacturasClientePOBLACION = 'POBLACION';
fld_FacturasClientePROVINCIA = 'PROVINCIA';
fld_FacturasClienteCODIGO_POSTAL = 'CODIGO_POSTAL';
+ fld_FacturasClienteDATOS_BANCARIOS = 'DATOS_BANCARIOS';
fld_FacturasClienteFECHA_ALTA = 'FECHA_ALTA';
fld_FacturasClienteFECHA_MODIFICACION = 'FECHA_MODIFICACION';
fld_FacturasClienteUSUARIO = 'USUARIO';
@@ -75,16 +76,17 @@ const
idx_FacturasClientePOBLACION = 20;
idx_FacturasClientePROVINCIA = 21;
idx_FacturasClienteCODIGO_POSTAL = 22;
- idx_FacturasClienteFECHA_ALTA = 23;
- idx_FacturasClienteFECHA_MODIFICACION = 24;
- idx_FacturasClienteUSUARIO = 25;
- idx_FacturasClienteID_FORMA_PAGO = 26;
- idx_FacturasClienteRECARGO_EQUIVALENCIA = 27;
- idx_FacturasClienteID_TIPO_IVA = 28;
- idx_FacturasClienteIMPORTE_NETO = 29;
- idx_FacturasClienteIMPORTE_PORTE = 30;
- idx_FacturasClienteID_AGENTE = 31;
- idx_FacturasClienteREFERENCIA_COMISION = 32;
+ idx_FacturasClienteDATOS_BANCARIOS = 23;
+ idx_FacturasClienteFECHA_ALTA = 24;
+ idx_FacturasClienteFECHA_MODIFICACION = 25;
+ idx_FacturasClienteUSUARIO = 26;
+ idx_FacturasClienteID_FORMA_PAGO = 27;
+ idx_FacturasClienteRECARGO_EQUIVALENCIA = 28;
+ idx_FacturasClienteID_TIPO_IVA = 29;
+ idx_FacturasClienteIMPORTE_NETO = 30;
+ idx_FacturasClienteIMPORTE_PORTE = 31;
+ idx_FacturasClienteID_AGENTE = 32;
+ idx_FacturasClienteREFERENCIA_COMISION = 33;
{ FacturasCliente_Detalles fields }
fld_FacturasCliente_DetallesID = 'ID';
@@ -121,7 +123,7 @@ const
type
{ IFacturasCliente }
IFacturasCliente = interface(IDAStronglyTypedDataTable)
- ['{F5184C4A-3061-4D25-A4A7-9B93249B7D92}']
+ ['{273190B2-EDD5-4AE4-8774-924D1E28AEB6}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -214,6 +216,10 @@ type
procedure SetCODIGO_POSTALValue(const aValue: String);
function GetCODIGO_POSTALIsNull: Boolean;
procedure SetCODIGO_POSTALIsNull(const aValue: Boolean);
+ function GetDATOS_BANCARIOSValue: String;
+ procedure SetDATOS_BANCARIOSValue(const aValue: String);
+ function GetDATOS_BANCARIOSIsNull: Boolean;
+ procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
function GetFECHA_ALTAValue: DateTime;
procedure SetFECHA_ALTAValue(const aValue: DateTime);
function GetFECHA_ALTAIsNull: Boolean;
@@ -303,6 +309,8 @@ type
property PROVINCIAIsNull: Boolean read GetPROVINCIAIsNull write SetPROVINCIAIsNull;
property CODIGO_POSTAL: String read GetCODIGO_POSTALValue write SetCODIGO_POSTALValue;
property CODIGO_POSTALIsNull: Boolean read GetCODIGO_POSTALIsNull write SetCODIGO_POSTALIsNull;
+ property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
+ property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
property FECHA_ALTA: DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
property FECHA_ALTAIsNull: Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
@@ -423,6 +431,10 @@ type
procedure SetCODIGO_POSTALValue(const aValue: String); virtual;
function GetCODIGO_POSTALIsNull: Boolean; virtual;
procedure SetCODIGO_POSTALIsNull(const aValue: Boolean); virtual;
+ function GetDATOS_BANCARIOSValue: String; virtual;
+ procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
+ function GetDATOS_BANCARIOSIsNull: Boolean; virtual;
+ procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
function GetFECHA_ALTAValue: DateTime; virtual;
procedure SetFECHA_ALTAValue(const aValue: DateTime); virtual;
function GetFECHA_ALTAIsNull: Boolean; virtual;
@@ -511,6 +523,8 @@ type
property PROVINCIAIsNull: Boolean read GetPROVINCIAIsNull write SetPROVINCIAIsNull;
property CODIGO_POSTAL: String read GetCODIGO_POSTALValue write SetCODIGO_POSTALValue;
property CODIGO_POSTALIsNull: Boolean read GetCODIGO_POSTALIsNull write SetCODIGO_POSTALIsNull;
+ property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
+ property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
property FECHA_ALTA: DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
property FECHA_ALTAIsNull: Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
@@ -540,7 +554,7 @@ type
{ IFacturasCliente_Detalles }
IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
- ['{777CB660-EDDA-4CEE-9992-604ED4D8A2D7}']
+ ['{EF027746-FBFB-4CBE-B3E6-8122C5FB2063}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -1234,6 +1248,27 @@ begin
DataTable.Fields[idx_FacturasClienteCODIGO_POSTAL].AsVariant := Null;
end;
+function TFacturasClienteDataTableRules.GetDATOS_BANCARIOSValue: String;
+begin
+ result := DataTable.Fields[idx_FacturasClienteDATOS_BANCARIOS].AsString;
+end;
+
+procedure TFacturasClienteDataTableRules.SetDATOS_BANCARIOSValue(const aValue: String);
+begin
+ DataTable.Fields[idx_FacturasClienteDATOS_BANCARIOS].AsString := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetDATOS_BANCARIOSIsNull: boolean;
+begin
+ result := DataTable.Fields[idx_FacturasClienteDATOS_BANCARIOS].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
+begin
+ if aValue then
+ DataTable.Fields[idx_FacturasClienteDATOS_BANCARIOS].AsVariant := Null;
+end;
+
function TFacturasClienteDataTableRules.GetFECHA_ALTAValue: DateTime;
begin
result := DataTable.Fields[idx_FacturasClienteFECHA_ALTA].AsDateTime;
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
index c6cb4aef..12b66788 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
@@ -9,13 +9,13 @@ 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_FacturasClienteDelta = '{A8659C85-51C8-44A3-9790-F3A3C50AA03D}';
- RID_FacturasCliente_DetallesDelta = '{BEF54047-703B-4F62-9C73-0F2DB7BF03B4}';
+ RID_FacturasClienteDelta = '{47F2B48F-D3D8-4A91-B919-D38B47FDB832}';
+ RID_FacturasCliente_DetallesDelta = '{6C2D7943-8663-4AC4-AEDA-F40D14BE5D92}';
type
{ IFacturasClienteDelta }
IFacturasClienteDelta = interface(IFacturasCliente)
- ['{A8659C85-51C8-44A3-9790-F3A3C50AA03D}']
+ ['{47F2B48F-D3D8-4A91-B919-D38B47FDB832}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@@ -40,6 +40,7 @@ type
function GetOldPOBLACIONValue : String;
function GetOldPROVINCIAValue : String;
function GetOldCODIGO_POSTALValue : String;
+ function GetOldDATOS_BANCARIOSValue : String;
function GetOldFECHA_ALTAValue : DateTime;
function GetOldFECHA_MODIFICACIONValue : DateTime;
function GetOldUSUARIOValue : String;
@@ -75,6 +76,7 @@ type
property OldPOBLACION : String read GetOldPOBLACIONValue;
property OldPROVINCIA : String read GetOldPROVINCIAValue;
property OldCODIGO_POSTAL : String read GetOldCODIGO_POSTALValue;
+ property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
property OldFECHA_ALTA : DateTime read GetOldFECHA_ALTAValue;
property OldFECHA_MODIFICACION : DateTime read GetOldFECHA_MODIFICACIONValue;
property OldUSUARIO : String read GetOldUSUARIOValue;
@@ -231,6 +233,12 @@ type
function GetOldCODIGO_POSTALIsNull: Boolean; virtual;
procedure SetCODIGO_POSTALValue(const aValue: String); virtual;
procedure SetCODIGO_POSTALIsNull(const aValue: Boolean); virtual;
+ function GetDATOS_BANCARIOSValue: String; virtual;
+ function GetDATOS_BANCARIOSIsNull: Boolean; virtual;
+ function GetOldDATOS_BANCARIOSValue: String; virtual;
+ function GetOldDATOS_BANCARIOSIsNull: Boolean; virtual;
+ procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
+ procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
function GetFECHA_ALTAValue: DateTime; virtual;
function GetFECHA_ALTAIsNull: Boolean; virtual;
function GetOldFECHA_ALTAValue: DateTime; virtual;
@@ -385,6 +393,10 @@ type
property CODIGO_POSTALIsNull : Boolean read GetCODIGO_POSTALIsNull write SetCODIGO_POSTALIsNull;
property OldCODIGO_POSTAL : String read GetOldCODIGO_POSTALValue;
property OldCODIGO_POSTALIsNull : Boolean read GetOldCODIGO_POSTALIsNull;
+ property DATOS_BANCARIOS : String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
+ property DATOS_BANCARIOSIsNull : Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
+ property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
+ property OldDATOS_BANCARIOSIsNull : Boolean read GetOldDATOS_BANCARIOSIsNull;
property FECHA_ALTA : DateTime read GetFECHA_ALTAValue write SetFECHA_ALTAValue;
property FECHA_ALTAIsNull : Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
property OldFECHA_ALTA : DateTime read GetOldFECHA_ALTAValue;
@@ -434,7 +446,7 @@ type
{ IFacturasCliente_DetallesDelta }
IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
- ['{BEF54047-703B-4F62-9C73-0F2DB7BF03B4}']
+ ['{6C2D7943-8663-4AC4-AEDA-F40D14BE5D92}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer;
@@ -1359,6 +1371,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteCODIGO_POSTAL] := Null;
end;
+function TFacturasClienteBusinessProcessorRules.GetDATOS_BANCARIOSValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDATOS_BANCARIOS];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetDATOS_BANCARIOSIsNull: Boolean;
+begin
+ result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDATOS_BANCARIOS]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldDATOS_BANCARIOSValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteDATOS_BANCARIOS];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldDATOS_BANCARIOSIsNull: Boolean;
+begin
+ result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteDATOS_BANCARIOS]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetDATOS_BANCARIOSValue(const aValue: String);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDATOS_BANCARIOS] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
+begin
+ if aValue then
+ BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteDATOS_BANCARIOS] := Null;
+end;
+
function TFacturasClienteBusinessProcessorRules.GetFECHA_ALTAValue: DateTime;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteFECHA_ALTA];
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
index 362e4f6c..0cda13b0 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
@@ -31,9 +31,10 @@ object RptFacturasCliente: TRptFacturasCliente
'acturas_cliente.poblacion, v_facturas_cliente.codigo_postal,'#10' ' +
'v_facturas_cliente.recargo_equivalencia, v_facturas_cliente.impo' +
'rte_neto,'#10' v_facturas_cliente.importe_porte, formas_pago.descr' +
- 'ipcion as FORMA_PAGO'#10'from v_facturas_cliente'#10' left outer join ' +
- 'formas_pago on (formas_pago.id = v_facturas_cliente.id_forma_pag' +
- 'o)'#10'WHERE V_FACTURAS_CLIENTE.ID = :ID'#10
+ 'ipcion as FORMA_PAGO,'#10' v_facturas_cliente.DATOS_BANCARIOS'#10'from' +
+ ' v_facturas_cliente'#10' left outer join formas_pago on (formas_pa' +
+ 'go.id = v_facturas_cliente.id_forma_pago)'#10'WHERE V_FACTURAS_CLIEN' +
+ 'TE.ID = :ID'#10
StatementType = stSQL
ColumnMappings = <
item
@@ -139,6 +140,10 @@ object RptFacturasCliente: TRptFacturasCliente
item
DatasetField = 'FORMA_PAGO'
TableField = 'FORMA_PAGO'
+ end
+ item
+ DatasetField = 'DATOS_BANCARIOS'
+ TableField = 'DATOS_BANCARIOS'
end>
end>
Name = 'InformeFacturasCliente'
@@ -275,7 +280,13 @@ object RptFacturasCliente: TRptFacturasCliente
Name = 'FORMA_PAGO'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'DATOS_BANCARIOS'
+ DataType = datString
+ Size = 255
end>
+ ReadOnly = True
end
item
Params = <
@@ -1220,7 +1231,7 @@ object RptFacturasCliente: TRptFacturasCliente
PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000
- ReportOptions.LastChange = 39506.841841898100000000
+ ReportOptions.LastChange = 39604.801510335640000000
ScriptLanguage = 'PascalScript'
ScriptText.Strings = (
''
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
index fd92d9a4..a9839574 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
@@ -70,8 +70,8 @@ type
detallesDESCUENTO: TFloatField;
detallesIMPORTE_TOTAL: TIBBCDField;
detallesVISIBLE: TSmallintField;
- schReport: TDASchema;
detallesREFERENCIA: TIBStringField;
+ schReport: TDASchema;
procedure DataModuleCreate(Sender: TObject);
private
FConnection: IDAConnection;
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm
index fa8946a1..8e5d17a7 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.dfm
@@ -11,7 +11,7 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
Params = <
item
Name = 'ID'
- Value = ''
+ Value = '2'
ParamType = daptInput
end>
Statements = <
@@ -31,9 +31,10 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
'acturas_cliente.poblacion, v_facturas_cliente.codigo_postal,'#10' ' +
'v_facturas_cliente.recargo_equivalencia, v_facturas_cliente.impo' +
'rte_neto,'#10' v_facturas_cliente.importe_porte, formas_pago.descr' +
- 'ipcion as FORMA_PAGO'#10'from v_facturas_cliente'#10' left outer join ' +
- 'formas_pago on (formas_pago.id = v_facturas_cliente.id_forma_pag' +
- 'o)'#10'WHERE V_FACTURAS_CLIENTE.ID = :ID'#10
+ 'ipcion as FORMA_PAGO,'#10' v_facturas_cliente.datos_bancarios'#10'from' +
+ ' v_facturas_cliente'#10' left outer join formas_pago on (formas_pa' +
+ 'go.id = v_facturas_cliente.id_forma_pago)'#10'WHERE V_FACTURAS_CLIEN' +
+ 'TE.ID = :ID'#10
StatementType = stSQL
ColumnMappings = <
item
@@ -139,6 +140,10 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
item
DatasetField = 'FORMA_PAGO'
TableField = 'FORMA_PAGO'
+ end
+ item
+ DatasetField = 'DATOS_BANCARIOS'
+ TableField = 'DATOS_BANCARIOS'
end>
end>
Name = 'Informe_Cabecera'
@@ -258,6 +263,11 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
Name = 'FORMA_PAGO'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'DATOS_BANCARIOS'
+ DataType = datString
+ Size = 255
end>
ReadOnly = True
end
@@ -525,11 +535,16 @@ object RptWordFacturaCliente: TRptWordFacturaCliente
Name = 'FORMA_PAGO'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'DATOS_BANCARIOS'
+ DataType = datString
+ Size = 255
end>
Params = <
item
Name = 'ID'
- Value = ''
+ Value = '2'
ParamType = daptInput
end>
LogChanges = False
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
index c9b6a810..9b8f6d98 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
@@ -208,7 +208,7 @@ begin
ReplaceBookmark('FechaFacturaCab', FieldByName('FECHA_FACTURA').AsString);
ReplaceBookmark('VencimientoCab', ''{FieldByName('FECHAVENCIMIENTO').AsString});
ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString);
- ReplaceBookmark('BancoCab', ''{FieldByName('BANCO').AsString});
+ ReplaceBookmark('BancoCab', FieldByName('DATOS_BANCARIOS').AsString);
ReplaceBookmark('NombreClienteCab', FieldByName('NOMBRE').AsString);
ReplaceBookmark('CIFClienteCab', FieldByName('NIF_CIF').AsString);
diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
index 55f123d7..d907966a 100644
--- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
+++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
@@ -153,6 +153,10 @@ object srvFacturasCliente: TsrvFacturasCliente
item
DatasetField = 'REFERENCIA_COMISION'
TableField = 'REFERENCIA_COMISION'
+ end
+ item
+ DatasetField = 'DATOS_BANCARIOS'
+ TableField = 'DATOS_BANCARIOS'
end>
end>
Name = 'FacturasCliente'
@@ -284,6 +288,12 @@ object srvFacturasCliente: TsrvFacturasCliente
Size = 10
DictionaryEntry = 'FacturasCliente_CODIGO_POSTAL'
end
+ item
+ Name = 'DATOS_BANCARIOS'
+ DataType = datString
+ Size = 255
+ DictionaryEntry = 'FacturasCliente_DATOS_BANCARIOS'
+ end
item
Name = 'FECHA_ALTA'
DataType = datDateTime
@@ -741,6 +751,13 @@ object srvFacturasCliente: TsrvFacturasCliente
end
item
Params = <
+ item
+ Name = 'DATOS_BANCARIOS'
+ DataType = datString
+ Size = 255
+ Value = ''
+ ParamType = daptInput
+ end
item
Name = 'ID'
DataType = datAutoInc
@@ -930,15 +947,16 @@ object srvFacturasCliente: TsrvFacturasCliente
'NIF_CIF,'#10' NOMBRE,'#10' CALLE,'#10' POBLACION,'#10' PROVINCIA,'#10' ' +
' CODIGO_POSTAL,'#10' FECHA_ALTA,'#10' FECHA_MODIFICACION,'#10' USU' +
'ARIO,'#10' ID_FORMA_PAGO,'#10' RECARGO_EQUIVALENCIA,'#10' ID_TIPO_I' +
- 'VA,'#10' IMPORTE_NETO,'#10' IMPORTE_PORTE)'#10' VALUES ('#10' :ID,'#10' ' +
- ' :ID_EMPRESA,'#10' :REFERENCIA,'#10' :FECHA_FACTURA,'#10' :BASE_IMP' +
- 'ONIBLE,'#10' :DESCUENTO,'#10' :IMPORTE_DESCUENTO,'#10' :IVA,'#10' :I' +
- 'MPORTE_IVA,'#10' :RE,'#10' :IMPORTE_RE,'#10' :IMPORTE_TOTAL,'#10' :O' +
- 'BSERVACIONES,'#10' :ID_CLIENTE,'#10' :NIF_CIF,'#10' :NOMBRE,'#10' :C' +
- 'ALLE,'#10' :POBLACION,'#10' :PROVINCIA,'#10' :CODIGO_POSTAL,'#10' :F' +
- 'ECHA_ALTA,'#10' :FECHA_MODIFICACION,'#10' :USUARIO,'#10' :ID_FORMA_' +
- 'PAGO,'#10' :RECARGO_EQUIVALENCIA,'#10' :ID_TIPO_IVA,'#10' :IMPORTE_' +
- 'NETO,'#10' :IMPORTE_PORTE);'
+ 'VA,'#10' IMPORTE_NETO,'#10' IMPORTE_PORTE,'#10' DATOS_BANCARIOS)'#10' ' +
+ 'VALUES ('#10' :ID,'#10' :ID_EMPRESA,'#10' :REFERENCIA,'#10' :FECHA_F' +
+ 'ACTURA,'#10' :BASE_IMPONIBLE,'#10' :DESCUENTO,'#10' :IMPORTE_DESCUE' +
+ 'NTO,'#10' :IVA,'#10' :IMPORTE_IVA,'#10' :RE,'#10' :IMPORTE_RE,'#10' :' +
+ 'IMPORTE_TOTAL,'#10' :OBSERVACIONES,'#10' :ID_CLIENTE,'#10' :NIF_CIF' +
+ ','#10' :NOMBRE,'#10' :CALLE,'#10' :POBLACION,'#10' :PROVINCIA,'#10' :' +
+ 'CODIGO_POSTAL,'#10' :FECHA_ALTA,'#10' :FECHA_MODIFICACION,'#10' :US' +
+ 'UARIO,'#10' :ID_FORMA_PAGO,'#10' :RECARGO_EQUIVALENCIA,'#10' :ID_TI' +
+ 'PO_IVA,'#10' :IMPORTE_NETO,'#10' :IMPORTE_PORTE,'#10' :DATOS_BANCAR' +
+ 'IOS);'#10
StatementType = stSQL
ColumnMappings = <>
end>
@@ -946,6 +964,13 @@ object srvFacturasCliente: TsrvFacturasCliente
end
item
Params = <
+ item
+ Name = 'DATOS_BANCARIOS'
+ DataType = datString
+ Size = 255
+ Value = ''
+ ParamType = daptInput
+ end
item
Name = 'ID_EMPRESA'
DataType = datInteger
@@ -1140,8 +1165,8 @@ object srvFacturasCliente: TsrvFacturasCliente
' = :FECHA_MODIFICACION,'#10' USUARIO = :USUARIO,'#10' ID_FORMA_PAG' +
'O = :ID_FORMA_PAGO,'#10' RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALE' +
'NCIA,'#10' ID_TIPO_IVA = :ID_TIPO_IVA,'#10' IMPORTE_NETO = :IMPORT' +
- 'E_NETO,'#10' IMPORTE_PORTE = :IMPORTE_PORTE'#10' WHERE'#10' (ID = :OLD_' +
- 'ID);'
+ 'E_NETO,'#10' IMPORTE_PORTE = :IMPORTE_PORTE,'#10' DATOS_BANCARIOS ' +
+ '= :DATOS_BANCARIOS'#10' WHERE'#10' (ID = :OLD_ID);'#10
StatementType = stSQL
ColumnMappings = <>
end>
@@ -1493,6 +1518,12 @@ object srvFacturasCliente: TsrvFacturasCliente
Name = 'FacturasCliente_Detalles_REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'FacturasCliente_DATOS_BANCARIOS'
+ DataType = datString
+ Size = 255
+ DisplayLabel = 'Datos bancarios'
end>
Left = 150
Top = 22
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
index 4ad99f8e..23091ff9 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
@@ -113,8 +113,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end
inherited memObservaciones: TcxDBMemo
ExplicitWidth = 445
- ExplicitHeight = 163
- Height = 163
+ ExplicitHeight = 136
+ Height = 136
Width = 445
end
inherited frViewClienteFactura: TfrViewDatosYSeleccionCliente
@@ -170,6 +170,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Left = 335
ExplicitLeft = 335
end
+ inherited cbCuentaBancaria: TcxDBComboBox
+ ExplicitWidth = 343
+ Width = 343
+ end
end
end
end
@@ -199,87 +203,91 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Height = 51
ExplicitWidth = 815
ExplicitHeight = 51
- inherited ToolButton4: TToolButton [1]
- Left = 109
+ inherited ToolButton3: TToolButton
+ Wrap = False
end
- inherited ToolButton14: TToolButton [2]
- Left = 165
+ inherited ToolButton4: TToolButton
+ Left = 278
+ Top = 0
+ ExplicitLeft = 278
+ ExplicitTop = 0
+ end
+ inherited ToolButton14: TToolButton
+ Left = 334
Top = 0
Wrap = False
- ExplicitLeft = 165
+ ExplicitLeft = 334
ExplicitTop = 0
end
- inherited FontName: TJvFontComboBox [3]
- Left = 230
+ inherited FontName: TJvFontComboBox
+ Left = 399
Top = 0
- ExplicitLeft = 230
+ ExplicitLeft = 399
ExplicitTop = 0
end
- inherited FontSize: TEdit [4]
- Left = 375
+ inherited FontSize: TEdit
+ Left = 544
Top = 0
- Width = 72
- ExplicitLeft = 375
+ Width = 104
+ ExplicitLeft = 544
ExplicitTop = 0
- ExplicitWidth = 72
+ ExplicitWidth = 104
end
- inherited UpDown1: TUpDown [5]
- Left = 447
- Top = 0
- ExplicitLeft = 447
- ExplicitTop = 0
- end
- inherited ToolButton13: TToolButton [6]
- end
- inherited ToolButton6: TToolButton [7]
+ inherited ToolButton13: TToolButton [7]
Left = 0
- Top = 30
+ Top = 0
+ Wrap = True
ExplicitLeft = 0
- ExplicitTop = 30
+ ExplicitTop = 0
+ ExplicitHeight = 27
end
- inherited ToolButton7: TToolButton [8]
- Left = 66
- Top = 30
- ExplicitLeft = 66
- ExplicitTop = 30
+ inherited UpDown1: TUpDown [8]
+ Left = 0
+ Top = 27
+ ExplicitLeft = 0
+ ExplicitTop = 27
end
- inherited ToolButton2: TToolButton [9]
- Left = 133
+ inherited ToolButton6: TToolButton
+ Left = 17
+ Top = 27
+ ExplicitLeft = 17
+ ExplicitTop = 27
end
- inherited ToolButton8: TToolButton [10]
- Left = 247
- Top = 30
- ExplicitLeft = 247
- ExplicitTop = 30
+ inherited ToolButton7: TToolButton
+ Left = 83
+ Top = 27
+ ExplicitLeft = 83
+ ExplicitTop = 27
end
- inherited ToolButton3: TToolButton [11]
- Left = 330
- Top = 30
- ExplicitLeft = 330
- ExplicitTop = 30
+ inherited ToolButton8: TToolButton
+ Left = 150
+ Top = 27
+ ExplicitLeft = 150
+ ExplicitTop = 27
end
- inherited ToolButton12: TToolButton [12]
- Left = 385
- Top = 30
- ExplicitLeft = 385
- ExplicitTop = 30
+ inherited ToolButton12: TToolButton
+ Left = 233
+ Top = 27
+ ExplicitLeft = 233
+ ExplicitTop = 27
end
- inherited ToolButton9: TToolButton [13]
- Left = 393
- ExplicitLeft = 393
+ inherited ToolButton9: TToolButton
+ Left = 241
+ Top = 27
+ ExplicitLeft = 241
+ ExplicitTop = 27
end
- inherited ToolButton10: TToolButton [14]
- Left = 538
- Top = 30
- ExplicitLeft = 538
- ExplicitTop = 30
+ inherited ToolButton10: TToolButton
+ Left = 386
+ Top = 27
+ ExplicitLeft = 386
+ ExplicitTop = 27
end
- inherited ToolButton11: TToolButton [15]
- Left = 663
- Top = 30
- Wrap = False
- ExplicitLeft = 663
- ExplicitTop = 30
+ inherited ToolButton11: TToolButton
+ Left = 511
+ Top = 27
+ ExplicitLeft = 511
+ ExplicitTop = 27
end
end
inherited cxGrid: TcxGrid
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
index 10c0ab47..f770f63a 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
@@ -33,17 +33,13 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Style.Color = clInfoBk
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.Color = clMenuBar
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 0
- Width = 158
+ Width = 165
end
object edtFecha: TcxDBDateEdit
Left = 124
@@ -56,23 +52,19 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Style.Color = clInfoBk
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.Shadow = False
Style.ButtonStyle = bts3D
Style.ButtonTransparency = ebtNone
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 1
- Width = 158
+ Width = 165
end
object memObservaciones: TcxDBMemo
Left = 22
- Top = 137
+ Top = 164
Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'OBSERVACIONES'
DataBinding.DataSource = DADataSource
@@ -81,21 +73,17 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Style.BorderStyle = ebs3D
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 4
- Height = 151
- Width = 260
+ TabOrder = 5
+ Height = 124
+ Width = 267
end
inline frViewClienteFactura: TfrViewDatosYSeleccionCliente
- Left = 310
+ Left = 317
Top = 30
- Width = 119
+ Width = 112
Height = 215
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -103,69 +91,45 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
- TabOrder = 5
+ TabOrder = 6
ReadOnly = False
- ExplicitLeft = 310
+ ExplicitLeft = 317
ExplicitTop = 30
- ExplicitWidth = 119
+ ExplicitWidth = 112
ExplicitHeight = 215
inherited dxLayoutControl1: TdxLayoutControl
- Width = 119
+ Width = 112
Height = 215
- ExplicitWidth = 314
+ ExplicitWidth = 270
ExplicitHeight = 215
inherited edtlNombre: TcxDBTextEdit
DataBinding.DataSource = DADataSource
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 210
Width = 210
end
inherited edtNIFCIF: TcxDBTextEdit
DataBinding.DataSource = DADataSource
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 210
Width = 210
end
inherited edtCalle: TcxDBTextEdit
DataBinding.DataSource = DADataSource
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 210
Width = 210
end
inherited edtPoblacion: TcxDBTextEdit
DataBinding.DataSource = DADataSource
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 92
Width = 92
end
inherited edtProvincia: TcxDBTextEdit
DataBinding.DataSource = DADataSource
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 210
Width = 210
end
inherited edtCodigoPostal: TcxDBTextEdit
Left = 192
DataBinding.DataSource = DADataSource
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 192
end
inherited Button3: TBitBtn
@@ -195,23 +159,19 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 2
- Width = 20
+ Width = 27
end
object bFormasPago: TButton
- Left = 150
+ Left = 157
Top = 84
Width = 132
Height = 23
@@ -219,6 +179,23 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
TabOrder = 3
OnClick = bFormasPagoClick
end
+ object cbCuentaBancaria: TcxDBComboBox
+ Left = 124
+ Top = 113
+ DataBinding.DataField = 'DATOS_BANCARIOS'
+ DataBinding.DataSource = DADataSource
+ Properties.DropDownListStyle = lsFixedList
+ Properties.ImmediatePost = True
+ Properties.ImmediateUpdateText = True
+ Properties.PostPopupValueOnTab = True
+ Style.BorderColor = clWindowFrame
+ Style.BorderStyle = ebs3D
+ Style.HotTrack = False
+ Style.ButtonStyle = bts3D
+ Style.PopupBorderStyle = epbsFrame3D
+ TabOrder = 4
+ Width = 165
+ end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
Hidden = True
@@ -235,11 +212,15 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
AlignHorz = ahClient
Caption = 'Datos de la factura'
object dxLayoutControl1Item1: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahClient
Caption = 'Referencia:'
Control = eReferencia
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item2: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahClient
Caption = 'Fecha de la factura:'
Control = edtFecha
ControlOptions.ShowBorder = False
@@ -247,24 +228,35 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
object dxLayoutControl1Group3: TdxLayoutGroup
ShowCaption = False
Hidden = True
- LayoutDirection = ldHorizontal
ShowBorder = False
- object dxLayoutControl1Item4: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- Caption = 'Forma de pago:'
- Control = cbFormaPago
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item10: TdxLayoutItem
+ object dxLayoutControl1Group4: TdxLayoutGroup
ShowCaption = False
- Control = bFormasPago
+ Hidden = True
+ LayoutDirection = ldHorizontal
+ ShowBorder = False
+ object dxLayoutControl1Item4: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahClient
+ Caption = 'Forma de pago:'
+ Control = cbFormaPago
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item10: TdxLayoutItem
+ ShowCaption = False
+ Control = bFormasPago
+ ControlOptions.ShowBorder = False
+ end
+ end
+ object dxLayoutControl1Item3: TdxLayoutItem
+ Caption = 'Cuenta bancaria:'
+ Control = cbCuentaBancaria
ControlOptions.ShowBorder = False
end
end
end
object dxLayoutControl1Group5: TdxLayoutGroup
- AutoAligns = [aaHorizontal]
+ AutoAligns = []
+ AlignHorz = ahClient
AlignVert = avClient
Caption = 'Observaciones'
LayoutDirection = ldHorizontal
@@ -308,7 +300,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
end
end
object dsFormaPago: TDADataSource
- Left = 64
+ Left = 16
Top = 24
end
end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
index cf0935bf..52e52dc6 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
@@ -49,6 +49,9 @@ type
bFormasPago: TButton;
dxLayoutControl1Group3: TdxLayoutGroup;
dxLayoutControl1Group6: TdxLayoutGroup;
+ dxLayoutControl1Item3: TdxLayoutItem;
+ cbCuentaBancaria: TcxDBComboBox;
+ dxLayoutControl1Group4: TdxLayoutGroup;
procedure bFormasPagoClick(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure CustomViewCreate(Sender: TObject);
@@ -58,6 +61,7 @@ type
FFormasPagoController : IFormasPagoController;
function GetFactura: IBizFacturaCliente;
procedure SetFactura(const Value: IBizFacturaCliente);
+ procedure RellenarCuentasBancarias;
public
property Factura: IBizFacturaCliente read GetFactura write SetFactura;
end;
@@ -66,7 +70,8 @@ type
implementation
uses
- uDataModuleContactos, schFacturasClienteClient_Intf;
+ uDataModuleContactos, schFacturasClienteClient_Intf, uFactuGES_App,
+ uEmpresasController;
{$R *.dfm}
@@ -98,11 +103,42 @@ begin
Result := FFactura;
end;
+procedure TfrViewFacturaCliente.RellenarCuentasBancarias;
+var
+ AController : IEmpresasController;
+ ALista : TStringList;
+ i : integer;
+begin
+ AController := TEmpresasController.Create;
+ try
+ ALista := AController.DarListaCuentasBancarias(AppFactuGES.EmpresaActiva);
+ try
+ with cbCuentaBancaria.Properties.Items do
+ begin
+ BeginUpdate;
+ try
+ Clear;
+ Add('');
+ for i := 0 to ALista.Count - 1 do
+ Add(ALista.Names[i]);
+ finally
+ EndUpdate;
+ end;
+ end;
+ finally
+ FreeANDNIL(ALista);
+ end;
+ finally
+ AController := NIL;
+ end;
+end;
+
procedure TfrViewFacturaCliente.SetFactura(const Value: IBizFacturaCliente);
var
ACadena : String;
begin
FFactura := Value;
+ RellenarCuentasBancarias;
if Assigned(FFactura) then
begin
DADataSource.DataTable := FFactura.DataTable;
diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.res b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.res
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.res and b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.res differ
diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas
index e3625f1d..239646f8 100644
--- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas
+++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas
@@ -3,7 +3,7 @@ unit schFacturasProveedorClient_Intf;
interface
uses
- Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+ Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
const
{ Data table rules ids
@@ -330,7 +330,7 @@ type
end;
{ TFacturasProveedorDataTableRules }
- TFacturasProveedorDataTableRules = class(TDADataTableRules, IFacturasProveedor)
+ TFacturasProveedorDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor)
private
f_OBSERVACIONES: IROStrings;
procedure OBSERVACIONES_OnChange(Sender: TObject);
@@ -624,7 +624,7 @@ type
end;
{ TFacturasProveedor_DetallesDataTableRules }
- TFacturasProveedor_DetallesDataTableRules = class(TDADataTableRules, IFacturasProveedor_Detalles)
+ TFacturasProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Detalles)
private
protected
{ Property getters and setters }
@@ -773,7 +773,7 @@ type
end;
{ TFacturasProveedor_PedidosDataTableRules }
- TFacturasProveedor_PedidosDataTableRules = class(TDADataTableRules, IFacturasProveedor_Pedidos)
+ TFacturasProveedor_PedidosDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Pedidos)
private
protected
{ Property getters and setters }
diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res and b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res differ
diff --git a/Source/Servidor/Configuracion/uConexionBD.dfm b/Source/Servidor/Configuracion/uConexionBD.dfm
index 112f31bd..542f8b14 100644
--- a/Source/Servidor/Configuracion/uConexionBD.dfm
+++ b/Source/Servidor/Configuracion/uConexionBD.dfm
@@ -1,7 +1,4 @@
inherited frConexionBD: TfrConexionBD
- Width = 394
- Height = 262
- Visible = True
object GroupBox1: TGroupBox
Left = 8
Top = 8
@@ -101,13 +98,13 @@ inherited frConexionBD: TfrConexionBD
Kind = bkEllipsis
end>
Properties.OnButtonClick = cxButtonEdit1PropertiesButtonClick
- Style.LookAndFeel.Kind = lfUltraFlat
+ Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.Kind = lfUltraFlat
+ StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.Kind = lfUltraFlat
+ StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.Kind = lfUltraFlat
+ StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 2
Width = 231
diff --git a/Source/Servidor/Configuracion/uConexionBD.pas b/Source/Servidor/Configuracion/uConexionBD.pas
index e5c79ca3..32a919c2 100644
--- a/Source/Servidor/Configuracion/uConexionBD.pas
+++ b/Source/Servidor/Configuracion/uConexionBD.pas
@@ -6,7 +6,12 @@ uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, ExtCtrls, cxShellBrowserDialog, cxControls,
cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxButtonEdit, IBServices,
- DB, IBDatabase, uFrameConfiguracion;
+ DB, IBDatabase, uFrameConfiguracion, dxSkinsCore, dxSkinBlack, dxSkinBlue,
+ dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian,
+ dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins,
+ dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+ dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust,
+ dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue;
type
TfrConexionBD = class(TFrameConfiguracion)
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 14ca7361..929fe000 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 95df3bb2..39b56556 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,279 +1,279 @@
-
+
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
- vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
- True
- True
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
-
-
- Delphi.Personality
-
-
-FalseTrueFalse/standaloneTrueFalse1050FalseFalseFalseFalseFalse308212521.0.5.01.0.5.0martes, 03 de junio de 2008 19:12FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TFrame
-
-
-
- TFrame
-
-
-
- TForm
-
-
-
- TFrame
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
+ FactuGES_Server.dpr
+ Debug
+ AnyCPU
+ DCC32
+ ..\..\Output\Debug\Servidor\FactuGES_Server.exe
+ vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+ True
+ True
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+
+
+ Delphi.Personality
+
+
+ FalseTrueFalse/standaloneTrueFalse1050FalseFalseFalseFalseFalse308212521.0.5.01.0.5.0martes, 03 de junio de 2008 19:12FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+