Se arregla la gestion de referencias que ha fallado, y se oculta el campo posicion

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@992 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Source/Base/Base.dproj

@@ -54,57 +54,57 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contactos\Model\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxExportD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxIntl6D11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxIntl6D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\designide.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\designide.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\Model\xmlrtl.dcp" />
+    <DCCReference Include="..\Modulos\Referencias\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>

Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm

@@ -1,34 +1,12 @@
 inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
   inherited ToolBar1: TToolBar
-    inherited ToolButton11: TToolButton [11]
+    inherited FontSize: TEdit
-      Left = 0
-      ExplicitLeft = 0
-    end
-    inherited ToolButton6: TToolButton [12]
-      Left = 141
-      ExplicitLeft = 141
-    end
-    inherited ToolButton8: TToolButton [13]
-      Left = 207
-      ExplicitLeft = 207
-    end
-    inherited FontSize: TEdit [14]
-      Left = 290
       Width = 58
-      ExplicitLeft = 290
       ExplicitWidth = 58
     end
-    inherited UpDown1: TUpDown [15]
-      Left = 348
-      ExplicitLeft = 348
-    end
   end
   inherited cxGrid: TcxGrid
-    ExplicitTop = 121
     inherited cxGridView: TcxGridDBTableView
-      inherited cxGridViewPOSICION: TcxGridDBColumn
-        Visible = True
-      end
       inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
         DataBinding.FieldName = ''
       end

Source/Modulos/Referencias/Controller/Referencias_controller.dproj

@@ -47,24 +47,10 @@
     <DelphiCompile Include="Referencias_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\..\Servidor\ApplicaReferencias_data.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicationBaReferencias_data.dcp" />
+    <DCCReference Include="..\Base.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicationBaseReferencias_data.dcp" />
+    <DCCReference Include="..\Referencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicationBasReferencias_data.dcp" />
+    <DCCReference Include="..\Referencias_model.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicationBReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicationReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicatioReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicatiReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicatReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\AppliReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\AppReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\AReferencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Base.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Referencias_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Referencias_model.dcp" />
     <DCCReference Include="uReferenciasController.pas" />
     <DCCReference Include="View\uIEditorReferencias.pas" />
   </ItemGroup>

Source/Modulos/Referencias/Controller/uReferenciasController.pas

@@ -59,6 +59,8 @@ end;
 procedure TReferenciasController.FiltrarEmpresa(AReferencias: IBizReferencia);
 var
   Condicion: TDAWhereExpression;
+  Condicion1: TDAWhereExpression;
+  Condicion2: TDAWhereExpression;
 begin
   if AReferencias.DataTable.Active then
     AReferencias.DataTable.Active := False;
@@ -66,9 +68,13 @@ begin
   // Filtrar las facturas actuales por empresa
   with AReferencias.DataTable.DynamicWhere do
   begin
-    // (ID_EMPRESA >= ID)
+    // (ID_EMPRESA = ID)
-    Condicion := NewBinaryExpression(NewField('', fld_ReferenciasID_EMPRESA),
+    Condicion1 := NewBinaryExpression(NewField('', fld_ReferenciasID_EMPRESA),
       NewConstant(AppFactuGES.EmpresaActiva.ID, datInteger), dboEqual);
+    // (ID_EMPRESA = NULL)
+    Condicion2 := NewBinaryExpression(NewField('', 'ID_EMPRESA'), NewConstant(ID_NULO, datInteger), dboEqual);
+
+    Condicion := NewBinaryExpression(Condicion1, Condicion2, dboOr);
 
     if IsEmpty then
        Expression := Condicion

Source/Modulos/Referencias/Servidor/srvReferencias_Impl.dfm

@@ -21,7 +21,7 @@ object srvReferencias: TsrvReferencias
             Name = 'IBX'
             SQL = 
               'SELECT '#10'    ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION'#10'  FROM'#10'  ' +
-              '  REFERENCIAS'#10'  WHERE ID_EMPRESA IS NULL'#10'  or {Where}'#10
+              '  REFERENCIAS'#10'  WHERE {Where}'#10
             StatementType = stSQL
             ColumnMappings = <
               item

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@@ -36,6 +36,7 @@
     <Borland.ProjectType />
     <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">1</VersionInfo><VersionInfo Name="MinorVer">8</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.8.0.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">1.8.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 08 de febrero de 2010 19:24</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><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>