diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index f4910a29..c93edcee 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -54,58 +54,58 @@
MainSource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
TForm
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 8b251f31..1641339f 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm
index 6f6771fe..227cc64f 100644
--- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm
+++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm
@@ -467,7 +467,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
Top = 16
end
object frxReport: TfrxReport
- Version = '4.3'
+ Version = '4.7.71'
DotMatrixReport = False
EngineOptions.DoublePass = True
IniFile = '\Software\Fast Reports'
@@ -564,6 +564,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
UserName = 'frxDBCabecera'
CloseDataSource = False
DataSource = DADSCabecera
+ BCDToCurrency = False
Left = 264
Top = 16
end
@@ -571,6 +572,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
UserName = 'frxDBDetalles'
CloseDataSource = False
DataSource = DADSDetalles
+ BCDToCurrency = False
Left = 344
Top = 16
end
@@ -876,8 +878,6 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = DABin2DataStreamer1
- DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
- MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Informe_Cabecera'
IndexDefs = <>
Left = 264
@@ -945,8 +945,6 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
LocalSchema = schReport
LocalDataStreamer = DABin2DataStreamer1
DetailFields = 'ID_ALBARAN'
- DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
- MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Informe_Detalles'
IndexDefs = <>
Left = 344
@@ -956,13 +954,21 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
ShowDialog = False
UseFileCache = True
ShowProgress = False
+ OverwritePrompt = False
PrintOptimized = True
Outline = False
+ Background = False
+ HTMLTags = True
Author = 'FactuGES'
Subject = 'FactuGES'
- Background = False
Creator = 'FactuGES'
- HTMLTags = True
+ ProtectionFlags = [ePrint, eModify, eCopy, eAnnot]
+ HideToolbar = False
+ HideMenubar = False
+ HideWindowUI = False
+ FitWindow = False
+ CenterWindow = False
+ PrintScaling = False
Left = 344
Top = 304
end
diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas
index 96197419..4d1a9d9f 100644
--- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas
+++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas
@@ -176,6 +176,7 @@ function TRptAlbaranesCliente.GenerarEtiquetas(const AID: Integer; withRefClient
dsDetail: IDADataset;
AStream: TMemoryStream;}
begin
+ Result := NIL;
{
AStream := TMemoryStream.Create;
Result := Binary.Create;
diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas
index 68a40cec..23fabbb0 100644
--- a/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas
@@ -100,10 +100,10 @@ begin
end;
procedure TRptWordAlbaranCliente.RellenarDatosAlbaran;
-var
- FicheroTemporal : String;
- LinkToFile, SaveWithDocument, _Range : OleVariant;
- Imagen : InlineShape;
+//var
+// FicheroTemporal : String;
+// LinkToFile, SaveWithDocument, _Range : OleVariant;
+// Imagen : InlineShape;
begin
diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas
index b5c0b8bc..56044c18 100644
--- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas
+++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas
@@ -95,6 +95,7 @@ function TsrvAlbaranesCliente.GenerarInformeEtiquetas(const ID: Integer; const w
//var
// AReportGenerator : TRptAlbaranesCliente;
begin
+ Result := NIL;
{
AReportGenerator := TRptAlbaranesCliente.Create(nil);
try
diff --git a/Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas
index fd7fbcac..f67f1488 100644
--- a/Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas
+++ b/Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas
@@ -82,8 +82,6 @@ begin
end;
function TRptWordAlbaranProveedor.Generar : Boolean;
-var
- Aux : OleVariant;
begin
FWordApp := TWordApp.Create (False, False);
with FWordApp do
@@ -171,9 +169,9 @@ end;
function TRptWordAlbaranProveedor.RellenarDatosAlbaran : Boolean;
var
- DireccionEntrega, FicheroTemporal : String;
- LinkToFile, SaveWithDocument, _Range : OleVariant;
- Imagen : InlineShape;
+ DireccionEntrega : String;
+// LinkToFile, SaveWithDocument, _Range : OleVariant;
+// Imagen : InlineShape;
begin
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
index 1d023dae..a1e57c44 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
@@ -23,12 +23,12 @@ type
FPlantilla : string;
FWordApp : TWordApp;
FDocumento : TWordDoc;
- FNumCapitulos : Integer;
+// FNumCapitulos : Integer;
FCodigoFactura : string;
FNombreFichero : String;
FVerSello : Boolean;
- function DarNumCapitulos : Integer;
- procedure InsertarConceptos(Tabla : Table);
+// function DarNumCapitulos : Integer;
+// procedure InsertarConceptos(Tabla : Table);
function Generar : Boolean;
function RellenarCabecera : boolean; virtual;
function RellenarInforme : boolean; virtual;
@@ -58,7 +58,7 @@ begin
FDocumento := NIL;
end;
-function TRptWordFacturaCliente.DarNumCapitulos: Integer;
+{function TRptWordFacturaCliente.DarNumCapitulos: Integer;
var
AuxNumCapitulos : integer;
begin
@@ -72,7 +72,7 @@ begin
end;
tbl_Cabecera.First;
Result := AuxNumCapitulos;
-end;
+end;}
destructor TRptWordFacturaCliente.Destroy;
begin
@@ -104,8 +104,6 @@ begin
end;
function TRptWordFacturaCliente.Generar : Boolean;
-var
- Aux : OleVariant;
begin
FWordApp := TWordApp.Create (False, False);
with FWordApp do
@@ -131,7 +129,7 @@ begin
end;
end;
-procedure TRptWordFacturaCliente.InsertarConceptos(Tabla : Table);
+{procedure TRptWordFacturaCliente.InsertarConceptos(Tabla : Table);
var
numRows, numCols, mergeSplit, shiftCells : OleVariant;
iContador : Integer;
@@ -140,6 +138,7 @@ var
AIndice: Integer;
AText : String;
begin
+ TotalConceptos := 0;
numRows := 2;
numCols := 1;
mergeSplit := False;
@@ -186,15 +185,15 @@ begin
Cell(iContador, 1).Range.Text := 'Total: ' + FormatFloat(DISPLAY_EUROS2, TotalConceptos);
AutoFitBehavior(wdAutoFitWindow);
end;
-end;
+end;}
function TRptWordFacturaCliente.RellenarCabecera: boolean;
var
NombreFichero,
Texto,
- FicheroTemporal : String;
- LinkToFile, SaveWithDocument, _Range : OleVariant;
- Imagen : InlineShape;
+// FicheroTemporal : String;
+// LinkToFile, SaveWithDocument, _Range : OleVariant;
+// Imagen : InlineShape;
_ShiftCells : OleVariant;
ImporteAux : Double;
Cadena : String;
diff --git a/Source/Modulos/Gestion de documentos/Servidor/srvGestorDocumentos_Impl.pas b/Source/Modulos/Gestion de documentos/Servidor/srvGestorDocumentos_Impl.pas
index 56d18c84..823358ab 100644
--- a/Source/Modulos/Gestion de documentos/Servidor/srvGestorDocumentos_Impl.pas
+++ b/Source/Modulos/Gestion de documentos/Servidor/srvGestorDocumentos_Impl.pas
@@ -75,6 +75,7 @@ var
i: Integer;
begin
+ Result := NIL;
Ruta := DarRutaDocumentos;
try
case Almacen of
diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas
index b384f0da..c71ea824 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas
@@ -86,8 +86,6 @@ begin
end;
function TRptWordPedidoProveedor.Generar : Boolean;
-var
- Aux : OleVariant;
begin
FWordApp := TWordApp.Create (False, False);
with FWordApp do
@@ -178,9 +176,9 @@ end;
function TRptWordPedidoProveedor.RellenarDatosPedido : Boolean;
var
- DireccionEntrega, FicheroTemporal : String;
- LinkToFile, SaveWithDocument, _Range : OleVariant;
- Imagen : InlineShape;
+ DireccionEntrega : String;
+// LinkToFile, SaveWithDocument, _Range : OleVariant;
+// Imagen : InlineShape;
begin
diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.dfm b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.dfm
index 722dec99..39a2434f 100644
--- a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.dfm
@@ -485,8 +485,6 @@ object RptWordCertificadoTrabajo: TRptWordCertificadoTrabajo
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = DABin2DataStreamer
- DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
- MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Informe_Cabecera'
IndexDefs = <>
Left = 168
@@ -540,8 +538,6 @@ object RptWordCertificadoTrabajo: TRptWordCertificadoTrabajo
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = DABin2DataStreamer
- DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
- MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Informe_Capitulos'
IndexDefs = <>
Left = 264
@@ -559,8 +555,6 @@ object RptWordCertificadoTrabajo: TRptWordCertificadoTrabajo
LogChanges = False
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteFetchEnabled = False
- DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
- MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Empresa'
IndexDefs = <>
Left = 168
diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas
index e938cad3..0141b52e 100644
--- a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas
+++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas
@@ -26,8 +26,8 @@ type
private
FConnection: IDAConnection;
FImportes : Boolean;
- FDesBonificacion : Variant;
- FImpBonificacion : Double;
+// FDesBonificacion : Variant;
+// FImpBonificacion : Double;
FPlantilla : string;
FWordApp : TWordApp;
FDocumento : TWordDoc;
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index c5fe7cc8..80060c14 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -36,6 +36,10 @@
FalseTrueFalse/standaloneTrueFalse1760FalseFalseFalseFalseFalse308212521.7.6.01.7.6.0martes, 05 de mayo de 2009 16:47
+
+
+
+
ExpressPrinting System by Developer Express Inc.
FactuGES_Server.dpr