From 3877d4b360f4942e27a54fb3bdd93b6dd09e3742 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 9 Sep 2016 16:53:08 +0000
Subject: [PATCH] =?UTF-8?q?-=20Mejorado=20el=20alta/modificaci=C3=B3n=20de?=
 =?UTF-8?q?=20contratos=20y=20presupuestos=20al=20desactivar=20los=20docum?=
 =?UTF-8?q?entos=20relacionados=20hasta=20que=20se=20accede=20a=20la=20pes?=
 =?UTF-8?q?ta=C3=B1a=20-=20Revisi=C3=B3n=20para=20tratar=20de=20localizar?=
 =?UTF-8?q?=20porqu=C3=A9=20se=20queda=20esperando=20en=20el=20ordenador?=
 =?UTF-8?q?=20de=20V=C3=ADctor.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@651 f4e31baf-9722-1c47-927c-6f952f962d4b
---
 Source/Cliente/FactuGES.dpr                   |   1 +
 Source/Cliente/FactuGES.dproj                 |  39 ++--
 Source/Cliente/FactuGES.rc                    |   8 +-
 Source/Cliente/FactuGES.res                   | Bin 171984 -> 171984 bytes
 .../Views/uEditorContratoCliente.dfm          | 184 ++++++++--------
 .../Views/uEditorContratoCliente.pas          |  16 +-
 .../Views/uViewDocumentosContratoCliente.pas  |  23 +-
 .../uGestorDocumentosController.pas           |   4 +-
 .../Views/PedidosProveedor_view.dproj         |  42 ++--
 .../Views/uEditorPedidoProveedor.dfm          | 198 +++++++-----------
 .../Views/uEditorPedidoProveedor.pas          |  10 +-
 .../Views/uViewDocumentosPedidoProveedor.pas  |  19 +-
 .../Views/uEditorPresupuestoCliente.dfm       |  46 ++--
 .../Views/uEditorPresupuestoCliente.pas       |  13 +-
 .../uViewDocumentosPresupuestoCliente.pas     |  21 +-
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 Source/Servidor/FactuGES_Server.res           | Bin 23344 -> 23356 bytes
 17 files changed, 316 insertions(+), 310 deletions(-)

diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr
index 26dad992..953a0006 100644
--- a/Source/Cliente/FactuGES.dpr
+++ b/Source/Cliente/FactuGES.dpr
@@ -1,6 +1,7 @@
 program FactuGES;
 
 uses
+  ExceptionLog,
   Forms,
   Windows,
   SysUtils,
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 865d20a8..e30dce53 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -43,7 +43,7 @@
     <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
     <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG;</DCC_Define>
+    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
     <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
     <DCC_DebugVN>True</DCC_DebugVN>
     <DCC_MapFile>3</DCC_MapFile>
@@ -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">7</VersionInfo><VersionInfo Name="Release">5</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.5.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.5.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">7</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.7.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.7.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>
@@ -81,24 +81,24 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
-Activate=0
+Activate=1
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
 Freeze Activate=0
 Freeze Timeout=60
-SMTP From=eurekalog@email.com
-SMTP Host=
+SMTP From=info@acanainteriorismo.com
+SMTP Host=europe%2Dpriva45.privatednsorg.com
 SMTP Port=25
-SMTP UserID=
-SMTP Password=
+SMTP UserID=info@acanainteriorismo.com
+SMTP Password=*Acana2014
 Append to Log=0
 TerminateBtn Operation=2
 Errors Number=32
 Errors Terminate=3
-Email Address=
-Email Object=
-Email Send Options=0
+Email Address=soporte@rodax%2Dsoftware.com
+Email Object=EurekaLog
+Email Send Options=2
 Output Path=
 Encrypt Password=
 AutoCloseDialogSecs=0
@@ -142,15 +142,15 @@ ZipPassword=
 PreBuildEvent=
 PostSuccessfulBuildEvent=
 PostFailureBuildEvent=
-ExceptionDialogType=2
+ExceptionDialogType=3
 Count=0
-EMail Message Line Count=0
+EMail Message Line Count=1
 loNoDuplicateErrors=0
 loAppendReproduceText=0
-loDeleteLogAtVersionChange=0
+loDeleteLogAtVersionChange=1
 loAddComputerNameInLogFileName=0
 loSaveModulesAndProcessesSections=1
-loSaveAssemblerAndCPUSections=1
+loSaveAssemblerAndCPUSections=0
 soAppStartDate=1
 soAppName=1
 soAppVersionNumber=1
@@ -201,14 +201,14 @@ soNetDHCP=1
 soCustomData=1
 sndShowSendDialog=1
 sndShowSuccessFailureMsg=0
-sndSendEntireLog=0
+sndSendEntireLog=1
 sndSendXMLLogCopy=0
 sndSendScreenshot=1
-sndUseOnlyActiveWindow=0
+sndUseOnlyActiveWindow=1
 sndSendLastHTMLPage=1
 sndSendInSeparatedThread=0
-sndAddDateInFileName=0
-sndAddComputerNameInFileName=0
+sndAddDateInFileName=1
+sndAddComputerNameInFileName=1
 edoSendErrorReportChecked=1
 edoAttachScreenshotChecked=1
 edoShowCopyToClipOption=1
@@ -233,7 +233,7 @@ boSaveCompressedCopyInCaseOfError=0
 boHandleSafeCallExceptions=1
 boCallRTLExceptionEvent=0
 boCatchHandledExceptions=0
-loCatchLeaks=0
+loCatchLeaks=1
 loGroupsSonLeaks=1
 loHideBorlandLeaks=1
 loFreeAllLeaks=1
@@ -560,4 +560,5 @@ mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
 TextsCollection=
+Line0="Error FactuGES en %%ComputerName%% con usuario %%UserName%%"
 EurekaLog Last Line -->
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index aa8b7c7a..adfe2735 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,7,5,0
-PRODUCTVERSION 2,7,5,0
+FILEVERSION 2,7,7,0
+PRODUCTVERSION 2,7,7,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.7.5.0\0"
+              VALUE "FileVersion", "2.7.7.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.7.5.0\0"
+              VALUE "ProductVersion", "2.7.7.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index d1f5bab55ef9a9fc5da4faf4e538d3904c776e6f..bccf48cbf1ebece48098912769b03fa392fc7a33 100644
GIT binary patch
delta 42
xcmcbxpX<VYu7(!IElgtbIN2H48JHLt7}%%F&tp2tXg>YrJf_(|s&zh-Hvk`54HN(X

delta 42
xcmcbxpX<VYu7(!IElgtbI9VCk8JHLt7+9yv&tp2tXgdAnJf_(|s&zh-Hvk^f4GaJP

diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm
index c5fd8ea3..5e83370e 100644
--- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm	
+++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm	
@@ -2,11 +2,11 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
   Left = 332
   Top = 147
   Caption = 'Nuevo contrato de cliente'
-  ClientHeight = 633
+  ClientHeight = 798
   ClientWidth = 872
   OnClose = CustomEditorClose
   ExplicitWidth = 880
-  ExplicitHeight = 667
+  ExplicitHeight = 832
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -129,7 +129,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
     Width = 872
     ExplicitWidth = 872
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 488
+      ExplicitWidth = 634
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -162,7 +162,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 614
+    Top = 779
     Width = 872
     Panels = <
       item
@@ -173,26 +173,27 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
   end
   inherited pgPaginas: TPageControl
     Width = 866
-    Height = 308
+    Height = 464
     ActivePage = pagDocumentos
     TabOrder = 1
     OnChanging = pgPaginasChanging
     ExplicitWidth = 866
-    ExplicitHeight = 308
+    ExplicitHeight = 299
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 858
-      ExplicitHeight = 280
+      ExplicitHeight = 271
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitHeight = 271
       inline frViewDetallesContratoCliente1: TfrViewDetallesContratoCliente
         Left = 0
         Top = 0
         Width = 858
-        Height = 280
+        Height = 436
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -205,12 +206,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 858
-        ExplicitHeight = 280
+        ExplicitHeight = 271
         inherited ToolBar1: TToolBar
           Width = 858
-          Height = 24
           ExplicitWidth = 858
-          ExplicitHeight = 24
           inherited ToolButton4: TToolButton
             Wrap = False
           end
@@ -221,89 +220,64 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
             ExplicitTop = 0
           end
           inherited FontName: TJvFontComboBox
-            Left = 368
-            Top = 0
-            ExplicitLeft = 368
-            ExplicitTop = 0
+            Left = 0
+            ExplicitLeft = 0
           end
-          inherited FontSize: TEdit
-            Left = 513
-            Top = 0
-            Width = 90
-            ExplicitLeft = 513
-            ExplicitTop = 0
-            ExplicitWidth = 90
+          inherited ToolButton13: TToolButton [6]
+            Left = 145
+            ExplicitLeft = 145
           end
-          inherited UpDown1: TUpDown
-            Left = 603
-            Top = 0
-            ExplicitLeft = 603
-            ExplicitTop = 0
+          inherited ToolButton6: TToolButton [7]
+            Left = 153
+            ExplicitLeft = 153
           end
-          inherited ToolButton13: TToolButton
-            Left = 620
-            Top = 0
-            ExplicitLeft = 620
-            ExplicitTop = 0
+          inherited ToolButton7: TToolButton [8]
+            Left = 187
+            ExplicitLeft = 187
           end
-          inherited ToolButton6: TToolButton
-            Left = 628
-            Top = 0
-            ExplicitLeft = 628
-            ExplicitTop = 0
+          inherited ToolButton8: TToolButton [9]
+            Left = 221
+            ExplicitLeft = 221
           end
-          inherited ToolButton7: TToolButton
-            Left = 662
-            Top = 0
-            ExplicitLeft = 662
-            ExplicitTop = 0
+          inherited ToolButton12: TToolButton [10]
+            Left = 255
+            ExplicitLeft = 255
           end
-          inherited ToolButton8: TToolButton
-            Left = 696
-            Top = 0
-            ExplicitLeft = 696
-            ExplicitTop = 0
+          inherited ToolButton9: TToolButton [11]
+            Left = 263
+            ExplicitLeft = 263
           end
-          inherited ToolButton12: TToolButton
-            Left = 730
-            Top = 0
-            ExplicitLeft = 730
-            ExplicitTop = 0
+          inherited ToolButton10: TToolButton [12]
+            Left = 297
+            ExplicitLeft = 297
           end
-          inherited ToolButton9: TToolButton
-            Left = 738
-            Top = 0
-            ExplicitLeft = 738
-            ExplicitTop = 0
+          inherited ToolButton11: TToolButton [13]
+            Left = 331
+            ExplicitLeft = 331
           end
-          inherited ToolButton10: TToolButton
-            Left = 772
-            Top = 0
-            ExplicitLeft = 772
-            ExplicitTop = 0
+          inherited FontSize: TEdit [14]
+            Left = 365
+            Width = 110
+            ExplicitLeft = 365
+            ExplicitWidth = 110
           end
-          inherited ToolButton11: TToolButton
-            Left = 806
-            Top = 0
-            ExplicitLeft = 806
-            ExplicitTop = 0
+          inherited UpDown1: TUpDown [15]
+            Left = 475
+            ExplicitLeft = 475
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 50
           Width = 858
-          Height = 230
-          ExplicitTop = 50
+          Height = 361
+          ExplicitTop = 53
           ExplicitWidth = 858
-          ExplicitHeight = 230
+          ExplicitHeight = 218
         end
         inherited TBXDock1: TTBXDock
-          Top = 24
           Width = 858
-          ExplicitTop = 24
           ExplicitWidth = 858
           inherited TBXToolbar1: TTBXToolbar
-            ExplicitWidth = 665
+            ExplicitWidth = 858
           end
         end
         inherited cxLookupComboBox1: TcxLookupComboBox
@@ -320,15 +294,17 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
     object pagCalidades: TTabSheet
       Caption = 'Calidades'
       ImageIndex = 5
+      ExplicitHeight = 271
       object dxLayoutControl2: TdxLayoutControl
         Left = 0
         Top = 0
         Width = 858
-        Height = 280
+        Height = 436
         Align = alClient
         TabOrder = 0
         TabStop = False
         AutoContentSizes = [acsWidth, acsHeight]
+        ExplicitHeight = 271
         object memCalidades: TcxDBMemo
           Left = 10
           Top = 10
@@ -356,6 +332,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
           Hidden = True
           ShowBorder = False
           object dxLayoutItem1: TdxLayoutItem
+            AutoAligns = [aaHorizontal]
+            AlignVert = avClient
             Control = memCalidades
             ControlOptions.ShowBorder = False
           end
@@ -365,15 +343,17 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
     object pagCondiciones: TTabSheet
       Caption = 'Condiciones'
       ImageIndex = 4
+      ExplicitHeight = 271
       object dxLayoutControl1: TdxLayoutControl
         Left = 0
         Top = 0
         Width = 858
-        Height = 280
+        Height = 436
         Align = alClient
         TabOrder = 0
         TabStop = False
         AutoContentSizes = [acsWidth, acsHeight]
+        ExplicitHeight = 271
         object memCondiciones: TcxDBMemo
           Left = 10
           Top = 10
@@ -401,6 +381,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
           Hidden = True
           ShowBorder = False
           object dxLayoutControl1Item1: TdxLayoutItem
+            AutoAligns = [aaHorizontal]
+            AlignVert = avClient
             Control = memCondiciones
             ControlOptions.ShowBorder = False
           end
@@ -410,11 +392,12 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
+      ExplicitHeight = 271
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
         Width = 858
-        Height = 280
+        Height = 436
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -425,7 +408,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 858
-        ExplicitHeight = 280
+        ExplicitHeight = 271
         inherited pnlSup: TPanel
           Width = 858
           ExplicitWidth = 858
@@ -435,13 +418,14 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
         end
         inherited GroupBox1: TGroupBox
           Width = 858
-          Height = 252
+          Height = 408
           ExplicitWidth = 858
-          ExplicitHeight = 252
+          ExplicitHeight = 243
           inherited eIncidencias: TcxDBMemo
+            ExplicitTop = 18
             ExplicitWidth = 854
-            ExplicitHeight = 235
-            Height = 235
+            ExplicitHeight = 391
+            Height = 391
             Width = 854
           end
         end
@@ -450,11 +434,13 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
     object pagDocumentos: TTabSheet
       Caption = 'Documentos'
       ImageIndex = 5
+      OnShow = pagDocumentosShow
+      ExplicitHeight = 271
       inline frViewDocumentosContratoCliente1: TfrViewDocumentosContratoCliente
         Left = 0
         Top = 0
         Width = 858
-        Height = 280
+        Height = 436
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -465,16 +451,16 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 858
-        ExplicitHeight = 280
+        ExplicitHeight = 271
         inherited TBXDock: TTBXDock
           Width = 858
           ExplicitWidth = 858
         end
         inherited ListView1: TListView
           Width = 858
-          Height = 257
+          Height = 407
           ExplicitWidth = 858
-          ExplicitHeight = 257
+          ExplicitHeight = 242
         end
         inherited EditorActionList: TActionList
           Left = 8
@@ -493,7 +479,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
   end
   inline frViewTotales1: TfrViewTotales [5]
     Left = 0
-    Top = 420
+    Top = 585
     Width = 872
     Height = 194
     Align = alBottom
@@ -513,26 +499,32 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
       ExplicitWidth = 872
       inherited Bevel3: TBevel
         Left = 429
-        Height = 152
         ExplicitLeft = 429
-        ExplicitHeight = 152
       end
       inherited Bevel4: TBevel
         Left = 541
+        Width = 210
         ExplicitLeft = 541
+        ExplicitWidth = 210
       end
       inherited ImporteDto: TcxDBCurrencyEdit
         Style.IsFontAssigned = True
+        ExplicitWidth = 93
+        Width = 93
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
         Left = 612
         Style.IsFontAssigned = True
         ExplicitLeft = 612
+        ExplicitWidth = 137
+        Width = 137
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
         Left = 542
         Style.IsFontAssigned = True
         ExplicitLeft = 542
+        ExplicitWidth = 137
+        Width = 137
       end
       inherited edtDescuento: TcxDBSpinEdit
         Style.IsFontAssigned = True
@@ -546,6 +538,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
         Left = 541
         Style.IsFontAssigned = True
         ExplicitLeft = 541
+        ExplicitWidth = 92
+        Width = 92
       end
       inherited edtRE: TcxDBSpinEdit
         Left = 541
@@ -556,22 +550,34 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
         Left = 612
         Style.IsFontAssigned = True
         ExplicitLeft = 612
+        ExplicitWidth = 56
+        Width = 56
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
         Style.IsFontAssigned = True
+        ExplicitWidth = 147
+        Width = 147
       end
       inherited ePorte: TcxDBCurrencyEdit
         Style.IsFontAssigned = True
+        ExplicitWidth = 147
+        Width = 147
       end
       inherited eIVA: TcxDBLookupComboBox
         Properties.OnValidate = frViewTotales1eIVAPropertiesValidate
         Style.Color = clInfoBk
+        ExplicitWidth = 81
+        Width = 81
       end
       inherited bTiposIVA: TButton
         Left = 281
         OnClick = frViewTotales1bTiposIVAClick
         ExplicitLeft = 281
       end
+      inherited cbRecargoEquivalencia: TcxDBCheckBox
+        ExplicitWidth = 219
+        Width = 219
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
           inherited dxLayoutControl1Group2: TdxLayoutGroup
diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas
index 19eb8b6a..dffa4410 100644
--- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas	
+++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas	
@@ -60,7 +60,8 @@ type
     procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure OnRecargoEquivalenciaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
-      var Error: Boolean); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor.
+      var Error: Boolean);
+    procedure pagDocumentosShow(Sender: TObject); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor.
 
   private
     //procedure RecalcularPortePorUnidad;
@@ -112,7 +113,8 @@ implementation
 
 uses
   uViewDatosYSeleccionCliente, uDataModuleUsuarios, uClientesController,
-  uBizDireccionesContacto, uDialogUtils, uFactuGES_App, uDataTableUtils;
+  uBizDireccionesContacto, uDialogUtils, uFactuGES_App, uDataTableUtils,
+  Dialogs;
 
 {$R *.dfm}
 
@@ -322,6 +324,13 @@ begin
      Contrato.RECARGO_EQUIVALENCIA := 0;
 end;
 
+procedure TfEditorContratoCliente.pagDocumentosShow(Sender: TObject);
+begin
+  inherited;
+  //GESTION_DOCUMENTOS
+  frViewDocumentosContratoCliente1.Contrato := FContrato;
+end;
+
 procedure TfEditorContratoCliente.pgPaginasChanging(Sender: TObject;
   var AllowChange: Boolean);
 var
@@ -419,9 +428,6 @@ begin
         frViewDetallesContratoCliente1.Detalles := FContrato.Detalles;
         frViewDetallesContratoCliente1.Contrato := FContrato; //Para poder sacar los descuento del articulos segun el cliente seleccionado
 
-        //GESTION_DOCUMENTOS
-        frViewDocumentosContratoCliente1.Contrato := FContrato;
-
       finally
         ViewContrato.ViewClienteContrato.OnClienteChanged := OnClienteChanged;
       end;
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewDocumentosContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewDocumentosContratoCliente.pas
index 20e8de35..f14cec38 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewDocumentosContratoCliente.pas	
+++ b/Source/Modulos/Contratos de cliente/Views/uViewDocumentosContratoCliente.pas	
@@ -72,11 +72,16 @@ end;
 procedure TfrViewDocumentosContratoCliente.SetContrato(const Value: IBizContratoCliente);
 begin
   FContrato := Value;
-  //Inicializamos la lista de documentos local con los ficheros del servidor
-  if Assigned(FContrato) and Assigned(FController) then
-     ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Contrato.ID);
+  try
+    ShowHourglassCursor;
+    //Inicializamos la lista de documentos local con los ficheros del servidor
+    if Assigned(FContrato) and Assigned(FController) then
+       ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Contrato.ID);
 
-  RefrescarVisualizador;
+    RefrescarVisualizador;
+  finally
+    HideHourglassCursor;
+  end;
 end;
 
 procedure TfrViewDocumentosContratoCliente.Sincronizar;
@@ -94,7 +99,15 @@ begin
       ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.');
   end;
 }
-  Controller.GestorDocumentosController.SincronizarDocumentos(Contrato.ID, ListaFicheros, Directorio);
+  if Assigned(Contrato) then
+  begin
+    try
+      ShowHourglassCursor;
+      Controller.GestorDocumentosController.SincronizarDocumentos(Contrato.ID, ListaFicheros, Directorio);
+    finally
+      HideHourglassCursor;
+    end;
+  end;
 end;
 
 end.
diff --git a/Source/Modulos/Gestion de documentos/Controller/uGestorDocumentosController.pas b/Source/Modulos/Gestion de documentos/Controller/uGestorDocumentosController.pas
index d1024710..d6e46831 100644
--- a/Source/Modulos/Gestion de documentos/Controller/uGestorDocumentosController.pas	
+++ b/Source/Modulos/Gestion de documentos/Controller/uGestorDocumentosController.pas	
@@ -107,9 +107,9 @@ begin
   for i:= 0 to ListaDocumentosServidor.Count - 1 do
       if not FListaDocumentos.Find(ListaDocumentosServidor.Strings[i], j) then
          if not FDataModule.EliminarFichero(ID, Almacen, ListaDocumentosServidor.Strings[i]) then
-            showmessage('Error al borrar fichero' + ListaDocumentosServidor.Strings[i]);
+            ShowMessage('Error al borrar fichero' + ListaDocumentosServidor.Strings[i]);
 
-  //Subimos todos los ficheros que halla al servidor (de momento no se miran fechas)
+  //Subimos todos los ficheros que existan al servidor (de momento no se miran fechas)
   for i := 0 to FListaDocumentos.Count - 1 do
   begin
     ANombreFichero := Directorio + FListaDocumentos.Strings[i];
diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj
index f58c19ec..adca1708 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj	
+++ b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj	
@@ -49,27 +49,27 @@
     <DelphiCompile Include="PedidosProveedor_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\Almacenes_controller.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\Almacenes_model.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\Articulos_view.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\Contactos_view.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\ContratosCliente_controller.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\ContratosCliente_model.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\dxCoreD11.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\GUIBase.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\PedidosProveedor_controller.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\PedidosProveedor_model.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\PNG_D10.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\rtl.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\tb2k_d10.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\tbx_d10.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\vcl.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\vclactnband.dcp" />
+    <DCCReference Include="..\..\Presupuestos de cliente\vclx.dcp" />
     <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
       <Form>fEditorDireccionEntregaPedidoProveedor </Form>
       <DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
index 581e3fff..6b6771c1 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
@@ -12,7 +12,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 922
     Caption = 'Nuevo pedido a proveedor'
-    ExplicitTop = 49
     ExplicitWidth = 922
     inherited Image1: TImage
       Left = 895
@@ -47,7 +46,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     Width = 922
     ExplicitWidth = 922
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 488
+      ExplicitWidth = 634
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -74,22 +73,22 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
   end
   inherited pgPaginas: TPageControl
     Width = 916
-    Height = 491
+    Height = 482
+    ActivePage = pagDocumentos
     TabOrder = 1
     OnChanging = pgPaginasChanging
-    ExplicitTop = 109
     ExplicitWidth = 916
-    ExplicitHeight = 491
+    ExplicitHeight = 482
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 908
-      ExplicitHeight = 463
+      ExplicitHeight = 454
       inline frViewPedidoProveedor1: TfrViewPedidoProveedor
         Left = 0
         Top = 0
         Width = 908
-        Height = 463
+        Height = 454
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -100,102 +99,63 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 908
-        ExplicitHeight = 463
+        ExplicitHeight = 454
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 908
-          Height = 463
+          Height = 454
           ExplicitWidth = 908
-          ExplicitHeight = 463
+          ExplicitHeight = 454
           inherited frViewProveedorPedido: TfrViewDatosYSeleccionProveedor
-            Left = 551
+            Left = 548
             Width = 357
-            ExplicitLeft = 551
+            ExplicitLeft = 548
             ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 357
+              ExplicitWidth = 317
               inherited edtlNombre: TcxDBTextEdit
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
               inherited edtNIFCIF: TcxDBTextEdit
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
               inherited edtCalle: TcxDBTextEdit
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
               inherited edtPoblacion: TcxDBTextEdit
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 176
                 Width = 176
               end
               inherited edtProvincia: TcxDBTextEdit
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 283
                 Width = 283
               end
               inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 237
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 237
+                Left = 236
+                ExplicitLeft = 236
               end
               inherited Button3: TBitBtn
-                Left = 110
-                ExplicitLeft = 110
+                Left = 109
+                ExplicitLeft = 109
               end
             end
           end
           inherited edtFechaPedido: TcxDBDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 158
             Width = 158
           end
           inherited edtFechaConfirmacion: TcxDBDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 158
             Width = 158
           end
           inherited edtFechaEntrega: TcxDBDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 158
             Width = 158
           end
           inherited eReferencia: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 158
             Width = 158
           end
@@ -207,6 +167,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 273
               Height = 166
+              ExplicitWidth = 496
+              ExplicitHeight = 20
               inherited rdxDestino1: TRadioButton
                 Width = 253
                 ExplicitWidth = 253
@@ -216,16 +178,12 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
                 ExplicitWidth = 253
               end
               inherited cbLista: TcxDBLookupComboBox
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 238
                 Width = 238
               end
               inherited bModificar: TBitBtn
-                Left = 344
-                ExplicitLeft = 344
+                Left = 337
+                ExplicitLeft = 337
               end
               inherited txtDireccion: TStaticText
                 Width = 238
@@ -233,52 +191,45 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
                 ExplicitWidth = 238
                 ExplicitHeight = 42
               end
+              inherited rdxDestinoCliente: TRadioButton
+                Width = 566
+                ExplicitWidth = 566
+              end
+              inherited cbListaDireccionesCliente: TcxDBLookupComboBox
+                ExplicitWidth = 551
+                Width = 551
+              end
             end
           end
           inherited cbFormaPago: TcxDBLookupComboBox
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 20
             Width = 20
           end
           inherited bFormasPago: TButton
-            Left = 389
-            ExplicitLeft = 389
+            Left = 386
+            ExplicitLeft = 386
           end
           inherited edtFechaEnvio: TcxDBDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 158
             Width = 158
           end
           inherited eReferenciaContratoCli: TcxTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 20
             Width = 20
           end
           inherited Button1: TButton
-            Left = 389
-            ExplicitLeft = 389
+            Left = 386
+            ExplicitLeft = 386
           end
           inherited frViewTienda1: TfrViewTienda
-            Left = 551
+            Left = 548
             Width = 357
-            ExplicitLeft = 551
+            ExplicitLeft = 548
             ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 357
+              ExplicitWidth = 317
               inherited cbTienda: TcxComboBox
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 390
                 Width = 390
               end
@@ -289,22 +240,15 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             ExplicitWidth = 422
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewPedidoProveedor1.DADataSource
+              ExplicitWidth = 360
               Width = 422
             end
           end
           inherited edtlDescripcion: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 283
             Width = 283
           end
           inherited edtFechaEnvio2: TcxDBDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 257
             Width = 257
           end
@@ -322,7 +266,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Left = 0
         Top = 0
         Width = 908
-        Height = 463
+        Height = 454
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -335,7 +279,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 908
-        ExplicitHeight = 463
+        ExplicitHeight = 454
         inherited ToolBar1: TToolBar
           Width = 908
           Height = 24
@@ -363,64 +307,64 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             ExplicitTop = 0
           end
           inherited UpDown1: TUpDown
-            Left = 571
+            Left = 555
             Top = 0
-            ExplicitLeft = 571
+            ExplicitLeft = 555
             ExplicitTop = 0
           end
           inherited ToolButton13: TToolButton
-            Left = 588
+            Left = 572
             Top = 0
-            ExplicitLeft = 588
+            ExplicitLeft = 572
             ExplicitTop = 0
           end
           inherited ToolButton6: TToolButton
-            Left = 596
+            Left = 580
             Top = 0
-            ExplicitLeft = 596
+            ExplicitLeft = 580
             ExplicitTop = 0
           end
           inherited ToolButton7: TToolButton
-            Left = 630
+            Left = 614
             Top = 0
-            ExplicitLeft = 630
+            ExplicitLeft = 614
             ExplicitTop = 0
           end
           inherited ToolButton8: TToolButton
-            Left = 664
+            Left = 648
             Top = 0
-            ExplicitLeft = 664
+            ExplicitLeft = 648
             ExplicitTop = 0
           end
           inherited ToolButton12: TToolButton
-            Left = 698
+            Left = 682
             Top = 0
-            ExplicitLeft = 698
+            ExplicitLeft = 682
             ExplicitTop = 0
           end
           inherited ToolButton9: TToolButton
-            Left = 706
+            Left = 690
             Top = 0
-            ExplicitLeft = 706
+            ExplicitLeft = 690
             ExplicitTop = 0
           end
           inherited ToolButton10: TToolButton
-            Left = 740
+            Left = 724
             Top = 0
-            ExplicitLeft = 740
+            ExplicitLeft = 724
             ExplicitTop = 0
           end
           inherited ToolButton11: TToolButton
-            Left = 774
+            Left = 758
             Top = 0
-            ExplicitLeft = 774
+            ExplicitLeft = 758
             ExplicitTop = 0
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 50
+          Top = 53
           Width = 908
-          Height = 413
+          Height = 401
           ExplicitTop = 50
           ExplicitWidth = 908
           ExplicitHeight = 413
@@ -433,10 +377,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         inherited TBXDock1: TTBXDock
           Top = 24
           Width = 908
-          ExplicitTop = 24
           ExplicitWidth = 908
           inherited TBXToolbar1: TTBXToolbar
-            ExplicitWidth = 548
+            ExplicitWidth = 731
           end
         end
       end
@@ -448,7 +391,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Left = 0
         Top = 0
         Width = 908
-        Height = 463
+        Height = 454
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -459,7 +402,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 908
-        ExplicitHeight = 463
+        ExplicitHeight = 454
         inherited pnlSup: TPanel
           Width = 908
           ExplicitWidth = 908
@@ -469,13 +412,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         end
         inherited GroupBox1: TGroupBox
           Width = 908
-          Height = 435
+          Height = 426
           ExplicitWidth = 908
-          ExplicitHeight = 435
+          ExplicitHeight = 426
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 904
-            ExplicitHeight = 418
-            Height = 418
+            ExplicitHeight = 409
+            Height = 409
             Width = 904
           end
         end
@@ -484,11 +427,12 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     object pagDocumentos: TTabSheet
       Caption = 'Documentos'
       ImageIndex = 3
+      OnShow = pagDocumentosShow
       inline frViewDocumentosPedidoProveedor1: TfrViewDocumentosPedidoProveedor
         Left = 0
         Top = 0
         Width = 908
-        Height = 463
+        Height = 454
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -499,16 +443,17 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 908
-        ExplicitHeight = 463
+        ExplicitHeight = 454
         inherited TBXDock: TTBXDock
           Width = 908
           ExplicitWidth = 908
         end
         inherited ListView1: TListView
           Width = 908
-          Height = 440
+          Height = 425
+          ExplicitTop = 29
           ExplicitWidth = 908
-          ExplicitHeight = 440
+          ExplicitHeight = 425
         end
       end
     end
@@ -709,7 +654,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
   end
   inherited PnlComentario: TPanel [5]
     Width = 922
-    ExplicitTop = 76
     ExplicitWidth = 922
     inherited lbComentario: TLabel
       Width = 912
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas
index c6b010a1..ddaf0056 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas	
@@ -35,6 +35,7 @@ type
     procedure pgPaginasChanging(Sender: TObject; var AllowChange: Boolean);
     procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+    procedure pagDocumentosShow(Sender: TObject);
   private
     procedure RecalcularPortePorUnidad;
 
@@ -222,6 +223,13 @@ begin
 //     FController.DetallesController.ActualizarDetalles(FPedido.Detalles, FPedido.Proveedor);
 end;
 
+procedure TfEditorPedidoProveedor.pagDocumentosShow(Sender: TObject);
+begin
+  inherited;
+  //GESTION_DOCUMENTOS
+  frViewDocumentosPedidoProveedor1.Pedido := FPedido;
+end;
+
 procedure TfEditorPedidoProveedor.pgPaginasChanging(Sender: TObject; var AllowChange: Boolean);
 begin
   inherited;
@@ -300,8 +308,6 @@ begin
       frViewDetallesPedidoProveedor1.Detalles := FPedido.Detalles;
       frViewDetallesPedidoProveedor1.Pedido := FPedido; //Para poder sacar los articulos del proveedor seleccionado
 
-      //GESTION_DOCUMENTOS
-      frViewDocumentosPedidoProveedor1.Pedido := FPedido;
     end;
   end;
 end;
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDocumentosPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewDocumentosPedidoProveedor.pas
index 4d82b4af..059daae6 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uViewDocumentosPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDocumentosPedidoProveedor.pas	
@@ -73,10 +73,14 @@ procedure TfrViewDocumentosPedidoProveedor.SetPedido(const Value: IBizPedidoProv
 begin
   FPedido := Value;
   //Inicializamos la lista de documentos local con los ficheros del servidor
-  if Assigned(FPedido) and Assigned(FController) then
-     ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Pedido.ID);
-
-  RefrescarVisualizador;
+  try
+    ShowHourglassCursor;
+    if Assigned(FPedido) and Assigned(FController) then
+       ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Pedido.ID);
+    RefrescarVisualizador;
+  finally
+    HideHourglassCursor;
+  end;
 end;
 
 procedure TfrViewDocumentosPedidoProveedor.Sincronizar;
@@ -94,7 +98,12 @@ begin
       ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.');
   end;
 }
-  Controller.GestorDocumentosController.SincronizarDocumentos(Pedido.ID, ListaFicheros, Directorio);
+  try
+    ShowHourglassCursor;
+    Controller.GestorDocumentosController.SincronizarDocumentos(Pedido.ID, ListaFicheros, Directorio);
+  finally
+    HideHourglassCursor;
+  end;
 end;
 
 end.
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
index d177f6a9..94d2ca2d 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm	
@@ -129,7 +129,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     Width = 848
     ExplicitWidth = 848
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 488
+      ExplicitWidth = 634
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -176,12 +176,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   end
   inherited pgPaginas: TPageControl
     Width = 842
-    Height = 442
-    ActivePage = pagContenido
+    Height = 433
+    ActivePage = pagDocumentos
     TabOrder = 1
     OnChanging = pgPaginasChanging
     ExplicitWidth = 842
-    ExplicitHeight = 442
+    ExplicitHeight = 433
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
@@ -195,7 +195,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 0
         Top = 0
         Width = 834
-        Height = 414
+        Height = 405
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -208,7 +208,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 834
-        ExplicitHeight = 414
+        ExplicitHeight = 405
         inherited ToolBar1: TToolBar
           Width = 834
           Height = 24
@@ -293,12 +293,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 50
+          Top = 53
           Width = 834
-          Height = 364
-          ExplicitTop = 50
+          Height = 352
+          ExplicitTop = 53
           ExplicitWidth = 834
-          ExplicitHeight = 364
+          ExplicitHeight = 352
         end
         inherited TBXDock1: TTBXDock
           Top = 24
@@ -306,7 +306,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
           ExplicitTop = 24
           ExplicitWidth = 834
           inherited TBXToolbar1: TTBXToolbar
-            ExplicitWidth = 665
+            ExplicitWidth = 834
           end
         end
         inherited cxLookupComboBox1: TcxLookupComboBox
@@ -327,7 +327,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 0
         Top = 0
         Width = 834
-        Height = 414
+        Height = 405
         Align = alClient
         TabOrder = 0
         TabStop = False
@@ -374,7 +374,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 0
         Top = 0
         Width = 834
-        Height = 414
+        Height = 405
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -385,7 +385,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 834
-        ExplicitHeight = 414
+        ExplicitHeight = 405
         inherited pnlSup: TPanel
           Width = 834
           ExplicitWidth = 834
@@ -395,13 +395,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         end
         inherited GroupBox1: TGroupBox
           Width = 834
-          Height = 386
+          Height = 377
           ExplicitWidth = 834
-          ExplicitHeight = 386
+          ExplicitHeight = 377
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 830
-            ExplicitHeight = 369
-            Height = 369
+            ExplicitHeight = 360
+            Height = 360
             Width = 830
           end
         end
@@ -410,11 +410,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagDocumentos: TTabSheet
       Caption = 'Documentos'
       ImageIndex = 5
+      OnShow = pagDocumentosShow
       inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente
         Left = 0
         Top = 0
         Width = 834
-        Height = 414
+        Height = 405
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -425,16 +426,17 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 834
-        ExplicitHeight = 414
+        ExplicitHeight = 405
         inherited TBXDock: TTBXDock
           Width = 834
           ExplicitWidth = 834
         end
         inherited ListView1: TListView
           Width = 834
-          Height = 391
+          Height = 376
+          ExplicitTop = 29
           ExplicitWidth = 834
-          ExplicitHeight = 266
+          ExplicitHeight = 376
         end
         inherited EditorActionList: TActionList
           Left = 8
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas
index c5483d3e..da8a4077 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas	
@@ -57,7 +57,8 @@ type
     procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure OnRecargoEquivalenciaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
-      var Error: Boolean); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor.
+      var Error: Boolean);
+    procedure pagDocumentosShow(Sender: TObject); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor.
 
   private
     procedure RecalcularPortePorUnidad;
@@ -321,6 +322,13 @@ begin
      Presupuesto.RECARGO_EQUIVALENCIA := 0;
 end;
 
+procedure TfEditorPresupuestoCliente.pagDocumentosShow(Sender: TObject);
+begin
+  inherited;
+  //GESTION_DOCUMENTOS
+  frViewDocumentosPresupuestoCliente1.Presupuesto := FPresupuesto;
+end;
+
 procedure TfEditorPresupuestoCliente.pgPaginasChanging(Sender: TObject;
   var AllowChange: Boolean);
 var
@@ -418,9 +426,6 @@ begin
         frViewDetallesPresupuestoCliente1.Detalles := FPresupuesto.Detalles;
         frViewDetallesPresupuestoCliente1.Presupuesto := FPresupuesto; //Para poder sacar los descuento del articulos segun el cliente seleccionado
 
-        //GESTION_DOCUMENTOS
-        frViewDocumentosPresupuestoCliente1.Presupuesto := FPresupuesto;
-
       finally
         ViewPresupuesto.ViewClientePresupuesto.OnClienteChanged := OnClienteChanged;
       end;
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDocumentosPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewDocumentosPresupuestoCliente.pas
index 381f6e1a..dab640d3 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewDocumentosPresupuestoCliente.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDocumentosPresupuestoCliente.pas	
@@ -73,10 +73,15 @@ procedure TfrViewDocumentosPresupuestoCliente.SetPresupuesto(const Value: IBizPr
 begin
   FPresupuesto := Value;
   //Inicializamos la lista de documentos local con los ficheros del servidor
-  if Assigned(FPresupuesto) and Assigned(FController) then
-     ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Presupuesto.ID);
+  try
+    ShowHourglassCursor;
+    if Assigned(FPresupuesto) and Assigned(FController) then
+       ListaFicheros := Controller.GestorDocumentosController.DarListaDocumentos(Presupuesto.ID);
 
-  RefrescarVisualizador;
+    RefrescarVisualizador;
+  finally
+    HideHourglassCursor;
+  end;
 end;
 
 procedure TfrViewDocumentosPresupuestoCliente.Sincronizar;
@@ -94,7 +99,15 @@ begin
       ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.');
   end;
 }
-  Controller.GestorDocumentosController.SincronizarDocumentos(Presupuesto.ID, ListaFicheros, Directorio);
+  if Assigned(Presupuesto) then
+  begin
+    try
+      ShowHourglassCursor;
+      Controller.GestorDocumentosController.SincronizarDocumentos(Presupuesto.ID, ListaFicheros, Directorio);
+    finally
+      HideHourglassCursor;
+    end;
+  end;
 end;
 
 end.
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 8f9efd3c..09067fad 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.7.5.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
               VALUE "ProductVersion", "2.7.5.0\0"
-              VALUE "CompileDate", "lunes, 01 de agosto de 2016 13:42\0"
+              VALUE "CompileDate", "viernes, 09 de septiembre de 2016 18:07\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 5bc88d12eae6ed27849652380aff8ff3f36e02f4..7a79a3b17d21813b74342bcecbedc99917fea6e6 100644
GIT binary patch
delta 124
zcmdn6jd9O5#tnBO7#$|xjgSYDe<Pw97fg<fRA#K%TpP*F$XvjnF}XWR*0+oylOdI%
zh#?P17BlEDC@>f>SOUouAYTC}lFCrPPy$wy%a8<A2NH$I839!qGMEARh71-ARzRNl
I<d;$I0MTY11^@s6

delta 112
zcmdn9jd24I-HBi{nS3`w9!UO;h-REJIWkh2v0!s;BsU{-3WL(*?kHKu9EMVcJcd+;
yVg?-s1qK5KLm-&~<SQ^FGNd!)1I0^#BuvZ*tilY)H)JqouwpP_Fq-@|${hehyBj_L