From bb15a17ab224731f546a5feeae231f9554234a92 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Mon, 26 Oct 2015 22:22:59 +0000
Subject: [PATCH] Guardar el ancho de las columnas en el grid.

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@634 f4e31baf-9722-1c47-927c-6f952f962d4b
---
 Source/Base/Utiles/uGridUtils.pas             |   3 +-
 Source/Base/uDMBase.pas                       |   8 ++---
 Source/Cliente/FactuGES.dproj                 |   2 +-
 Source/Cliente/FactuGES.rc                    |   8 ++---
 Source/Cliente/FactuGES.res                   | Bin 171984 -> 171984 bytes
 Source/GUIBase/uViewDetallesBase.dfm          |   8 +++--
 Source/GUIBase/uViewDetallesBase.pas          |   3 +-
 Source/GUIBase/uViewGridBase.pas              |   7 +++--
 .../Reports/uRptPedidosProveedor_Server.dfm   |  29 ++++++++++++------
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 Source/Servidor/FactuGES_Server.res           | Bin 23352 -> 23348 bytes
 11 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/Source/Base/Utiles/uGridUtils.pas b/Source/Base/Utiles/uGridUtils.pas
index e3b654a2..7d5ec875 100644
--- a/Source/Base/Utiles/uGridUtils.pas
+++ b/Source/Base/Utiles/uGridUtils.pas
@@ -60,7 +60,7 @@ implementation
 
 
 uses
-  uDADataTable, uDAInterfaces, cxVariants;
+  uDADataTable, uDAInterfaces, cxVariants, uDMBase;
 
 
 procedure TRecordInfos.Notify(Ptr: Pointer; Action: TListNotification);
@@ -360,6 +360,7 @@ begin
       Acolumn.MinWidth := 10;
       if AColumn.Width > AColumn.BestFitMaxWidth then
         AColumn.Width := AColumn.BestFitMaxWidth;
+      //dmBase.EscribirLog(AColumn.DataBinding.FieldName + ' -> ' + IntToStr(AColumn.Width) + ' -> ' + IntToStr(AColumn.BestFitMaxWidth));
     end;
   finally
     AView.EndUpdate;
diff --git a/Source/Base/uDMBase.pas b/Source/Base/uDMBase.pas
index 39db46e2..983d5eac 100644
--- a/Source/Base/uDMBase.pas
+++ b/Source/Base/uDMBase.pas
@@ -69,13 +69,13 @@ begin
   ALogFileName := ALogFileName + PathDelim + 'Rodax Software' + PathDelim + 'FactuGES' + PathDelim;
   if SysUtils.ForceDirectories(ALogFileName) then
   begin
-{SE COMENTA PORQUE TUESTA LA PARTE CLIENTE SI SE DESEA ARREGLAR ACTUALIZAR LAS JV de tecsitel
+//SE COMENTA PORQUE TUESTA LA PARTE CLIENTE SI SE DESEA ARREGLAR ACTUALIZAR LAS JV de tecsitel
       JvLogFile.Active := False;
       JvLogFile.FileName := ALogFileName + 'ClientLog.txt';
       JvLogFile.AutoSave := True;
       JvLogFile.Active := True;
       JvLogFile.Clear;
-}      
+     
   end
   else
     raise Exception.Create('Error al crear directorio para Log: ' + IntToStr(GetLastError));
@@ -143,14 +143,14 @@ end;
 
 procedure TdmBase.EscribirLog(const AMensaje: String);
 begin
-{
+
   FEscribirLog.Acquire;
   try
     JvLogFile.Add(AMensaje);
   finally
     FEscribirLog.Release;
   end;
-}
+
 end;
 
 end.
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 31ede151..74120da1 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,7 +52,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <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">6</VersionInfo><VersionInfo Name="Release">9</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.6.9.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.6.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<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">7</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.7.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.7.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 16413fb6..0e6be076 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,9,0
-PRODUCTVERSION 2,6,9,0
+FILEVERSION 2,7,0,0
+PRODUCTVERSION 2,7,0,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.9.0\0"
+              VALUE "FileVersion", "2.7.0.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.6.9.0\0"
+              VALUE "ProductVersion", "2.7.0.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index a7b99c5a82d8cc0e063c1f21bc84202093256b34..bec558bef2bf33f7ec36660f8d7ebf3fa1e4c8cb 100644
GIT binary patch
delta 56
zcmcbxpX<VYu7(!IEldLQ_}Lkl7(f6@PnVy^bd=ScL65;;`pbDt)1l1P`Apsbmb(qh

delta 56
zcmcbxpX<VYu7(!IEldLQ_}Lhk7#J8h8KCrZ`FTu7S<M*q7%Zp1oX0dB%50s_<P89s
CUk&R3

diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index 85f558a3..380ef601 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -147,13 +147,15 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object cxGrid: TcxGrid
     Left = 0
-    Top = 72
+    Top = 75
     Width = 451
-    Height = 232
+    Height = 229
     Align = alClient
     TabOrder = 1
     LookAndFeel.Kind = lfStandard
     LookAndFeel.NativeStyle = True
+    ExplicitTop = 72
+    ExplicitHeight = 232
     object cxGridView: TcxGridDBTableView
       OnKeyDown = cxGridViewKeyDown
       NavigatorButtons.ConfirmDelete = False
@@ -385,7 +387,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     Left = 0
     Top = 46
     Width = 451
-    Height = 26
+    Height = 29
     BackgroundOnToolbars = False
     UseParentBackground = True
     object TBXToolbar1: TTBXToolbar
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index 76546378..0bffec90 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -314,7 +314,6 @@ begin
 end;
 
 
-
 procedure TfrViewDetallesBase.AjustarAncho;
 begin
   if Assigned(_FocusedView) then begin
@@ -754,7 +753,7 @@ begin
   if Assigned(FDetalles) then
   begin
     DADataSource.DataTable := FDetalles.DataTable;
-    //RestoreFromIniFile; // la restauración de las columnas sólo funciona cuando hay datos.
+    RestoreFromIniFile; // la restauración de las columnas sólo funciona cuando hay datos.
     AjustarAncho;
   end
   else
diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas
index fa5a8ae1..67231bc7 100644
--- a/Source/GUIBase/uViewGridBase.pas
+++ b/Source/GUIBase/uViewGridBase.pas
@@ -343,6 +343,7 @@ begin
   inherited;
   if Assigned(_FocusedView) then
   begin
+    // AjustarAncho; <- No activar porque pisa los anchos que ha puesto el usuario.
 
     AIniFile := GetSpecialFolderPath(CSIDL_APPDATA); //[Current Users]\Application Data
     AIniFile := AIniFile + PathDelim + 'Rodax Software' + PathDelim + GetAppName + PathDelim;
@@ -352,13 +353,14 @@ begin
 
     _FocusedView.RestoreFromIniFile(AIniFile + 'grid.xml', True, False, []);
   end;
-  AjustarAncho;
 end;
 
 procedure TfrViewGridBase.RestoreFromRegistry(const Path: String);
 begin
   if Assigned(_FocusedView) then
+  begin
     _FocusedView.RestoreFromRegistry(Path + '\\GridSettings\\' + Self.Name, False, False, [], Self.Name);
+  end;
 end;
 
 procedure TfrViewGridBase.RestoreGridStatus;
@@ -450,7 +452,6 @@ begin
       ForceDirectories(AIniFile);
 
       _FocusedView.StoreToIniFile(AIniFile + 'grid.xml', False, []);
-//      _FocusedView.StoreToRegistry(Path + '\\GridSettings\\' + Self.Name, False, [], Self.Name);
   end;
 end;
 
@@ -458,7 +459,9 @@ procedure TfrViewGridBase.StoreToRegistry(const Path: String);
 begin
   inherited;
   if Assigned(_FocusedView) then
+  begin
     _FocusedView.StoreToRegistry(Path + '\\GridSettings\\' + Self.Name, False, [], Self.Name);
+  end;
 end;
 
 procedure TfrViewGridBase.FiltrarGrid(TextoFiltro : String);
diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
index 65429eba..4007c41e 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
@@ -95,16 +95,25 @@ object RptPedidosProveedor: TRptPedidosProveedor
               'ENDEDOR,'#10'  PROVEEDOR.NOMBRE,'#10'  PROVEEDOR.FAX,'#10#10'  CONTRATOS_CLIEN' +
               'TE.referencia as referencia_contrato,'#10'  CONTRATOS_CLIENTE.refere' +
               'ncia_CLIENTE,'#10'  CLIENTES.NOMBRE AS NOMBRE_CLIENTE,'#10'  '#10'  PEDIDOS_' +
-              'PROVEEDOR.ID_ALMACEN,'#10'  PEDIDOS_PROVEEDOR.CALLE,'#10'  PEDIDOS_PROVE' +
-              'EDOR.POBLACION,'#10'  PEDIDOS_PROVEEDOR.PROVINCIA,'#10'  PEDIDOS_PROVEED' +
-              'OR.CODIGO_POSTAL,'#10'  PEDIDOS_PROVEEDOR.PERSONA_CONTACTO,'#10'  PEDIDO' +
-              'S_PROVEEDOR.TELEFONO'#10#10'FROM'#10'  PEDIDOS_PROVEEDOR'#10'  LEFT OUTER JOIN' +
-              ' CONTACTOS PROVEEDOR ON (PROVEEDOR .ID = PEDIDOS_PROVEEDOR.ID_PR' +
-              'OVEEDOR)'#10'  LEFT OUTER JOIN CONTACTOS VENDEDORES ON (VENDEDORES.I' +
-              'D = PEDIDOS_PROVEEDOR.ID_VENDEDOR)'#10'  LEFT OUTER JOIN CONTRATOS_C' +
-              'LIENTE ON (CONTRATOS_CLIENTE.ID = PEDIDOS_PROVEEDOR.ID_CONTRATO_' +
-              'CLIENTE)'#10'  LEFT OUTER JOIN CONTACTOS CLIENTES ON (CLIENTES.ID = ' +
-              'CONTRATOS_CLIENTE.ID_CLIENTE)'#10'WHERE PEDIDOS_PROVEEDOR.ID = :ID'#10
+              'PROVEEDOR.ID_ALMACEN,'#10'  '#10'  IIF ((PEDIDOS_PROVEEDOR.ID_ALMACEN = ' +
+              '0), PEDIDOS_PROVEEDOR.CALLE, ALMACENES.CALLE) AS CALLE,'#10'  IIF ((' +
+              'PEDIDOS_PROVEEDOR.ID_ALMACEN = 0), PEDIDOS_PROVEEDOR.POBLACION, ' +
+              'ALMACENES.POBLACION) AS POBLACION,'#10'  IIF ((PEDIDOS_PROVEEDOR.ID_' +
+              'ALMACEN = 0), PEDIDOS_PROVEEDOR.PROVINCIA, ALMACENES.PROVINCIA) ' +
+              'AS PROVINCIA,'#10'  IIF ((PEDIDOS_PROVEEDOR.ID_ALMACEN = 0), PEDIDOS' +
+              '_PROVEEDOR.CODIGO_POSTAL, ALMACENES.CODIGO_POSTAL) AS CODIGO_POS' +
+              'TAL,'#10'  IIF ((PEDIDOS_PROVEEDOR.ID_ALMACEN = 0), PEDIDOS_PROVEEDO' +
+              'R.PERSONA_CONTACTO, ALMACENES.PERSONA_CONTACTO) AS PERSONA_CONTA' +
+              'CTO,'#10'  IIF ((PEDIDOS_PROVEEDOR.ID_ALMACEN = 0), PEDIDOS_PROVEEDO' +
+              'R.TELEFONO, ALMACENES.TELEFONO) AS TELEFONO'#10#10'FROM'#10'  PEDIDOS_PROV' +
+              'EEDOR'#10'  LEFT OUTER JOIN CONTACTOS PROVEEDOR ON (PROVEEDOR .ID = ' +
+              'PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'  LEFT OUTER JOIN CONTACTOS VEND' +
+              'EDORES ON (VENDEDORES.ID = PEDIDOS_PROVEEDOR.ID_VENDEDOR)'#10'  LEFT' +
+              ' OUTER JOIN CONTRATOS_CLIENTE ON (CONTRATOS_CLIENTE.ID = PEDIDOS' +
+              '_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10'  LEFT OUTER JOIN CONTACTOS CLIE' +
+              'NTES ON (CLIENTES.ID = CONTRATOS_CLIENTE.ID_CLIENTE)'#10'  LEFT OUTE' +
+              'R JOIN ALMACENES ON (ALMACENES.ID = PEDIDOS_PROVEEDOR.ID_ALMACEN' +
+              ')'#10'WHERE PEDIDOS_PROVEEDOR.ID = :ID'#10
             StatementType = stSQL
             ColumnMappings = <
               item
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 883d551c..39c30524 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.6.9.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
               VALUE "ProductVersion", "2.6.9.0\0"
-              VALUE "CompileDate", "viernes, 23 de octubre de 2015 14:13\0"
+              VALUE "CompileDate", "lunes, 26 de octubre de 2015 22:39\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 5e68ccfdd05f7f2013e3deafcff82c5ce5179b93..76a6c90d487bf213096926d06b21788ab416a8c0 100644
GIT binary patch
delta 78
zcmdn7jd9C1#tnBO7%e8>jgSYDe<Pw9r%jHGRAwyNTpP*F$ehNYJh?kcRxpR5lp&8H
gm7$nHhe3hCh{0^~-Y88@BOuF)!I;5v^7|-H04Y2ddH?_b

delta 82
zcmdn8jd8~|#tnBO7;PrsjgSYDe<Pw9XHAZbRAwyOTpP*F$ehKXI=MSaR<w*ElOdI%
jh#?P17BlEDC@>f?7*F0ArO9c?V8UR<U<l;Bj`9Qmj7b<*