Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 2.4.0

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1168 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2021-09-23 17:15:32 +00:00
parent 82393c1405
commit bf321b65a8
45 changed files with 1615 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Cliente/FactuGES.dproj
View File

@ -53,7 +53,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType> <Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.3.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.3.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.4.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup> <ItemGroup>

8
Source/Cliente/FactuGES.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico" MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,3,4,0 FILEVERSION 2,4,0,0
PRODUCTVERSION 2,3,4,0 PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.3.4.0\0" VALUE "FileVersion", "2.4.0.0\0"
VALUE "InternalName", "FactuGES\0" VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0" VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "2.3.4.0\0" VALUE "ProductVersion", "2.4.0.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

BIN
Source/Informes/1/AlbaranCliente.rdx
View File

Binary file not shown.

6
Source/Informes/1/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

BIN
Source/Informes/2/AlbaranCliente.rdx
View File

Binary file not shown.

7
Source/Informes/2/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

13
Source/Informes/2/InformeListadoBeneficiosGrafComp.fr3
View File

File diff suppressed because one or more lines are too long

11
Source/Informes/2/InformeListadoFacturasProveedorGrafComp.fr3
View File

File diff suppressed because one or more lines are too long

BIN
Source/Informes/3/AlbaranCliente.rdx
View File

Binary file not shown.

10
Source/Informes/3/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

13
Source/Informes/3/InformeListadoBeneficiosGrafComp.fr3
View File

File diff suppressed because one or more lines are too long

11
Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3
View File

File diff suppressed because one or more lines are too long

BIN
Source/Informes/4/AlbaranCliente.rdx
View File

Binary file not shown.

4
Source/Informes/4/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

BIN
Source/Informes/5/AlbaranCliente.rdx
View File

Binary file not shown.

6
Source/Informes/5/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

12
Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas
View File

@ -180,6 +180,18 @@ begin
ReplaceBookmark('FaxEmpresa', tbl_Empresa.FieldByName('FAX').AsString); ReplaceBookmark('FaxEmpresa', tbl_Empresa.FieldByName('FAX').AsString);
if BookmarkExists('CorreoEmpresa') then if BookmarkExists('CorreoEmpresa') then
ReplaceBookmark('CorreoEmpresa', tbl_Empresa.FieldByName('EMAIL_1').AsString); ReplaceBookmark('CorreoEmpresa', tbl_Empresa.FieldByName('EMAIL_1').AsString);
if BookmarkExists('ImporteTotal') then
if ImprimirPrecio then
begin
ReplaceBookmark('ImporteTotal', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat));
end
else
begin
ReplaceBookmark('ImporteTotal', '');
if BookmarkExists('DescripcionImporteTotal') then
ReplaceBookmark('DescripcionImporteTotal', '');
end;
end; end;
end; end;

433
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
View File

@ -2379,7 +2379,63 @@ object RptFacturasCliente: TRptFacturasCliente
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -2449,19 +2505,21 @@ object RptFacturasCliente: TRptFacturasCliente
'(VALOR = periodo_ingresos1.NFILA)'#10#10'left join'#10'(select comp2.ID_EM' + '(VALOR = periodo_ingresos1.NFILA)'#10#10'left join'#10'(select comp2.ID_EM' +
'PRESA, comp2.ANO, MES as NFILA, SUM(comp2.BASE_IMPONIBLE) as IMP' + 'PRESA, comp2.ANO, MES as NFILA, SUM(comp2.BASE_IMPONIBLE) as IMP' +
'ORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_EMPRESA = :ID' + 'ORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_EMPRESA = :ID' +
'_EMPRESA1'#10'and (ANO = :ANO1)'#10'and (comp2.ID_TIPO_FACTURA = :ID_TIP' + '_EMPRESA1'#10'and (ANO = :ANO1)'#10'AND comp2.ID_TIPO_FACTURA in (:T1,:T' +
'O_GASTO)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo_gastos1 o' + '2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,:T10,:T11,:T12,:T13,:T14,:T15)'#10'gro' +
'n (VALOR = periodo_gastos1.NFILA)'#10#10'left join'#10'(select comp3.ID_EM' + 'up by 1,2,3'#10'order by 1 desc,2 asc) periodo_gastos1 on (VALOR = p' +
'PRESA, comp3.ANO, MES as NFILA, SUM(comp3.BASE_IMPONIBLE) as IMP' + 'eriodo_gastos1.NFILA)'#10#10'left join'#10'(select comp3.ID_EMPRESA, comp3' +
'ORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp3'#10'where ID_EMPRESA = :ID_E' + '.ANO, MES as NFILA, SUM(comp3.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'f' +
'MPRESA2'#10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) ' + 'rom V_INF_FAC_CLIENTE comp3'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and ' +
'periodo_ingresos2 on (VALOR = periodo_ingresos2.NFILA)'#10#10'left joi' + '(ANO = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo_ingr' +
'n'#10'(select comp4.ID_EMPRESA, comp4.ANO, MES as NFILA, SUM(comp4.B' + 'esos2 on (VALOR = periodo_ingresos2.NFILA)'#10#10'left join'#10'(select co' +
'ASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp4'#10'w' + 'mp4.ID_EMPRESA, comp4.ANO, MES as NFILA, SUM(comp4.BASE_IMPONIBL' +
'here ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'and (comp4.ID_T' + 'E) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp4'#10'where ID_EMPR' +
'IPO_FACTURA = :ID_TIPO_GASTO)'#10'group by 1,2,3'#10'order by 1 desc,2 a' + 'ESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'AND comp4.ID_TIPO_FACTURA i' +
'sc) periodo_gastos2 on (VALOR = periodo_gastos2.NFILA)'#10#10#10'where p' + 'n (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,:T10,:T11,:T12,:T13,:T14,' +
'eriodo= '#39'MENSUAL'#39#10'order by valor asc'#10 ':T15)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo_gastos2 on (' +
'VALOR = periodo_gastos2.NFILA)'#10#10#10'where periodo= '#39'MENSUAL'#39#10'order ' +
'by valor asc'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -2640,7 +2698,63 @@ object RptFacturasCliente: TRptFacturasCliente
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -2710,19 +2824,21 @@ object RptFacturasCliente: TRptFacturasCliente
's1 on (VALOR = periodo_ingresos1.NFILA)'#10#10'left join'#10'(select comp2' + 's1 on (VALOR = periodo_ingresos1.NFILA)'#10#10'left join'#10'(select comp2' +
'.ID_EMPRESA, comp2.ANO, SEMESTRE as NFILA, SUM(comp2.BASE_IMPONI' + '.ID_EMPRESA, comp2.ANO, SEMESTRE as NFILA, SUM(comp2.BASE_IMPONI' +
'BLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_EM' + 'BLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_EM' +
'PRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'and (comp2.ID_TIPO_FACTUR' + 'PRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'AND comp2.ID_TIPO_FACTURA' +
'A = :ID_TIPO_GASTO)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) period' + ' in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,:T10,:T11,:T12,:T13,:T1' +
'o_gastos1 on (VALOR = periodo_gastos1.NFILA)'#10#10'left join'#10'(select ' + '4,:T15)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo_gastos1 on' +
'comp3.ID_EMPRESA, comp3.ANO, SEMESTRE as NFILA, SUM(comp3.BASE_I' + ' (VALOR = periodo_gastos1.NFILA)'#10#10'left join'#10'(select comp3.ID_EMP' +
'MPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp3'#10'where ID' + 'RESA, comp3.ANO, SEMESTRE as NFILA, SUM(comp3.BASE_IMPONIBLE) as' +
'_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'order b' + ' IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp3'#10'where ID_EMPRESA = :' +
'y 1 desc,2 asc) periodo_ingresos2 on (VALOR = periodo_ingresos2.' + 'ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 a' +
'NFILA)'#10#10'left join'#10'(select comp4.ID_EMPRESA, comp4.ANO, SEMESTRE ' + 'sc) periodo_ingresos2 on (VALOR = periodo_ingresos2.NFILA)'#10#10'left' +
'as NFILA, SUM(comp4.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_' + ' join'#10'(select comp4.ID_EMPRESA, comp4.ANO, SEMESTRE as NFILA, SU' +
'FAC_PROVEEDOR comp4'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :' + 'M(comp4.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDO' +
'ANO2)'#10'and (comp4.ID_TIPO_FACTURA = :ID_TIPO_GASTO)'#10'group by 1,2,' + 'R comp4'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'AND co' +
'3'#10'order by 1 desc,2 asc) periodo_gastos2 on (VALOR = periodo_gas' + 'mp4.ID_TIPO_FACTURA in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,:T10' +
'tos2.NFILA)'#10#10#10'where periodo= '#39'SEMESTRAL'#39#10'order by valor asc'#10 ',:T11,:T12,:T13,:T14,:T15)'#10'group by 1,2,3'#10'order by 1 desc,2 asc)' +
' periodo_gastos2 on (VALOR = periodo_gastos2.NFILA)'#10#10#10'where peri' +
'odo= '#39'SEMESTRAL'#39#10'order by valor asc'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -2901,7 +3017,63 @@ object RptFacturasCliente: TRptFacturasCliente
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -2971,20 +3143,21 @@ object RptFacturasCliente: TRptFacturasCliente
'os1 on (VALOR = periodo_ingresos1.NFILA)'#10#10'left join'#10'(select comp' + 'os1 on (VALOR = periodo_ingresos1.NFILA)'#10#10'left join'#10'(select comp' +
'2.ID_EMPRESA, comp2.ANO, TRIMESTRE as NFILA, SUM(comp2.BASE_IMPO' + '2.ID_EMPRESA, comp2.ANO, TRIMESTRE as NFILA, SUM(comp2.BASE_IMPO' +
'NIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_' + 'NIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_' +
'EMPRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'and (comp2.ID_TIPO_FACT' + 'EMPRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'AND comp2.ID_TIPO_FACTU' +
'URA = :ID_TIPO_GASTO)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) peri' + 'RA in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,:T10,:T11,:T12,:T13,:' +
'odo_gastos1 on (VALOR = periodo_gastos1.NFILA)'#10#10'left join'#10'(selec' + 'T14,:T15)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo_gastos1 ' +
't comp3.ID_EMPRESA, comp3.ANO, TRIMESTRE as NFILA, SUM(comp3.BAS' + 'on (VALOR = periodo_gastos1.NFILA)'#10#10'left join'#10'(select comp3.ID_E' +
'E_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp3'#10'where' + 'MPRESA, comp3.ANO, TRIMESTRE as NFILA, SUM(comp3.BASE_IMPONIBLE)' +
' ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'orde' + ' as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp3'#10'where ID_EMPRESA ' +
'r by 1 desc,2 asc) periodo_ingresos2 on (VALOR = periodo_ingreso' + '= :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,' +
's2.NFILA)'#10#10'left join'#10'(select comp4.ID_EMPRESA, comp4.ANO, TRIMES' + '2 asc) periodo_ingresos2 on (VALOR = periodo_ingresos2.NFILA)'#10#10'l' +
'TRE as NFILA, SUM(comp4.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_' + 'eft join'#10'(select comp4.ID_EMPRESA, comp4.ANO, TRIMESTRE as NFILA' +
'INF_FAC_PROVEEDOR comp4'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO' + ', SUM(comp4.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROV' +
' = :ANO2)'#10'and (comp4.ID_TIPO_FACTURA = :ID_TIPO_GASTO)'#10'group by ' + 'EEDOR comp4'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'AN' +
'1,2,3'#10'order by 1 desc,2 asc) periodo_gastos2 on (VALOR = periodo' + 'D comp4.ID_TIPO_FACTURA in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,' +
'_gastos2.NFILA)'#10#10#10'where periodo= '#39'TRIMESTRAL'#39#10'order by valor asc' + ':T10,:T11,:T12,:T13,:T14,:T15)'#10'group by 1,2,3'#10'order by 1 desc,2 ' +
#10 'asc) periodo_gastos2 on (VALOR = periodo_gastos2.NFILA)'#10#10#10'where ' +
'periodo= '#39'TRIMESTRAL'#39#10'order by valor asc'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -5321,7 +5494,63 @@ object RptFacturasCliente: TRptFacturasCliente
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -5436,7 +5665,63 @@ object RptFacturasCliente: TRptFacturasCliente
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -5551,7 +5836,63 @@ object RptFacturasCliente: TRptFacturasCliente
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item

49
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
View File

@ -110,10 +110,10 @@ type
frxDBDInformeIVAComparativoFacturasPro: TfrxDBDataset; frxDBDInformeIVAComparativoFacturasPro: TfrxDBDataset;
DADSInformeIVAComparativoFacturasPro: TDADataSource; DADSInformeIVAComparativoFacturasPro: TDADataSource;
tbl_InformeIVAComparativoFacturasPro: TDAMemDataTable; tbl_InformeIVAComparativoFacturasPro: TDAMemDataTable;
schReport: TDASchema;
tbl_InformeListadoBeneficiosGrafCompSemestralTipoGasto: TDAMemDataTable; tbl_InformeListadoBeneficiosGrafCompSemestralTipoGasto: TDAMemDataTable;
tbl_InformeListadoBeneficiosGrafCompTrimestralTipoGasto: TDAMemDataTable; tbl_InformeListadoBeneficiosGrafCompTrimestralTipoGasto: TDAMemDataTable;
tbl_InformeListadoBeneficiosGrafCompMensualTipoGasto: TDAMemDataTable; tbl_InformeListadoBeneficiosGrafCompMensualTipoGasto: TDAMemDataTable;
schReport: TDASchema;
procedure DataModuleCreate(Sender: TObject); procedure DataModuleCreate(Sender: TObject);
procedure DataModuleDestroy(Sender: TObject); procedure DataModuleDestroy(Sender: TObject);
private private
@ -141,6 +141,7 @@ type
procedure PrepararTablaResumenInforme(ATabla: IDADataset); procedure PrepararTablaResumenInforme(ATabla: IDADataset);
procedure PrepararTablaInformeGrafComp(ATabla: TDAMemDataTable); procedure PrepararTablaInformeGrafComp(ATabla: TDAMemDataTable);
procedure PrepararTablaResumenInformeGrafComp(ATabla: TDAMemDataTable); procedure PrepararTablaResumenInformeGrafComp(ATabla: TDAMemDataTable);
procedure RellenarParametro(ANombreParametro: String; AID: Integer; AListaIDTiposGasto: TIntegerArray; ATabla: TDADataSource);
function _GenerarInforme(const TipoInforme: String): Binary; function _GenerarInforme(const TipoInforme: String): Binary;
procedure IniciarParametrosInforme; procedure IniciarParametrosInforme;
procedure RecuperarNombresClientes; procedure RecuperarNombresClientes;
@ -246,6 +247,7 @@ var
AStream: TMemoryStream; AStream: TMemoryStream;
AInforme: Variant; AInforme: Variant;
ACadena: TStringList; ACadena: TStringList;
i: Integer;
begin begin
FConnection.BeginTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO" FConnection.BeginTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"
@ -267,28 +269,18 @@ begin
FListaNombreTiposGasto := ListaNombreTiposGasto; FListaNombreTiposGasto := ListaNombreTiposGasto;
//Cargamos las tablas con parametro ID_TIPO_GASTO //Cargamos las tablas con parametro ID_TIPO_GASTO
if (FListaIDTiposdeGasto.Count = 1) then //Preparamos la tabla correspondiente y la abrimos para el informe
begin if (FIntervalo = CTE_MENSUAL) then
//Preparamos la tabla correspondiente y la abrimos para el informe PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompMensualTipoGasto)
if (FIntervalo = CTE_MENSUAL) then else if (FIntervalo = CTE_TRIMESTRAL) then
PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompMensualTipoGasto) PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompTrimestralTipoGasto)
else if (FIntervalo = CTE_TRIMESTRAL) then
PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompTrimestralTipoGasto)
else
PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompSemestralTipoGasto);
DASInformeListadoFacturasGrafComp.DataTable.ParamByName('ID_TIPO_GASTO').AsInteger := FListaIDTiposdeGasto.Items[0];
end
else else
begin PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompSemestralTipoGasto);
//Preparamos la tabla correspondiente y la abrimos para el informe
if (FIntervalo = CTE_MENSUAL) then //Rellenamos los 15 parametros de tipos de gasto (1..15, en caso de estar filtrado a 0
PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompMensual) for i := 1 to 15 do
else if (FIntervalo = CTE_TRIMESTRAL) then RellenarParametro('T' + IntToStr(i), i, FListaIDTiposdeGasto, DASInformeListadoFacturasGrafComp);
PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompTrimestral) // DASInformeListadoFacturasGrafComp.DataTable.ParamByName('ID_TIPO_GASTO').AsInteger := FListaIDTiposdeGasto.Items[0];
else
PrepararTablaInformeGrafComp(tbl_InformeListadoBeneficiosGrafCompSemestral);
end;
DASInformeListadoFacturasGrafComp.DataTable.Active := True; DASInformeListadoFacturasGrafComp.DataTable.Active := True;
Result := Binary.Create; Result := Binary.Create;
@ -305,7 +297,9 @@ begin
if Assigned(FListaIDTiposdeGasto) and (FListaIDTiposdeGasto.Count > 0) then if Assigned(FListaIDTiposdeGasto) and (FListaIDTiposdeGasto.Count > 0) then
begin begin
ACadena.Clear; ACadena.Clear;
ACadena.Add('Solo tipo de gasto ' + FListaNombreTiposGasto.Items[0]); ACadena.Add('Solo tipo de gasto: ');
for i := 0 to FListaNombreTiposGasto.Count - 1 do
ACadena.Add(FListaNombreTiposGasto.Items[i]);
end; end;
frxReport.Variables.Variables['TextoParametros']:= ACadena.Text; frxReport.Variables.Variables['TextoParametros']:= ACadena.Text;
@ -889,6 +883,15 @@ begin
end; end;
end; end;
procedure TRptFacturasCliente.RellenarParametro(ANombreParametro: String; AID: Integer; AListaIDTiposGasto: TIntegerArray; ATabla: TDADataSource);
begin
if (AListaIDTiposGasto.Count > AID-1)
then ATabla.DataTable.ParamByName(ANombreParametro).AsInteger := FListaIDTiposdeGasto.Items[AID-1]
else if (AListaIDTiposGasto.Count <> 0) then
ATabla.DataTable.ParamByName(ANombreParametro).AsInteger := 0
else ATabla.DataTable.ParamByName(ANombreParametro).AsInteger := AID;
end;
procedure TRptFacturasCliente._GenerarFactura(const ID: Integer; const VerSello: Boolean = True; const VerCopia: Boolean = True); procedure TRptFacturasCliente._GenerarFactura(const ID: Integer; const VerSello: Boolean = True; const VerCopia: Boolean = True);
var var
AInforme: Variant; AInforme: Variant;

20
Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas
View File

@ -50,7 +50,8 @@ type
function EsEliminable(AFactura: IBizFacturaProveedor): Boolean; function EsEliminable(AFactura: IBizFacturaProveedor): Boolean;
function ElegirFacturas(AFacturas : IBizFacturaProveedor; AMensaje: String; AMultiSelect: Boolean): IBizFacturaProveedor; function ElegirFacturas(AFacturas : IBizFacturaProveedor; AMensaje: String; AMultiSelect: Boolean): IBizFacturaProveedor;
function ExtraerSeleccionados(ARecibosProveedor: IBizFacturaProveedor) : IBizFacturaProveedor; function ExtraerSeleccionados(ARecibosProveedor: IBizFacturaProveedor) : IBizFacturaProveedor; overload;
function ExtraerSeleccionados(ATiposFacturasProveedor: IBizTiposFacturaProveedor) : IBizTiposFacturaProveedor; overload;
function DarListaAnosFacturas: TStringList; function DarListaAnosFacturas: TStringList;
procedure FiltrarAno(AFactura: IBizFacturaProveedor; ADynWhereDataTable: WideString; const Ano: String); procedure FiltrarAno(AFactura: IBizFacturaProveedor; ADynWhereDataTable: WideString; const Ano: String);
@ -122,7 +123,8 @@ type
function EsEliminable(AFactura: IBizFacturaProveedor): Boolean; function EsEliminable(AFactura: IBizFacturaProveedor): Boolean;
function ElegirFacturas(AFacturas : IBizFacturaProveedor; AMensaje: String; AMultiSelect: Boolean): IBizFacturaProveedor; function ElegirFacturas(AFacturas : IBizFacturaProveedor; AMensaje: String; AMultiSelect: Boolean): IBizFacturaProveedor;
function ExtraerSeleccionados(AFacturasProveedor: IBizFacturaProveedor) : IBizFacturaProveedor; function ExtraerSeleccionados(AFacturasProveedor: IBizFacturaProveedor) : IBizFacturaProveedor; overload;
function ExtraerSeleccionados(ATiposFacturasProveedor: IBizTiposFacturaProveedor) : IBizTiposFacturaProveedor; overload;
function DarListaAnosFacturas: TStringList; function DarListaAnosFacturas: TStringList;
procedure FiltrarAno(AFactura: IBizFacturaProveedor; ADynWhereDataTable: WideString; const Ano: String); procedure FiltrarAno(AFactura: IBizFacturaProveedor; ADynWhereDataTable: WideString; const Ano: String);
@ -621,6 +623,11 @@ begin
if (AFactura.Detalles.DataTable.RecordCount = 0) then if (AFactura.Detalles.DataTable.RecordCount = 0) then
raise Exception.Create('La factura debe tener al menos un concepto en su contenido'); raise Exception.Create('La factura debe tener al menos un concepto en su contenido');
{ Esta validación puede saltar cuando se generan facturas automáticamente
por albaranes o pedidos y el Proveedor no tiene Tipo de IVA puesto. }
if (AFactura.ID_TIPO_FACTURA = 0) then
raise Exception.Create('Debe indicar un tipo de gasto para esta factura');
{ Esta validación puede saltar cuando se generan facturas automáticamente { Esta validación puede saltar cuando se generan facturas automáticamente
por albaranes o pedidos y el Proveedor no tiene Tipo de IVA puesto. } por albaranes o pedidos y el Proveedor no tiene Tipo de IVA puesto. }
{ if (AFactura.ID_TIPO_IVA = 0) then { if (AFactura.ID_TIPO_IVA = 0) then
@ -919,6 +926,15 @@ begin
end; end;
end; end;
function TFacturasProveedorController.ExtraerSeleccionados(ATiposFacturasProveedor: IBizTiposFacturaProveedor): IBizTiposFacturaProveedor;
var
ASeleccionados : IBizTiposFacturaProveedor;
begin
ASeleccionados := (darTiposFacturaProveedor as IBizTiposFacturaProveedor);
CopyDataTableDA5(ATiposFacturasProveedor.DataTable, ASeleccionados.DataTable, True);
Result := ASeleccionados;
end;
function TFacturasProveedorController.ExtraerSeleccionados(AFacturasProveedor: IBizFacturaProveedor): IBizFacturaProveedor; function TFacturasProveedorController.ExtraerSeleccionados(AFacturasProveedor: IBizFacturaProveedor): IBizFacturaProveedor;
var var
ASeleccionados : IBizFacturaProveedor; ASeleccionados : IBizFacturaProveedor;

24
Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas
View File

@ -48,7 +48,14 @@ type
procedure CalcularImporteTotal; procedure CalcularImporteTotal;
end; end;
TBizTiposFacturaProveedor = class(TTiposFacturaProveedorDataTableRules, IBizTiposFacturaProveedor) TBizTiposFacturaProveedor = class(TTiposFacturaProveedorDataTableRules, IBizTiposFacturaProveedor, ISeleccionable)
private
FSeleccionableInterface : ISeleccionable;
public
property SeleccionableInterface : ISeleccionable read FSeleccionableInterface
write FSeleccionableInterface implements ISeleccionable;
constructor Create(aDataTable: TDADataTable); override;
destructor Destroy; override;
end; end;
TBizFacturaProveedor = class(TFacturasProveedorDataTableRules, IBizFacturaProveedor, ISeleccionable) TBizFacturaProveedor = class(TFacturasProveedorDataTableRules, IBizFacturaProveedor, ISeleccionable)
@ -303,6 +310,7 @@ begin
RE := 0; RE := 0;
SITUACION := CTE_PENDIENTE; SITUACION := CTE_PENDIENTE;
FACTURA_WEB := 0; FACTURA_WEB := 0;
ID_TIPO_FACTURA := 15; //COMPRAS POR DEFECTO
end; end;
procedure TBizFacturaProveedor.IVAOnChange(Sender: TDACustomField); procedure TBizFacturaProveedor.IVAOnChange(Sender: TDACustomField);
@ -388,6 +396,20 @@ begin
FProveedor := AValue; FProveedor := AValue;
end; end;
{ TBizTiposFacturaProveedor }
constructor TBizTiposFacturaProveedor.Create(aDataTable: TDADataTable);
begin
inherited;
FSeleccionableInterface := TSeleccionable.Create(aDataTable);
end;
destructor TBizTiposFacturaProveedor.Destroy;
begin
FSeleccionableInterface := NIL;
inherited;
end;
initialization initialization
RegisterDataTableRules(BIZ_CLIENT_FACTURA_PROVEEDOR, TBizFacturaProveedor); RegisterDataTableRules(BIZ_CLIENT_FACTURA_PROVEEDOR, TBizFacturaProveedor);
RegisterDataTableRules(BIZ_CLIENT_TIPOS_FACTURA_PROVEEDOR, TBizTiposFacturaProveedor); RegisterDataTableRules(BIZ_CLIENT_TIPOS_FACTURA_PROVEEDOR, TBizTiposFacturaProveedor);

645
Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm
View File

@ -1537,7 +1537,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -1562,14 +1618,15 @@ object RptFacturasProveedor: TRptFacturasProveedor
'periodos_aux'#10'left join'#10'(select comp1.ID_EMPRESA, comp1.ANO, MES ' + 'periodos_aux'#10'left join'#10'(select comp1.ID_EMPRESA, comp1.ANO, MES ' +
'as NFILA, SUM(comp1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_' + 'as NFILA, SUM(comp1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_' +
'FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :' + 'FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :' +
'ANO1)'#10'and (ID_TIPO_FACTURA = :ID_TIPO_GASTO)'#10'group by 1,2,3'#10'orde' + 'ANO1)'#10'AND ID_TIPO_FACTURA in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T' +
'r by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'left jo' + '9,:T10,:T11,:T12,:T13,:T14,:T15)'#10'group by 1,2,3'#10'order by 1 desc,' +
'in'#10'(select comp2.ID_EMPRESA, comp2.ANO, MES as NFILA, SUM(comp2.' + '2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'left join'#10'(select c' +
'BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10 + 'omp2.ID_EMPRESA, comp2.ANO, MES as NFILA, SUM(comp2.BASE_IMPONIB' +
'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'and (ID_TIPO_F' + 'LE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_EMP' +
'ACTURA = :ID_TIPO_GASTO)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) p' + 'RESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'AND ID_TIPO_FACTURA in (:T' +
'eriodo2 on (VALOR = periodo2.NFILA)'#10#10'where periodo= '#39'MENSUAL'#39#10'or' + '1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,:T10,:T11,:T12,:T13,:T14,:T15)' +
'der by valor asc'#10#10 #10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo2 on (VALOR = peri' +
'odo2.NFILA)'#10#10'where periodo= '#39'MENSUAL'#39#10'order by valor asc'#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -1652,7 +1709,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -1677,14 +1790,16 @@ object RptFacturasProveedor: TRptFacturasProveedor
'periodos_aux'#10'left join'#10'(select comp1.ID_EMPRESA, comp1.ANO, SEME' + 'periodos_aux'#10'left join'#10'(select comp1.ID_EMPRESA, comp1.ANO, SEME' +
'STRE as NFILA, SUM(comp1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V' + 'STRE as NFILA, SUM(comp1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V' +
'_INF_FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (AN' + '_INF_FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (AN' +
'O = :ANO1)'#10'and (ID_TIPO_FACTURA = :ID_TIPO_GASTO)'#10'group by 1,2,3' + 'O = :ANO1)'#10'AND ID_TIPO_FACTURA in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:' +
#10'order by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'le' + 'T8,:T9,:T10,:T11,:T12,:T13,:T14,:T15)'#10'group by 1,2,3'#10'order by 1 ' +
'ft join'#10'(select comp2.ID_EMPRESA, comp2.ANO, SEMESTRE as NFILA, ' + 'desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'left join'#10'(sel' +
'SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEE' + 'ect comp2.ID_EMPRESA, comp2.ANO, SEMESTRE as NFILA, SUM(comp2.BA' +
'DOR comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'and ' + 'SE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'wh' +
'(ID_TIPO_FACTURA = :ID_TIPO_GASTO)'#10'group by 1,2,3'#10'order by 1 des' + 'ere ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'AND ID_TIPO_FACT' +
'c,2 asc) periodo2 on (VALOR = periodo2.NFILA)'#10#10'where periodo= '#39'S' + 'URA in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,:T10,:T11,:T12,:T13,' +
'EMESTRAL'#39#10'order by valor asc'#10#10#10 ':T14,:T15)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo2 on (VA' +
'LOR = periodo2.NFILA)'#10#10'where periodo= '#39'SEMESTRAL'#39#10'order by valor' +
' asc'#10#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -1767,7 +1882,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -1792,14 +1963,16 @@ object RptFacturasProveedor: TRptFacturasProveedor
'periodos_aux'#10'left join'#10'(select comp1.ID_EMPRESA, comp1.ANO, TRIM' + 'periodos_aux'#10'left join'#10'(select comp1.ID_EMPRESA, comp1.ANO, TRIM' +
'ESTRE as NFILA, SUM(comp1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from ' + 'ESTRE as NFILA, SUM(comp1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from ' +
'V_INF_FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (A' + 'V_INF_FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (A' +
'NO = :ANO1)'#10'and (ID_TIPO_FACTURA = :ID_TIPO_GASTO)'#10'group by 1,2,' + 'NO = :ANO1)'#10'AND ID_TIPO_FACTURA in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,' +
'3'#10'order by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'l' + ':T8,:T9,:T10,:T11,:T12,:T13,:T14,:T15)'#10'group by 1,2,3'#10'order by 1' +
'eft join'#10'(select comp2.ID_EMPRESA, comp2.ANO, TRIMESTRE as NFILA' + ' desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'left join'#10'(se' +
', SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROV' + 'lect comp2.ID_EMPRESA, comp2.ANO, TRIMESTRE as NFILA, SUM(comp2.' +
'EEDOR comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'an' + 'BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10 +
'd (ID_TIPO_FACTURA = :ID_TIPO_GASTO)'#10'group by 1,2,3'#10'order by 1 d' + 'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'AND ID_TIPO_FA' +
'esc,2 asc) periodo2 on (VALOR = periodo2.NFILA)'#10#10'where periodo= ' + 'CTURA in (:T1,:T2,:T3,:T4,:T5,:T6,:T7,:T8,:T9,:T10,:T11,:T12,:T1' +
#39'TRIMESTRAL'#39#10'order by valor asc'#10#10#10 '3,:T14,:T15)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo2 on (' +
'VALOR = periodo2.NFILA)'#10#10'where periodo= '#39'TRIMESTRAL'#39#10'order by va' +
'lor asc'#10#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -1882,7 +2055,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -1900,8 +2129,9 @@ object RptFacturasProveedor: TRptFacturasProveedor
' 0 then 0'#10'else ((SUM(P.IMPORTE_DESCUENTO) * 100) / SUM(P.IMPORTE' + ' 0 then 0'#10'else ((SUM(P.IMPORTE_DESCUENTO) * 100) / SUM(P.IMPORTE' +
'_TOTAL)) end as PORCENTAJE'#10#10'from V_INF_FAC_PROVEEDOR P'#10'left join' + '_TOTAL)) end as PORCENTAJE'#10#10'from V_INF_FAC_PROVEEDOR P'#10'left join' +
' CONTACTOS C on P.ID_PROVEEDOR = C.ID'#10#10'where p.ID_EMPRESA = :ID_' + ' CONTACTOS C on P.ID_PROVEEDOR = C.ID'#10#10'where p.ID_EMPRESA = :ID_' +
'EMPRESA'#10'and P.ANO = :ANO'#10'and ID_TIPO_FACTURA = :ID_TIPO_GASTO'#10'gr' + 'EMPRESA'#10'and P.ANO = :ANO'#10'AND ID_TIPO_FACTURA in (:T1,:T2,:T3,:T4' +
'oup by 1,2,3'#10'order by 1,5 desc'#10'rows 1 to :NTOP'#10#10#10 ',:T5,:T6,:T7,:T8,:T9,:T10,:T11,:T12,:T13,:T14,:T15)'#10'group by 1,2' +
',3'#10'order by 1,5 desc'#10'rows 1 to :NTOP'#10#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -1980,7 +2210,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -1997,8 +2283,9 @@ object RptFacturasProveedor: TRptFacturasProveedor
'= 0 then 0'#10'else ((SUM(P.IMPORTE_TOTAL)*100)/p.Importe_TOTAL_ANO)' + '= 0 then 0'#10'else ((SUM(P.IMPORTE_TOTAL)*100)/p.Importe_TOTAL_ANO)' +
#10'end as PORCENTAJE'#10#10'from V_INF_FAC_PROVEEDOR P'#10'left join CONTACT' + #10'end as PORCENTAJE'#10#10'from V_INF_FAC_PROVEEDOR P'#10'left join CONTACT' +
'OS C on P.ID_PROVEEDOR = C.ID'#10#10'where p.ID_EMPRESA = :ID_EMPRESA'#10 + 'OS C on P.ID_PROVEEDOR = C.ID'#10#10'where p.ID_EMPRESA = :ID_EMPRESA'#10 +
'and P.ANO = :ANO'#10'and P.ID_TIPO_FACTURA = :ID_TIPO_GASTO'#10'group by' + 'and P.ANO = :ANO'#10'AND ID_TIPO_FACTURA in (:T1,:T2,:T3,:T4,:T5,:T6' +
' 1,2,3,4'#10'order by 1,6 desc'#10'rows 1 to :NTOP'#10#10#10 ',:T7,:T8,:T9,:T10,:T11,:T12,:T13,:T14,:T15)'#10'group by 1,2,3,4'#10'ord' +
'er by 1,6 desc'#10'rows 1 to :NTOP'#10#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -3023,7 +3310,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -3090,7 +3433,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -3108,7 +3507,7 @@ object RptFacturasProveedor: TRptFacturasProveedor
LocalDataStreamer = Bin2DataStreamer LocalDataStreamer = Bin2DataStreamer
LogicalName = 'InformeListadoFacturasGrafCompTrimestralTipoGasto' LogicalName = 'InformeListadoFacturasGrafCompTrimestralTipoGasto'
IndexDefs = <> IndexDefs = <>
Left = 304 Left = 296
Top = 448 Top = 448
end end
object tbl_InformeListadoFacturasGrafCompSemestralTipoGasto: TDAMemDataTable object tbl_InformeListadoFacturasGrafCompSemestralTipoGasto: TDAMemDataTable
@ -3157,7 +3556,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -3221,7 +3676,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item
@ -3281,7 +3792,63 @@ object RptFacturasProveedor: TRptFacturasProveedor
Value = '' Value = ''
end end
item item
Name = 'ID_TIPO_GASTO' Name = 'T1'
Value = ''
end
item
Name = 'T2'
Value = ''
end
item
Name = 'T3'
Value = ''
end
item
Name = 'T4'
Value = ''
end
item
Name = 'T5'
Value = ''
end
item
Name = 'T6'
Value = ''
end
item
Name = 'T7'
Value = ''
end
item
Name = 'T8'
Value = ''
end
item
Name = 'T9'
Value = ''
end
item
Name = 'T10'
Value = ''
end
item
Name = 'T11'
Value = ''
end
item
Name = 'T12'
Value = ''
end
item
Name = 'T13'
Value = ''
end
item
Name = 'T14'
Value = ''
end
item
Name = 'T15'
Value = '' Value = ''
end end
item item

87
Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas
View File

@ -81,6 +81,7 @@ type
procedure PrepararTablaResumenInforme(ATabla: IDADataset); procedure PrepararTablaResumenInforme(ATabla: IDADataset);
procedure PrepararTablaInformeGrafComp(ATabla: TDAMemDataTable); procedure PrepararTablaInformeGrafComp(ATabla: TDAMemDataTable);
procedure PrepararTablaResumenInformeGrafComp(ATabla: TDAMemDataTable); procedure PrepararTablaResumenInformeGrafComp(ATabla: TDAMemDataTable);
procedure RellenarParametro(ANombreParametro: String; AID: Integer; AListaIDTiposGasto: TIntegerArray; ATabla: TDADataSource);
procedure IniciarParametrosInforme; procedure IniciarParametrosInforme;
function _GenerarInforme(const TipoInforme: String): Binary; function _GenerarInforme(const TipoInforme: String): Binary;
public public
@ -142,6 +143,7 @@ var
AStream: TMemoryStream; AStream: TMemoryStream;
AInforme: Variant; AInforme: Variant;
ACadena: TStringList; ACadena: TStringList;
i: Integer;
begin begin
FConnection.BeginTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO" FConnection.BeginTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"
@ -167,17 +169,13 @@ begin
FreeAndNil(FListaNombreTiposGasto); FreeAndNil(FListaNombreTiposGasto);
FListaNombreTiposGasto := ListaNombreTiposGasto; FListaNombreTiposGasto := ListaNombreTiposGasto;
//Cargamos las tablas con parametro ID_TIPO_GASTO //Preparamos la tabla correspondiente y la abrimos para el informe
if (FListaIDTiposdeGasto.Count = 1) then if (FIntervalo = CTE_MENSUAL) then
begin PrepararTablaInformeGrafComp(InformeListadoFacturasGrafCompMensualTipoGasto)
//Preparamos la tabla correspondiente y la abrimos para el informe else if (FIntervalo = CTE_TRIMESTRAL) then
if (FIntervalo = CTE_MENSUAL) then PrepararTablaInformeGrafComp(tbl_InformeListadoFacturasGrafCompTrimestralTipoGasto)
PrepararTablaInformeGrafComp(InformeListadoFacturasGrafCompMensualTipoGasto) else
else if (FIntervalo = CTE_TRIMESTRAL) then PrepararTablaInformeGrafComp(tbl_InformeListadoFacturasGrafCompSemestralTipoGasto);
PrepararTablaInformeGrafComp(tbl_InformeListadoFacturasGrafCompTrimestralTipoGasto)
else
PrepararTablaInformeGrafComp(tbl_InformeListadoFacturasGrafCompSemestralTipoGasto);
//Se preparan las tablas del listado resumen del informe //Se preparan las tablas del listado resumen del informe
PrepararTablaResumenInformeGrafComp(tbl_InformeListadoProveedoresMayorFacturacionResumenTipoGasto); PrepararTablaResumenInformeGrafComp(tbl_InformeListadoProveedoresMayorFacturacionResumenTipoGasto);
@ -185,27 +183,9 @@ begin
DADSInformeListadoProveedoresMayorFacturacionResumen.DataTable := tbl_InformeListadoProveedoresMayorFacturacionResumenTipoGasto; DADSInformeListadoProveedoresMayorFacturacionResumen.DataTable := tbl_InformeListadoProveedoresMayorFacturacionResumenTipoGasto;
DADSInformeListadoProveedoresMayorDescuentoResumen.DataTable := tbl_InformeListadoProveedoresMayorDescuentoResumenTipoGasto; DADSInformeListadoProveedoresMayorDescuentoResumen.DataTable := tbl_InformeListadoProveedoresMayorDescuentoResumenTipoGasto;
DASInformeListadoFacturasGrafComp.DataTable.ParamByName('ID_TIPO_GASTO').AsInteger := FListaIDTiposdeGasto.Items[0]; //Rellenamos los 15 parametros de tipos de gasto (1..15, en caso de estar filtrado a 0
DADSInformeListadoProveedoresMayorFacturacionResumen.DataTable.ParamByName('ID_TIPO_GASTO').AsInteger := FListaIDTiposdeGasto.Items[0]; for i := 1 to 15 do
DADSInformeListadoProveedoresMayorDescuentoResumen.DataTable.ParamByName('ID_TIPO_GASTO').AsInteger := FListaIDTiposdeGasto.Items[0]; RellenarParametro('T' + IntToStr(i), i, FListaIDTiposdeGasto, DASInformeListadoFacturasGrafComp);
end
//El el caso de todas las facturas llamaremos a las tablas sin filtro
else
begin
//Preparamos la tabla correspondiente y la abrimos para el informe
if (FIntervalo = CTE_MENSUAL) then
PrepararTablaInformeGrafComp(tbl_InformeListadoFacturasGrafCompMensual)
else if (FIntervalo = CTE_TRIMESTRAL) then
PrepararTablaInformeGrafComp(tbl_InformeListadoFacturasGrafCompTrimestral)
else
PrepararTablaInformeGrafComp(tbl_InformeListadoFacturasGrafCompSemestral);
//Se preparan las tablas del listado resumen del informe
PrepararTablaResumenInformeGrafComp(tbl_InformeListadoProveedoresMayorFacturacionResumen);
PrepararTablaResumenInformeGrafComp(tbl_InformeListadoProveedoresMayorDescuentoResumen);
DADSInformeListadoProveedoresMayorFacturacionResumen.DataTable := tbl_InformeListadoProveedoresMayorFacturacionResumen;
DADSInformeListadoProveedoresMayorDescuentoResumen.DataTable := tbl_InformeListadoProveedoresMayorDescuentoResumen;
end;
DASInformeListadoFacturasGrafComp.DataTable.Active := True; DASInformeListadoFacturasGrafComp.DataTable.Active := True;
DADSInformeListadoProveedoresMayorFacturacionResumen.DataTable.Active := True; DADSInformeListadoProveedoresMayorFacturacionResumen.DataTable.Active := True;
@ -224,8 +204,10 @@ begin
ACadena.Add('Todos los tipos de gasto'); ACadena.Add('Todos los tipos de gasto');
if Assigned(FListaIDTiposdeGasto) and (FListaIDTiposdeGasto.Count > 0) then if Assigned(FListaIDTiposdeGasto) and (FListaIDTiposdeGasto.Count > 0) then
begin begin
ACadena.Clear; ACadena.Clear;
ACadena.Add('Solo tipo de gasto ' + FListaNombreTiposGasto.Items[0]); ACadena.Add('Solo tipo de gasto: ');
for i := 0 to FListaNombreTiposGasto.Count - 1 do
ACadena.Add(FListaNombreTiposGasto.Items[i]);
end; end;
frxReport.Variables.Variables['TextoParametros']:= ACadena.Text; frxReport.Variables.Variables['TextoParametros']:= ACadena.Text;
@ -478,6 +460,7 @@ procedure TRptFacturasProveedor.IniciarParametrosInforme;
var var
ATextos : TStringList; ATextos : TStringList;
ACadena : String; ACadena : String;
i: Integer;
begin begin
ATextos := TStringList.Create; ATextos := TStringList.Create;
@ -515,9 +498,11 @@ begin
ACadena := ACadena + ' (desglosados)' ACadena := ACadena + ' (desglosados)'
end; end;
if Assigned(FListaIDTiposdeGasto) and (FListaIDTiposdeGasto.Count > 0) then if Assigned(FListaIDTiposdeGasto) and (FListaNombreTiposGasto.Count > 0) then
begin begin
ACadena := 'Solo tipo de gasto ' + FListaNombreTiposGasto.Items[0]; ACadena := 'Solo tipo de gasto: ';
for i := 0 to FListaNombreTiposGasto.Count - 1 do
ACadena := ACadena + FListaNombreTiposGasto.Items[i] + #13;
end end
else begin else begin
ACadena := 'Todos los tipos de gasto'; ACadena := 'Todos los tipos de gasto';
@ -600,20 +585,25 @@ begin
end; end;
// Filtrar el informe por tipo de gasto // Filtrar el informe por tipo de gasto
if Assigned(FListaIDTiposdeGasto) then if Assigned(FListaIDTiposdeGasto)
and (FListaIDTiposdeGasto.Count > 0) then
begin begin
with ATabla.DynamicWhere do with ATabla.DynamicWhere do
begin begin
Condicion := Nil;
for i := 0 to FListaIDTiposdeGasto.Count - 1 do for i := 0 to FListaIDTiposdeGasto.Count - 1 do
begin begin
if (Condicion = Nil) then
// (ID_PROVEEDOR = ID) // (ID_TIPO_FACTURA = ID)
Condicion := NewBinaryExpression(NewField('', fld_FacturasProveedorID_TIPO_FACTURA), NewConstant(FListaIDTiposdeGasto.Items[i], datInteger), dboEqual); Condicion := NewBinaryExpression(NewField('', fld_FacturasProveedorID_TIPO_FACTURA), NewConstant(FListaIDTiposdeGasto.Items[i], datInteger), dboEqual)
if IsEmpty then
Expression := Condicion
else else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd); Condicion := NewBinaryExpression(NewBinaryExpression(NewField('', fld_FacturasProveedorID_TIPO_FACTURA), NewConstant(FListaIDTiposdeGasto.Items[i], datInteger), dboEqual), Condicion, dboOr);
end; end;
if IsEmpty then
Expression := Condicion
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end; end;
end; end;
@ -810,6 +800,15 @@ begin
end; end;
procedure TRptFacturasProveedor.RellenarParametro(ANombreParametro: String; AID: Integer; AListaIDTiposGasto: TIntegerArray; ATabla: TDADataSource);
begin
if (AListaIDTiposGasto.Count > AID-1)
then ATabla.DataTable.ParamByName(ANombreParametro).AsInteger := FListaIDTiposdeGasto.Items[AID-1]
else if (AListaIDTiposGasto.Count <> 0) then
ATabla.DataTable.ParamByName(ANombreParametro).AsInteger := 0
else ATabla.DataTable.ParamByName(ANombreParametro).AsInteger := AID;
end;
function TRptFacturasProveedor._GenerarInforme(const TipoInforme: String): Binary; function TRptFacturasProveedor._GenerarInforme(const TipoInforme: String): Binary;
var var
AInforme: Variant; AInforme: Variant;

5
Source/Modulos/Facturas de proveedor/Views/uEditorElegirTipoGasto.dfm
View File

@ -3,7 +3,7 @@ object fEditorElegirTipoGasto: TfEditorElegirTipoGasto
Top = 0 Top = 0
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Tipo de gasto' Caption = 'Tipo de gasto'
ClientHeight = 124 ClientHeight = 138
ClientWidth = 500 ClientWidth = 500
Color = clWindow Color = clWindow
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -34,11 +34,12 @@ object fEditorElegirTipoGasto: TfEditorElegirTipoGasto
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 83 Top = 97
Width = 500 Width = 500
Height = 41 Height = 41
Align = alBottom Align = alBottom
TabOrder = 0 TabOrder = 0
ExplicitTop = 381
DesignSize = ( DesignSize = (
500 500
41) 41)

5
Source/Modulos/Facturas de proveedor/Views/uEditorElegirTipoGasto.pas
View File

@ -7,7 +7,10 @@ uses
Dialogs, StdCtrls, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit, Dialogs, StdCtrls, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit,
cxDropDownEdit, cxCalendar, ExtCtrls, uEditorBasico, uIEditorElegirTipoGasto, cxDropDownEdit, cxCalendar, ExtCtrls, uEditorBasico, uIEditorElegirTipoGasto,
cxGraphics, DB, uDAInterfaces, uDADataTable, cxDBEdit, uFacturasProveedorController, cxGraphics, DB, uDAInterfaces, uDADataTable, cxDBEdit, uFacturasProveedorController,
cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uBizFacturasProveedor; cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uBizFacturasProveedor,
cxStyles, cxCustomData, cxFilter, cxData, cxDataStorage, cxDBData,
cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel,
cxClasses, cxGridCustomView, cxGrid;
type type
TfEditorElegirTipoGasto = class(TfEditorBasico, IEditorElegirTipoGasto) TfEditorElegirTipoGasto = class(TfEditorBasico, IEditorElegirTipoGasto)

16
Source/Modulos/Gestor de informes/GestorInformes_Group.groupproj
View File

@ -9,6 +9,7 @@
<Projects Include="..\..\Cliente\FactuGES.dproj" /> <Projects Include="..\..\Cliente\FactuGES.dproj" />
<Projects Include="..\..\GUIBase\GUIBase.dproj" /> <Projects Include="..\..\GUIBase\GUIBase.dproj" />
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" /> <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
<Projects Include="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" />
<Projects Include="..\Contactos\Model\Contactos_model.dproj" /> <Projects Include="..\Contactos\Model\Contactos_model.dproj" />
<Projects Include="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" /> <Projects Include="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" />
<Projects Include="..\Facturas de proveedor\Data\FacturasProveedor_data.dproj" /> <Projects Include="..\Facturas de proveedor\Data\FacturasProveedor_data.dproj" />
@ -161,14 +162,23 @@
<Target Name="FacturasProveedor_model:Make"> <Target Name="FacturasProveedor_model:Make">
<MSBuild Projects="..\Facturas de proveedor\Model\FacturasProveedor_model.dproj" Targets="Make" /> <MSBuild Projects="..\Facturas de proveedor\Model\FacturasProveedor_model.dproj" Targets="Make" />
</Target> </Target>
<Target Name="AlbaranesProveedor_view">
<MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="" />
</Target>
<Target Name="AlbaranesProveedor_view:Clean">
<MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Clean" />
</Target>
<Target Name="AlbaranesProveedor_view:Make">
<MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Make" />
</Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;GestorInformes_model;GestorInformes_data;GestorInformes_controller;GestorInformes_view;GestorInformes_plugin;FactuGES;FactuGES_Server;FacturasProveedor_view;FacturasProveedor_controller;FacturasProveedor_data;FacturasProveedor_model" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;GestorInformes_model;GestorInformes_data;GestorInformes_controller;GestorInformes_view;GestorInformes_plugin;FactuGES;FactuGES_Server;FacturasProveedor_view;FacturasProveedor_controller;FacturasProveedor_data;FacturasProveedor_model;AlbaranesProveedor_view" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;GestorInformes_view:Clean;GestorInformes_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasProveedor_view:Clean;FacturasProveedor_controller:Clean;FacturasProveedor_data:Clean;FacturasProveedor_model:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;GestorInformes_view:Clean;GestorInformes_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasProveedor_view:Clean;FacturasProveedor_controller:Clean;FacturasProveedor_data:Clean;FacturasProveedor_model:Clean;AlbaranesProveedor_view:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;GestorInformes_view:Make;GestorInformes_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasProveedor_view:Make;FacturasProveedor_controller:Make;FacturasProveedor_data:Make;FacturasProveedor_model:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;GestorInformes_view:Make;GestorInformes_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasProveedor_view:Make;FacturasProveedor_controller:Make;FacturasProveedor_data:Make;FacturasProveedor_model:Make;AlbaranesProveedor_view:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

96
Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj
View File

@ -38,48 +38,54 @@
<DelphiCompile Include="GestorInformes_view.dpk"> <DelphiCompile Include="GestorInformes_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="adortl.dcp" /> <DCCReference Include="..\adortl.dcp" />
<DCCReference Include="ApplicationBase.dcp" /> <DCCReference Include="..\ApplicationBase.dcp" />
<DCCReference Include="Base.dcp" /> <DCCReference Include="..\Base.dcp" />
<DCCReference Include="bdertl.dcp" /> <DCCReference Include="..\bdertl.dcp" />
<DCCReference Include="ccpackD11.dcp" /> <DCCReference Include="..\ccpackD11.dcp" />
<DCCReference Include="cfpack_d11.dcp" /> <DCCReference Include="..\cfpack_d11.dcp" />
<DCCReference Include="Contactos_controller.dcp" /> <DCCReference Include="..\Contactos_controller.dcp" />
<DCCReference Include="Contactos_model.dcp" /> <DCCReference Include="..\Contactos_model.dcp" />
<DCCReference Include="Contactos_view.dcp" /> <DCCReference Include="..\Contactos_view.dcp" />
<DCCReference Include="cxDataD11.dcp" /> <DCCReference Include="..\cxDataD11.dcp" />
<DCCReference Include="cxEditorsD11.dcp" /> <DCCReference Include="..\cxEditorsD11.dcp" />
<DCCReference Include="cxLibraryD11.dcp" /> <DCCReference Include="..\cxLibraryD11.dcp" />
<DCCReference Include="DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\DataAbstract_Core_D11.dcp" />
<DCCReference Include="dbrtl.dcp" /> <DCCReference Include="..\dbrtl.dcp" />
<DCCReference Include="designide.dcp" /> <DCCReference Include="..\designide.dcp" />
<DCCReference Include="dsnap.dcp" /> <DCCReference Include="..\dsnap.dcp" />
<DCCReference Include="dxComnD11.dcp" /> <DCCReference Include="..\dxComnD11.dcp" />
<DCCReference Include="dxCoreD11.dcp" /> <DCCReference Include="..\dxCoreD11.dcp" />
<DCCReference Include="dxGDIPlusD11.dcp" /> <DCCReference Include="..\dxGDIPlusD11.dcp" />
<DCCReference Include="dxLayoutControlD11.dcp" /> <DCCReference Include="..\dxLayoutControlD11.dcp" />
<DCCReference Include="dxThemeD11.dcp" /> <DCCReference Include="..\dxThemeD11.dcp" />
<DCCReference Include="FacturasProveedor_controller.dcp" /> <DCCReference Include="..\FacturasProveedor_controller.dcp" />
<DCCReference Include="FacturasProveedor_model.dcp" /> <DCCReference Include="..\FacturasProveedor_model.dcp" />
<DCCReference Include="fqb110.dcp" /> <DCCReference Include="..\fqb110.dcp" />
<DCCReference Include="frx11.dcp" /> <DCCReference Include="..\frx11.dcp" />
<DCCReference Include="frxe11.dcp" /> <DCCReference Include="..\frxe11.dcp" />
<DCCReference Include="fs11.dcp" /> <DCCReference Include="..\fs11.dcp" />
<DCCReference Include="GestorInformes_controller.dcp" /> <DCCReference Include="..\GestorInformes_controller.dcp" />
<DCCReference Include="GUIBase.dcp" /> <DCCReference Include="..\GUIBase.dcp" />
<DCCReference Include="GUISDK_D11R.dcp" /> <DCCReference Include="..\GUISDK_D11R.dcp" />
<DCCReference Include="Jcl.dcp" /> <DCCReference Include="..\Jcl.dcp" />
<DCCReference Include="JclVcl.dcp" /> <DCCReference Include="..\JclVcl.dcp" />
<DCCReference Include="JvCoreD11R.dcp" /> <DCCReference Include="..\JvCoreD11R.dcp" />
<DCCReference Include="JvPageCompsD11R.dcp" /> <DCCReference Include="..\JvPageCompsD11R.dcp" />
<DCCReference Include="JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\JvStdCtrlsD11R.dcp" />
<DCCReference Include="JvSystemD11R.dcp" /> <DCCReference Include="..\JvSystemD11R.dcp" />
<DCCReference Include="PngComponentsD10.dcp" /> <DCCReference Include="..\PngComponentsD10.dcp" />
<DCCReference Include="PNG_D10.dcp" /> <DCCReference Include="..\PNG_D10.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" /> <DCCReference Include="..\RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" /> <DCCReference Include="..\rtl.dcp" />
<DCCReference Include="tb2k_d10.dcp" /> <DCCReference Include="..\tb2k_d10.dcp" />
<DCCReference Include="tbx_d10.dcp" /> <DCCReference Include="..\tbx_d10.dcp" />
<DCCReference Include="..\vcl.dcp" />
<DCCReference Include="..\vclactnband.dcp" />
<DCCReference Include="..\vcldb.dcp" />
<DCCReference Include="..\vcljpg.dcp" />
<DCCReference Include="..\vclx.dcp" />
<DCCReference Include="..\xmlrtl.dcp" />
<DCCReference Include="uEditorInformeBase.pas"> <DCCReference Include="uEditorInformeBase.pas">
<Form>fEditorInformeBase</Form> <Form>fEditorInformeBase</Form>
<DesignClass>TForm</DesignClass> <DesignClass>TForm</DesignClass>
@ -181,12 +187,6 @@
<Form>frViewPeriodoFechas</Form> <Form>frViewPeriodoFechas</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vclactnband.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclx.dcp" />
<DCCReference Include="xmlrtl.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line

75
Source/Modulos/Gestor de informes/Views/uEditorInformeBeneficiosReportGrafComp.dfm
View File

@ -40,25 +40,25 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
ExplicitHeight = 534 ExplicitHeight = 534
end end
inherited TBXMultiDockDerecho: TTBXMultiDock inherited TBXMultiDockDerecho: TTBXMultiDock
Left = 703 Left = 675
Width = 192 Width = 220
Height = 534 Height = 534
ExplicitLeft = 703 ExplicitLeft = 675
ExplicitWidth = 192 ExplicitWidth = 220
ExplicitHeight = 534 ExplicitHeight = 534
inherited pnlParametros: TTBXDockablePanel inherited pnlParametros: TTBXDockablePanel
DockedWidth = 188 DockedWidth = 216
ExplicitWidth = 192 ExplicitWidth = 220
ExplicitHeight = 518 ExplicitHeight = 518
inherited TBXDockablePanel1: TTBXDockablePanel inherited TBXDockablePanel1: TTBXDockablePanel
Top = 368 Top = 446
ExplicitTop = 368 ExplicitTop = 368
ExplicitWidth = 188 ExplicitWidth = 188
inherited TBXButton1: TTBXButton inherited TBXButton1: TTBXButton
AlignWithMargins = True AlignWithMargins = True
Left = 3 Left = 3
Top = 3 Top = 3
Width = 182 Width = 210
Height = 37 Height = 37
Margins.Left = 8 Margins.Left = 8
Margins.Top = 8 Margins.Top = 8
@ -74,7 +74,7 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
inline frViewIntervaloComparativo1: TfrViewIntervaloComparativo inline frViewIntervaloComparativo1: TfrViewIntervaloComparativo
Left = 0 Left = 0
Top = 0 Top = 0
Width = 188 Width = 216
Height = 230 Height = 230
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -88,13 +88,13 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
ExplicitWidth = 188 ExplicitWidth = 188
ExplicitHeight = 230 ExplicitHeight = 230
inherited TBXAlignmentPanel2: TTBXAlignmentPanel inherited TBXAlignmentPanel2: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
DesignSize = ( DesignSize = (
182 210
42) 42)
inherited Label3: TLabel inherited Label3: TLabel
Width = 172 Width = 200
end end
inherited cbIntervalo: TcxComboBox inherited cbIntervalo: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -102,21 +102,21 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166 ExplicitWidth = 166
Width = 166 Width = 194
end end
end end
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited TBXAlignmentPanel3: TTBXAlignmentPanel inherited TBXAlignmentPanel3: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
DesignSize = ( DesignSize = (
182 210
42) 42)
inherited lis: TLabel inherited lis: TLabel
Width = 172 Width = 200
end end
inherited cbAno1: TcxComboBox inherited cbAno1: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -124,17 +124,17 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166 ExplicitWidth = 166
Width = 166 Width = 194
end end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
DesignSize = ( DesignSize = (
182 210
42) 42)
inherited Label1: TLabel inherited Label1: TLabel
Width = 172 Width = 200
end end
inherited cbAno2: TcxComboBox inherited cbAno2: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -142,22 +142,22 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166 ExplicitWidth = 166
Width = 166 Width = 194
end end
end end
inherited TBXAlignmentPanel4: TTBXAlignmentPanel inherited TBXAlignmentPanel4: TTBXAlignmentPanel
Width = 182 Width = 210
Visible = False Visible = False
ExplicitWidth = 182 ExplicitWidth = 182
inherited Label2: TLabel inherited Label2: TLabel
Width = 172 Width = 200
end end
end end
inherited TBXAlignmentPanel5: TTBXAlignmentPanel inherited TBXAlignmentPanel5: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
inherited Label4: TLabel inherited Label4: TLabel
Width = 172 Width = 200
end end
inherited cbSerie: TcxComboBox inherited cbSerie: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -165,14 +165,14 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166 ExplicitWidth = 166
Width = 166 Width = 194
end end
end end
end end
inline frViewFiltroClientes1: TfrViewFiltroClientes inline frViewFiltroClientes1: TfrViewFiltroClientes
Left = 0 Left = 0
Top = 356 Top = 460
Width = 188 Width = 216
Height = 195 Height = 195
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -187,11 +187,11 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
ExplicitTop = 356 ExplicitTop = 356
ExplicitWidth = 188 ExplicitWidth = 188
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited bElegirCliente: TBitBtn inherited bElegirCliente: TBitBtn
Width = 119 Width = 147
ExplicitWidth = 119 ExplicitWidth = 119
end end
inherited edtCliente: TcxTextEdit inherited edtCliente: TcxTextEdit
@ -200,14 +200,14 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 152 ExplicitWidth = 152
Width = 152 Width = 180
end end
end end
inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto
Left = 0 Left = 0
Top = 230 Top = 230
Width = 188 Width = 216
Height = 126 Height = 230
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -218,14 +218,15 @@ inherited fEditorInformeBeneficiosReportGrafComp: TfEditorInformeBeneficiosRepor
TabOrder = 3 TabOrder = 3
ReadOnly = False ReadOnly = False
ExplicitTop = 230 ExplicitTop = 230
ExplicitWidth = 188 ExplicitWidth = 216
ExplicitHeight = 230
inherited TBXLabel1: TTBXLabel inherited TBXLabel1: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited cbTipoGasto: TcxLookupComboBox inherited cbTipoGasto: TcxLookupComboBox
ExplicitWidth = 127 ExplicitWidth = 127
Width = 127 Width = 155
end end
end end
end end

13
Source/Modulos/Gestor de informes/Views/uEditorInformeBeneficiosReportGrafComp.pas
View File

@ -123,8 +123,10 @@ end;
function TfEditorInformeBeneficiosReportGrafComp.GetListaIDTiposGasto: TIntegerArray; function TfEditorInformeBeneficiosReportGrafComp.GetListaIDTiposGasto: TIntegerArray;
begin begin
FListaIDTiposGasto.Clear; FListaIDTiposGasto.Clear;
if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID); // if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
// FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID);
FListaIDTiposGasto := frViewFiltroTipoGasto1.TipoGastoID.ToIntegerArray;
Result := FListaIDTiposGasto; Result := FListaIDTiposGasto;
end; end;
@ -132,9 +134,10 @@ end;
function TfEditorInformeBeneficiosReportGrafComp.GetListaNombreTiposGasto: StringArray; function TfEditorInformeBeneficiosReportGrafComp.GetListaNombreTiposGasto: StringArray;
begin begin
FListaNombreTiposGasto.Clear; FListaNombreTiposGasto.Clear;
if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then // if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then
FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre); // FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre);
FListaNombreTiposGasto := frViewFiltroTipoGasto1.TipoGastoNombre;
Result := FListaNombreTiposGasto; Result := FListaNombreTiposGasto;
end; end;

10
Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.dfm
View File

@ -2,6 +2,7 @@ inherited fEditorInformeFacturasProveedorPendientesReport: TfEditorInformeFactur
Caption = 'fEditorInformeFacturasProveedorPendientesReport' Caption = 'fEditorInformeFacturasProveedorPendientesReport'
ClientHeight = 871 ClientHeight = 871
ClientWidth = 970 ClientWidth = 970
ExplicitTop = -200
ExplicitWidth = 978 ExplicitWidth = 978
ExplicitHeight = 905 ExplicitHeight = 905
PixelsPerInch = 96 PixelsPerInch = 96
@ -167,7 +168,7 @@ inherited fEditorInformeFacturasProveedorPendientesReport: TfEditorInformeFactur
end end
inline frViewFiltroImportes1: TfrViewFiltroImportes inline frViewFiltroImportes1: TfrViewFiltroImportes
Left = 0 Left = 0
Top = 240 Top = 632
Width = 216 Width = 216
Height = 88 Height = 88
Align = alTop Align = alTop
@ -201,7 +202,7 @@ inherited fEditorInformeFacturasProveedorPendientesReport: TfEditorInformeFactur
end end
inline frViewFiltroProveedores1: TfrViewFiltroProveedores inline frViewFiltroProveedores1: TfrViewFiltroProveedores
Left = 0 Left = 0
Top = 328 Top = 470
Width = 216 Width = 216
Height = 162 Height = 162
Align = alTop Align = alTop
@ -236,9 +237,9 @@ inherited fEditorInformeFacturasProveedorPendientesReport: TfEditorInformeFactur
end end
inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto
Left = 0 Left = 0
Top = 490 Top = 240
Width = 216 Width = 216
Height = 126 Height = 230
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -250,6 +251,7 @@ inherited fEditorInformeFacturasProveedorPendientesReport: TfEditorInformeFactur
ReadOnly = False ReadOnly = False
ExplicitTop = 490 ExplicitTop = 490
ExplicitWidth = 216 ExplicitWidth = 216
ExplicitHeight = 230
inherited TBXLabel1: TTBXLabel inherited TBXLabel1: TTBXLabel
Width = 216 Width = 216
ExplicitWidth = 216 ExplicitWidth = 216

13
Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorPendientesReport.pas
View File

@ -144,18 +144,21 @@ end;
function TfEditorInformeFacturasProveedorPendientesReport.GetListaIDTiposGasto: TIntegerArray; function TfEditorInformeFacturasProveedorPendientesReport.GetListaIDTiposGasto: TIntegerArray;
begin begin
FListaIDTiposGasto.Clear; FListaIDTiposGasto.Clear;
if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID);
// if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
// FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID);
FListaIDTiposGasto := frViewFiltroTipoGasto1.TipoGastoID.ToIntegerArray;
Result := FListaIDTiposGasto; Result := FListaIDTiposGasto;
end; end;
function TfEditorInformeFacturasProveedorPendientesReport.GetListaNombreTiposGasto: StringArray; function TfEditorInformeFacturasProveedorPendientesReport.GetListaNombreTiposGasto: StringArray;
begin begin
FListaNombreTiposGasto.Clear; FListaNombreTiposGasto.Clear;
if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then // if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then
FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre); // FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre);
FListaNombreTiposGasto := frViewFiltroTipoGasto1.TipoGastoNombre;
Result := FListaNombreTiposGasto; Result := FListaNombreTiposGasto;
end; end;

82
Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.dfm
View File

@ -40,20 +40,20 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
ExplicitHeight = 534 ExplicitHeight = 534
end end
inherited TBXMultiDockDerecho: TTBXMultiDock inherited TBXMultiDockDerecho: TTBXMultiDock
Left = 703 Left = 675
Width = 192 Width = 220
Height = 534 Height = 534
ExplicitLeft = 703 ExplicitLeft = 675
ExplicitWidth = 192 ExplicitWidth = 220
ExplicitHeight = 534 ExplicitHeight = 534
inherited pnlParametros: TTBXDockablePanel inherited pnlParametros: TTBXDockablePanel
DockedWidth = 188 DockedWidth = 216
ExplicitWidth = 192 ExplicitWidth = 220
ExplicitHeight = 518 ExplicitHeight = 518
inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0]
Left = 0 Left = 0
Top = 0 Top = 0
Width = 188 Width = 216
Height = 240 Height = 240
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -67,10 +67,10 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
ExplicitWidth = 188 ExplicitWidth = 188
ExplicitHeight = 240 ExplicitHeight = 240
inherited TBXAlignmentPanel2: TTBXAlignmentPanel inherited TBXAlignmentPanel2: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
inherited Label3: TLabel inherited Label3: TLabel
Width = 172 Width = 200
end end
inherited edtFechaFin: TcxDateEdit inherited edtFechaFin: TcxDateEdit
Left = 77 Left = 77
@ -80,7 +80,7 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 77 ExplicitLeft = 77
ExplicitWidth = 96 ExplicitWidth = 96
Width = 96 Width = 124
end end
inherited edtFechaIni: TcxDateEdit inherited edtFechaIni: TcxDateEdit
Left = 76 Left = 76
@ -90,7 +90,7 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 76 ExplicitLeft = 76
ExplicitWidth = 97 ExplicitWidth = 97
Width = 97 Width = 125
end end
inherited cbPeriodo: TcxComboBox inherited cbPeriodo: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -98,18 +98,18 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 170 ExplicitWidth = 170
Width = 170 Width = 198
end end
end end
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited TBXAlignmentPanel3: TTBXAlignmentPanel inherited TBXAlignmentPanel3: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
inherited Label4: TLabel inherited Label4: TLabel
Width = 172 Width = 200
end end
inherited edtFechaVenFin: TcxDateEdit inherited edtFechaVenFin: TcxDateEdit
Left = 77 Left = 77
@ -119,7 +119,7 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 77 ExplicitLeft = 77
ExplicitWidth = 96 ExplicitWidth = 96
Width = 96 Width = 124
end end
inherited edtFechaVenIni: TcxDateEdit inherited edtFechaVenIni: TcxDateEdit
Left = 76 Left = 76
@ -129,7 +129,7 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 76 ExplicitLeft = 76
ExplicitWidth = 97 ExplicitWidth = 97
Width = 97 Width = 125
end end
inherited cbPeriodo2: TcxComboBox inherited cbPeriodo2: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -137,12 +137,12 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 170 ExplicitWidth = 170
Width = 170 Width = 198
end end
end end
end end
inherited TBXDockablePanel1: TTBXDockablePanel inherited TBXDockablePanel1: TTBXDockablePanel
Top = 368 Top = 446
TabOrder = 2 TabOrder = 2
ExplicitTop = 368 ExplicitTop = 368
ExplicitWidth = 188 ExplicitWidth = 188
@ -150,7 +150,7 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
AlignWithMargins = True AlignWithMargins = True
Left = 3 Left = 3
Top = 3 Top = 3
Width = 182 Width = 210
Height = 37 Height = 37
Margins.Left = 8 Margins.Left = 8
Margins.Top = 8 Margins.Top = 8
@ -165,8 +165,8 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
end end
inline frViewFiltroImportes1: TfrViewFiltroImportes inline frViewFiltroImportes1: TfrViewFiltroImportes
Left = 0 Left = 0
Top = 366 Top = 470
Width = 188 Width = 216
Height = 88 Height = 88
Align = alTop Align = alTop
AutoSize = True AutoSize = True
@ -182,11 +182,11 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
ExplicitWidth = 188 ExplicitWidth = 188
ExplicitHeight = 88 ExplicitHeight = 88
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitTop = 43 ExplicitTop = 43
ExplicitWidth = 182 ExplicitWidth = 182
inherited eImporte: TcxSpinEdit inherited eImporte: TcxSpinEdit
@ -199,8 +199,8 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
end end
inline frViewFiltroProveedores1: TfrViewFiltroProveedores inline frViewFiltroProveedores1: TfrViewFiltroProveedores
Left = 0 Left = 0
Top = 454 Top = 558
Width = 188 Width = 216
Height = 162 Height = 162
Align = alTop Align = alTop
AutoSize = True AutoSize = True
@ -216,14 +216,14 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
ExplicitWidth = 188 ExplicitWidth = 188
ExplicitHeight = 162 ExplicitHeight = 162
DesignSize = ( DesignSize = (
188 216
162) 162)
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited bElegirProveedor: TBitBtn inherited bElegirProveedor: TBitBtn
Width = 108 Width = 136
ExplicitWidth = 108 ExplicitWidth = 108
end end
inherited edtProveedor: TcxTextEdit inherited edtProveedor: TcxTextEdit
@ -232,14 +232,14 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 141 ExplicitWidth = 141
Width = 141 Width = 169
end end
end end
inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto
Left = 0 Left = 0
Top = 240 Top = 240
Width = 188 Width = 216
Height = 126 Height = 230
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -250,14 +250,26 @@ inherited fEditorInformeFacturasProveedorReport: TfEditorInformeFacturasProveedo
TabOrder = 4 TabOrder = 4
ReadOnly = False ReadOnly = False
ExplicitTop = 240 ExplicitTop = 240
ExplicitWidth = 188 ExplicitWidth = 216
ExplicitHeight = 230
inherited TBXLabel1: TTBXLabel inherited TBXLabel1: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited cbTipoGasto: TcxLookupComboBox inherited cbTipoGasto: TcxLookupComboBox
ExplicitWidth = 127 ExplicitWidth = 127
Width = 127 Width = 155
end
inherited cxGrid: TcxGrid
Width = 210
Height = 128
ExplicitWidth = 210
ExplicitHeight = 128
inherited cxGridDBTableView: TcxGridDBTableView
inherited cxGridDBTableViewDESCRIPCION: TcxGridDBColumn
Width = 190
end
end
end end
end end
end end

10
Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReport.pas
View File

@ -143,8 +143,9 @@ end;
function TfEditorInformeFacturasProveedorReport.GetListaIDTiposGasto: TIntegerArray; function TfEditorInformeFacturasProveedorReport.GetListaIDTiposGasto: TIntegerArray;
begin begin
FListaIDTiposGasto.Clear; FListaIDTiposGasto.Clear;
if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then // if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID); // FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID);
FListaIDTiposGasto := frViewFiltroTipoGasto1.TipoGastoID.ToIntegerArray;
Result := FListaIDTiposGasto; Result := FListaIDTiposGasto;
end; end;
@ -152,8 +153,9 @@ end;
function TfEditorInformeFacturasProveedorReport.GetListaNombreTiposGasto: StringArray; function TfEditorInformeFacturasProveedorReport.GetListaNombreTiposGasto: StringArray;
begin begin
FListaNombreTiposGasto.Clear; FListaNombreTiposGasto.Clear;
if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then // if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then
FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre); // FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre);
FListaNombreTiposGasto := frViewFiltroTipoGasto1.TipoGastoNombre;
Result := FListaNombreTiposGasto; Result := FListaNombreTiposGasto;
end; end;

77
Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm
View File

@ -40,26 +40,26 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
ExplicitHeight = 550 ExplicitHeight = 550
end end
inherited TBXMultiDockDerecho: TTBXMultiDock inherited TBXMultiDockDerecho: TTBXMultiDock
Left = 766 Left = 738
Width = 192 Width = 220
Height = 550 Height = 550
ExplicitLeft = 766 ExplicitLeft = 738
ExplicitWidth = 192 ExplicitWidth = 220
ExplicitHeight = 550 ExplicitHeight = 550
inherited pnlParametros: TTBXDockablePanel inherited pnlParametros: TTBXDockablePanel
DockedWidth = 188 DockedWidth = 216
DockPos = -136 DockPos = -136
ExplicitWidth = 192 ExplicitWidth = 220
ExplicitHeight = 534 ExplicitHeight = 534
inherited TBXDockablePanel1: TTBXDockablePanel inherited TBXDockablePanel1: TTBXDockablePanel
Top = 384 Top = 462
ExplicitTop = 384 ExplicitTop = 384
ExplicitWidth = 188 ExplicitWidth = 188
inherited TBXButton1: TTBXButton inherited TBXButton1: TTBXButton
AlignWithMargins = True AlignWithMargins = True
Left = 3 Left = 3
Top = 3 Top = 3
Width = 182 Width = 210
Height = 37 Height = 37
Margins.Left = 8 Margins.Left = 8
Margins.Top = 8 Margins.Top = 8
@ -75,7 +75,7 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
inline frViewIntervaloComparativo1: TfrViewIntervaloComparativo inline frViewIntervaloComparativo1: TfrViewIntervaloComparativo
Left = 0 Left = 0
Top = 0 Top = 0
Width = 188 Width = 216
Height = 230 Height = 230
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -89,10 +89,10 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
ExplicitWidth = 188 ExplicitWidth = 188
ExplicitHeight = 230 ExplicitHeight = 230
inherited TBXAlignmentPanel2: TTBXAlignmentPanel inherited TBXAlignmentPanel2: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
inherited Label3: TLabel inherited Label3: TLabel
Width = 172 Width = 200
end end
inherited cbIntervalo: TcxComboBox inherited cbIntervalo: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -100,18 +100,18 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166 ExplicitWidth = 166
Width = 166 Width = 194
end end
end end
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited TBXAlignmentPanel3: TTBXAlignmentPanel inherited TBXAlignmentPanel3: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
inherited lis: TLabel inherited lis: TLabel
Width = 172 Width = 200
end end
inherited cbAno1: TcxComboBox inherited cbAno1: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -119,14 +119,14 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166 ExplicitWidth = 166
Width = 166 Width = 194
end end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
inherited Label1: TLabel inherited Label1: TLabel
Width = 172 Width = 200
end end
inherited cbAno2: TcxComboBox inherited cbAno2: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -134,21 +134,21 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166 ExplicitWidth = 166
Width = 166 Width = 194
end end
end end
inherited TBXAlignmentPanel4: TTBXAlignmentPanel inherited TBXAlignmentPanel4: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
inherited Label2: TLabel inherited Label2: TLabel
Width = 172 Width = 200
end end
end end
inherited TBXAlignmentPanel5: TTBXAlignmentPanel inherited TBXAlignmentPanel5: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 182
inherited Label4: TLabel inherited Label4: TLabel
Width = 172 Width = 200
end end
inherited cbSerie: TcxComboBox inherited cbSerie: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -156,14 +156,14 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 166 ExplicitWidth = 166
Width = 166 Width = 194
end end
end end
end end
inline frViewFiltroProveedores1: TfrViewFiltroProveedores inline frViewFiltroProveedores1: TfrViewFiltroProveedores
Left = 0 Left = 0
Top = 359 Top = 460
Width = 188 Width = 216
Height = 195 Height = 195
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -175,15 +175,15 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
TabOrder = 2 TabOrder = 2
Visible = False Visible = False
ReadOnly = False ReadOnly = False
ExplicitTop = 359 ExplicitTop = 480
ExplicitWidth = 188 ExplicitWidth = 188
ExplicitHeight = 195 ExplicitHeight = 195
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited bElegirProveedor: TBitBtn inherited bElegirProveedor: TBitBtn
Width = 119 Width = 147
ExplicitWidth = 119 ExplicitWidth = 119
end end
inherited edtProveedor: TcxTextEdit inherited edtProveedor: TcxTextEdit
@ -192,14 +192,14 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 152 ExplicitWidth = 152
Width = 152 Width = 180
end end
end end
inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto
Left = 0 Left = 0
Top = 230 Top = 230
Width = 188 Width = 216
Height = 129 Height = 230
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -211,14 +211,21 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas
ReadOnly = False ReadOnly = False
ExplicitTop = 230 ExplicitTop = 230
ExplicitWidth = 188 ExplicitWidth = 188
ExplicitHeight = 129 ExplicitHeight = 230
DesignSize = (
216
230)
inherited TBXLabel1: TTBXLabel inherited TBXLabel1: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 188
end end
inherited cbTipoGasto: TcxLookupComboBox inherited cbTipoGasto: TcxLookupComboBox
ExplicitWidth = 126 ExplicitWidth = 126
Width = 126 Width = 154
end
inherited cxGrid: TcxGrid
Height = 128
ExplicitHeight = 128
end end
end end
end end

15
Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas
View File

@ -121,19 +121,22 @@ end;
function TfEditorInformeFacturasProveedorReportGrafComp.GetListaIDTiposGasto: TIntegerArray; function TfEditorInformeFacturasProveedorReportGrafComp.GetListaIDTiposGasto: TIntegerArray;
begin begin
FListaIDTiposGasto.Clear;
if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID);
// FListaIDTiposGasto.Clear;
// if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
// FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID);
FListaIDTiposGasto := frViewFiltroTipoGasto1.TipoGastoID.ToIntegerArray;
Result := FListaIDTiposGasto; Result := FListaIDTiposGasto;
end; end;
function TfEditorInformeFacturasProveedorReportGrafComp.GetListaNombreTiposGasto: StringArray; function TfEditorInformeFacturasProveedorReportGrafComp.GetListaNombreTiposGasto: StringArray;
begin begin
FListaNombreTiposGasto.Clear; FListaNombreTiposGasto.Clear;
if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then // if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then
FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre); // FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre);
FListaNombreTiposGasto := frViewFiltroTipoGasto1.TipoGastoNombre;
Result := FListaNombreTiposGasto; Result := FListaNombreTiposGasto;
end; end;

118
Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.dfm
View File

@ -40,20 +40,20 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
ExplicitHeight = 534 ExplicitHeight = 534
end end
inherited TBXMultiDockDerecho: TTBXMultiDock inherited TBXMultiDockDerecho: TTBXMultiDock
Left = 703 Left = 675
Width = 192 Width = 220
Height = 534 Height = 534
ExplicitLeft = 703 ExplicitLeft = 675
ExplicitWidth = 192 ExplicitWidth = 220
ExplicitHeight = 534 ExplicitHeight = 534
inherited pnlParametros: TTBXDockablePanel inherited pnlParametros: TTBXDockablePanel
DockedWidth = 188 DockedWidth = 216
ExplicitWidth = 192 ExplicitWidth = 220
ExplicitHeight = 518 ExplicitHeight = 518
inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0]
Left = 0 Left = 0
Top = 0 Top = 0
Width = 188 Width = 216
Height = 136 Height = 136
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -64,13 +64,13 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 188 ExplicitWidth = 216
ExplicitHeight = 136 ExplicitHeight = 136
inherited TBXAlignmentPanel2: TTBXAlignmentPanel inherited TBXAlignmentPanel2: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitWidth = 182 ExplicitWidth = 210
inherited Label3: TLabel inherited Label3: TLabel
Width = 172 Width = 200
end end
inherited edtFechaFin: TcxDateEdit inherited edtFechaFin: TcxDateEdit
Left = 76 Left = 76
@ -79,8 +79,8 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 76 ExplicitLeft = 76
ExplicitWidth = 97 ExplicitWidth = 125
Width = 97 Width = 125
end end
inherited edtFechaIni: TcxDateEdit inherited edtFechaIni: TcxDateEdit
Left = 76 Left = 76
@ -89,50 +89,52 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 76 ExplicitLeft = 76
ExplicitWidth = 97 ExplicitWidth = 125
Width = 97 Width = 125
end end
inherited cbPeriodo: TcxComboBox inherited cbPeriodo: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 170 ExplicitWidth = 198
Width = 170 Width = 198
end end
end end
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 216
end end
inherited TBXAlignmentPanel3: TTBXAlignmentPanel inherited TBXAlignmentPanel3: TTBXAlignmentPanel
Width = 182 Width = 210
Visible = False Visible = False
ExplicitWidth = 182 ExplicitWidth = 210
inherited Label4: TLabel inherited Label4: TLabel
Width = 172 Width = 200
end end
inherited edtFechaVenFin: TcxDateEdit inherited edtFechaVenFin: TcxDateEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 99 ExplicitWidth = 127
Width = 99 Width = 127
end end
inherited edtFechaVenIni: TcxDateEdit inherited edtFechaVenIni: TcxDateEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 97 ExplicitWidth = 125
Width = 97 Width = 125
end end
inherited cbPeriodo2: TcxComboBox inherited cbPeriodo2: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 457
Width = 457
end end
end end
end end
@ -140,12 +142,12 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
Top = 368 Top = 368
TabOrder = 2 TabOrder = 2
ExplicitTop = 368 ExplicitTop = 368
ExplicitWidth = 188 ExplicitWidth = 216
inherited TBXButton1: TTBXButton inherited TBXButton1: TTBXButton
AlignWithMargins = True AlignWithMargins = True
Left = 3 Left = 3
Top = 3 Top = 3
Width = 182 Width = 210
Height = 37 Height = 37
Margins.Left = 8 Margins.Left = 8
Margins.Top = 8 Margins.Top = 8
@ -154,14 +156,14 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
Align = alTop Align = alTop
ExplicitLeft = 3 ExplicitLeft = 3
ExplicitTop = 3 ExplicitTop = 3
ExplicitWidth = 182 ExplicitWidth = 210
ExplicitHeight = 37 ExplicitHeight = 37
end end
end end
inline frViewFiltroImportes1: TfrViewFiltroImportes inline frViewFiltroImportes1: TfrViewFiltroImportes
Left = 0 Left = 0
Top = 262 Top = 366
Width = 188 Width = 216
Height = 88 Height = 88
Align = alTop Align = alTop
AutoSize = True AutoSize = True
@ -173,17 +175,17 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
ParentFont = False ParentFont = False
TabOrder = 1 TabOrder = 1
ReadOnly = False ReadOnly = False
ExplicitTop = 262 ExplicitTop = 366
ExplicitWidth = 188 ExplicitWidth = 216
ExplicitHeight = 88 ExplicitHeight = 88
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 216
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 182 Width = 210
ExplicitTop = 43 ExplicitTop = 43
ExplicitWidth = 182 ExplicitWidth = 210
inherited eImporte: TcxSpinEdit inherited eImporte: TcxSpinEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
@ -194,8 +196,8 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
end end
inline frViewFiltroProveedores1: TfrViewFiltroProveedores inline frViewFiltroProveedores1: TfrViewFiltroProveedores
Left = 0 Left = 0
Top = 350 Top = 454
Width = 188 Width = 216
Height = 162 Height = 162
Align = alTop Align = alTop
AutoSize = True AutoSize = True
@ -207,31 +209,31 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
ParentFont = False ParentFont = False
TabOrder = 3 TabOrder = 3
ReadOnly = False ReadOnly = False
ExplicitTop = 350 ExplicitTop = 454
ExplicitWidth = 188 ExplicitWidth = 216
ExplicitHeight = 162 ExplicitHeight = 162
inherited TBXLabel2: TTBXLabel inherited TBXLabel2: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 216
end end
inherited bElegirProveedor: TBitBtn inherited bElegirProveedor: TBitBtn
Width = 108 Width = 136
ExplicitWidth = 108 ExplicitWidth = 136
end end
inherited edtProveedor: TcxTextEdit inherited edtProveedor: TcxTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 141 ExplicitWidth = 169
Width = 141 Width = 169
end end
end end
inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto inline frViewFiltroTipoGasto1: TfrViewFiltroTipoGasto
Left = 0 Left = 0
Top = 136 Top = 136
Width = 188 Width = 216
Height = 126 Height = 230
Align = alTop Align = alTop
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -242,14 +244,22 @@ inherited fEditorInformeIVAProveedoresReport: TfEditorInformeIVAProveedoresRepor
TabOrder = 4 TabOrder = 4
ReadOnly = False ReadOnly = False
ExplicitTop = 136 ExplicitTop = 136
ExplicitWidth = 188 ExplicitWidth = 216
ExplicitHeight = 230
DesignSize = (
216
230)
inherited TBXLabel1: TTBXLabel inherited TBXLabel1: TTBXLabel
Width = 188 Width = 216
ExplicitWidth = 188 ExplicitWidth = 216
end end
inherited cbTipoGasto: TcxLookupComboBox inherited cbTipoGasto: TcxLookupComboBox
ExplicitWidth = 127 ExplicitWidth = 155
Width = 127 Width = 155
end
inherited cxGrid: TcxGrid
Height = 128
ExplicitHeight = 128
end end
end end
end end

11
Source/Modulos/Gestor de informes/Views/uEditorInformeIVAProveedoresReport.pas
View File

@ -125,8 +125,10 @@ end;
function TfEditorInformeIVAProveedoresReport.GetListaIDTiposGasto: TIntegerArray; function TfEditorInformeIVAProveedoresReport.GetListaIDTiposGasto: TIntegerArray;
begin begin
FListaIDTiposGasto.Clear; FListaIDTiposGasto.Clear;
if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID); // if frViewFiltroTipoGasto1.rdUnTipoGasto.Checked then
// FListaIDTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoID);
FListaIDTiposGasto := frViewFiltroTipoGasto1.TipoGastoID.ToIntegerArray;
Result := FListaIDTiposGasto; Result := FListaIDTiposGasto;
end; end;
@ -134,8 +136,9 @@ end;
function TfEditorInformeIVAProveedoresReport.GetListaNombreTiposGasto: StringArray; function TfEditorInformeIVAProveedoresReport.GetListaNombreTiposGasto: StringArray;
begin begin
FListaNombreTiposGasto.Clear; FListaNombreTiposGasto.Clear;
if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then // if Assigned(frViewFiltroTipoGasto1.rdUnTipoGasto) then
FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre); // FListaNombreTiposGasto.Add(frViewFiltroTipoGasto1.TipoGastoNombre);
FListaNombreTiposGasto := frViewFiltroTipoGasto1.TipoGastoNombre;
Result := FListaNombreTiposGasto; Result := FListaNombreTiposGasto;
end; end;

48
Source/Modulos/Gestor de informes/Views/uViewFiltroTipoGasto.dfm
View File

@ -1,14 +1,14 @@
inherited frViewFiltroTipoGasto: TfrViewFiltroTipoGasto inherited frViewFiltroTipoGasto: TfrViewFiltroTipoGasto
Width = 451 Width = 451
Height = 126 Height = 287
Align = alTop Align = alTop
OnCreate = CustomViewCreate OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy OnDestroy = CustomViewDestroy
ExplicitWidth = 451 ExplicitWidth = 451
ExplicitHeight = 126 ExplicitHeight = 287
DesignSize = ( DesignSize = (
451 451
126) 287)
object TBXLabel1: TTBXLabel object TBXLabel1: TTBXLabel
Left = 0 Left = 0
Top = 0 Top = 0
@ -63,7 +63,6 @@ inherited frViewFiltroTipoGasto: TfrViewFiltroTipoGasto
end> end>
Properties.ListOptions.ShowHeader = False Properties.ListOptions.ShowHeader = False
Properties.ListOptions.SyncMode = True Properties.ListOptions.SyncMode = True
Properties.ListSource = dsTiposFactura
Style.LookAndFeel.Kind = lfOffice11 Style.LookAndFeel.Kind = lfOffice11
StyleDisabled.LookAndFeel.Kind = lfOffice11 StyleDisabled.LookAndFeel.Kind = lfOffice11
StyleFocused.LookAndFeel.Kind = lfOffice11 StyleFocused.LookAndFeel.Kind = lfOffice11
@ -72,8 +71,45 @@ inherited frViewFiltroTipoGasto: TfrViewFiltroTipoGasto
Height = 21 Height = 21
Width = 390 Width = 390
end end
object cxGrid: TcxGrid
Left = 3
Top = 94
Width = 210
Height = 146
TabOrder = 4
LookAndFeel.Kind = lfOffice11
object cxGridDBTableView: TcxGridDBTableView
NavigatorButtons.ConfirmDelete = False
DataController.DataSource = dsTiposFactura
DataController.Summary.DefaultGroupSummaryItems = <>
DataController.Summary.FooterSummaryItems = <>
DataController.Summary.SummaryGroups = <>
OptionsData.CancelOnExit = False
OptionsData.Deleting = False
OptionsData.DeletingConfirmation = False
OptionsData.Editing = False
OptionsData.Inserting = False
OptionsSelection.CellSelect = False
OptionsSelection.MultiSelect = True
OptionsView.GroupByBox = False
OptionsView.Header = False
object cxGridDBTableViewID: TcxGridDBColumn
DataBinding.FieldName = 'ID'
Visible = False
VisibleForCustomization = False
Width = 20
end
object cxGridDBTableViewDESCRIPCION: TcxGridDBColumn
DataBinding.FieldName = 'DESCRIPCION'
Width = 190
end
end
object cxGridLevel: TcxGridLevel
GridView = cxGridDBTableView
end
end
object dsTiposFactura: TDADataSource object dsTiposFactura: TDADataSource
Left = 232 Left = 192
Top = 60 Top = 28
end end
end end

111
Source/Modulos/Gestor de informes/Views/uViewFiltroTipoGasto.pas
View File

@ -5,19 +5,21 @@ interface
uses uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Dialogs, uViewBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit,
StdCtrls, Buttons, TBXDkPanels, uViewParametrosInforme, StdCtrls, Buttons, TBXDkPanels, uViewParametrosInforme, DataAbstract4_Intf,
uBizFacturasProveedor, uFacturasProveedorController, uBizFacturasProveedor, uFacturasProveedorController, uIntegerListUtils,
cxGraphics, cxMaskEdit, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxGraphics, cxMaskEdit, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit,
cxDBLookupComboBox, DB, uDAInterfaces, uDADataTable; cxDBLookupComboBox, DB, uDAInterfaces, uDADataTable, cxStyles, cxCustomData,
cxFilter, cxData, cxDataStorage, cxDBData, cxGridLevel, cxGridCustomTableView,
cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid;
type type
IViewFiltroTipoGasto = interface(IViewParametrosInforme) IViewFiltroTipoGasto = interface(IViewParametrosInforme)
['{B87F5712-9E24-4CE2-8FE6-7D60C4E505D6}'] ['{B87F5712-9E24-4CE2-8FE6-7D60C4E505D6}']
function getTipoGastoID: Integer; function getTipoGastoNombre: StringArray;
function getTipoGastoNombre: String; function getTipoGastoID: TIntegerList;
property TipoGastoID : Integer read getTipoGastoID; property TipoGastoID : TIntegerList read getTipoGastoID;
property TipoGastoNombre : String read getTipoGastoNombre; property TipoGastoNombre : StringArray read getTipoGastoNombre;
end; end;
TfrViewFiltroTipoGasto = class(TfrViewParametrosInforme, IViewFiltroTipoGasto) TfrViewFiltroTipoGasto = class(TfrViewParametrosInforme, IViewFiltroTipoGasto)
@ -26,6 +28,11 @@ type
rdUnTipoGasto: TRadioButton; rdUnTipoGasto: TRadioButton;
dsTiposFactura: TDADataSource; dsTiposFactura: TDADataSource;
cbTipoGasto: TcxLookupComboBox; cbTipoGasto: TcxLookupComboBox;
cxGrid: TcxGrid;
cxGridDBTableView: TcxGridDBTableView;
cxGridDBTableViewID: TcxGridDBColumn;
cxGridDBTableViewDESCRIPCION: TcxGridDBColumn;
cxGridLevel: TcxGridLevel;
procedure CustomViewCreate(Sender: TObject); procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject); procedure CustomViewDestroy(Sender: TObject);
procedure rdUnTipoGastoClick(Sender: TObject); procedure rdUnTipoGastoClick(Sender: TObject);
@ -33,49 +40,98 @@ type
private private
FTiposGasto : IBizTiposFacturaProveedor; FTiposGasto : IBizTiposFacturaProveedor;
FFacturasProveedorController : IFacturasProveedorController; FFacturasProveedorController : IFacturasProveedorController;
function getTipoGastoID: Integer; FTiposGastoID: TIntegerList;
function getTipoGastoNombre: String; FTiposGastoNombre: StringArray;
function getTipoGastoID: TIntegerList;
function getTipoGastoNombre: StringArray;
public public
property TipoGastoID : Integer read getTipoGastoID; property TipoGastoID : TIntegerList read getTipoGastoID;
property TipoGastoNombre : String read getTipoGastoNombre; property TipoGastoNombre : StringArray read getTipoGastoNombre;
end; end;
implementation implementation
{$R *.dfm} {$R *.dfm}
uses uGridStatusUtils, uDBSelectionListUtils;
procedure TfrViewFiltroTipoGasto.CustomViewCreate(Sender: TObject); procedure TfrViewFiltroTipoGasto.CustomViewCreate(Sender: TObject);
begin begin
inherited; inherited;
FTiposGastoID:= Nil;
FTiposGastoNombre:= Nil;
FTiposGasto := NIL; FTiposGasto := NIL;
FFacturasProveedorController := NIL; if not Assigned(FFacturasProveedorController) then
begin
FFacturasProveedorController := TFacturasProveedorController.Create;
FTiposGasto := FFacturasProveedorController.darTiposFacturaProveedor;
FTiposGasto.DataTable.Active := True;
end;
end; end;
procedure TfrViewFiltroTipoGasto.CustomViewDestroy(Sender: TObject); procedure TfrViewFiltroTipoGasto.CustomViewDestroy(Sender: TObject);
begin begin
inherited;
FTiposGasto := NIL; FTiposGasto := NIL;
FFacturasProveedorController := NIL; FFacturasProveedorController := NIL;
FTiposGastoID:= Nil;
FTiposGastoNombre:= Nil;
inherited;
end; end;
function TfrViewFiltroTipoGasto.getTipoGastoID: Integer; function TfrViewFiltroTipoGasto.getTipoGastoID: TIntegerList;
var
ATiposGasto: TIntegerList;
ATiposGastoNombre : StringArray;
ATiposGastoSeleccionados : IBizTiposFacturaProveedor;
AGridStatus : TcxGridStatus;
begin begin
if Assigned(FTiposGasto) then ATiposGasto := TIntegerList.Create;
Result := FTiposGasto.ID; ATiposGastoNombre := StringArray.Create;
if Assigned(FTiposGasto)
and rdUnTipoGasto.Checked then
begin
SeleccionarFilasDesdeGrid(cxGridDBTableView, (FTiposGasto as ISeleccionable).SelectedRecords);
if Assigned(FFacturasProveedorController) then
ATiposGastoSeleccionados := (FFacturasProveedorController as IFacturasProveedorController).ExtraerSeleccionados(FTiposGasto) as IBizTiposFacturaProveedor;
if (ATiposGastoSeleccionados.DataTable.RecordCount > 0) then
begin
with ATiposGastoSeleccionados.DataTable do
begin
First;
while not EOF do
begin
ATiposGasto.Add(ATiposGastoSeleccionados.ID);
ATiposGastoNombre.Add(ATiposGastoSeleccionados.DESCRIPCION);
Next;
end;
end;
end;
end;
FTiposGastoID := ATiposGasto;
FTiposGastoNombre := ATiposGastoNombre;
Result := FTiposGastoID;
end; end;
function TfrViewFiltroTipoGasto.getTipoGastoNombre: String; function TfrViewFiltroTipoGasto.getTipoGastoNombre: StringArray;
begin begin
if Assigned(FTiposGasto) then Result := FTiposGastoNombre;
Result := FTiposGasto.DESCRIPCION;
end; end;
procedure TfrViewFiltroTipoGasto.rdTodosLosTipoGastoClick(Sender: TObject); procedure TfrViewFiltroTipoGasto.rdTodosLosTipoGastoClick(Sender: TObject);
begin begin
if rdTodosLosTipoGasto.Checked then if rdTodosLosTipoGasto.Checked then
begin begin
cbTipoGasto.Enabled := False; // cbTipoGasto.Enabled := False;
cxGrid.Enabled := False;
dsTiposFactura.DataTable := Nil;
end; end;
end; end;
@ -83,14 +139,11 @@ procedure TfrViewFiltroTipoGasto.rdUnTipoGastoClick(Sender: TObject);
begin begin
if rdUnTipoGasto.Checked then if rdUnTipoGasto.Checked then
begin begin
cbTipoGasto.Enabled := True; // cbTipoGasto.Enabled := True;
if not Assigned(FFacturasProveedorController) then cxGrid.Enabled := True;
begin dsTiposFactura.DataTable := FTiposGasto.DataTable;
FFacturasProveedorController := TFacturasProveedorController.Create; FTiposGastoID:= Nil;
FTiposGasto := FFacturasProveedorController.darTiposFacturaProveedor; FTiposGastoNombre:= Nil;
FTiposGasto.DataTable.Active := True;
dsTiposFactura.DataTable := FTiposGasto.DataTable;
end;
end; end;
end; end;

24
Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.dfm
View File

@ -211,16 +211,16 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
'LLE,'#10' ARTICULOS.REFERENCIA, F_RTFTOTEXT(DET.CONCEPTO) as C' + 'LLE,'#10' ARTICULOS.REFERENCIA, F_RTFTOTEXT(DET.CONCEPTO) as C' +
'ONCEPTO, DET.CONCEPTO as CONCEPTO_RTF,'#10' DET.CANTIDAD,'#10' ' + 'ONCEPTO, DET.CONCEPTO as CONCEPTO_RTF,'#10' DET.CANTIDAD,'#10' ' +
' DET.UNIDAD_MEDIDA, DET.IMPORTE_UNIDAD - (DET.IMPORTE_UNIDAD *' + ' DET.UNIDAD_MEDIDA, DET.IMPORTE_UNIDAD - (DET.IMPORTE_UNIDAD *' +
' (DET.DESCUENTO / 100)) as IMPORTE_UNIDAD, DET.IMPORTE_TOTAL,'#10' ' + ' (coalesce(DET.DESCUENTO,0) / 100)) as IMPORTE_UNIDAD, DET.IMPOR' +
' ARTICULOS_PROVEEDORES.REFERENCIA_PROV as REFERENCIA_PROVEED' + 'TE_TOTAL,'#10' ARTICULOS_PROVEEDORES.REFERENCIA_PROV as REFERE' +
'OR,'#10' ARTICULOS.REFERENCIA_FABR as REFERENCIA_FABRICANTE'#10'FR' + 'NCIA_PROVEEDOR,'#10' ARTICULOS.REFERENCIA_FABR as REFERENCIA_F' +
'OM PEDIDOS_PROVEEDOR_DETALLES DET'#10'LEFT OUTER JOIN ARTICULOS ON (' + 'ABRICANTE'#10'FROM PEDIDOS_PROVEEDOR_DETALLES DET'#10'LEFT OUTER JOIN AR' +
'DET.ID_ARTICULO = ARTICULOS.ID)'#10'LEFT JOIN PEDIDOS_PROVEEDOR ON (' + 'TICULOS ON (DET.ID_ARTICULO = ARTICULOS.ID)'#10'LEFT JOIN PEDIDOS_PR' +
'PEDIDOS_PROVEEDOR.ID = DET.ID_PEDIDO)'#10'LEFT JOIN ARTICULOS_PROVEE' + 'OVEEDOR ON (PEDIDOS_PROVEEDOR.ID = DET.ID_PEDIDO)'#10'LEFT JOIN ARTI' +
'DORES ON ((ARTICULOS_PROVEEDORES.ID_ARTICULO = ARTICULOS.ID) AND' + 'CULOS_PROVEEDORES ON ((ARTICULOS_PROVEEDORES.ID_ARTICULO = ARTIC' +
' (ARTICULOS_PROVEEDORES.ID_PROVEEDOR = PEDIDOS_PROVEEDOR.ID_PROV' + 'ULOS.ID) AND (ARTICULOS_PROVEEDORES.ID_PROVEEDOR = PEDIDOS_PROVE' +
'EEDOR))'#10#10'WHERE DET.ID_PEDIDO = :ID_PEDIDO AND DET.VISIBLE = 1 AN' + 'EDOR.ID_PROVEEDOR))'#10#10'WHERE DET.ID_PEDIDO = :ID_PEDIDO AND DET.VI' +
'D {Where}'#10'ORDER BY DET.ID_PEDIDO, DET.POSICION;'#10#10 'SIBLE = 1 AND {Where}'#10'ORDER BY DET.ID_PEDIDO, DET.POSICION;'#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -312,7 +312,7 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
end end
item item
Name = 'CANTIDAD' Name = 'CANTIDAD'
DataType = datFloat DataType = datCurrency
end end
item item
Name = 'UNIDAD_MEDIDA' Name = 'UNIDAD_MEDIDA'
@ -321,7 +321,7 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
end end
item item
Name = 'IMPORTE_UNIDAD' Name = 'IMPORTE_UNIDAD'
DataType = datFloat DataType = datDecimal
end end
item item
Name = 'IMPORTE_TOTAL' Name = 'IMPORTE_TOTAL'

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -35,7 +35,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/> <Borland.ProjectType/>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.3.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.3.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 17 de junio de 2020 17:22</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.4.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 03 de septiembre de 2021 19:33</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>

10
Source/Servidor/FactuGES_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico" MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,3,4,0 FILEVERSION 2,4,0,0
PRODUCTVERSION 2,3,4,0 PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.3.4.0\0" VALUE "FileVersion", "2.4.0.0\0"
VALUE "ProductName", "FactuGES Servidor\0" VALUE "ProductName", "FactuGES Servidor\0"
VALUE "ProductVersion", "2.3.4.0\0" VALUE "ProductVersion", "2.4.0.0\0"
VALUE "CompileDate", "miércoles, 07 de octubre de 2020 18:37\0" VALUE "CompileDate", "miércoles, 08 de septiembre de 2021 18:46\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

11
Source/Servidor/uDataModuleServer.pas
View File

@ -167,10 +167,13 @@ begin
FEscribirLog := TCriticalSection.Create; FEscribirLog := TCriticalSection.Create;
JvLogFile1.Active := False; JvLogFile1.Active := False;
// JvLogFile1.FileName := ExtractFilePath(Application.ExeName) + 'ServerLog.txt';
// JvLogFile1.AutoSave := True; {
// JvLogFile1.Active := True; JvLogFile1.FileName := ExtractFilePath(Application.ExeName) + 'ServerLog.txt';
// JvLogFile1.Clear; JvLogFile1.AutoSave := True;
JvLogFile1.Active := True;
JvLogFile1.Clear;
}
end; end;
procedure TdmServer.DataModuleCreate(Sender: TObject); procedure TdmServer.DataModuleCreate(Sender: TObject);