diff --git a/Resources/Fuentes/DejaVuSansMono-Bold.ttf b/Resources/Fuentes/DejaVuSansMono-Bold.ttf
new file mode 100644
index 00000000..32a8695f
Binary files /dev/null and b/Resources/Fuentes/DejaVuSansMono-Bold.ttf differ
diff --git a/Resources/Fuentes/DejaVuSansMono-BoldOblique.ttf b/Resources/Fuentes/DejaVuSansMono-BoldOblique.ttf
new file mode 100644
index 00000000..5e2ee033
Binary files /dev/null and b/Resources/Fuentes/DejaVuSansMono-BoldOblique.ttf differ
diff --git a/Resources/Fuentes/DejaVuSansMono-Oblique.ttf b/Resources/Fuentes/DejaVuSansMono-Oblique.ttf
new file mode 100644
index 00000000..9789ea05
Binary files /dev/null and b/Resources/Fuentes/DejaVuSansMono-Oblique.ttf differ
diff --git a/Resources/Fuentes/DejaVuSansMono.ttf b/Resources/Fuentes/DejaVuSansMono.ttf
new file mode 100644
index 00000000..6bc854dd
Binary files /dev/null and b/Resources/Fuentes/DejaVuSansMono.ttf differ
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index c8226812..011a1446 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -51,13 +51,6 @@
-
-
-
-
-
-
-
VCL for the Web Design Package for CodeGear RAD Studio
CodeGear WebSnap Components
CodeGear SOAP Components
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index aa2ba778..4714b502 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2360FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.6.0FactuGESFactuGES2.3.6.0FactuGES.dprFalse
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2370FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.7.0FactuGESFactuGES2.3.7.0FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index bd23d37f..4161ede1 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
-FILEVERSION 2,3,6,0
-PRODUCTVERSION 2,3,6,0
+FILEVERSION 2,3,7,0
+PRODUCTVERSION 2,3,7,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
- VALUE "FileVersion", "2.3.6.0\0"
+ VALUE "FileVersion", "2.3.7.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "2.3.6.0\0"
+ VALUE "ProductVersion", "2.3.7.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 82e01168..6c5d298a 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/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3
index 04cfe54c..d6770ef1 100644
--- a/Source/Informes/1/InfAlbaranCliente.fr3
+++ b/Source/Informes/1/InfAlbaranCliente.fr3
@@ -1,62 +1,61 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3
index 2f79a140..b9ea1080 100644
--- a/Source/Informes/2/InfAlbaranCliente.fr3
+++ b/Source/Informes/2/InfAlbaranCliente.fr3
@@ -1,58 +1,58 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm
index cd4d9969..da184a85 100644
--- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm
+++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm
@@ -173,8 +173,6 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = Bin2DataStreamer
- DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
- MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Informe_Cabecera'
IndexDefs = <>
Left = 264
@@ -245,8 +243,6 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = Bin2DataStreamer
- DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
- MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Informe_Detalles'
IndexDefs = <>
Left = 344
@@ -597,7 +593,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
item
Name = 'ID_ALBARAN'
DataType = datInteger
- Value = ''
+ Value = '1'
ParamType = daptInput
end>
Statements = <
@@ -608,13 +604,15 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
'SELECT ALBARANES_CLIENTE_DETALLES.ID, ALBARANES_CLIENTE_DETALLES' +
'.ID_ALBARAN,'#10' ALBARANES_CLIENTE_DETALLES.POSICION, ALBARAN' +
'ES_CLIENTE_DETALLES.TIPO_DETALLE,'#10' ALBARANES_CLIENTE_DETAL' +
- 'LES.CONCEPTO, ALBARANES_CLIENTE_DETALLES.CANTIDAD,'#10' ALBARA' +
- 'NES_CLIENTE_DETALLES.DESCUENTO,'#10' ALBARANES_CLIENTE_DETALLE' +
- 'S.IMPORTE_UNIDAD, ALBARANES_CLIENTE_DETALLES.IMPORTE_TOTAL,'#10' ' +
- ' ARTICULOS.REFERENCIA, ARTICULOS.FAMILIA, ARTICULOS.REFERENCIA' +
- '_PROV as REFERENCIA_PROVEEDOR'#10#10'FROM ALBARANES_CLIENTE_DETALLES'#10'L' +
- 'EFT JOIN ARTICULOS ON (ALBARANES_CLIENTE_DETALLES.ID_ARTICULO = ' +
- 'ARTICULOS.ID)'#10'WHERE ID_ALBARAN = :ID_ALBARAN'#10'ORDER BY POSICION'#10
+ 'LES.CONCEPTO as CONCEPTO_RTF,'#10' F_RTFTOTEXT(ALBARANES_CLIEN' +
+ 'TE_DETALLES.CONCEPTO) as CONCEPTO,'#10' ALBARANES_CLIENTE_DETA' +
+ 'LLES.CANTIDAD,'#10' ALBARANES_CLIENTE_DETALLES.DESCUENTO,'#10' ' +
+ ' ALBARANES_CLIENTE_DETALLES.IMPORTE_UNIDAD, ALBARANES_CLIENTE_' +
+ 'DETALLES.IMPORTE_TOTAL,'#10' ARTICULOS.REFERENCIA, ARTICULOS.F' +
+ 'AMILIA, ARTICULOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR'#10#10'FROM ' +
+ 'ALBARANES_CLIENTE_DETALLES'#10'LEFT JOIN ARTICULOS ON (ALBARANES_CLI' +
+ 'ENTE_DETALLES.ID_ARTICULO = ARTICULOS.ID)'#10'WHERE ID_ALBARAN = :ID' +
+ '_ALBARAN'#10'ORDER BY POSICION'#10
StatementType = stSQL
ColumnMappings = <
item
@@ -685,6 +683,11 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
DataType = datString
Size = 10
end
+ item
+ Name = 'CONCEPTO_RTF'
+ DataType = datString
+ Size = 2000
+ end
item
Name = 'CONCEPTO'
DataType = datString
@@ -1041,7 +1044,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
Top = 158
end
object frxReport: TfrxReport
- Version = '4.3'
+ Version = '4.8.11'
DotMatrixReport = False
EngineOptions.DoublePass = True
IniFile = '\Software\Fast Reports'
@@ -1051,148 +1054,12 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
PrintOptions.Printer = 'Default'
PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 37871.995398692100000000
- ReportOptions.LastChange = 39532.759439363400000000
+ ReportOptions.LastChange = 40107.819356273150000000
ReportOptions.VersionBuild = '1'
ReportOptions.VersionMajor = '12'
ReportOptions.VersionMinor = '13'
ReportOptions.VersionRelease = '1'
ScriptLanguage = 'PascalScript'
- ScriptText.Strings = (
- 'procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);'
- 'begin'
- ' DatosCliente.Lines.Clear;'
- ' DatosCliente.Lines.Add();'
- ''
- ' if ( <> '#39#39')'
- ' or ( <> '#39#39') then'
-
- ' DatosCliente.Lines.Add( + '#39' ' +
- ' '#39' + );'
- ''
- ' if ( <> '#39#39') then'
- ' DatosCliente.Lines.Add();'
- 'end;'
- ''
- 'procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);'
- 'begin'
- ' BandaDetalles.StartNewPage := False;'
- ' BandaDetalles.Visible := True;'
- ' MemPrecio.Style := '#39'Concepto normal'#39';'
- ' MemCantidad.Style := '#39'Concepto normal'#39';'
- ' MemImpTotal.Style := '#39'Concepto normal'#39';'
- ' RichConcepto.Visible := True;'
- ''
- ' case of'
- ' '#39'Salto'#39': begin'
- ' BandaDetalles.StartNewPage := True;'
- ' RichConcepto.Visible := False;'
- ' end;'
- ' '#39'Titulo'#39': begin'
- ' MemPrecio.Style := '#39'Concepto titulo'#39';'
- ' MemCantidad.Style := '#39'Concepto titulo'#39';'
- ' MemImpTotal.Style := '#39'Concepto titulo'#39';'
- ' end;'
- ' '#39'Concepto'#39': begin'
- ' MemPrecio.Style := '#39'Concepto normal'#39';'
- ' MemCantidad.Style := '#39'Concepto normal'#39';'
- ' MemImpTotal.Style := '#39'Concepto normal'#39';'
- ' end;'
- ' '#39'Subtotal'#39': begin'
- ' MemPrecio.Style := '#39'Concepto subtotal'#39';'
- ' MemCantidad.Style := '#39'Concepto subtotal'#39';'
- ' MemImpTotal.Style := '#39'Concepto subtotal'#39';'
- ' end;'
- ' '#39'Descuento'#39': begin'
- ' BandaDetalles.Visible := False;'
- ' RichConcepto.Color := clNone;'
- ' end;'
- ' end;'
- ''
- ' RichConcepto.Color := MemImpTotal.Color;'
- ' RichConcepto.Frame := MemImpTotal.Frame;'
- 'end;'
- ''
- 'procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);'
- 'begin'
- '// if Engine.FreeSpace > ReportSummary1.Height then '
-
- ' Engine.CurY := Engine.PageHeight - ReportSummary1.Height - P' +
- 'ageFooter1.Height - 1;'
- 'end;'
- ''
- 'procedure Memo15OnBeforePrint(Sender: TfrxComponent);'
- 'begin'
- ' Memo15.Lines.Clear;'
- ' if (StrToFloat() < 0) then'
- ' Memo15.Lines.Add('#39'ORDEN DEVOLUCI'#211'N'#39')'
- ' else'
- ' Memo15.Lines.Add('#39'ALBAR'#193'N'#39')'
- 'end;'
- ''
- 'procedure Band2OnBeforePrint(Sender: TfrxComponent);'
- 'begin'
- ' if not Engine.FinalPass then'
- ' Set('#39'TotalPaginas'#39', ( + 1));'
- ''
- ' if Engine.FinalPass then'
- ' Set('#39'Pagina'#39', ( + 1));'
- ''
- ' if Engine.FinalPass and ( > ) then'
- ' begin '
- ' LineaCorta0.visible := False; '
- ' LineaLarga0.visible := True; '
- ' LineaCorta1.visible := False;'
- ' LineaLarga1.visible := True; '
- ' LineaCorta2.visible := False; '
- ' LineaLarga2.visible := True; '
- ' LineaCorta3.visible := False; '
- ' LineaLarga3.visible := True; '
- ' end'
- ' else'
- ' begin'
- ' LineaCorta0.visible := True; '
- ' LineaLarga0.visible := False; '
- ' LineaCorta1.visible := True;'
- ' LineaLarga1.visible := False;'
- ' LineaCorta2.visible := True; '
- ' LineaLarga2.visible := False;'
- ' LineaCorta3.visible := True; '
- ' LineaLarga3.visible := False; '
- ' end;'
- 'end;'
- ''
- 'procedure frxReportOnStartReport(Sender: TfrxComponent);'
- 'begin'
- ' Set('#39'Pagina'#39', 0);'
- ' Set('#39'TotalPaginas'#39', 0);'
- 'end;'
- ''
-
- 'procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent)' +
- ';'
- 'begin'
-
- '//Es peor el remedio que la enfermedad, en el caso de sobre pasa' +
- 'r en uno el numero de conceptos para que no quepa el reportsumar' +
- 'y,'
-
- '//no hay forma de ponerlo al final en la p'#225'gina siguiente hasta ' +
- 'que el numero de conceptos rellene al menos un concepto de la si' +
- 'guiente hoja. ' +
- ' ' +
- ' ' +
- ' ' +
- ' ' +
- ' '
- '// if Engine.FreeSpace > ReportSummary1.Height then'
-
- '// Engine.CurY := Engine.PageHeight - ReportSummary1.Height -' +
- ' PageFooter1.Height - 1; '
- 'end;'
- ''
- 'begin'
- ''
- 'end.')
ShowProgress = False
StoreInDFM = False
OnStartReport = 'frxReportOnStartReport'
@@ -1203,6 +1070,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
UserName = 'frxDBCabecera'
CloseDataSource = False
DataSource = DADataCabecera
+ BCDToCurrency = False
Left = 264
Top = 16
end
@@ -1210,6 +1078,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
UserName = 'frxDBDetalles'
CloseDataSource = False
DataSource = DADataDetalles
+ BCDToCurrency = False
Left = 344
Top = 16
end
@@ -1267,8 +1136,6 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = Bin2DataStreamer
- DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
- MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Informe_Detalles_Etiquetas'
IndexDefs = <>
Left = 448
@@ -1284,6 +1151,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
UserName = 'frxDBEtiquetas'
CloseDataSource = False
DataSource = DADataEtiquetas
+ BCDToCurrency = False
Left = 448
Top = 16
end
@@ -1291,13 +1159,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 = 360
Top = 352
end
diff --git a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas
index 4c6fd6e1..7d4d5fa4 100644
--- a/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas
+++ b/Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas
@@ -82,6 +82,7 @@ function TsrvAlbaranesProveedor.GenerateReport(const ID: String): Binary;
//var
// AReportGenerator : TRptAlbaranesProveedor;
begin
+ Result := NIL;
{ AReportGenerator := TRptAlbaranesProveedor.Create(nil);
try
Result := AReportGenerator.GenerarAlbaran(ID);
diff --git a/Source/Modulos/Contratos de cliente/Controller/ContratosCliente_controller.drc b/Source/Modulos/Contratos de cliente/Controller/ContratosCliente_controller.drc
index 34874579..55420148 100644
--- a/Source/Modulos/Contratos de cliente/Controller/ContratosCliente_controller.drc
+++ b/Source/Modulos/Contratos de cliente/Controller/ContratosCliente_controller.drc
@@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Controller\ContratosCliente_controller.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfBAC.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3B1.tmp */
diff --git a/Source/Modulos/Contratos de cliente/Data/ContratosCliente_data.drc b/Source/Modulos/Contratos de cliente/Data/ContratosCliente_data.drc
index 23c34ca3..3008bbe1 100644
--- a/Source/Modulos/Contratos de cliente/Data/ContratosCliente_data.drc
+++ b/Source/Modulos/Contratos de cliente/Data/ContratosCliente_data.drc
@@ -14,4 +14,4 @@ END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Data\uDataModuleContratosCliente.dfm */
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Data\ContratosCliente_data.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfBAA.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3AF.tmp */
diff --git a/Source/Modulos/Contratos de cliente/Model/ContratosCliente_model.drc b/Source/Modulos/Contratos de cliente/Model/ContratosCliente_model.drc
index 5fc241cf..2d24ca9f 100644
--- a/Source/Modulos/Contratos de cliente/Model/ContratosCliente_model.drc
+++ b/Source/Modulos/Contratos de cliente/Model/ContratosCliente_model.drc
@@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Model\ContratosCliente_model.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfBA8.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3AD.tmp */
diff --git a/Source/Modulos/Contratos de cliente/Plugin/ContratosCliente_plugin.drc b/Source/Modulos/Contratos de cliente/Plugin/ContratosCliente_plugin.drc
index 14554c4d..8c449645 100644
--- a/Source/Modulos/Contratos de cliente/Plugin/ContratosCliente_plugin.drc
+++ b/Source/Modulos/Contratos de cliente/Plugin/ContratosCliente_plugin.drc
@@ -14,4 +14,4 @@ END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Plugin\uPluginContratosCliente.dfm */
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Plugin\ContratosCliente_plugin.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfBF4.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3F9.tmp */
diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.drc b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.drc
index 1fab9cd1..33b8280d 100644
--- a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.drc
+++ b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.drc
@@ -25,4 +25,4 @@ END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Views\uEditorElegirArticulosContratoCliente.dfm */
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Views\uEditorContratosClienteReport.dfm */
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Views\ContratosCliente_view.res */
-/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Views\ContratosCliente_view.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3F7.tmp */
diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas
index 34156746..1e068e50 100644
--- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas
+++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas
@@ -82,6 +82,7 @@ function TsrvFacturasProveedor.GenerateReport(const FacturaID: String): Binary;
//var
// AReportGenerator : TRptFacturasProveedor;
begin
+ Result := NIL;
{ AReportGenerator := TRptFacturasProveedor.Create(nil);
try
Result := AReportGenerator.GenerarFactura(FacturaID);
diff --git a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas
index a40fa423..ab281c8e 100644
--- a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas
+++ b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas
@@ -86,6 +86,7 @@ function TsrvPedidosProveedor.GenerateReport(const ID: String): Binary;
//var
// AReportGenerator : TRptPedidosProveedor;
begin
+ Result := NIL;
{ AReportGenerator := TRptPedidosProveedor.Create(nil);
try
Result := AReportGenerator.GenerarPedido(ID);
diff --git a/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.pas b/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.pas
index 3694fe9c..636ddf34 100644
--- a/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.pas
+++ b/Source/Modulos/Remesas de cliente/Servidor/srvRemesasCliente_Impl.pas
@@ -82,6 +82,7 @@ function TsrvRemesasCliente.GenerateReport(const ID: String): Binary;
//var
// AReportGenerator : TRptRemesasCliente;
begin
+ Result := NIL;
{ AReportGenerator := TRptRemesasCliente.Create(nil);
try
Result := AReportGenerator.GenerarRemesa(ID);
diff --git a/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.pas b/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.pas
index 404a81f1..2406dd30 100644
--- a/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.pas
+++ b/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.pas
@@ -83,6 +83,7 @@ function TsrvRemesasProveedor.GenerateReport(const ID: String): Binary;
//var
// AReportGenerator : TRptRemesasProveedor;
begin
+ Result := NIL;
{
AReportGenerator := TRptRemesasProveedor.Create(nil);
try
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 4b8b5584..1b799a01 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index 68963de6..839ff67c 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -143,7 +143,7 @@ uses
begin
Application.Initialize;
-// ReportMemoryLeaksOnShutdown := True;
+ //ReportMemoryLeaksOnShutdown := True; //
Application.Title := 'FactuGES (Servidor)';
Application.ShowMainForm := False;
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index d219be5a..4ef38019 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,295 +1,303 @@
-
+ï»ż
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
-
-
- Delphi.Personality
-
-
- FalseTrueFalseTrueFalse2360FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.6.0FactuGES (Servidor)2.3.6.0martes, 22 de septiembre de 2009 18:55
- FastQueryBuilder 1.03
- JVCL Unified Interbase Components
- FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
- TRORemoteDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
- TDataModule
-
-
-
- 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
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+
+
+ Delphi.Personality
+
+
+FalseTrueFalseTrueFalse2370FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.7.0FactuGES (Servidor)2.3.7.0miércoles, 14 de octubre de 2009 13:26
+
+
+
+
+
+
+
+
+ FastQueryBuilder 1.03
+ JVCL Unified Interbase Components
+ FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+ TRORemoteDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+