diff --git a/BaseDatos/TablaEmpresas.pas b/BaseDatos/TablaEmpresas.pas index 1235599..e63875a 100644 --- a/BaseDatos/TablaEmpresas.pas +++ b/BaseDatos/TablaEmpresas.pas @@ -196,7 +196,8 @@ begin with sqlGrid do begin Add('select CODIGO, NIFCIF, LOGOTIPO, NOMBRECOMERCIAL'); - Add('from EMPRESAS order by CODIGO '); + Add('from EMPRESAS '); + Add('where CODIGO IN ( select CODIGOEMPRESA from PERMISOS_EMPRESAS where usuario = :USUARIO) order by CODIGO '); end; end; diff --git a/Empresas/ElegirEmpresa.pas b/Empresas/ElegirEmpresa.pas index 1de3d82..a56a646 100644 --- a/Empresas/ElegirEmpresa.pas +++ b/Empresas/ElegirEmpresa.pas @@ -99,6 +99,7 @@ begin Database := BaseDatos; Transaction := Transaccion; SelectSQL.Assign(dmTablaEmpresas.sqlGrid); + ParamByName('USUARIO').AsString := UpperCase(dmBaseDatos.Usuario); Prepare; EnableControls; end; diff --git a/Factuges.dof b/Factuges.dof index f329dd5..9ef0e8c 100644 --- a/Factuges.dof +++ b/Factuges.dof @@ -113,8 +113,8 @@ RootDir=C:\Archivos de programa\Borland\Delphi7\Bin\ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=3 -MinorVer=2 -Release=9 +MinorVer=3 +Release=0 Build=0 Debug=0 PreRelease=0 @@ -126,13 +126,13 @@ CodePage=1252 [Version Info Keys] CompanyName= FileDescription= -FileVersion=3.2.9.0 +FileVersion=3.3.0.0 InternalName= LegalCopyright= LegalTrademarks= OriginalFilename= ProductName= -ProductVersion=3.2.9.0 +ProductVersion=3.3.0.0 Comments= [Excluded Packages] C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxLibraryVCLD7.bpl=Express Cross Platform Library (VCL Edition) by Developer Express Inc. diff --git a/Factuges.dsk b/Factuges.dsk index c9c72a1..ca0023a 100644 --- a/Factuges.dsk +++ b/Factuges.dsk @@ -1,28 +1,31 @@ [Closed Files] -File_0=SourceModule,'C:\Codigo Abeto\Clientes\FacturaCliente.pas',0,1,334,63,344,0,0 -File_1=SourceModule,'C:\Codigo Abeto\Libreria\Constantes.pas',0,1,42,24,55,0,0 -File_2=SourceModule,'C:\Codigo Abeto\Proveedores\FacturaProveedor.pas',0,1,272,38,285,1,0 -File_3=SourceModule,'C:\Codigo Abeto\Informes\InformeTrimestralCompras.pas',0,1,140,65,150,0,0 -File_4=SourceModule,'C:\Codigo Abeto\Informes\InformeResumenFacturacionProveedores.pas',0,1,75,34,91,0,0 -File_5=SourceModule,'C:\Codigo Abeto\Informes\InformeResumenFacturacionClientes.pas',0,1,72,34,93,0,0 -File_6=SourceModule,'C:\Codigo Abeto\Informes\InformeHistorialFacturacionProveedores.pas',0,1,75,37,99,0,0 -File_7=SourceModule,'C:\Codigo Abeto\Informes\InformeHistorialFacturacionClientes.pas',0,1,76,21,98,0,0 -File_8=SourceModule,'C:\Codigo Abeto\Clientes\AlbaranCliente.pas',0,1,633,23,648,0,0 -File_9=SourceModule,'C:\Codigo Abeto\BaseDatos\TablaFacturasCliente.pas',0,1,217,14,154,0,0 +File_0=SourceModule,'c:\archivos de programa\borland\delphi7\source\rtl\common\ComObj.pas',0,1,1259,1,1269,0,0 +File_1=SourceModule,'c:\archivos de programa\borland\delphi7\source\vcl\DB.pas',0,1,2340,1,2350,0,0 +File_2=SourceModule,'c:\archivos de programa\borland\delphi7\source\vcl\IB.pas',0,1,403,1,411,0,0 +File_3=SourceModule,'C:\Codigo\Informes\InformePresupuestoCliente.pas',0,1,1,1,1,1,0 +File_4=SourceModule,'C:\Codigo Abeto\Clientes\FacturaCliente.pas',0,1,334,63,344,0,0 +File_5=SourceModule,'C:\Codigo Abeto\Libreria\Constantes.pas',0,1,42,24,55,0,0 +File_6=SourceModule,'C:\Codigo Abeto\Proveedores\FacturaProveedor.pas',0,1,272,38,285,1,0 +File_7=SourceModule,'C:\Codigo Abeto\Informes\InformeTrimestralCompras.pas',0,1,140,65,150,0,0 +File_8=SourceModule,'C:\Codigo Abeto\Informes\InformeResumenFacturacionProveedores.pas',0,1,75,34,91,0,0 [Modules] -Module0=C:\Codigo\Informes\InformePresupuestoCliente.pas -Module1=C:\Codigo\Factuges.dpr +Module0=C:\Codigo\Empresas\ElegirEmpresa.pas +Module1=C:\Codigo\BaseDatos\TablaEmpresas.pas Count=2 EditWindowCount=1 -[C:\Codigo\Informes\InformePresupuestoCliente.pas] +[C:\Codigo\Empresas\ElegirEmpresa.pas] ModuleType=SourceModule FormState=1 -FormOnTop=1 +FormOnTop=0 + +[C:\Codigo\BaseDatos\TablaEmpresas.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 [C:\Codigo\Factuges.dpr] -ModuleType=SourceModule FormState=0 FormOnTop=0 @@ -30,13 +33,9 @@ FormOnTop=0 FormState=0 FormOnTop=0 -[C:\Codigo\Informes\InformeBase.pas] -FormState=0 -FormOnTop=0 - [EditWindow0] ViewCount=2 -CurrentView=1 +CurrentView=0 View0=0 View1=1 CodeExplorer=CodeExplorer@EditWindow0 @@ -44,34 +43,34 @@ MessageView=MessageView@EditWindow0 Create=1 Visible=1 State=0 -Left=433 -Top=142 -Width=1139 -Height=663 +Left=447 +Top=136 +Width=1137 +Height=560 MaxLeft=-1 MaxTop=-1 -ClientWidth=1131 -ClientHeight=629 +ClientWidth=1129 +ClientHeight=526 LeftPanelSize=140 LeftPanelClients=CodeExplorer@EditWindow0 LeftPanelData=000004000000000000000000000000000000000000000000000100000000000000000C000000436F64654578706C6F726572FFFFFFFF RightPanelSize=0 -BottomPanelSize=0 +BottomPanelSize=85 BottomPanelClients=MessageView@EditWindow0 -BottomPanelData=00000400010000000B0000004D657373616765566965770000000000000000000000000000000000FFFFFFFF +BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF [View0] -Module=C:\Codigo\Factuges.dpr -CursorX=1 -CursorY=1 -TopLine=1 +Module=C:\Codigo\Empresas\ElegirEmpresa.pas +CursorX=70 +CursorY=102 +TopLine=86 LeftCol=1 [View1] -Module=C:\Codigo\Informes\InformePresupuestoCliente.pas -CursorX=1 -CursorY=1 -TopLine=1 +Module=C:\Codigo\BaseDatos\TablaEmpresas.pas +CursorX=96 +CursorY=200 +TopLine=187 LeftCol=1 [Watches] @@ -98,7 +97,8 @@ LRDockWidth=842 Dockable=1 [Breakpoints] -Count=0 +Count=1 +Breakpoint0='C:\Codigo\Empresas\ElegirEmpresa.pas',72,'',0,1,'',1,0,0,'',1,'','','' [AddressBreakpoints] Count=0 @@ -109,13 +109,13 @@ Visible=1 State=2 Left=0 Top=0 -Width=1660 +Width=1676 Height=112 MaxLeft=-1 MaxTop=-1 -MaxWidth=1660 +MaxWidth=1684 MaxHeight=112 -ClientWidth=1652 +ClientWidth=1676 ClientHeight=78 [ProjectManager] @@ -390,26 +390,26 @@ State=0 Left=0 Top=12 Width=140 -Height=617 +Height=426 MaxLeft=-1 MaxTop=-1 ClientWidth=140 -ClientHeight=617 +ClientHeight=426 TBDockHeight=305 LRDockWidth=140 Dockable=1 [MessageView@EditWindow0] Create=1 -Visible=0 +Visible=1 State=0 -Left=-236 -Top=-691 -Width=443 +Left=12 +Top=0 +Width=1117 Height=85 MaxLeft=-1 MaxTop=-1 -ClientWidth=443 +ClientWidth=1117 ClientHeight=85 TBDockHeight=85 LRDockWidth=443 diff --git a/Factuges.res b/Factuges.res index eb372e8..15c62c6 100644 Binary files a/Factuges.res and b/Factuges.res differ diff --git a/Temp/Factuges.exe b/Temp/Factuges.exe index baa5293..911a7f2 100644 Binary files a/Temp/Factuges.exe and b/Temp/Factuges.exe differ diff --git a/bd/ABETO.GDB b/bd/ABETO.GDB index 1d8109f..6400157 100644 Binary files a/bd/ABETO.GDB and b/bd/ABETO.GDB differ