diff --git a/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.dfm b/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.dfm index f1f4987d..f70f05b1 100644 --- a/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.dfm +++ b/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.dfm @@ -69,8 +69,6 @@ object RptComisiones: TRptComisiones RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeComisiones' IndexDefs = <> Left = 264 @@ -860,7 +858,7 @@ object RptComisiones: TRptComisiones Top = 150 end object frxReport: TfrxReport - Version = '4.3' + Version = '4.8.11' DotMatrixReport = False IniFile = '\Software\Fast Reports' PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick] @@ -870,11 +868,6 @@ object RptComisiones: TRptComisiones ReportOptions.CreateDate = 39589.794825115700000000 ReportOptions.LastChange = 39589.813437314820000000 ScriptLanguage = 'PascalScript' - ScriptText.Strings = ( - '' - 'begin' - '' - 'end.') ShowProgress = False StoreInDFM = False Left = 169 @@ -884,6 +877,7 @@ object RptComisiones: TRptComisiones UserName = 'frxDBCabecera' CloseDataSource = False DataSource = DADataCabecera + BCDToCurrency = False Left = 264 Top = 16 end @@ -895,6 +889,7 @@ object RptComisiones: TRptComisiones UserName = 'frxDBDetalles1' CloseDataSource = False DataSource = DADataDetalles1 + BCDToCurrency = False Left = 352 Top = 16 end @@ -1094,8 +1089,6 @@ object RptComisiones: TRptComisiones RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeComisionesFacturas' IndexDefs = <> Left = 352 @@ -1105,6 +1098,7 @@ object RptComisiones: TRptComisiones UserName = 'frxDBDetalles2' CloseDataSource = False DataSource = DADataDetalles2 + BCDToCurrency = False Left = 456 Top = 16 end @@ -1156,8 +1150,6 @@ object RptComisiones: TRptComisiones RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeComisionesVendedores' IndexDefs = <> Left = 456 diff --git a/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.pas b/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.pas index 87482586..3c749f14 100644 --- a/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.pas +++ b/Source/Modulos/Comisiones/Reports/uRptComisiones_Server.pas @@ -66,9 +66,14 @@ var begin FConnection.BeginTransaction; try + tbl_Comisiones.Active := False; + tbl_Facturas.Active := False; + tbl_Vendedores.Active := False; + tbl_Comisiones.ParamByName('ID').AsInteger := ID; tbl_Facturas.ParamByName('ID').AsInteger := ID; tbl_Vendedores.ParamByName('ID').AsInteger := ID; + tbl_Comisiones.Active := True; tbl_Facturas.Active := True; tbl_Vendedores.Active := True; @@ -78,6 +83,7 @@ begin raise Exception.Create (('Error Servidor: GenerarComision, no encuentra informe' + rptComision)); frxReport.LoadFromFile(AInforme, True); + frxReport.ReportOptions.Name := 'Comisiones'; frxReport.PrepareReport(False); finally FConnection.RollbackTransaction; @@ -95,7 +101,7 @@ begin ID_Comisiones := TStringList.Create; ID_Comisiones.CommaText := AComisionID; - //Vamos generando todos y cada uno de los albaranes recibidos + //Vamos generando todos y cada uno de las comisiones pedidas for i := 0 to ID_Comisiones.Count - 1 do GenerarComision(StrToInt(ID_Comisiones.Strings[i])); diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas index 1990321c..27d29c2f 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas @@ -616,6 +616,7 @@ begin raise Exception.Create (('Error Servidor: _GenerarFactura, no encuentra informe ' + rptFacturaCliente)); frxReport.LoadFromFile(AInforme, True); + frxReport.ReportOptions.Name := 'Factura ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString; frxReport.PrepareReport(False); finally FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO" diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm index d332bf4c..c0e363a5 100644 --- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm +++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm @@ -202,8 +202,6 @@ object RptRecibosCliente: TRptRecibosCliente 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 @@ -910,7 +908,7 @@ object RptRecibosCliente: TRptRecibosCliente Top = 158 end object frxReport: TfrxReport - Version = '4.3' + Version = '4.8.11' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' @@ -928,79 +926,6 @@ object RptRecibosCliente: TRptRecibosCliente ReportOptions.VersionMinor = '13' ReportOptions.VersionRelease = '1' ScriptLanguage = 'PascalScript' - ScriptText.Strings = ( - 'procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);' - 'var' - ' Cadena: String;' - 'begin' - ' DatosEmpresa.Lines.Clear;' - ' DatosEmpresa.Lines.Add();' - - ' DatosEmpresa.Lines.Add( + '#39' - '#39 + - ' + + '#39' '#39' + );' - '' - ' Cadena := '#39#39';' - ' if ( <> '#39#39') then' - ' Cadena := '#39'TLF: '#39' + ;' - ' if ( <> '#39#39') then' - ' Cadena := Cadena + '#39' FAX: '#39' + ;' - ' DatosEmpresa.Lines.Add(Cadena);' - 'end;' - '' - 'procedure Memo54OnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' if ( <> '#39#39') then' - ' Memo54.Text := '#39'Recibos compensados'#39';' - 'end;' - '' - 'procedure EtiCompensadoOnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' if ( = '#39#39') then' - ' begin' - ' EtiCompensado.Visible := False;' - ' EtiCompensado2.Visible := False;' - ' end;' - 'end;' - '' - 'procedure Memo55OnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' if ( <> '#39#39') then' - ' begin' - - ' Memo55.Text := '#39'( Compensado en el recibo '#39' + + '#39' )'#39';' - - ' Memo1.Text := '#39'( Compensado en el recibo '#39' + + '#39' )'#39';' - ' end;' - 'end;' - '' - 'procedure Memo40OnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' if ( < 1) then' - ' begin' - ' Memo40.visible := False;' - ' Memo25.visible := False; ' - ' eFormaPagoFactura.visible := False;' - ' Memo26.visible := False; ' - ' end' - 'end;' - '' - 'procedure Memo35OnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' if ( < 1) then' - ' begin' - ' Memo35.visible := False;' - ' Memo44.visible := False; ' - ' eFechaFactura.visible := False;' - ' Memo47.visible := False; ' - ' end' - 'end;' - '' - 'begin' - '' - 'end.') ShowProgress = False StoreInDFM = False Left = 169 @@ -1010,6 +935,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBCabecera' CloseDataSource = False DataSource = DADataCabecera + BCDToCurrency = False Left = 264 Top = 16 end @@ -1023,6 +949,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBCompensados' CloseDataSource = True DataSource = DADataCompensados + BCDToCurrency = False Left = 360 Top = 16 end @@ -1055,8 +982,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'Informe_Compensados' IndexDefs = <> Left = 360 @@ -1124,8 +1049,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeListadoRecibos' IndexDefs = <> Left = 496 @@ -1141,6 +1064,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibos' CloseDataSource = True DataSource = DADSInformeListadoRecibos + BCDToCurrency = False Left = 496 Top = 16 end diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas index 5a8251fe..4494e8c2 100644 --- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas +++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas @@ -268,6 +268,7 @@ begin raise Exception.Create (('Error Servidor: _GenerarRecibo, no encuentra informe ' + rptInforme)); frxReport.LoadFromFile(AInforme, True); + frxReport.ReportOptions.Name := 'Recibo de cliente ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString; frxReport.PrepareReport(False); finally FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"