Archivado/LuisLeon_FactuGES
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arreglo en informes

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@156 c93665c3-c93d-084d-9b98-7d5f4a9c3376
This commit is contained in:
roberto 2007-09-10 10:02:11 +00:00
parent df7d977014
commit ed6bed6a8b
46 changed files with 2602 additions and 9569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Database/FACTUGES.FDB
View File

Binary file not shown.

2
Database/VISTAS.SQL
View File

@ -2473,5 +2473,5 @@ left join AGENTES_COMISIONES
on ((AGENTES_COMISIONES.ID_AGENTE = AGENTES.ID) and (AGENTES_COMISIONES.ID_PROVEEDOR = PROVEEDORES.ID))
where (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO is not null) and (FACTURAS_CLIENTE_DETALLES.ID_ARTICULO > 0) /*Quitamos conceptos libres*/
and (FACTURAS_CLIENTE_DETALLES.cantidad > 0) /*Quitamos los abonos*/
/*and (FACTURAS_CLIENTE_DETALLES.cantidad > 0) Quitamos los abonos*/
and (ARTICULOS.INVENTARIABLE = 1); /*Solo nos quedamos con los inventariables*/

BIN
Output/Debug/Cliente/Base.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/FactuGES.exe
View File

Binary file not shown.

BIN
Output/Debug/Cliente/GUIBase.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/InfVentasArticulo_controller.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/InfVentasArticulo_data.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/InfVentasArticulo_model.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/InfVentasArticulo_plugin.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/InfVentasArticulo_view.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/InformesBase_controller.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/InformesBase_view.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/Informes_controller.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/Informes_data.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/Informes_model.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/Informes_plugin.bpl
View File

Binary file not shown.

BIN
Output/Debug/Cliente/Informes_view.bpl
View File

Binary file not shown.

BIN
Output/Debug/Servidor/FactuGES_Server.exe
View File

Binary file not shown.

12059
Output/Debug/Servidor/ServerLog.txt
View File

File diff suppressed because it is too large Load Diff

BIN
Source/Base/GUIBase/GUIBase.res
View File

Binary file not shown.

4
Source/Cliente/FactuGES.bdsproj
View File

@ -149,7 +149,7 @@
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">2</VersionInfo>
<VersionInfo Name="MinorVer">2</VersionInfo>
<VersionInfo Name="Release">5</VersionInfo>
<VersionInfo Name="Release">6</VersionInfo>
<VersionInfo Name="Build">0</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
@ -162,7 +162,7 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys>
<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">2.2.5.0</VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">2.2.6.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

3
Source/Informes_Group.bdsgroup
View File

@ -32,7 +32,8 @@
<Projects Name="FactuGES.exe">Cliente\FactuGES.bdsproj</Projects>
<Projects Name="FactuGES_Server.exe">Servidor\FactuGES_Server.bdsproj</Projects>
<Projects Name="Articulos_view.bpl">Modulos\Articulos\Views\Articulos_view.bdsproj</Projects>
<Projects Name="Targets">DataAbstract_D10.bpl Base.bpl GUIBase.bpl Informes_model.bpl Informes_data.bpl Informes_controller.bpl InformesBase_controller.bpl Informes_view.bpl InformesBase_view.bpl Informes_plugin.bpl InfVentasArticulo_model.bpl InfVentasArticulo_data.bpl InfVentasArticulo_controller.bpl InfVentasArticulo_view.bpl InfVentasArticulo_plugin.bpl InfMargenArticulo_model.bpl InfMargenArticulo_data.bpl InfMargenArticulo_controller.bpl InfMargenArticulo_view.bpl InfMargenArticulo_plugin.bpl FactuGES.exe FactuGES_Server.exe Articulos_view.bpl</Projects>
<Projects Name="AlbaranesCliente_view.bpl">Modulos\Albaranes de cliente\Views\AlbaranesCliente_view.bdsproj</Projects>
<Projects Name="Targets">DataAbstract_D10.bpl Base.bpl GUIBase.bpl Informes_model.bpl Informes_data.bpl Informes_controller.bpl InformesBase_controller.bpl Informes_view.bpl InformesBase_view.bpl Informes_plugin.bpl InfVentasArticulo_model.bpl InfVentasArticulo_data.bpl InfVentasArticulo_controller.bpl InfVentasArticulo_view.bpl InfVentasArticulo_plugin.bpl InfMargenArticulo_model.bpl InfMargenArticulo_data.bpl InfMargenArticulo_controller.bpl InfMargenArticulo_view.bpl InfMargenArticulo_plugin.bpl FactuGES.exe FactuGES_Server.exe Articulos_view.bpl AlbaranesCliente_view.bpl</Projects>
</Projects>
<Dependencies/>
</Default.Personality>

BIN
Source/Lib/Base.dcp
View File

Binary file not shown.

BIN
Source/Lib/GUIBase.dcp
View File

Binary file not shown.

4
Source/Modulos/Informe margen por articulo/Views/uEditorInfMargenArticulo.pas
View File

@ -42,7 +42,6 @@ type
procedure frViewInfMargenArticulo1bRefrescarClick(Sender: TObject);
private
FInformesController: IInformesController;
procedure RestaurarConfiguracion;
procedure GuardarConfiguracion;
protected
FDatos : IBizInfMargenArticulo;
@ -52,6 +51,8 @@ type
procedure SetInforme(const Value: IBizInforme); override;
procedure RellenarCabeceraInforme; override;
procedure RestaurarConfiguracion; override;
function GetController : IInfMargenArticuloController;
procedure SetController (const Value : IInfMargenArticuloController);
@ -255,7 +256,6 @@ begin
//Restauramos la configuración
frViewInfMargenArticulo1.frViewInfMargenArticuloGrid1.cxGridView.RestoreFromIniFile(NombreFichero,True,false,[gsoUseFilter,gsoUseSummary]);
finally
//Eliminamos el fichero temporal
DeleteFile(NombreFichero);

3
Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticulo.dfm
View File

@ -14,9 +14,6 @@ inherited frViewInfMargenArticulo: TfrViewInfMargenArticulo
Height = 67
ExplicitHeight = 67
inherited TabSheet5: TTabSheet
ExplicitLeft = 4
ExplicitTop = 6
ExplicitWidth = 210
ExplicitHeight = 57
end
inherited tsColumnas: TTabSheet

BIN
Source/Modulos/Informes base/Views/InformesBase_view.res
View File

Binary file not shown.

26
Source/Modulos/Informes base/Views/uEditorInformeBase.pas
View File

@ -43,6 +43,7 @@ type
procedure ComprobarPrivilegios;
protected
Cadena:string;
FInforme : IBizInforme;
FViewInforme : IViewInformeBase;
function GetInforme: IBizInforme; virtual;
@ -51,6 +52,9 @@ type
procedure RellenarCabeceraInforme; virtual;
function GetModified: Boolean; override;
procedure RestaurarConfiguracion; virtual;
public
procedure PonerTitulos(const ATitulo: string = ''); override;
property Informe: IBizInforme read GetInforme write SetInforme;
@ -60,7 +64,7 @@ type
implementation
uses uEditorDBBase, uEditorBase, uDataModuleUsuarios, uFormPropiedadesInforme,
uViewGridBase;
uViewGridBase, cxFilter;
{$R *.dfm}
@ -85,7 +89,7 @@ begin
dsDataTable.DataTable := FInforme.DataTable;
ComprobarPrivilegios;
if Assigned(FViewInforme) then
FViewInforme.Informe := FInforme;
end;
@ -95,9 +99,15 @@ begin
inherited;
if not Assigned(FViewInforme) then
Exit;
if Length(Text) > 0 then
begin
//La aplicación de los filtros aqui cambia el orden, ya que antes de aplicar el filtro establecido en el
//campo de filtro por el usuario hay que aplicar el propio del informe por ello siempre antes de aplicar el filtro
//que desea el usuario restauramos la configuración inicial.
RestaurarConfiguracion;
FViewInforme.Filter := Text
end
else
actQuitarFiltro.Execute;
end;
@ -137,6 +147,11 @@ begin
begin
tbxEditFiltro.Text := '';
FViewInforme.Filter := '';
//Esto al igual que en resto de las partes cambiará ya que siempre que se quite el filtro
//se debe limpiar para que no queden rastros y restaurar la configuración del informe con el filtro
//de dicho informe
FViewInforme._FocusedView.DataController.Filter.Root.Clear;
RestaurarConfiguracion;
end;
end;
@ -205,6 +220,11 @@ begin
//
end;
procedure TfEditorInformeBase.RestaurarConfiguracion;
begin
//
end;
procedure TfEditorInformeBase.actImprimirExecute(Sender: TObject);
begin
RellenarCabeceraInforme;

1
Source/Modulos/Informes base/Views/uViewFiltros.dfm
View File

@ -54,6 +54,7 @@ inherited frViewFiltros: TfrViewFiltros
Color = clWindow
LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True
NullString = '<empty>'
TabOrder = 2
TabStop = True
end

8
Source/Modulos/Informes base/Views/uViewInformeBase.dfm
View File

@ -110,6 +110,7 @@ inherited frViewInformeBase: TfrViewInformeBase
Align = alClient
Style = tsFlatButtons
TabOrder = 1
ExplicitHeight = 39
object TabSheet5: TTabSheet
Caption = 'TabSheet5'
TabVisible = False
@ -122,6 +123,7 @@ inherited frViewInformeBase: TfrViewInformeBase
Caption = 'tsColumnas'
ImageIndex = 1
TabVisible = False
ExplicitHeight = 29
inline frViewColumnas1: TfrViewColumnas
Left = 0
Top = 0
@ -131,7 +133,7 @@ inherited frViewInformeBase: TfrViewInformeBase
TabOrder = 0
ReadOnly = False
ExplicitWidth = 210
ExplicitHeight = 123
ExplicitHeight = 29
inherited TBXLabel1: TTBXLabel
Width = 210
ExplicitWidth = 210
@ -140,7 +142,7 @@ inherited frViewInformeBase: TfrViewInformeBase
Width = 210
Height = 94
ExplicitWidth = 210
ExplicitHeight = 94
ExplicitHeight = 0
end
end
end
@ -239,6 +241,7 @@ inherited frViewInformeBase: TfrViewInformeBase
DoubleBuffered = False
Range = 0
TabOrder = 0
ExplicitHeight = 106
object TBXAlignmentPanel1: TTBXAlignmentPanel
Left = 0
Top = 0
@ -303,6 +306,7 @@ inherited frViewInformeBase: TfrViewInformeBase
Align = alClient
Style = tsButtons
TabOrder = 1
ExplicitHeight = 58
object tsSumarios: TTabSheet
Caption = 'tsSumarios'
ImageIndex = 2

41
Source/Modulos/Informes base/Views/uViewInformeBase.pas
View File

@ -81,6 +81,8 @@ type
function GetModificable: Boolean; virtual;
procedure SetModificable(const Value: Boolean); virtual;
procedure FiltrarGrid(TextoFiltro : String); override;
public
property Modificable : Boolean read GetModificable write SetModificable;
property OnViewChanged: TNotifyEvent read GetOnViewChanged write SetOnViewChanged;
@ -94,7 +96,7 @@ implementation
{$R *.dfm}
uses uDataModuleUsuarios;
uses cxGridDBTableView, cxFilter, uDataModuleUsuarios;
const
COLUMNAS = 1;
@ -195,6 +197,43 @@ begin
inherited;
end;
procedure TfrViewInformeBase.FiltrarGrid(TextoFiltro: String);
var
Columna: TcxGridDBColumn;
i: Integer;
AItemList: TcxFilterCriteriaItemList;
begin
with _FocusedView.DataController.Filter do
begin
BeginUpdate;
try
Options := [fcoCaseInsensitive, fcoSoftCompare];
// Hemos tenido que sobreescribir este metodo porque hemos tenido que cambiar el orden a aplicar los filtros
// en el caso de los informes debemos aplicar el filtro del campo de texto siempre despues del filtro
// establecido para el informe, por ello este método nunca limpiará el filtro que tenga ya establecido el grid
// sino que se añadirá al filtro existente
// Root.Clear;
if Length(TextoFiltro) > 0 then
begin
AItemList := Root.AddItemList(fboAnd);
AItemList.BoolOperatorKind := fboOr;
for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do
begin
Columna := (_FocusedView as TcxGridDBTableView).Columns[i];
if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then
AItemList.AddItem(Columna, foLike, '%'+TextoFiltro+'%', IntToStr(i));
end;
Active := True;
end
else
Active := False;
finally
ExpandirTodo;
EndUpdate;
end;
end;
end;
function TfrViewInformeBase.GetModificable: Boolean;
begin
Result := FModificable;

BIN
Source/Modulos/Lib/InfVentasArticulo_controller.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/InfVentasArticulo_data.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/InfVentasArticulo_model.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/InfVentasArticulo_plugin.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/InfVentasArticulo_view.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/InformesBase_controller.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/InformesBase_view.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/Informes_controller.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/Informes_data.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/Informes_model.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/Informes_plugin.dcp
View File

Binary file not shown.

BIN
Source/Modulos/Lib/Informes_view.dcp
View File

Binary file not shown.

20
Source/Servidor/FactuGES_Server.bdsproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
<PersonalityInfo>
<Option>
@ -154,7 +154,7 @@
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">2</VersionInfo>
<VersionInfo Name="MinorVer">2</VersionInfo>
<VersionInfo Name="Release">5</VersionInfo>
<VersionInfo Name="Release">6</VersionInfo>
<VersionInfo Name="Build">0</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
@ -167,21 +167,21 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
<VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">2.2.5.0</VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">2.2.6.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"></VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
<VersionInfoKeys Name="ProductName"></VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">2.2.4.0</VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">2.2.5.0</VersionInfoKeys>
<VersionInfoKeys Name="Comments"></VersionInfoKeys>
<VersionInfoKeys Name="CompileDate">jueves, 30 de agosto de 2007 15:15</VersionInfoKeys></VersionInfoKeys>
<Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<VersionInfoKeys Name="CompileDate">jueves, 06 de septiembre de 2007 11:24</VersionInfoKeys></VersionInfoKeys>
<Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<ModelSupport>False</ModelSupport>
<!-- EurekaLog First Line
<!-- EurekaLog First Line
[Exception Log]
EurekaLog Version=519
Activate=0

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.