diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 8384cc9c..857051e0 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -54,58 +54,58 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
TForm
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 8b251f31..1641339f 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Informes/1/InformeListadoFacturasClienteGrafComp.fr3 b/Source/Informes/1/InformeListadoFacturasClienteGrafComp.fr3
index d70178d9..c0ee047b 100644
--- a/Source/Informes/1/InformeListadoFacturasClienteGrafComp.fr3
+++ b/Source/Informes/1/InformeListadoFacturasClienteGrafComp.fr3
@@ -1,16 +1,16 @@
-
+
-
+
-
+
-
-
+
+
@@ -36,18 +36,18 @@
-
+
-
+
-
+
-
+
diff --git a/Source/Informes/1/InformeListadoFacturasProveedorGrafComp.fr3 b/Source/Informes/1/InformeListadoFacturasProveedorGrafComp.fr3
index e7ff5c34..ed539f0f 100644
--- a/Source/Informes/1/InformeListadoFacturasProveedorGrafComp.fr3
+++ b/Source/Informes/1/InformeListadoFacturasProveedorGrafComp.fr3
@@ -1,16 +1,16 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -23,43 +23,43 @@
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
diff --git a/Source/Informes/2/InformeListadoFacturasClienteGrafComp.fr3 b/Source/Informes/2/InformeListadoFacturasClienteGrafComp.fr3
index aaf10b34..c8e4af95 100644
--- a/Source/Informes/2/InformeListadoFacturasClienteGrafComp.fr3
+++ b/Source/Informes/2/InformeListadoFacturasClienteGrafComp.fr3
@@ -1,16 +1,16 @@
-
+
-
+
-
+
-
-
+
+
@@ -36,18 +36,18 @@
-
+
-
+
-
+
-
+
diff --git a/Source/Informes/2/InformeListadoFacturasProveedorGrafComp.fr3 b/Source/Informes/2/InformeListadoFacturasProveedorGrafComp.fr3
index 1d023386..4a39ecba 100644
--- a/Source/Informes/2/InformeListadoFacturasProveedorGrafComp.fr3
+++ b/Source/Informes/2/InformeListadoFacturasProveedorGrafComp.fr3
@@ -1,16 +1,16 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -23,43 +23,43 @@
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
diff --git a/Source/Informes/3/InformeListadoFacturasClienteGrafComp.fr3 b/Source/Informes/3/InformeListadoFacturasClienteGrafComp.fr3
index 969f8e7b..be455884 100644
--- a/Source/Informes/3/InformeListadoFacturasClienteGrafComp.fr3
+++ b/Source/Informes/3/InformeListadoFacturasClienteGrafComp.fr3
@@ -1,5 +1,5 @@
-
+
@@ -7,7 +7,7 @@
-
+
@@ -39,14 +39,14 @@
-
+
-
+
diff --git a/Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3 b/Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3
index e1f38c29..686081f3 100644
--- a/Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3
+++ b/Source/Informes/3/InformeListadoFacturasProveedorGrafComp.fr3
@@ -1,13 +1,13 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -22,43 +22,43 @@
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
index 50fbd9fd..40331fa5 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
@@ -37,17 +37,17 @@ object RptFacturasCliente: TRptFacturasCliente
'1.IMPORTE_TOTAL - periodo2.IMPORTE_TOTAL) as Diferencia,'#10'/*SOLO ' +
'COMPARAREMOS CUANDO EL SEGUNDO A'#209'O SEA DIFERENTE DE 0, comparati' +
'va de A'#241'o1 respecto A'#241'o2*/'#10'case'#10'when (periodo1.IMPORTE_TOTAL = 0' +
- ') then (NULL)'#10'else (100 - ((periodo2.IMPORTE_TOTAL*100)/periodo1' +
- '.IMPORTE_TOTAL))'#10'end as Porcentaje'#10#10'FROM'#10'periodos_aux'#10'left join'#10 +
- '(select comp1.ID_EMPRESA, comp1.ANO, MES as NFILA, SUM(comp1.BAS' +
- 'E_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp1'#10'where' +
- ' ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'group by 1,2,3'#10'orde' +
- 'r by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'left jo' +
- 'in'#10'(select comp2.ID_EMPRESA, comp2.ANO, MES as NFILA, SUM(comp2.' +
- 'BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp2'#10'wh' +
- 'ere ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'o' +
- 'rder by 1 desc,2 asc) periodo2 on (VALOR = periodo2.NFILA)'#10#10'wher' +
- 'e periodo= '#39'MENSUAL'#39#10'order by valor asc'#10#10
+ ') then (NULL)'#10'else (((periodo1.IMPORTE_TOTAL - periodo2.IMPORTE_' +
+ 'TOTAL) * 100) / periodo2.IMPORTE_TOTAL)'#10'end as Porcentaje'#10#10'FROM'#10 +
+ '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_' +
+ 'FAC_CLIENTE comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :AN' +
+ 'O1)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo1 on (VALOR = p' +
+ 'eriodo1.NFILA)'#10#10'left join'#10'(select comp2.ID_EMPRESA, comp2.ANO, M' +
+ 'ES as NFILA, SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_I' +
+ 'NF_FAC_CLIENTE comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = ' +
+ ':ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo2 on (VALOR ' +
+ '= periodo2.NFILA)'#10#10'where periodo= '#39'MENSUAL'#39#10'order by valor asc'#10#10
StatementType = stSQL
ColumnMappings = <
item
@@ -1144,17 +1144,18 @@ object RptFacturasCliente: TRptFacturasCliente
'1.IMPORTE_TOTAL - periodo2.IMPORTE_TOTAL) as Diferencia,'#10'/*SOLO ' +
'COMPARAREMOS CUANDO EL SEGUNDO A'#209'O SEA DIFERENTE DE 0, comparati' +
'va de A'#241'o1 respecto A'#241'o2*/'#10'case'#10'when (periodo1.IMPORTE_TOTAL = 0' +
- ') then (NULL)'#10'else (100 - ((periodo2.IMPORTE_TOTAL*100)/periodo1' +
- '.IMPORTE_TOTAL))'#10'end as Porcentaje'#10#10'FROM'#10'periodos_aux'#10'left join'#10 +
- '(select comp1.ID_EMPRESA, comp1.ANO, TRIMESTRE as NFILA, SUM(com' +
- 'p1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp1' +
- #10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'group by 1,2,' +
- '3'#10'order by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'l' +
- 'eft join'#10'(select comp2.ID_EMPRESA, comp2.ANO, TRIMESTRE as NFILA' +
- ', SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIE' +
- 'NTE comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'grou' +
- 'p 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 valor asc'#10#10
+ ') then (NULL)'#10'else (((periodo1.IMPORTE_TOTAL - periodo2.IMPORTE_' +
+ 'TOTAL) * 100) / periodo2.IMPORTE_TOTAL)'#10'end as Porcentaje'#10#10'FROM'#10 +
+ '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 ' +
+ 'V_INF_FAC_CLIENTE comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO' +
+ ' = :ANO1)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo1 on (VAL' +
+ 'OR = periodo1.NFILA)'#10#10'left join'#10'(select comp2.ID_EMPRESA, comp2.' +
+ 'ANO, TRIMESTRE as NFILA, SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TO' +
+ 'TAL'#10'from V_INF_FAC_CLIENTE comp2'#10'where ID_EMPRESA = :ID_EMPRESA2' +
+ #10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo' +
+ '2 on (VALOR = periodo2.NFILA)'#10#10'where periodo= '#39'TRIMESTRAL'#39#10'order' +
+ ' by valor asc'#10#10
StatementType = stSQL
ColumnMappings = <
item
@@ -1255,17 +1256,18 @@ object RptFacturasCliente: TRptFacturasCliente
'1.IMPORTE_TOTAL - periodo2.IMPORTE_TOTAL) as Diferencia,'#10'/*SOLO ' +
'COMPARAREMOS CUANDO EL SEGUNDO A'#209'O SEA DIFERENTE DE 0, comparati' +
'va de A'#241'o1 respecto A'#241'o2*/'#10'case'#10'when (periodo1.IMPORTE_TOTAL = 0' +
- ') then (NULL)'#10'else (100 - ((periodo2.IMPORTE_TOTAL*100)/periodo1' +
- '.IMPORTE_TOTAL))'#10'end as Porcentaje'#10#10'FROM'#10'periodos_aux'#10'left join'#10 +
- '(select comp1.ID_EMPRESA, comp1.ANO, SEMESTRE as NFILA, SUM(comp' +
- '1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENTE comp1'#10 +
- 'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'group by 1,2,3' +
- #10'order by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'le' +
- 'ft join'#10'(select comp2.ID_EMPRESA, comp2.ANO, SEMESTRE as NFILA, ' +
- 'SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_CLIENT' +
- 'E comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'group ' +
- 'by 1,2,3'#10'order by 1 desc,2 asc) periodo2 on (VALOR = periodo2.NF' +
- 'ILA)'#10#10'where periodo= '#39'SEMESTRAL'#39#10'order by valor asc'#10#10
+ ') then (NULL)'#10'else (((periodo1.IMPORTE_TOTAL - periodo2.IMPORTE_' +
+ 'TOTAL) * 100) / periodo2.IMPORTE_TOTAL)'#10'end as Porcentaje'#10#10'FROM'#10 +
+ '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' +
+ '_INF_FAC_CLIENTE comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO ' +
+ '= :ANO1)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo1 on (VALO' +
+ 'R = periodo1.NFILA)'#10#10'left join'#10'(select comp2.ID_EMPRESA, comp2.A' +
+ 'NO, SEMESTRE as NFILA, SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTA' +
+ 'L'#10'from V_INF_FAC_CLIENTE comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'a' +
+ 'nd (ANO = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo2 ' +
+ 'on (VALOR = periodo2.NFILA)'#10#10'where periodo= '#39'SEMESTRAL'#39#10'order by' +
+ ' valor asc'#10#10
StatementType = stSQL
ColumnMappings = <
item
diff --git a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm
index 17ca562e..23a37a82 100644
--- a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm
+++ b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm
@@ -989,17 +989,18 @@ object RptFacturasProveedor: TRptFacturasProveedor
'1.IMPORTE_TOTAL - periodo2.IMPORTE_TOTAL) as Diferencia,'#10'/*SOLO ' +
'COMPARAREMOS CUANDO EL SEGUNDO A'#209'O SEA DIFERENTE DE 0, comparati' +
'va de A'#241'o1 respecto A'#241'o2*/'#10'case'#10'when (periodo1.IMPORTE_TOTAL = 0' +
- ') then (NULL)'#10'else (100 - ((periodo2.IMPORTE_TOTAL*100)/periodo1' +
- '.IMPORTE_TOTAL))'#10'end as Porcentaje'#10#10'FROM'#10'periodos_aux'#10'left join'#10 +
- '(select comp1.ID_EMPRESA, comp1.ANO, MES as NFILA, SUM(comp1.BAS' +
- 'E_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp1'#10'whe' +
- 're ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'group by 1,2,3'#10'or' +
- 'der by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10'left ' +
- 'join'#10'(select comp2.ID_EMPRESA, comp2.ANO, MES as NFILA, SUM(comp' +
- '2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp' +
- '2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'group by 1,2' +
- ',3'#10'order by 1 desc,2 asc) periodo2 on (VALOR = periodo2.NFILA)'#10#10 +
- 'where periodo= '#39'MENSUAL'#39#10'order by valor asc'#10#10#10
+ ') then (NULL)'#10'else (((periodo1.IMPORTE_TOTAL - periodo2.IMPORTE_' +
+ 'TOTAL) * 100) / periodo2.IMPORTE_TOTAL)'#10'end as Porcentaje'#10#10'FROM'#10 +
+ '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_' +
+ 'FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :' +
+ 'ANO1)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo1 on (VALOR =' +
+ ' periodo1.NFILA)'#10#10'left join'#10'(select comp2.ID_EMPRESA, comp2.ANO,' +
+ ' MES as NFILA, SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V' +
+ '_INF_FAC_PROVEEDOR comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (AN' +
+ 'O = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo2 on (VA' +
+ 'LOR = periodo2.NFILA)'#10#10'where periodo= '#39'MENSUAL'#39#10'order by valor a' +
+ 'sc'#10#10#10
StatementType = stSQL
ColumnMappings = <
item
@@ -1098,17 +1099,18 @@ object RptFacturasProveedor: TRptFacturasProveedor
'1.IMPORTE_TOTAL - periodo2.IMPORTE_TOTAL) as Diferencia,'#10'/*SOLO ' +
'COMPARAREMOS CUANDO EL SEGUNDO A'#209'O SEA DIFERENTE DE 0, comparati' +
'va de A'#241'o1 respecto A'#241'o2*/'#10'case'#10'when (periodo1.IMPORTE_TOTAL = 0' +
- ') then (NULL)'#10'else (100 - ((periodo2.IMPORTE_TOTAL*100)/periodo1' +
- '.IMPORTE_TOTAL))'#10'end as Porcentaje'#10#10'FROM'#10'periodos_aux'#10'left join'#10 +
- '(select comp1.ID_EMPRESA, comp1.ANO, TRIMESTRE as NFILA, SUM(com' +
- 'p1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR com' +
- 'p1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'group by 1,' +
- '2,3'#10'order by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10 +
- #10'left join'#10'(select comp2.ID_EMPRESA, comp2.ANO, TRIMESTRE as NFI' +
- 'LA, SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PR' +
- 'OVEEDOR comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10 +
- 'group by 1,2,3'#10'order by 1 desc,2 asc) periodo2 on (VALOR = perio' +
- 'do2.NFILA)'#10#10'where periodo= '#39'TRIMESTRAL'#39#10'order by valor asc'#10#10#10
+ ') then (NULL)'#10'else (((periodo1.IMPORTE_TOTAL - periodo2.IMPORTE_' +
+ 'TOTAL) * 100) / periodo2.IMPORTE_TOTAL)'#10'end as Porcentaje'#10#10'FROM'#10 +
+ '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 ' +
+ 'V_INF_FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (A' +
+ 'NO = :ANO1)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo1 on (V' +
+ 'ALOR = periodo1.NFILA)'#10#10'left join'#10'(select comp2.ID_EMPRESA, comp' +
+ '2.ANO, TRIMESTRE as NFILA, SUM(comp2.BASE_IMPONIBLE) as IMPORTE_' +
+ 'TOTAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_EMPRESA = :ID_EMPR' +
+ 'ESA2'#10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) per' +
+ 'iodo2 on (VALOR = periodo2.NFILA)'#10#10'where periodo= '#39'TRIMESTRAL'#39#10'o' +
+ 'rder by valor asc'#10#10#10
StatementType = stSQL
ColumnMappings = <
item
@@ -1207,17 +1209,18 @@ object RptFacturasProveedor: TRptFacturasProveedor
'1.IMPORTE_TOTAL - periodo2.IMPORTE_TOTAL) as Diferencia,'#10'/*SOLO ' +
'COMPARAREMOS CUANDO EL SEGUNDO A'#209'O SEA DIFERENTE DE 0, comparati' +
'va de A'#241'o1 respecto A'#241'o2*/'#10'case'#10'when (periodo1.IMPORTE_TOTAL = 0' +
- ') then (NULL)'#10'else (100 - ((periodo2.IMPORTE_TOTAL*100)/periodo1' +
- '.IMPORTE_TOTAL))'#10'end as Porcentaje'#10#10'FROM'#10'periodos_aux'#10'left join'#10 +
- '(select comp1.ID_EMPRESA, comp1.ANO, SEMESTRE as NFILA, SUM(comp' +
- '1.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROVEEDOR comp' +
- '1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (ANO = :ANO1)'#10'group by 1,2' +
- ',3'#10'order by 1 desc,2 asc) periodo1 on (VALOR = periodo1.NFILA)'#10#10 +
- 'left join'#10'(select comp2.ID_EMPRESA, comp2.ANO, SEMESTRE as NFILA' +
- ', SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TOTAL'#10'from V_INF_FAC_PROV' +
- 'EEDOR comp2'#10'where ID_EMPRESA = :ID_EMPRESA2'#10'and (ANO = :ANO2)'#10'gr' +
- 'oup by 1,2,3'#10'order by 1 desc,2 asc) periodo2 on (VALOR = periodo' +
- '2.NFILA)'#10#10'where periodo= '#39'SEMESTRAL'#39#10'order by valor asc'#10#10#10
+ ') then (NULL)'#10'else (((periodo1.IMPORTE_TOTAL - periodo2.IMPORTE_' +
+ 'TOTAL) * 100) / periodo2.IMPORTE_TOTAL)'#10'end as Porcentaje'#10#10'FROM'#10 +
+ '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' +
+ '_INF_FAC_PROVEEDOR comp1'#10'where ID_EMPRESA = :ID_EMPRESA1'#10'and (AN' +
+ 'O = :ANO1)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) periodo1 on (VA' +
+ 'LOR = periodo1.NFILA)'#10#10'left join'#10'(select comp2.ID_EMPRESA, comp2' +
+ '.ANO, SEMESTRE as NFILA, SUM(comp2.BASE_IMPONIBLE) as IMPORTE_TO' +
+ 'TAL'#10'from V_INF_FAC_PROVEEDOR comp2'#10'where ID_EMPRESA = :ID_EMPRES' +
+ 'A2'#10'and (ANO = :ANO2)'#10'group by 1,2,3'#10'order by 1 desc,2 asc) perio' +
+ 'do2 on (VALOR = periodo2.NFILA)'#10#10'where periodo= '#39'SEMESTRAL'#39#10'orde' +
+ 'r by valor asc'#10#10#10
StatementType = stSQL
ColumnMappings = <
item
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 13d25f2a..bb6e4d34 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 19180dee..4548812b 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,334 +1,341 @@
-
+
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
- vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
- True
- True
- C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
-
-
- Delphi.Personality
-
-
- FalseTrueFalse/standaloneTrueFalse2060FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.6.0FactuGES Servidor2.0.6.0martes, 04 de marzo de 2014 11:21
- ExpressPrinting System by Developer Express Inc.
- FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
- TDARemoteService
-
-
-
- TDataModule
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TFrame
-
-
-
- TFrame
-
-
-
- TForm
-
-
-
- TFrame
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
+ FactuGES_Server.dpr
+ Debug
+ AnyCPU
+ DCC32
+ ..\..\Output\Debug\Servidor\FactuGES_Server.exe
+ vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+ True
+ True
+ C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+
+
+ Delphi.Personality
+
+
+FalseTrueFalse/standaloneTrueFalse2060FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.6.0FactuGES Servidor2.0.6.0martes, 04 de marzo de 2014 11:21
+
+
+
+
+
+
+
+ ExpressPrinting System by Developer Express Inc.
+ FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+ TDARemoteService
+
+
+
+ TDataModule
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+