Nueva version

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1151 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2017-01-27 18:08:46 +00:00
parent ba6e9a5753
commit 450dc47c86
22 changed files with 1537 additions and 1696 deletions

View File

@ -6,6 +6,7 @@ uses
Classes;
const
DISPLAY_EUROS4_ESPECIAL = '###0.00## €;-###0.00## €;';
DISPLAY_EUROS4 = '#,0.0000 €';
DISPLAY_EUROS2 = '#,0.00 €';
DISPLAY_PORCENTAJE = '#,0.00%';

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -225,13 +225,13 @@ begin
if ImprimirPrecio
and (FieldByName('IMPORTE_UNIDAD').AsFloat <> 0) then
Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat)
Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS4_ESPECIAL, FieldByName('IMPORTE_UNIDAD').AsFloat)
else
Cell(iRowCount, 4).Range.Text := '';
if ImprimirPrecio
and (FieldByName('IMPORTE_TOTAL').AsFloat <> 0) then
Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat)
Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4_ESPECIAL, FieldByName('IMPORTE_TOTAL').AsFloat)
else
Cell(iRowCount, 5).Range.Text := '';

View File

@ -427,10 +427,10 @@ begin
Cell(iRowCount, 3).Range.Text := AText + ' ' + FieldByName('UNIDAD_MEDIDA').AsString;
if FieldByName('IMPORTE_UNIDAD').AsFloat <> 0 then
Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat);
Cell(iRowCount, 4).Range.Text := FormatFloat(DISPLAY_EUROS4_ESPECIAL, FieldByName('IMPORTE_UNIDAD').AsFloat);
if FieldByName('IMPORTE_TOTAL').AsFloat <> 0 then
Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat);
Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS4_ESPECIAL, FieldByName('IMPORTE_TOTAL').AsFloat);
TotalCapitulo := TotalCapitulo + FieldByName('IMPORTE_TOTAL').AsFloat;
end;

View File

@ -1651,7 +1651,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 42305.717481620370000000
ReportOptions.LastChange = 42759.744943807870000000
ScriptLanguage = 'PascalScript'
ScriptText.Strings = (
''
@ -1744,11 +1744,11 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
''
'procedure Page2OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if (Length(<frxDBCabecera."MEMORIA_TEXTO">) = 0) then'
' Page2.Visible := false '
' else'
' Page2.Visible := true; '
' '
' if (Length(trim(<frxDBCabecera."MEMORIA">)) = 0) then'
' begin '
' Page2.Visible := False;'
' Set('#39'TotalPaginas'#39', (<TotalPaginas> - 1)); '
' end; '
'end;'
''
'procedure Memo45OnBeforePrint(Sender: TfrxComponent);'
@ -1759,7 +1759,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
' if (<frxDBCapitulos."TIPO_DETALLE"> <> '#39'Titulo opcional'#39') t' +
'hen '
' Set('#39'Capitulo'#39', (<Capitulo> + 1));'
''
' '
' Set('#39'TextoNumCapitulo'#39', <Capitulo>);'
''
@ -1779,17 +1779,6 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
' Set('#39'NumCapitulos'#39', (<NumCapitulos> + 1));'
'end;'
''
'procedure Memo47OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if (Length(<frxDBCabecera."OBSERVACIONES">) = 0) then'
' begin'
' Memo11.Visible := False; ' +
' '
' Memo47.Visible := False;'
' end '
'end;'
''
'procedure Footer2OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if not ((<frxDBCabecera."IMPORTE_BONIFICACION">) > 0) then'
@ -1805,9 +1794,8 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
' mImporteFinal.Visible := True; ' +
' '
' end;'
' end'
'end;'
''
''
'procedure frxDBDetallesCANTIDADOnBeforePrint(Sender: TfrxCompone' +
@ -1834,7 +1822,46 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
'DAD">)] [frxDBDetalles."UNIDAD_MEDIDA"]'#39'; '
' '
' frxDBDetallesCANTIDAD.Memo.Add(AText);'
' end; '
' end; '
'end;'
''
'procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent)' +
';'
'begin'
' ReportSummary1.Height := Engine.FreeSpace - 20; '
'end;'
''
'procedure MasterData4OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if (MasterData4.DataSet.RecordCount > 1) then'
' begin '
' Header2.Visible := True; ' +
' '
' MasterData4.Visible := True;'
' Memo38.Visible := True; ' +
' '
' end '
' else'
' begin'
' Header2.Visible := False; '
' MasterData4.Visible := False;'
' Memo38.Visible := False; '
' end; '
'end;'
''
'procedure Shape3OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if (Length(<frxDBCabecera."OBSERVACIONES">) = 0) then'
' begin'
' Memo59.Visible := False; ' +
' '
' Memo31.Visible := False;'
' end '
' '
'end;'
''
'procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);'
@ -1850,41 +1877,6 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
' Firma2.Visible := True; '
' end;'
'end;'
''
'procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent)' +
';'
'begin'
' ReportSummary1.Height := Engine.FreeSpace - 20;'
'end;'
''
'procedure MasterData4OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if (MasterData4.DataSet.RecordCount > 1) then'
' begin '
' Header2.Visible := True; ' +
' '
' MasterData4.Visible := True;'
' Memo38.Visible := True;'
' end '
' else'
' begin'
' Header2.Visible := False; '
' MasterData4.Visible := False;'
' Memo38.Visible := False;'
' end;'
'end;'
''
'procedure Picture4OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if (<VerISO> = 0) then'
' begin '
' end '
' else'
' begin '
' end; '
'end;'
''
'begin'
''

View File

@ -185,13 +185,13 @@ begin
if FImportes and
(FieldByName('IMPORTE_UNIDAD').AsFloat <> 0) then
Cell(iContador, 3).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_UNIDAD').AsFloat)
Cell(iContador, 3).Range.Text := FormatFloat(DISPLAY_EUROS4_ESPECIAL, FieldByName('IMPORTE_UNIDAD').AsFloat)
else
Cell(iContador, 3).Range.Text := '';
if FImportes and
(FieldByName('IMPORTE_TOTAL').AsFloat <> 0) then
Cell(iContador, 4).Range.Text := FormatFloat(DISPLAY_EUROS4, FieldByName('IMPORTE_TOTAL').AsFloat)
Cell(iContador, 4).Range.Text := FormatFloat(DISPLAY_EUROS4_ESPECIAL, FieldByName('IMPORTE_TOTAL').AsFloat)
else
Cell(iContador, 4).Range.Text := '';

Binary file not shown.

View File

@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "2.1.6.0\0"
VALUE "ProductName", "FactuGES Servidor\0"
VALUE "ProductVersion", "2.1.6.0\0"
VALUE "CompileDate", "lunes, 23 de enero de 2017 16:53\0"
VALUE "CompileDate", "viernes, 27 de enero de 2017 17:31\0"
END
END
BLOCK "VarFileInfo"