diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm index 136323e8..17eaa570 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm @@ -1690,23 +1690,177 @@ object RptFacturasCliente: TRptFacturasCliente PreviewOptions.Zoom = 1.000000000000000000 PrintOptions.Printer = 'Por defecto' PrintOptions.PrintOnSheet = 0 - ReportOptions.CreateDate = 37800.807714351900000000 - ReportOptions.LastChange = 39840.805247928200000000 + ReportOptions.CreateDate = 39065.872423495400000000 + ReportOptions.LastChange = 39920.656640081000000000 ScriptLanguage = 'PascalScript' ScriptText.Strings = ( - 'procedure mContinuaOnBeforePrint(Sender: TfrxComponent);' + '' + 'procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);' + 'var' + ' Cadena: String;' 'begin' - ' if Engine.FinalPass then' - ' begin' - ' if ( = ) then' - ' begin ' - ' mContinua.Visible := False;' - ' end ' - ' else' - ' begin ' - ' mContinua.Visible := True;' - ' end ' - ' end; ' + '{ DatosEmpresa.Lines.Clear;' + ' if ( <> '#39#39') then' + ' Cadena := '#39'TLF: '#39' + ;' + ' if ( <> '#39#39') then' + + ' Cadena := Cadena + '#39' FAX: '#39' + ;' + ' DatosEmpresa.Lines.Add(Cadena);' + '}' + 'end;' + '' + 'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);' + 'begin' + '{ NombreEmpresa.Lines.Clear;' + ' NombreEmpresa.Lines.Add();' + '}' + 'end;' + '' + 'procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);' + 'var' + ' ACadena : String;' + 'begin' + '{ ACadena := '#39#39';' + ' DireccionEnvio.Lines.Clear;' + ' if ( <> '#39#39') then' + ' ACadena := ;' + '' + ' if ( <> '#39#39') then' + + ' ACadena := ACadena + '#39' '#39' + ;' + '' + ' DireccionEnvio.Lines.Add(ACadena);' + ' ACadena := '#39#39';' + ' DireccionEnvio.Lines.Add();' + ' if ( <> '#39#39') then' + ' ACadena := + '#39' '#39';' + ' if ( <> '#39#39') then' + ' ACadena := ACadena + ;' + '' + ' if (ACadena <> '#39#39') then' + ' DireccionEnvio.Lines.Add(ACadena);' + '' + ' if ( <> '#39#39') then' + ' DireccionEnvio.Lines.Add();' + '' + ' if ( <> '#39#39') then' + ' DireccionEnvio.Lines.Add();' + '}' + 'end;' + '' + 'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if not Engine.FinalPass then' + ' Set('#39'TotalPaginas'#39', ( + 1));' + '' + ' if Engine.FinalPass then' + ' Set('#39'Pagina'#39', ( + 1)); ' + 'end;' + '' + 'procedure frxReportOnStartReport(Sender: TfrxComponent);' + 'begin' + ' Set('#39'Pagina'#39', 0);' + ' Set('#39'TotalPaginas'#39', 0);' + ' Set('#39'Capitulo'#39', 0);' + ' Set('#39'NumCapitulos'#39', 0); ' + 'end;' + '' + 'procedure Memo4OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if (Length() = 0) then' + ' Memo4.Visible := False; ' + 'end;' + '' + 'procedure Memo22OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if ( = 0) then' + ' begin ' + ' Subtotal.Text := '#39'Base imponible:'#39';' + ' BaseImponible.Text := '#39'Importe total:'#39'; ' + ' BaseImponible.Font.Style := fsBold;' + '' + + ' ImpBaseImponible.Text := FormatFloat('#39'#,##0.00 '#8364#39', );' + ' ImpBaseImponible.Font.Style := fsBold; ' + ' ' + ' Descuento.Text := '#39'[]% IVA:'#39';' + ' ImpDescuento.Text := '#39'[frxDBCabecera."IMPORTE_IVA"]'#39';' + ' Memo11.Color := $00CCFFCC;' + '' + ' if ( > 0) then' + ' begin ' + ' BaseImponible.Text := '#39'Total certificaci'#243'n:'#39';' + + ' IVA.Text := FormatFloat('#39'#,##0.00 %'#39',) + '#39' Retenci'#243'n:'#39'; ' + + ' ImpIVA.Text := FormatFloat('#39'-#,##0.00 '#8364#39',);' + + ' ImporteTotal.Text := '#39'TOTAL FACTURA'#39'; ' + + ' ' + + ' ' + + ' ImpImporteTotal.Text := FormatFloat('#39'#,##0.00 '#8364#39', ( - ' + + ')); ' + ' end ' + ' else' + ' begin' + ' IVA.Visible := False;' + ' ImpIVA.Visible := False;' + ' ImporteTotal.Visible := False;' + ' ImpImporteTotal.Visible := False;' + ' Memo16.Visible := False; ' + ' Memo17.Visible := False;' + ' end;' + ' end' + ' else' + ' begin ' + ' if ( > 0) then' + ' begin' + ' ImporteTotal.Text := '#39'Total certificaci'#243'n:'#39'; ' + ' Retencion.Visible := True;' + ' ImpRetencion.Visible := True;' + ' LinRetencion.Visible := True; ' + ' TotalFacturaRet.Visible := True;' + ' ImpTotalFacturaRet.Visible := True;' + ' LinImporteTotalFacturaRet.Visible := True; ' + ' end' + ' end ' + 'end;' + '' + 'procedure Memo39OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' Memo39.Clear; ' + ' if ( = '#39'F'#39') then' + + ' Memo39.Text := '#39'FACTURA'#39' ' + + ' ' + ' else' + ' Memo39.Text := '#39'ABONO'#39'; ' + 'end;' + '' + 'procedure Picture4OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if ( = 1) then' + ' Picture4.Visible := True' + ' else' + ' Picture4.Visible := False; ' + 'end;' + '' + 'procedure eCopiaOnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if ( = 1) then' + ' begin ' + ' eCopia.Visible := True; ' + ' Picture4.Visible := False; ' + ' end ' + ' else' + ' eCopia.Visible := False; ' 'end;' '' 'begin' diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas index bf1bdf66..82ad53d1 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas @@ -686,6 +686,7 @@ begin if VerCopia then begin frxReport.Variables.Variables['VerCopia'] := 1; + frxReport.Variables.Variables['VerSello'] := 0; //El sello nunca saldrá en la copia frxReport.PrepareReport(False); end; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index ed666fab..84b43a7c 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 50d46d34..1c1ed592 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.7.3.0\0" VALUE "ProductVersion", "1.7.3.0\0" - VALUE "CompileDate", "viernes, 17 de abril de 2009 10:41\0" + VALUE "CompileDate", "viernes, 17 de abril de 2009 11:42\0" END END BLOCK "VarFileInfo"